@dedot/codegen 0.0.1-next.3f5dd645.0 → 0.0.1-next.41a5fa17.16

package/cjs/genSupportedChainTypes.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("./index");
+const index_js_1 = require("./index.js");
 const static_substrate_1 = require("@polkadot/types-support/metadata/static-substrate");
 const substrate_hex_1 = __importDefault(require("@polkadot/types-support/metadata/v15/substrate-hex"));
 const codecs_1 = require("@dedot/codecs");
@@ -61,13 +61,13 @@ async function run() {
         const { chain, endpoint, metadataHex, rpcMethods } = network;
         if (endpoint) {
             console.log(`Generate types for ${chain} via endpoint ${endpoint}`);
-            await (0, index_1.generateTypesFromChain)(network, endpoint, OUT_DIR);
+            await (0, index_js_1.generateTypesFromChain)(network, endpoint, OUT_DIR);
         }
         else if (metadataHex && rpcMethods) {
             console.log(`Generate types for ${chain} via raw data`);
             const metadata = codecs_1.$Metadata.tryDecode(metadataHex);
             const runtimeVersion = getRuntimeVersion(metadata);
-            await (0, index_1.generateTypes)(network, metadata.latest, rpcMethods, runtimeVersion.apis, OUT_DIR);
+            await (0, index_js_1.generateTypes)(network, metadata.latest, rpcMethods, runtimeVersion.apis, OUT_DIR);
         }
     }
     console.log('DONE!');

package/cjs/generator/ConstsGen.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstsGen = void 0;
-const util_1 = require("@polkadot/util");
 const utils_1 = require("@dedot/utils");
-const generator_1 = require("../generator");
-const utils_2 = require("./utils");
-class ConstsGen extends generator_1.ApiGen {
+const index_js_1 = require("../generator/index.js");
+const utils_js_1 = require("./utils.js");
+class ConstsGen extends index_js_1.ApiGen {
     generate() {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
@@ -17,16 +16,16 @@ class ConstsGen extends generator_1.ApiGen {
                 type: this.typesGen.generateType(one.typeId, 1, true),
                 docs: one.docs,
             }));
-            defTypeOut += (0, utils_2.commentBlock)(`Pallet \`${pallet.name}\`'s constants`);
-            defTypeOut += `${(0, util_1.stringLowerFirst)(pallet.name)}: {
-        ${typedConstants.map(({ name, type, docs }) => `${(0, utils_2.commentBlock)(docs)}${name}: ${type}`).join(',\n')}
+            defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s constants`);
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
+        ${typedConstants.map(({ name, type, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${name}: ${type}`).join(',\n')}
           
-        ${(0, utils_2.commentBlock)('Generic pallet constant')}[name: string]: any,
+        ${(0, utils_js_1.commentBlock)('Generic pallet constant')}[name: string]: any,
       },`;
         }
         const importTypes = this.typesGen.typeImports.toImports();
-        const template = (0, utils_2.compileTemplate)('consts.hbs');
-        return (0, utils_2.beautifySourceCode)(template({ importTypes, defTypeOut }));
+        const template = (0, utils_js_1.compileTemplate)('consts.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }
 }
 exports.ConstsGen = ConstsGen;

package/cjs/generator/ErrorsGen.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorsGen = void 0;
-const ApiGen_1 = require("./ApiGen");
-const utils_1 = require("./utils");
-const util_1 = require("@polkadot/util");
-const utils_2 = require("@dedot/utils");
-class ErrorsGen extends ApiGen_1.ApiGen {
+const ApiGen_js_1 = require("./ApiGen.js");
+const utils_js_1 = require("./utils.js");
+const utils_1 = require("@dedot/utils");
+class ErrorsGen extends ApiGen_js_1.ApiGen {
     generate() {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
@@ -17,24 +16,24 @@ class ErrorsGen extends ApiGen_1.ApiGen {
                 continue;
             }
             const errorDefs = this.#getErrorDefs(errorTypeId);
-            defTypeOut += (0, utils_1.commentBlock)(`Pallet \`${pallet.name}\`'s errors`);
-            defTypeOut += `${(0, util_1.stringCamelCase)(pallet.name)}: {
+            defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s errors`);
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${errorDefs
-                .map(({ name, docs }) => `${(0, utils_1.commentBlock)(docs)}${(0, util_1.stringPascalCase)(name)}: GenericPalletError`)
+                .map(({ name, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${(0, utils_1.stringPascalCase)(name)}: GenericPalletError`)
                 .join(',\n')}
           
-        ${(0, utils_1.commentBlock)('Generic pallet error')}[error: string]: GenericPalletError,
+        ${(0, utils_js_1.commentBlock)('Generic pallet error')}[error: string]: GenericPalletError,
       },`;
         }
         const importTypes = this.typesGen.typeImports.toImports();
-        const template = (0, utils_1.compileTemplate)('errors.hbs');
-        return (0, utils_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
+        const template = (0, utils_js_1.compileTemplate)('errors.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }
     #getErrorDefs(errorTypeId) {
         const def = this.metadata.types[errorTypeId];
-        (0, utils_2.assert)(def, `Error def not found for id ${errorTypeId}`);
+        (0, utils_1.assert)(def, `Error def not found for id ${errorTypeId}`);
         const { tag, value } = def.type;
-        (0, utils_2.assert)(tag === 'Enum', `Invalid pallet error type!`);
+        (0, utils_1.assert)(tag === 'Enum', `Invalid pallet error type!`);
         return value.members;
     }
 }

package/cjs/generator/EventsGen.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventsGen = void 0;
-const ApiGen_1 = require("./ApiGen");
-const utils_1 = require("./utils");
-const util_1 = require("@polkadot/util");
-const utils_2 = require("@dedot/utils");
-class EventsGen extends ApiGen_1.ApiGen {
+const ApiGen_js_1 = require("./ApiGen.js");
+const utils_js_1 = require("./utils.js");
+const utils_1 = require("@dedot/utils");
+class EventsGen extends ApiGen_js_1.ApiGen {
     generate() {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
@@ -18,8 +17,8 @@ class EventsGen extends ApiGen_1.ApiGen {
             }
             const eventDefs = this.#getEventDefs(eventTypeId);
             const flatMembers = eventDefs.every((d) => d.fields.length === 0);
-            defTypeOut += (0, utils_1.commentBlock)(`Pallet \`${pallet.name}\`'s events`);
-            defTypeOut += `${(0, util_1.stringCamelCase)(pallet.name)}: {
+            defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s events`);
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${eventDefs
                 .map((def) => {
                 const genericParts = [`'${pallet.name}'`, `'${def.name}'`];
@@ -32,21 +31,21 @@ class EventsGen extends ApiGen_1.ApiGen {
                 }
                 return { ...def, genericParts };
             })
-                .map(({ name, docs, fields, genericParts }) => `${(0, utils_1.commentBlock)(docs)}${(0, util_1.stringPascalCase)(name)}: GenericPalletEvent<${genericParts.join(', ')}>`)
+                .map(({ name, docs, fields, genericParts }) => `${(0, utils_js_1.commentBlock)(docs)}${(0, utils_1.stringPascalCase)(name)}: GenericPalletEvent<${genericParts.join(', ')}>`)
                 .join(',\n')}
           
-        ${(0, utils_1.commentBlock)('Generic pallet event')}[prop: string]: GenericPalletEvent,
+        ${(0, utils_js_1.commentBlock)('Generic pallet event')}[prop: string]: GenericPalletEvent,
       },`;
         }
         const importTypes = this.typesGen.typeImports.toImports();
-        const template = (0, utils_1.compileTemplate)('events.hbs');
-        return (0, utils_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
+        const template = (0, utils_js_1.compileTemplate)('events.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }
     #getEventDefs(typeId) {
         const def = this.metadata.types[typeId];
-        (0, utils_2.assert)(def, `Event def not found for id ${typeId}`);
+        (0, utils_1.assert)(def, `Event def not found for id ${typeId}`);
         const { tag, value } = def.type;
-        (0, utils_2.assert)(tag === 'Enum', 'Invalid pallet event type!');
+        (0, utils_1.assert)(tag === 'Enum', 'Invalid pallet event type!');
         return value.members;
     }
     #generateMemberDefType(fields) {
@@ -57,7 +56,7 @@ class EventsGen extends ApiGen_1.ApiGen {
             return fields.length === 1
                 ? this.typesGen.generateType(fields[0].typeId, 1, true)
                 : `[${fields
-                    .map(({ typeId, docs }) => `${(0, utils_1.commentBlock)(docs)}${this.typesGen.generateType(typeId, 1, true)}`)
+                    .map(({ typeId, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${this.typesGen.generateType(typeId, 1, true)}`)
                     .join(', ')}]`;
         }
         else {

package/cjs/generator/IndexGen.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexGen = void 0;
-const utils_1 = require("./utils");
-const util_1 = require("@polkadot/util");
+const utils_js_1 = require("./utils.js");
+const utils_1 = require("@dedot/utils");
 class IndexGen {
     networkInfo;
     constructor(networkInfo) {
@@ -10,9 +10,9 @@ class IndexGen {
     }
     async generate() {
         const { chain } = this.networkInfo;
-        const interfaceName = (0, util_1.stringPascalCase)(chain);
-        const template = (0, utils_1.compileTemplate)('index.hbs');
-        return (0, utils_1.beautifySourceCode)(template({ interfaceName }));
+        const interfaceName = (0, utils_1.stringPascalCase)(chain);
+        const template = (0, utils_js_1.compileTemplate)('index.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ interfaceName }));
     }
 }
 exports.IndexGen = IndexGen;

package/cjs/generator/QueryGen.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryGen = void 0;
-const util_1 = require("@polkadot/util");
 const utils_1 = require("@dedot/utils");
-const generator_1 = require("../generator");
-const utils_2 = require("./utils");
-class QueryGen extends generator_1.ApiGen {
+const index_js_1 = require("../generator/index.js");
+const utils_js_1 = require("./utils.js");
+class QueryGen extends index_js_1.ApiGen {
     generate() {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
@@ -16,17 +15,17 @@ class QueryGen extends generator_1.ApiGen {
             if (!storage)
                 continue;
             const queries = storage.entries.map((one) => this.#generateEntry(one));
-            const queryDefs = queries.map(({ name, valueType, keyType, docs }) => `${(0, utils_2.commentBlock)(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`);
-            defTypeOut += (0, utils_2.commentBlock)(`Pallet \`${pallet.name}\`'s storage queries`);
-            defTypeOut += `${(0, util_1.stringLowerFirst)(pallet.name)}: {
+            const queryDefs = queries.map(({ name, valueType, keyType, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`);
+            defTypeOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s storage queries`);
+            defTypeOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
         ${queryDefs.join(',\n')}
         
-        ${(0, utils_2.commentBlock)('Generic pallet storage query')}[storage: string]: GenericStorageQuery;
+        ${(0, utils_js_1.commentBlock)('Generic pallet storage query')}[storage: string]: GenericStorageQuery;
       },`;
         }
         const importTypes = this.typesGen.typeImports.toImports();
-        const template = (0, utils_2.compileTemplate)('query.hbs');
-        return (0, utils_2.beautifySourceCode)(template({ importTypes, defTypeOut }));
+        const template = (0, utils_js_1.compileTemplate)('query.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }
     #generateEntry(entry) {
         const { name, type, docs, modifier } = entry;

package/cjs/generator/RpcGen.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcGen = void 0;
 const specs_1 = require("@dedot/specs");
-const utils_1 = require("@dedot/utils");
-const generator_1 = require("../generator");
-const utils_2 = require("./utils");
-const known_codecs_1 = require("./known-codecs");
+const index_js_1 = require("../generator/index.js");
+const utils_js_1 = require("./utils.js");
+const known_codecs_js_1 = require("./known-codecs.js");
 const HIDDEN_RPCS = [
     // Ref: https://github.com/paritytech/polkadot-sdk/blob/43415ef58c143b985e09015cd000dbd65f6d3997/substrate/client/rpc-servers/src/lib.rs#L152C9-L158
     'rpc_methods',
 ];
-class RpcGen extends generator_1.ApiGen {
+class RpcGen extends index_js_1.ApiGen {
     typesGen;
     rpcMethods;
     constructor(typesGen, rpcMethods) {
@@ -63,8 +62,8 @@ class RpcGen extends generator_1.ApiGen {
         });
         // TODO include & define external types
         const importTypes = this.typesGen.typeImports.toImports();
-        const template = (0, utils_2.compileTemplate)('rpc.hbs');
-        return (0, utils_2.beautifySourceCode)(template({ importTypes, rpcCallsOut }));
+        const template = (0, utils_js_1.compileTemplate)('rpc.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, rpcCallsOut }));
     }
     #generateMethodDef(spec) {
         const { name, type, module, method, docs = [], params, pubsub, deprecated } = spec;
@@ -74,7 +73,7 @@ class RpcGen extends generator_1.ApiGen {
             defaultDocs.push(`@deprecated: ${deprecated}`);
         }
         if (type === 'GenericRpcCall' && params.length === 0) {
-            return `${(0, utils_2.commentBlock)(defaultDocs)}${method}: GenericRpcCall`;
+            return `${(0, utils_js_1.commentBlock)(defaultDocs)}${method}: GenericRpcCall`;
         }
         this.addTypeImport(type, false);
         params.forEach(({ type, isScale }) => {
@@ -92,10 +91,10 @@ class RpcGen extends generator_1.ApiGen {
             defaultDocs.shift();
             defaultDocs.unshift(`@pubsub: ${pubsub?.join(', ')}`);
             paramsOut.push(`callback: Callback<${typeOut}>`);
-            return `${(0, utils_2.commentBlock)(docs, '\n', defaultDocs, paramsDoc)}${method}: GenericRpcCall<(${paramsOut.join(', ')}) => Promise<Unsub>>`;
+            return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, paramsDoc)}${method}: GenericRpcCall<(${paramsOut.join(', ')}) => Promise<Unsub>>`;
         }
         else {
-            return `${(0, utils_2.commentBlock)(docs, '\n', defaultDocs, paramsDoc)}${method}: GenericRpcCall<(${paramsOut.join(', ')}) => Promise<${typeOut}>>`;
+            return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, paramsDoc)}${method}: GenericRpcCall<(${paramsOut.join(', ')}) => Promise<${typeOut}>>`;
         }
     }
     // TODO check typeIn, typeOut if param type, or rpc type isScale
@@ -105,15 +104,15 @@ class RpcGen extends generator_1.ApiGen {
             return;
         }
         type = type.trim();
-        if ((0, utils_1.isNativeType)(type)) {
+        if ((0, utils_js_1.isNativeType)(type)) {
             return;
         }
         // Handle generic wrapper types
-        const matchArray = type.match(utils_2.WRAPPER_TYPE_REGEX);
+        const matchArray = type.match(utils_js_1.WRAPPER_TYPE_REGEX);
         if (matchArray) {
             const [_, $1, $2] = matchArray;
             this.addTypeImport($1, toTypeIn);
-            if ($2.match(utils_2.WRAPPER_TYPE_REGEX) || $2.match(utils_2.TUPLE_TYPE_REGEX)) {
+            if ($2.match(utils_js_1.WRAPPER_TYPE_REGEX) || $2.match(utils_js_1.TUPLE_TYPE_REGEX)) {
                 this.addTypeImport($2, toTypeIn);
             }
             else {
@@ -122,7 +121,7 @@ class RpcGen extends generator_1.ApiGen {
             return;
         }
         // Check tuple type
-        if (type.match(utils_2.TUPLE_TYPE_REGEX)) {
+        if (type.match(utils_js_1.TUPLE_TYPE_REGEX)) {
             this.addTypeImport(type.slice(1, -1).split(','), toTypeIn);
             return;
         }
@@ -132,7 +131,7 @@ class RpcGen extends generator_1.ApiGen {
         }
         try {
             const codecType = this.#getCodecType(type, toTypeIn);
-            if ((0, utils_1.isNativeType)(codecType))
+            if ((0, utils_js_1.isNativeType)(codecType))
                 return;
             this.typesGen.typeImports.addCodecType(codecType);
             return;
@@ -142,11 +141,11 @@ class RpcGen extends generator_1.ApiGen {
     }
     getGeneratedTypeName(type, toTypeIn = true) {
         try {
-            const matchArray = type.match(utils_2.WRAPPER_TYPE_REGEX);
+            const matchArray = type.match(utils_js_1.WRAPPER_TYPE_REGEX);
             if (matchArray) {
                 const [_, $1, $2] = matchArray;
                 const wrapperTypeName = this.#getCodecType($1, toTypeIn);
-                if ($2.match(utils_2.WRAPPER_TYPE_REGEX) || $2.match(utils_2.TUPLE_TYPE_REGEX)) {
+                if ($2.match(utils_js_1.WRAPPER_TYPE_REGEX) || $2.match(utils_js_1.TUPLE_TYPE_REGEX)) {
                     return `${wrapperTypeName}<${this.getGeneratedTypeName($2, toTypeIn)}>`;
                 }
                 const innerTypeNames = $2
@@ -155,7 +154,7 @@ class RpcGen extends generator_1.ApiGen {
                     .join(', ');
                 return `${wrapperTypeName}<${innerTypeNames}>`;
             }
-            else if (type.match(utils_2.TUPLE_TYPE_REGEX)) {
+            else if (type.match(utils_js_1.TUPLE_TYPE_REGEX)) {
                 const innerTypeNames = type
                     .slice(1, -1)
                     .split(',')
@@ -169,7 +168,7 @@ class RpcGen extends generator_1.ApiGen {
         return type;
     }
     #getCodecType(type, toTypeIn = true) {
-        const { typeIn, typeOut } = (0, known_codecs_1.findKnownCodecType)(type);
+        const { typeIn, typeOut } = (0, known_codecs_js_1.findKnownCodecType)(type);
         return toTypeIn ? typeIn : typeOut;
     }
 }

package/cjs/generator/RuntimeApisGen.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeApisGen = void 0;
 const specs_1 = require("@dedot/specs");
-const utils_1 = require("./utils");
-const utils_2 = require("@dedot/utils");
-const RpcGen_1 = require("./RpcGen");
-const util_1 = require("@polkadot/util");
-class RuntimeApisGen extends RpcGen_1.RpcGen {
+const utils_js_1 = require("./utils.js");
+const utils_1 = require("@dedot/utils");
+const RpcGen_js_1 = require("./RpcGen.js");
+class RuntimeApisGen extends RpcGen_js_1.RpcGen {
     typesGen;
     runtimeApis;
     constructor(typesGen, runtimeApis) {
@@ -21,19 +20,19 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
         if (this.metadata.apis.length > 0) {
             this.metadata.apis.forEach((runtimeApi) => {
                 const { name: runtimeApiName, methods } = runtimeApi;
-                runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${(0, utils_2.calculateRuntimeApiHash)(runtimeApiName)}`);
-                runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+                runtimeCallsOut += (0, utils_js_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${(0, utils_1.calcRuntimeApiHash)(runtimeApiName)}`);
+                runtimeCallsOut += `${(0, utils_1.stringCamelCase)(runtimeApiName)}: {
             ${methods.map((method) => this.#generateMethodDef(runtimeApiName, method)).join('\n')} 
               
-            ${(0, utils_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
+            ${(0, utils_js_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
         }`;
             });
         }
         else {
             const specs = this.#targetRuntimeApiSpecs();
             specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
-                runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+                runtimeCallsOut += (0, utils_js_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
+                runtimeCallsOut += `${(0, utils_1.stringCamelCase)(runtimeApiName)}: {
             ${Object.keys(methods)
                     .map((methodName) => this.#generateMethodDefFromSpec({
                     ...methods[methodName],
@@ -42,13 +41,13 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
                 }))
                     .join('\n')} 
               
-            ${(0, utils_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
+            ${(0, utils_js_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
           }`;
             });
         }
         const importTypes = this.typesGen.typeImports.toImports();
-        const template = (0, utils_1.compileTemplate)('runtime.hbs');
-        return (0, utils_1.beautifySourceCode)(template({ importTypes, runtimeCallsOut }));
+        const template = (0, utils_js_1.compileTemplate)('runtime.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, runtimeCallsOut }));
     }
     #isOptionalType(type) {
         return type.startsWith('Option<') || type.endsWith('| undefined');
@@ -58,7 +57,7 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
     }
     #generateMethodDefFromSpec(spec) {
         const { docs = [], params, type, runtimeApiName, methodName } = spec;
-        const callName = `${runtimeApiName}_${(0, utils_2.stringSnakeCase)(methodName)}`;
+        const callName = `${runtimeApiName}_${(0, utils_1.stringSnakeCase)(methodName)}`;
         const defaultDocs = [`@callname: ${callName}`];
         this.addTypeImport(type, false);
         params.forEach(({ type }) => this.addTypeImport(type));
@@ -68,14 +67,14 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             plainType: this.getGeneratedTypeName(param.type),
         }));
         const paramsOut = typedParams
-            .map(({ name, isOptional, plainType }) => `${(0, util_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${plainType}`)
+            .map(({ name, isOptional, plainType }) => `${(0, utils_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${plainType}`)
             .join(', ');
         const typeOut = this.getGeneratedTypeName(type, false);
-        return `${(0, utils_1.commentBlock)(docs, '\n', defaultDocs, typedParams.map(({ plainType, name }) => `@param {${plainType}} ${name}`))}${methodName}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
+        return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, typedParams.map(({ plainType, name }) => `@param {${plainType}} ${name}`))}${methodName}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
     #generateMethodDef(runtimeApiName, methodDef) {
         const { name: methodName, inputs, output, docs } = methodDef;
-        const callName = `${runtimeApiName}_${(0, utils_2.stringSnakeCase)(methodName)}`;
+        const callName = `${runtimeApiName}_${(0, utils_1.stringSnakeCase)(methodName)}`;
         const defaultDocs = [`@callname: ${callName}`];
         const typeOut = this.typesGen.generateType(output, 1, true);
         this.addTypeImport(typeOut, false);
@@ -90,9 +89,9 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
         }));
         this.addTypeImport(typedInputs.map((t) => t.type));
         const paramsOut = typedInputs
-            .map(({ name, type, isOptional }) => `${(0, util_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${type}`)
+            .map(({ name, type, isOptional }) => `${(0, utils_1.stringCamelCase)(name)}${isOptional ? '?' : ''}: ${type}`)
             .join(', ');
-        return `${(0, utils_1.commentBlock)(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${(0, util_1.stringCamelCase)(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
+        return `${(0, utils_js_1.commentBlock)(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${(0, utils_1.stringCamelCase)(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
     #targetRuntimeApiSpecs() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
@@ -112,7 +111,7 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
         }, []);
     }
     #findRuntimeApiSpec = (runtimeApiHash, version) => {
-        const runtimeApiName = (0, specs_1.getRuntimeApiNames)().find((one) => (0, utils_2.calculateRuntimeApiHash)(one) === runtimeApiHash);
+        const runtimeApiName = (0, specs_1.getRuntimeApiNames)().find((one) => (0, utils_1.calcRuntimeApiHash)(one) === runtimeApiHash);
         return (0, specs_1.getRuntimeApiSpecs)().find((one) => one.runtimeApiName === runtimeApiName && one.version === version);
     };
 }

package/cjs/generator/TxGen.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxGen = void 0;
-const generator_1 = require("../generator");
-const util_1 = require("@polkadot/util");
-const utils_1 = require("./utils");
-class TxGen extends generator_1.ApiGen {
+const index_js_1 = require("../generator/index.js");
+const utils_1 = require("@dedot/utils");
+const utils_js_1 = require("./utils.js");
+class TxGen extends index_js_1.ApiGen {
     generate() {
         const { pallets, types } = this.metadata;
         this.typesGen.clearCache();
@@ -26,9 +26,9 @@ class TxGen extends generator_1.ApiGen {
             const isFlatEnum = type.value.members.every((m) => m.fields.length === 0);
             const typedTxs = type.value.members
                 .map((one) => ({
-                functionName: (0, util_1.stringCamelCase)(one.name),
+                functionName: (0, utils_1.stringCamelCase)(one.name),
                 params: one.fields.map((f) => ({
-                    name: (0, util_1.stringCamelCase)(f.name),
+                    name: (0, utils_1.stringCamelCase)(f.name),
                     normalizedName: this.#normalizeParamName(f.name),
                     type: this.typesGen.generateType(f.typeId, 1),
                     docs: f.docs,
@@ -38,16 +38,16 @@ class TxGen extends generator_1.ApiGen {
                 .map((f) => {
                 return {
                     ...f,
-                    callInput: this.#generateCallInput((0, util_1.stringPascalCase)(pallet.name), (0, util_1.stringPascalCase)(f.functionName), !isFlatEnum ? f.params.map((p) => `${p.name}: ${p.type}`) : undefined),
+                    callInput: this.#generateCallInput((0, utils_1.stringPascalCase)(pallet.name), (0, utils_1.stringPascalCase)(f.functionName), !isFlatEnum ? f.params.map((p) => `${p.name}: ${p.type}`) : undefined),
                 };
             });
-            txDefsOut += (0, utils_1.commentBlock)(`Pallet \`${pallet.name}\`'s transaction calls`);
-            txDefsOut += `${(0, util_1.stringCamelCase)(pallet.name)}: {
+            txDefsOut += (0, utils_js_1.commentBlock)(`Pallet \`${pallet.name}\`'s transaction calls`);
+            txDefsOut += `${(0, utils_1.stringCamelCase)(pallet.name)}: {
           ${typedTxs
-                .map(({ functionName, params, docs, callInput }) => `${(0, utils_1.commentBlock)(docs, '\n', params.map((p) => `@param {${p.type}} ${p.normalizedName} ${p.docs}`))}${functionName}: GenericTxCall<(${params.map((p) => `${p.normalizedName}: ${p.type}`).join(', ')}) => ChainSubmittableExtrinsic<${callInput}>>`)
+                .map(({ functionName, params, docs, callInput }) => `${(0, utils_js_1.commentBlock)(docs, '\n', params.map((p) => `@param {${p.type}} ${p.normalizedName} ${p.docs}`))}${functionName}: GenericTxCall<(${params.map((p) => `${p.normalizedName}: ${p.type}`).join(', ')}) => ChainSubmittableExtrinsic<${callInput}>>`)
                 .join(',\n')}
             
-          ${(0, utils_1.commentBlock)('Generic pallet tx call')}[callName: string]: GenericTxCall<TxCall>,
+          ${(0, utils_js_1.commentBlock)('Generic pallet tx call')}[callName: string]: GenericTxCall<TxCall>,
         },`;
         }
         const importTypes = this.typesGen.typeImports.toImports();
@@ -59,12 +59,12 @@ class TxGen extends generator_1.ApiGen {
         
     export type TxCall = (...args: any[]) => ChainSubmittableExtrinsic;    
 `;
-        const template = (0, utils_1.compileTemplate)('tx.hbs');
-        return (0, utils_1.beautifySourceCode)(template({ importTypes, defTypes, txDefsOut }));
+        const template = (0, utils_js_1.compileTemplate)('tx.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypes, txDefsOut }));
     }
     #normalizeParamName(name) {
-        name = (0, util_1.stringCamelCase)(name);
-        return (0, utils_1.isReservedWord)(name) ? `${name}_` : name;
+        name = (0, utils_1.stringCamelCase)(name);
+        return (0, utils_js_1.isReservedWord)(name) ? `${name}_` : name;
     }
     #generateCallInput(palletName, callName, params) {
         if (!params) {

package/cjs/generator/TypesGen.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypesGen = exports.BASIC_KNOWN_TYPES = void 0;
-const util_1 = require("@polkadot/util");
 const codecs_1 = require("@dedot/codecs");
 const utils_1 = require("@dedot/utils");
-const utils_2 = require("./utils");
-const known_types_1 = require("./known-types");
-const TypeImports_1 = require("./TypeImports");
-const known_codecs_1 = require("./known-codecs");
+const utils_js_1 = require("./utils.js");
+const known_types_js_1 = require("./known-types.js");
+const TypeImports_js_1 = require("./TypeImports.js");
+const known_codecs_js_1 = require("./known-codecs.js");
 // Skip generate types for these
 // as we do have native types for them
 const SKIP_TYPES = [
@@ -43,7 +42,7 @@ class TypesGen {
         this.metadata = metadata;
         this.registry = new codecs_1.PortableRegistry(this.metadata);
         this.includedTypes = this.#includedTypes();
-        this.typeImports = new TypeImports_1.TypeImports();
+        this.typeImports = new TypeImports_js_1.TypeImports();
     }
     generate() {
         this.clearCache();
@@ -51,14 +50,14 @@ class TypesGen {
         Object.values(this.includedTypes)
             .filter(({ skip, knownType }) => !(skip || knownType))
             .forEach(({ name, nameOut, id, docs }) => {
-            defTypeOut += `${(0, utils_2.commentBlock)(docs)}export type ${nameOut} = ${this.generateType(id, 0, true)};\n\n`;
+            defTypeOut += `${(0, utils_js_1.commentBlock)(docs)}export type ${nameOut} = ${this.generateType(id, 0, true)};\n\n`;
             if (this.#shouldGenerateTypeIn(id)) {
                 defTypeOut += `export type ${name} = ${this.generateType(id)};\n\n`;
             }
         });
         const importTypes = this.typeImports.toImports('./types');
-        const template = (0, utils_2.compileTemplate)('types.hbs');
-        return (0, utils_2.beautifySourceCode)(template({ importTypes, defTypeOut }));
+        const template = (0, utils_js_1.compileTemplate)('types.hbs');
+        return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }
     typeCache = {};
     clearCache() {
@@ -103,7 +102,7 @@ class TypesGen {
         const { tag, value } = type;
         switch (tag) {
             case 'Primitive':
-                const $codec = (0, known_codecs_1.findKnownCodec)(value.kind);
+                const $codec = (0, known_codecs_js_1.findKnownCodec)(value.kind);
                 if ($codec.nativeType) {
                     return $codec.nativeType;
                 }
@@ -151,12 +150,12 @@ class TypesGen {
                     return 'null';
                 }
                 else if (members.every((x) => x.fields.length === 0)) {
-                    return members.map(({ name, docs }) => `${(0, utils_2.commentBlock)(docs)}'${(0, util_1.stringPascalCase)(name)}'`).join(' | ');
+                    return members.map(({ name, docs }) => `${(0, utils_js_1.commentBlock)(docs)}'${(0, utils_1.stringPascalCase)(name)}'`).join(' | ');
                 }
                 else {
                     const membersType = [];
                     for (const { fields, name, docs } of members) {
-                        const keyName = (0, util_1.stringPascalCase)(name);
+                        const keyName = (0, utils_1.stringPascalCase)(name);
                         if (fields.length === 0) {
                             membersType.push([keyName, null, docs]);
                         }
@@ -164,7 +163,7 @@ class TypesGen {
                             const valueType = fields.length === 1
                                 ? this.generateType(fields[0].typeId, nestedLevel + 1, typeOut)
                                 : `[${fields
-                                    .map(({ typeId, docs }) => `${(0, utils_2.commentBlock)(docs)}${this.generateType(typeId, nestedLevel + 1, typeOut)}`)
+                                    .map(({ typeId, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${this.generateType(typeId, nestedLevel + 1, typeOut)}`)
                                     .join(', ')}]`;
                             membersType.push([keyName, valueType, docs]);
                         }
@@ -179,7 +178,7 @@ class TypesGen {
                         value: valueType ? `, ${valueKey}${this.#isOptionalType(valueType) ? '?' : ''}: ${valueType} ` : '',
                         docs,
                     }))
-                        .map(({ tag, value, docs }) => `${(0, utils_2.commentBlock)(docs)}{ ${tag}${value} }`)
+                        .map(({ tag, value, docs }) => `${(0, utils_js_1.commentBlock)(docs)}{ ${tag}${value} }`)
                         .join(' | ');
                 }
             }
@@ -226,7 +225,7 @@ class TypesGen {
             };
         });
         return `{${props
-            .map(({ name, type, optional, docs }) => `${(0, utils_2.commentBlock)(docs)}${name}${optional ? '?' : ''}: ${type}`)
+            .map(({ name, type, optional, docs }) => `${(0, utils_js_1.commentBlock)(docs)}${name}${optional ? '?' : ''}: ${type}`)
             .join(',\n')}}`;
     }
     #isOptionalType(type) {
@@ -267,8 +266,8 @@ class TypesGen {
             const suffix = typeSuffixes.get(id) || '';
             let knownType = false;
             let name, nameOut;
-            if ((0, known_codecs_1.isKnownCodecType)(joinedPath)) {
-                const codecType = (0, known_codecs_1.findKnownCodecType)(path.at(-1));
+            if ((0, known_codecs_js_1.isKnownCodecType)(joinedPath)) {
+                const codecType = (0, known_codecs_js_1.findKnownCodecType)(path.at(-1));
                 name = codecType.typeIn;
                 nameOut = codecType.typeOut;
                 knownType = true;
@@ -315,7 +314,7 @@ class TypesGen {
      */
     #cleanPath(path) {
         return path
-            .map((one) => (0, util_1.stringPascalCase)(one))
+            .map((one) => (0, utils_1.stringPascalCase)(one))
             .filter((one, idx, currentPath) => idx === 0 || one !== currentPath[idx - 1])
             .join('');
     }
@@ -390,10 +389,10 @@ class TypesGen {
         if (diffParam?.typeId) {
             const diffType = types[diffParam.typeId];
             if (diffType.path.length > 0) {
-                return (0, util_1.stringPascalCase)(diffType.path.at(-1));
+                return (0, utils_1.stringPascalCase)(diffType.path.at(-1));
             }
             else if (diffType.type.tag === 'Primitive') {
-                return (0, util_1.stringPascalCase)(diffType.type.value.kind);
+                return (0, utils_1.stringPascalCase)(diffType.type.value.kind);
             }
         }
         // Last resort!
@@ -404,7 +403,7 @@ class TypesGen {
             typeName.forEach((one) => this.addTypeImport(one));
             return;
         }
-        if ((0, utils_1.isNativeType)(typeName)) {
+        if ((0, utils_js_1.isNativeType)(typeName)) {
             return;
         }
         for (let type of Object.values(this.includedTypes)) {
@@ -426,7 +425,7 @@ class TypesGen {
             this.typeImports.addCodecType(typeName);
             return;
         }
-        if (known_types_1.knownTypes.includes(typeName)) {
+        if (known_types_js_1.knownTypes.includes(typeName)) {
             this.typeImports.addKnownType(typeName);
         }
         else {

package/cjs/generator/index.js

@@ -14,13 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./TypesGen"), exports);
-__exportStar(require("./ApiGen"), exports);
-__exportStar(require("./ConstsGen"), exports);
-__exportStar(require("./QueryGen"), exports);
-__exportStar(require("./RpcGen"), exports);
-__exportStar(require("./IndexGen"), exports);
-__exportStar(require("./ErrorsGen"), exports);
-__exportStar(require("./EventsGen"), exports);
-__exportStar(require("./TxGen"), exports);
-__exportStar(require("./RuntimeApisGen"), exports);
+__exportStar(require("./TypesGen.js"), exports);
+__exportStar(require("./ApiGen.js"), exports);
+__exportStar(require("./ConstsGen.js"), exports);
+__exportStar(require("./QueryGen.js"), exports);
+__exportStar(require("./RpcGen.js"), exports);
+__exportStar(require("./IndexGen.js"), exports);
+__exportStar(require("./ErrorsGen.js"), exports);
+__exportStar(require("./EventsGen.js"), exports);
+__exportStar(require("./TxGen.js"), exports);
+__exportStar(require("./RuntimeApisGen.js"), exports);

package/cjs/generator/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
+exports.isNativeType = exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
 const fs = __importStar(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const path = __importStar(require("path"));
@@ -66,3 +66,32 @@ const TS_RESERVED_WORDS = ['new', 'class'];
  */
 const isReservedWord = (word) => TS_RESERVED_WORDS.includes(word);
 exports.isReservedWord = isReservedWord;
+const TS_PRIMITIVE_TYPES = [
+    'void',
+    'undefined',
+    'null',
+    'number',
+    'boolean',
+    'bigint',
+    'Map',
+    'Set',
+    'string',
+    'any',
+    'Array',
+    'Record',
+];
+/**
+ * Check if a type is native JS/TS type
+ * @param type
+ */
+const isNativeType = (type) => {
+    return TS_PRIMITIVE_TYPES.some((one) => {
+        if (typeof one === 'string') {
+            return one === type;
+        }
+        else {
+            return type.match(one);
+        }
+    });
+};
+exports.isNativeType = isNativeType;

package/cjs/index.js

@@ -27,14 +27,14 @@ exports.generateTypes = exports.generateTypesFromChain = void 0;
 const dedot_1 = require("dedot");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const generator_1 = require("./generator");
-const util_1 = require("@polkadot/util");
+const index_js_1 = require("./generator/index.js");
+const utils_1 = require("@dedot/utils");
 async function generateTypesFromChain(network, endpoint, outDir) {
     const api = await dedot_1.Dedot.create(endpoint);
     const { methods } = await api.rpc.rpc.methods();
     const apis = api.runtimeVersion?.apis || [];
     if (!network.chain) {
-        network.chain = (0, util_1.stringCamelCase)(api.runtimeVersion?.specName || api.runtimeChain || 'local');
+        network.chain = (0, utils_1.stringCamelCase)(api.runtimeVersion?.specName || api.runtimeChain || 'local');
     }
     await generateTypes(network, api.metadataLatest, methods, apis, outDir);
     await api.disconnect();
@@ -54,15 +54,15 @@ async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir
     if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath, { recursive: true });
     }
-    const typesGen = new generator_1.TypesGen(metadata);
-    const constsGen = new generator_1.ConstsGen(typesGen);
-    const queryGen = new generator_1.QueryGen(typesGen);
-    const rpcGen = new generator_1.RpcGen(typesGen, rpcMethods);
-    const indexGen = new generator_1.IndexGen(network);
-    const errorsGen = new generator_1.ErrorsGen(typesGen);
-    const eventsGen = new generator_1.EventsGen(typesGen);
-    const runtimeApisGen = new generator_1.RuntimeApisGen(typesGen, runtimeApis);
-    const txGen = new generator_1.TxGen(typesGen);
+    const typesGen = new index_js_1.TypesGen(metadata);
+    const constsGen = new index_js_1.ConstsGen(typesGen);
+    const queryGen = new index_js_1.QueryGen(typesGen);
+    const rpcGen = new index_js_1.RpcGen(typesGen, rpcMethods);
+    const indexGen = new index_js_1.IndexGen(network);
+    const errorsGen = new index_js_1.ErrorsGen(typesGen);
+    const eventsGen = new index_js_1.EventsGen(typesGen);
+    const runtimeApisGen = new index_js_1.RuntimeApisGen(typesGen, runtimeApis);
+    const txGen = new index_js_1.TxGen(typesGen);
     fs.writeFileSync(defTypesFileName, await typesGen.generate());
     fs.writeFileSync(errorsFileName, await errorsGen.generate());
     fs.writeFileSync(eventsFileName, await eventsGen.generate());

package/cjs/packageInfo.js

@@ -2,4 +2,4 @@
 // THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.27' };
+exports.packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.28' };

package/genSupportedChainTypes.js

@@ -1,4 +1,4 @@
-import { generateTypes, generateTypesFromChain } from './index';
+import { generateTypes, generateTypesFromChain } from './index.js';
 import { rpc } from '@polkadot/types-support/metadata/static-substrate';
 import staticSubstrate from '@polkadot/types-support/metadata/v15/substrate-hex';
 import { $Metadata, PortableRegistry } from '@dedot/codecs';

package/generator/ApiGen.d.ts

@@ -1,4 +1,4 @@
-import { TypesGen } from '../generator';
+import { TypesGen } from '../generator/index.js';
 export declare abstract class ApiGen {
     readonly typesGen: TypesGen;
     constructor(typesGen: TypesGen);

package/generator/ConstsGen.d.ts

@@ -1,4 +1,4 @@
-import { ApiGen } from '../generator';
+import { ApiGen } from '../generator/index.js';
 export declare class ConstsGen extends ApiGen {
     generate(): Promise<string>;
 }

package/generator/ConstsGen.js

@@ -1,7 +1,6 @@
-import { stringLowerFirst } from '@polkadot/util';
-import { normalizeName } from '@dedot/utils';
-import { ApiGen } from '../generator';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils';
+import { normalizeName, stringCamelCase } from '@dedot/utils';
+import { ApiGen } from '../generator/index.js';
+import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class ConstsGen extends ApiGen {
     generate() {
         const { pallets } = this.metadata;
@@ -15,7 +14,7 @@ export class ConstsGen extends ApiGen {
                 docs: one.docs,
             }));
             defTypeOut += commentBlock(`Pallet \`${pallet.name}\`'s constants`);
-            defTypeOut += `${stringLowerFirst(pallet.name)}: {
+            defTypeOut += `${stringCamelCase(pallet.name)}: {
         ${typedConstants.map(({ name, type, docs }) => `${commentBlock(docs)}${name}: ${type}`).join(',\n')}
           
         ${commentBlock('Generic pallet constant')}[name: string]: any,

package/generator/ErrorsGen.d.ts

@@ -1,4 +1,4 @@
-import { ApiGen } from './ApiGen';
+import { ApiGen } from './ApiGen.js';
 export declare class ErrorsGen extends ApiGen {
     #private;
     generate(): Promise<string>;

package/generator/ErrorsGen.js

@@ -1,7 +1,6 @@
-import { ApiGen } from './ApiGen';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils';
-import { stringCamelCase, stringPascalCase } from '@polkadot/util';
-import { assert } from '@dedot/utils';
+import { ApiGen } from './ApiGen.js';
+import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
+import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
 export class ErrorsGen extends ApiGen {
     generate() {
         const { pallets } = this.metadata;

package/generator/EventsGen.d.ts

@@ -1,4 +1,4 @@
-import { ApiGen } from './ApiGen';
+import { ApiGen } from './ApiGen.js';
 export declare class EventsGen extends ApiGen {
     #private;
     generate(): Promise<string>;

package/generator/EventsGen.js

@@ -1,7 +1,6 @@
-import { ApiGen } from './ApiGen';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils';
-import { stringCamelCase, stringPascalCase } from '@polkadot/util';
-import { assert } from '@dedot/utils';
+import { ApiGen } from './ApiGen.js';
+import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
+import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
 export class EventsGen extends ApiGen {
     generate() {
         const { pallets } = this.metadata;

package/generator/IndexGen.d.ts

@@ -1,4 +1,4 @@
-import { NetworkInfo } from '../types';
+import { NetworkInfo } from '../types.js';
 export declare class IndexGen {
     readonly networkInfo: NetworkInfo;
     constructor(networkInfo: NetworkInfo);

package/generator/IndexGen.js

@@ -1,5 +1,5 @@
-import { beautifySourceCode, compileTemplate } from './utils';
-import { stringPascalCase } from '@polkadot/util';
+import { beautifySourceCode, compileTemplate } from './utils.js';
+import { stringPascalCase } from '@dedot/utils';
 export class IndexGen {
     networkInfo;
     constructor(networkInfo) {

package/generator/QueryGen.d.ts

@@ -1,4 +1,4 @@
-import { ApiGen } from '../generator';
+import { ApiGen } from '../generator/index.js';
 export declare class QueryGen extends ApiGen {
     #private;
     generate(): Promise<string>;

package/generator/QueryGen.js

@@ -1,7 +1,6 @@
-import { stringLowerFirst } from '@polkadot/util';
-import { normalizeName } from '@dedot/utils';
-import { ApiGen } from '../generator';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils';
+import { normalizeName, stringCamelCase } from '@dedot/utils';
+import { ApiGen } from '../generator/index.js';
+import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class QueryGen extends ApiGen {
     generate() {
         const { pallets } = this.metadata;
@@ -15,7 +14,7 @@ export class QueryGen extends ApiGen {
             const queries = storage.entries.map((one) => this.#generateEntry(one));
             const queryDefs = queries.map(({ name, valueType, keyType, docs }) => `${commentBlock(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`);
             defTypeOut += commentBlock(`Pallet \`${pallet.name}\`'s storage queries`);
-            defTypeOut += `${stringLowerFirst(pallet.name)}: {
+            defTypeOut += `${stringCamelCase(pallet.name)}: {
         ${queryDefs.join(',\n')}
         
         ${commentBlock('Generic pallet storage query')}[storage: string]: GenericStorageQuery;

package/generator/RpcGen.d.ts

@@ -1,4 +1,4 @@
-import { ApiGen, TypesGen } from '../generator';
+import { ApiGen, TypesGen } from '../generator/index.js';
 export declare class RpcGen extends ApiGen {
     #private;
     readonly typesGen: TypesGen;

package/generator/RpcGen.js

@@ -1,8 +1,7 @@
 import { findAliasRpcSpec, findRpcSpec, isUnsubscribeMethod } from '@dedot/specs';
-import { isNativeType } from '@dedot/utils';
-import { ApiGen } from '../generator';
-import { beautifySourceCode, commentBlock, compileTemplate, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX } from './utils';
-import { findKnownCodecType } from './known-codecs';
+import { ApiGen } from '../generator/index.js';
+import { isNativeType, beautifySourceCode, commentBlock, compileTemplate, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX, } from './utils.js';
+import { findKnownCodecType } from './known-codecs.js';
 const HIDDEN_RPCS = [
     // Ref: https://github.com/paritytech/polkadot-sdk/blob/43415ef58c143b985e09015cd000dbd65f6d3997/substrate/client/rpc-servers/src/lib.rs#L152C9-L158
     'rpc_methods',

package/generator/RuntimeApisGen.d.ts

@@ -1,5 +1,5 @@
-import { TypesGen } from './TypesGen';
-import { RpcGen } from './RpcGen';
+import { TypesGen } from './TypesGen.js';
+import { RpcGen } from './RpcGen.js';
 export declare class RuntimeApisGen extends RpcGen {
     #private;
     readonly typesGen: TypesGen;

package/generator/RuntimeApisGen.js

@@ -1,8 +1,7 @@
 import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/specs';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils';
-import { calculateRuntimeApiHash, stringSnakeCase } from '@dedot/utils';
-import { RpcGen } from './RpcGen';
-import { stringCamelCase } from '@polkadot/util';
+import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
+import { calcRuntimeApiHash, stringSnakeCase, stringCamelCase } from '@dedot/utils';
+import { RpcGen } from './RpcGen.js';
 export class RuntimeApisGen extends RpcGen {
     typesGen;
     runtimeApis;
@@ -18,7 +17,7 @@ export class RuntimeApisGen extends RpcGen {
         if (this.metadata.apis.length > 0) {
             this.metadata.apis.forEach((runtimeApi) => {
                 const { name: runtimeApiName, methods } = runtimeApi;
-                runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${calculateRuntimeApiHash(runtimeApiName)}`);
+                runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${calcRuntimeApiHash(runtimeApiName)}`);
                 runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
             ${methods.map((method) => this.#generateMethodDef(runtimeApiName, method)).join('\n')} 
               
@@ -109,7 +108,7 @@ export class RuntimeApisGen extends RpcGen {
         }, []);
     }
     #findRuntimeApiSpec = (runtimeApiHash, version) => {
-        const runtimeApiName = getRuntimeApiNames().find((one) => calculateRuntimeApiHash(one) === runtimeApiHash);
+        const runtimeApiName = getRuntimeApiNames().find((one) => calcRuntimeApiHash(one) === runtimeApiHash);
         return getRuntimeApiSpecs().find((one) => one.runtimeApiName === runtimeApiName && one.version === version);
     };
 }

package/generator/TxGen.d.ts

@@ -1,4 +1,4 @@
-import { ApiGen } from '../generator';
+import { ApiGen } from '../generator/index.js';
 export declare class TxGen extends ApiGen {
     #private;
     generate(): Promise<string>;

package/generator/TxGen.js

@@ -1,6 +1,6 @@
-import { ApiGen } from '../generator';
-import { stringCamelCase, stringPascalCase } from '@polkadot/util';
-import { beautifySourceCode, commentBlock, compileTemplate, isReservedWord } from './utils';
+import { ApiGen } from '../generator/index.js';
+import { stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { beautifySourceCode, commentBlock, compileTemplate, isReservedWord } from './utils.js';
 export class TxGen extends ApiGen {
     generate() {
         const { pallets, types } = this.metadata;

package/generator/TypesGen.d.ts

@@ -1,5 +1,5 @@
 import { PortableRegistry, Field, MetadataLatest, PortableType, TypeId } from '@dedot/codecs';
-import { TypeImports } from './TypeImports';
+import { TypeImports } from './TypeImports.js';
 interface NamedType extends PortableType {
     name: string;
     nameOut: string;

package/generator/TypesGen.js

@@ -1,10 +1,9 @@
-import { stringPascalCase } from '@polkadot/util';
 import { PortableRegistry } from '@dedot/codecs';
-import { isNativeType, normalizeName } from '@dedot/utils';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils';
-import { knownTypes } from './known-types';
-import { TypeImports } from './TypeImports';
-import { findKnownCodec, findKnownCodecType, isKnownCodecType } from './known-codecs';
+import { normalizeName, stringPascalCase } from '@dedot/utils';
+import { isNativeType, beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
+import { knownTypes } from './known-types.js';
+import { TypeImports } from './TypeImports.js';
+import { findKnownCodec, findKnownCodecType, isKnownCodecType } from './known-codecs.js';
 // Skip generate types for these
 // as we do have native types for them
 const SKIP_TYPES = [

package/generator/index.d.ts

@@ -1,10 +1,10 @@
-export * from './TypesGen';
-export * from './ApiGen';
-export * from './ConstsGen';
-export * from './QueryGen';
-export * from './RpcGen';
-export * from './IndexGen';
-export * from './ErrorsGen';
-export * from './EventsGen';
-export * from './TxGen';
-export * from './RuntimeApisGen';
+export * from './TypesGen.js';
+export * from './ApiGen.js';
+export * from './ConstsGen.js';
+export * from './QueryGen.js';
+export * from './RpcGen.js';
+export * from './IndexGen.js';
+export * from './ErrorsGen.js';
+export * from './EventsGen.js';
+export * from './TxGen.js';
+export * from './RuntimeApisGen.js';

package/generator/index.js

@@ -1,10 +1,10 @@
-export * from './TypesGen';
-export * from './ApiGen';
-export * from './ConstsGen';
-export * from './QueryGen';
-export * from './RpcGen';
-export * from './IndexGen';
-export * from './ErrorsGen';
-export * from './EventsGen';
-export * from './TxGen';
-export * from './RuntimeApisGen';
+export * from './TypesGen.js';
+export * from './ApiGen.js';
+export * from './ConstsGen.js';
+export * from './QueryGen.js';
+export * from './RpcGen.js';
+export * from './IndexGen.js';
+export * from './ErrorsGen.js';
+export * from './EventsGen.js';
+export * from './TxGen.js';
+export * from './RuntimeApisGen.js';

package/generator/utils.d.ts

@@ -8,3 +8,8 @@ export declare const compileTemplate: (templateFileName: string) => HandlebarsTe
  * @param word
  */
 export declare const isReservedWord: (word: string) => boolean;
+/**
+ * Check if a type is native JS/TS type
+ * @param type
+ */
+export declare const isNativeType: (type: string) => boolean;

package/generator/utils.js

@@ -33,3 +33,31 @@ const TS_RESERVED_WORDS = ['new', 'class'];
  * @param word
  */
 export const isReservedWord = (word) => TS_RESERVED_WORDS.includes(word);
+const TS_PRIMITIVE_TYPES = [
+    'void',
+    'undefined',
+    'null',
+    'number',
+    'boolean',
+    'bigint',
+    'Map',
+    'Set',
+    'string',
+    'any',
+    'Array',
+    'Record',
+];
+/**
+ * Check if a type is native JS/TS type
+ * @param type
+ */
+export const isNativeType = (type) => {
+    return TS_PRIMITIVE_TYPES.some((one) => {
+        if (typeof one === 'string') {
+            return one === type;
+        }
+        else {
+            return type.match(one);
+        }
+    });
+};

package/index.d.ts

@@ -1,4 +1,4 @@
 import { MetadataLatest } from '@dedot/codecs';
-import { NetworkInfo } from './types';
+import { NetworkInfo } from './types.js';
 export declare function generateTypesFromChain(network: NetworkInfo, endpoint: string, outDir: string): Promise<void>;
 export declare function generateTypes(network: NetworkInfo, metadata: MetadataLatest, rpcMethods: string[], runtimeApis: any[], outDir?: string): Promise<void>;

package/index.js

@@ -1,8 +1,8 @@
 import { Dedot } from 'dedot';
 import * as fs from 'fs';
 import * as path from 'path';
-import { ConstsGen, ErrorsGen, EventsGen, IndexGen, QueryGen, RpcGen, RuntimeApisGen, TxGen, TypesGen, } from './generator';
-import { stringCamelCase } from '@polkadot/util';
+import { ConstsGen, ErrorsGen, EventsGen, IndexGen, QueryGen, RpcGen, RuntimeApisGen, TxGen, TypesGen, } from './generator/index.js';
+import { stringCamelCase } from '@dedot/utils';
 export async function generateTypesFromChain(network, endpoint, outDir) {
     const api = await Dedot.create(endpoint);
     const { methods } = await api.rpc.rpc.methods();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.0.1-next.3f5dd645.0+3f5dd64",
+  "version": "0.0.1-next.41a5fa17.16+41a5fa1",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,12 +18,11 @@
     "copy": "cp -R ./src/templates ./dist && cp -R ./src/templates ./dist/cjs"
   },
   "dependencies": {
-    "@dedot/codecs": "0.0.1-next.3f5dd645.0+3f5dd64",
-    "@dedot/shape": "0.0.1-next.3f5dd645.0+3f5dd64",
-    "@dedot/specs": "0.0.1-next.3f5dd645.0+3f5dd64",
-    "@dedot/utils": "0.0.1-next.3f5dd645.0+3f5dd64",
-    "@polkadot/util": "^12.6.2",
-    "dedot": "0.0.1-next.3f5dd645.0+3f5dd64",
+    "@dedot/codecs": "0.0.1-next.41a5fa17.16+41a5fa1",
+    "@dedot/shape": "0.0.1-next.41a5fa17.16+41a5fa1",
+    "@dedot/specs": "0.0.1-next.41a5fa17.16+41a5fa1",
+    "@dedot/utils": "0.0.1-next.41a5fa17.16+41a5fa1",
+    "dedot": "0.0.1-next.41a5fa17.16+41a5fa1",
     "handlebars": "^4.7.8",
     "prettier": "^3.0.3"
   },
@@ -32,7 +31,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "3f5dd645506eba716db8a7ecceaaed6e121efbc6",
+  "gitHead": "41a5fa17e0b5721f8505271acfcbe4c94c0c8ca5",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/packageInfo.js

@@ -1,2 +1,2 @@
 // THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
-export const packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.27' };
+export const packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.28' };