@cosmwasm/ts-codegen 1.12.0 → 1.13.0

package/utils/cleanse.js

@@ -1,18 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanse = void 0;
+exports.cleanse = exports.cleanFor = void 0;
 const case_1 = require("case");
 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], (0, case_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], (0, case_1.pascal)(match[1]));
     }
     return str;
 };
+exports.cleanFor = cleanFor;
 const cleanNullable = (str) => {
     if (/^Nullable_/.test(str)) {
         str = str.replace(/^Nullable_/, 'Nullable');
@@ -49,10 +54,10 @@ 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)] = (0, exports.cleanse)(obj[attr]);
+                    copy[(0, exports.cleanFor)(attr)] = (0, exports.cleanse)(obj[attr]);
                 }
                 else if (/^Nullable_/.test(attr)) {
                     // @ts-ignore
@@ -64,7 +69,7 @@ const cleanse = (obj) => {
                         case '$ref':
                             if (typeof obj[attr] === 'string') {
                                 // @ts-ignore
-                                copy[attr] = (0, exports.cleanse)(cleanNullable(cleanFor(obj[attr])));
+                                copy[attr] = (0, exports.cleanse)(cleanNullable((0, exports.cleanFor)(obj[attr])));
                             }
                             else {
                                 // @ts-ignore

package/utils/files.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/utils/package.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readAndParsePackageJson = void 0;
+exports.readAndParsePackageJson = readAndParsePackageJson;
 const fs_1 = require("fs");
 const path_1 = require("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 = (0, path_1.join)(currentDir, 'package.json');
     // Check if package.json exists in the current directory
@@ -27,4 +27,3 @@ function readAndParsePackageJson() {
     const pkg = JSON.parse(str);
     return pkg;
 }
-exports.readAndParsePackageJson = readAndParsePackageJson;

package/utils/parse.js

@@ -8,18 +8,16 @@ const parser_1 = require("@babel/parser");
 const traverse_1 = __importDefault(require("@babel/traverse"));
 const parser = (codes) => {
     const hash = {};
-    codes.forEach(code => {
-        const plugins = [
-            'typescript',
-        ];
+    codes.forEach((code) => {
+        const plugins = ['typescript'];
         const ast = (0, parser_1.parse)(code, {
             sourceType: 'module',
-            plugins
+            plugins,
         });
         const visitor = visitorFn({
             addType(key, node) {
                 hash[key] = node;
-            }
+            },
         });
         (0, traverse_1.default)(ast, visitor);
     });
@@ -39,5 +37,5 @@ const visitorFn = (parser) => ({
     },
     TSInterfaceDeclaration(path) {
         parser.addType(path.node.id.name, path.parentPath.node);
-    }
+    },
 });

package/utils/prompt.js

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

package/utils/schemas.d.ts

@@ -4,7 +4,11 @@ interface ReadSchemaOpts {
     schemaDir: string;
     clean?: boolean;
 }
-export declare const readSchemas: ({ schemaDir, clean }: ReadSchemaOpts) => Promise<ContractInfo>;
+/**
+ * Takes a schema directory and returns a list of relevant file paths
+ */
+export declare const findSchemaFiles: (schemaDir: string) => Promise<string[]>;
+export declare const readSchemas: ({ schemaDir, clean, }: ReadSchemaOpts) => Promise<ContractInfo>;
 export declare const findQueryMsg: (schemas: JSONSchema[]) => QueryMsg;
 export declare const findExecuteMsg: (schemas: JSONSchema[]) => ExecuteMsg;
 export declare const findAndParseTypes: (schemas: JSONSchema[]) => Promise<Record<string, any>>;

package/utils/schemas.js

@@ -1,40 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAndParseTypes = exports.findExecuteMsg = exports.findQueryMsg = exports.readSchemas = void 0;
+exports.findAndParseTypes = exports.findExecuteMsg = exports.findQueryMsg = exports.readSchemas = exports.findSchemaFiles = void 0;
 const json_schema_to_typescript_1 = require("@pyramation/json-schema-to-typescript");
 const fs_1 = require("fs");
 const glob_1 = require("glob");
 const cleanse_1 = require("./cleanse");
 const parse_1 = require("./parse");
-;
-const readSchemas = async ({ schemaDir, clean = true }) => {
-    const fn = clean ? cleanse_1.cleanse : (schema) => schema;
-    const files = (0, glob_1.sync)(schemaDir + '/**/*.json')
-        .filter(file => !file.match(/\/raw\//));
-    const schemas = files
-        .map(file => JSON.parse((0, fs_1.readFileSync)(file, 'utf-8')));
-    if (schemas.length > 1) {
+/**
+ * Takes a schema directory and returns a list of relevant file paths
+ */
+const findSchemaFiles = async (schemaDir) => {
+    const files = (0, glob_1.globSync)(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;
+};
+exports.findSchemaFiles = findSchemaFiles;
+const readSchemas = async ({ schemaDir, clean = true, }) => {
+    const fn = clean
+        ? cleanse_1.cleanse
+        : (schema) => schema;
+    const files = (await (0, exports.findSchemaFiles)(schemaDir)).map((path) => (0, fs_1.readFileSync)(path, 'utf-8'));
+    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 = files.map((file) => JSON.parse(file));
         return {
-            schemas: fn(schemas)
+            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 = schemas[0];
+    const idlObject = JSON.parse(files[0]);
     const { 
     // contract_name,
     // contract_version,
-    idl_version, responses, instantiate, execute, query, migrate, sudo } = idlObject;
+    idl_version, responses, instantiate, execute, query, migrate, sudo, } = idlObject;
     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 = JSON.parse(files[0]);
         return {
-            schemas: fn(schemas)
+            schemas: fn([schema]),
         };
     }
     // TODO use contract_name, etc.
@@ -43,25 +57,25 @@ const readSchemas = async ({ schemaDir, clean = true }) => {
         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,
     };
 };
 exports.readSchemas = readSchemas;
 const findQueryMsg = (schemas) => {
-    const queryMsg = schemas.find(schema => schema.title === 'QueryMsg');
+    const queryMsg = schemas.find((schema) => schema.title === 'QueryMsg');
     return queryMsg;
 };
 exports.findQueryMsg = findQueryMsg;
 const findExecuteMsg = (schemas) => {
-    const executeMsg = schemas.find(schema => schema.title.startsWith('ExecuteMsg'));
+    const executeMsg = schemas.find((schema) => schema.title.startsWith('ExecuteMsg'));
     return executeMsg;
 };
 exports.findExecuteMsg = findExecuteMsg;

package/utils/unused.js

@@ -16,13 +16,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unused = void 0;
 const t = __importStar(require("@babel/types"));
@@ -39,8 +49,7 @@ exports.unused = {
                 const importName = source.node.value;
                 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);
                 }
@@ -68,6 +77,6 @@ exports.unused = {
                     binding.path.parentPath.remove();
                 }
             });
-        }
-    }
+        },
+    },
 };