@cosmwasm/ts-codegen 1.12.1 → 1.13.0

package/esm/commands/generate.js

@@ -7,38 +7,33 @@ export default async (argv) => {
             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) {
         argv.plugin = 'types';
@@ -55,24 +50,23 @@ export default async (argv) => {
                 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') {
@@ -82,11 +76,10 @@ export default async (argv) => {
                 type: 'confirm',
                 name: 'mutations',
                 message: 'Generate useMutation hooks?',
-                default: false
-            }
+                default: false,
+            },
         ]);
     }
-    ;
     const { mutations } = await prompt(questions3, argv);
     const queryFactoryQuestions = [];
     if (queryKeys) {
@@ -96,11 +89,10 @@ export default async (argv) => {
                 type: 'confirm',
                 name: 'queryFactory',
                 message: 'queryFactory? ',
-                default: false
-            }
+                default: false,
+            },
         ]);
     }
-    ;
     const { queryFactory } = await prompt(queryFactoryQuestions, argv);
     ///////// END REACT QUERY
     ///////// BUNDLE
@@ -111,27 +103,26 @@ export default async (argv) => {
                 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 = {
         types: {
-            enabled: true
+            enabled: true,
         },
         client: {
             enabled: plugin.includes('client') ||
                 plugin.includes('recoil') ||
-                plugin.includes('react-query')
+                plugin.includes('react-query'),
         },
         reactQuery: {
             enabled: plugin.includes('react-query'),
@@ -139,31 +130,31 @@ export default async (argv) => {
             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,
     });
 };

package/esm/commands/install.js

@@ -1,5 +1,5 @@
 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';
@@ -11,10 +11,12 @@ const TMPDIR = tmpdir();
 const rnd = () => Math.random().toString(36).substring(2, 15) +
     Math.random().toString(36).substring(2, 15);
 const getPackages = (names) => {
-    return names.map(pkg => {
+    return names
+        .map((pkg) => {
         const { name, version } = parse(pkg);
         return `${name}@${version}`;
-    }).join(' ');
+    })
+        .join(' ');
 };
 export default async (argv) => {
     // don't prompt if we got this...
@@ -27,7 +29,7 @@ export default async (argv) => {
     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!');
     }
     // what are we installing?
@@ -46,14 +48,14 @@ export default async (argv) => {
                 'stargaze-vending-factory',
                 'stargaze-vending-minter',
                 'stargaze-whitelist',
-                'wasmswap'
-            ].map(name => {
+                'wasmswap',
+            ].map((name) => {
                 return {
                     name,
-                    value: `@cosmjson/${name}`
+                    value: `@cosmjson/${name}`,
                 };
-            })
-        }
+            }),
+        },
     ], argv);
     // install
     if (!Array.isArray(pkg))
@@ -63,26 +65,28 @@ export default async (argv) => {
     process.chdir(tmp);
     exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`);
     // 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'; })
+        .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'
-                || f === 'package.json'
-                || /license/i.test(f)
-                || /readme/i.test(f))
+        const files = glob(`${extDir}/**/*`, { nodir: true }).sort();
+        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}...`);
@@ -95,7 +99,7 @@ export default async (argv) => {
     thisPackage.devDependencies = thisPackage.devDependencies ?? {};
     thisPackage.devDependencies = {
         ...thisPackage.devDependencies,
-        ...deps
+        ...deps,
     };
     thisPackage.devDependencies = Object.fromEntries(Object.entries(thisPackage.devDependencies).sort());
     writeFileSync(join(cur, 'package.json'), JSON.stringify(thisPackage, null, 2));

package/esm/file.js

@@ -1,15 +1,16 @@
 #!/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 = [
     {
         _: true,
         type: 'string',
         name: 'file',
-        message: 'file'
-    }
+        message: 'file',
+    },
 ];
 (async () => {
     const { file } = await prompt(question, argv);

package/esm/plugins/client.js

@@ -43,7 +43,7 @@ export class ClientPlugin extends BuilderPluginBase {
                 context.addProviderInfo(name, w.PROVIDER_TYPES.SIGNING_CLIENT_TYPE, Client, localname);
             }
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }

package/esm/plugins/message-builder.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { getMessageProperties, RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { getMessageProperties, RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
@@ -37,7 +37,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase {
                 body.push(w.createMessageBuilderClass(context, className, QueryMsg));
             }
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }
@@ -45,8 +45,8 @@ export class MessageBuilderPlugin extends BuilderPluginBase {
             {
                 type: 'message-builder',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/plugins/message-composer.js

@@ -30,7 +30,7 @@ export class MessageComposerPlugin extends BuilderPluginBase {
                 context.addProviderInfo(name, w.PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE, TheClass, localname);
             }
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }

package/esm/plugins/plugin-base.js

@@ -1,6 +1,6 @@
 import generate from '@babel/generator';
 import * as t from '@babel/types';
-import { defaultOptions } from '@cosmwasm/ts-codegen-ast';
+import { defaultOptions, } from '@cosmwasm/ts-codegen-ast';
 import deepmerge from 'deepmerge';
 import { writeFileSync } from 'fs';
 import { sync as mkdirp } from 'mkdirp';
@@ -41,8 +41,9 @@ export class BuilderPluginBase {
         }
         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);
             writeFileSync(filename, code);

package/esm/plugins/provider-bundle.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { BuilderPluginBase } from './plugin-base';
 import { GetLocalBaseNameByContractName } from './provider';

package/esm/plugins/provider.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { BuilderPluginBase } from './plugin-base';
 export const GetLocalNameByContractName = (name) => `${pascal(name)}.provider.ts`;

package/esm/plugins/react-query.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { getMessageProperties, RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { getMessageProperties, RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
@@ -24,7 +24,8 @@ export class ReactQueryPlugin extends BuilderPluginBase {
         const QueryClient = pascal(`${name}QueryClient`);
         const body = [];
         const clientImports = [];
-        QueryMsg && clientImports.push(QueryClient);
+        if (QueryMsg)
+            clientImports.push(QueryClient);
         // check that there are commands within the exec msg
         const shouldGenerateMutationHooks = ExecuteMsg &&
             options?.version === 'v4' &&
@@ -43,7 +44,7 @@ export class ReactQueryPlugin extends BuilderPluginBase {
                 context,
                 queryMsg: QueryMsg,
                 contractName: name,
-                QueryClient
+                QueryClient,
             }));
         }
         if (shouldGenerateMutationHooks) {
@@ -51,10 +52,10 @@ export class ReactQueryPlugin extends BuilderPluginBase {
                 context,
                 execMsg: ExecuteMsg,
                 contractName: name,
-                ExecuteClient
+                ExecuteClient,
             }));
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }
@@ -62,8 +63,8 @@ export class ReactQueryPlugin extends BuilderPluginBase {
             {
                 type: 'react-query',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/plugins/recoil.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
@@ -36,7 +36,7 @@ export class RecoilPlugin extends BuilderPluginBase {
             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;
         }
@@ -44,8 +44,8 @@ export class RecoilPlugin extends BuilderPluginBase {
             {
                 type: 'recoil',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/plugins/types.js

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findExecuteMsg } from '../utils';
 import { clean } from '../utils/clean';
@@ -31,8 +31,8 @@ export class TypesPlugin extends BuilderPluginBase {
             {
                 type: 'type',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/ts-codegen.js

@@ -1,6 +1,7 @@
 #!/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);
 })();

package/esm/utils/clean.js

@@ -21,7 +21,7 @@ export const clean = (obj) => {
     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':

package/esm/utils/cleanse.js

@@ -1,12 +1,16 @@
 import { pascal } from 'case';
-const cleanFor = (str) => {
+export const cleanFor = (str) => {
     /*
           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 (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;
 };
@@ -46,7 +50,7 @@ export const cleanse = (obj) => {
             }
         }
         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]);

package/esm/utils/package.js

@@ -1,6 +1,6 @@
 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) {
     const filePath = join(currentDir, 'package.json');
     // Check if package.json exists in the current directory

package/esm/utils/parse.js

@@ -2,18 +2,16 @@ import { parse } from '@babel/parser';
 import babelTraverse from '@babel/traverse';
 export const parser = (codes) => {
     const hash = {};
-    codes.forEach(code => {
-        const plugins = [
-            'typescript',
-        ];
+    codes.forEach((code) => {
+        const plugins = ['typescript'];
         const ast = parse(code, {
             sourceType: 'module',
-            plugins
+            plugins,
         });
         const visitor = visitorFn({
             addType(key, node) {
                 hash[key] = node;
-            }
+            },
         });
         babelTraverse(ast, visitor);
     });
@@ -32,5 +30,5 @@ const visitorFn = (parser) => ({
     },
     TSInterfaceDeclaration(path) {
         parser.addType(path.node.id.name, path.parentPath.node);
-    }
+    },
 });

package/esm/utils/prompt.js

@@ -36,7 +36,7 @@ const transform = (questions) => {
             return {
                 ...q,
                 type: 'autocomplete',
-                source: getFuzzySearch(choices)
+                source: getFuzzySearch(choices),
             };
         }
         else if (q.type === 'fuzzy:objects') {
@@ -45,7 +45,7 @@ const transform = (questions) => {
             return {
                 ...q,
                 type: 'autocomplete',
-                source: getFuzzySearchNames(choices)
+                source: getFuzzySearchNames(choices),
             };
         }
         else {