@dedot/codegen 0.0.1-alpha.3 → 0.0.1-alpha.30

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,18 +1,17 @@
 "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) {
-        this.networkInfo = networkInfo;
+    chain;
+    constructor(chain) {
+        this.chain = chain;
     }
     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)(this.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,14 +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 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) {
@@ -62,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;
@@ -73,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 }) => {
@@ -91,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
@@ -104,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 {
@@ -121,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;
         }
@@ -131,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;
@@ -141,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
@@ -154,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(',')
@@ -168,7 +168,7 @@ class RpcGen extends generator_1.ApiGen {
         return type;
     }
     #getCodecType(type, toTypeIn = true) {
-        const { typeIn, typeOut } = this.registry.findCodecType(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,32 +20,34 @@ 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 specsByModule = this.#runtimeApisSpecsByModule();
-            Object.values(specsByModule).forEach((specs) => {
-                specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
-                    runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                    runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+            const specs = this.#targetRuntimeApiSpecs();
+            specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
+                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], runtimeApiName, methodName }))
-                        .join('\n')} 
+                    .map((methodName) => this.#generateMethodDefFromSpec({
+                    ...methods[methodName],
+                    runtimeApiName,
+                    methodName,
+                }))
+                    .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');
@@ -56,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));
@@ -66,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);
@@ -88,13 +89,13 @@ 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}>>`;
     }
-    #runtimeApisSpecsByModule() {
+    #targetRuntimeApiSpecs() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
-            const runtimeApiSpec = (0, specs_1.findRuntimeApiSpec)(runtimeApiHash, version);
+            const runtimeApiSpec = this.#findRuntimeApiSpec(runtimeApiHash, version);
             if (!runtimeApiSpec)
                 return;
             return {
@@ -106,15 +107,12 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             if (!spec) {
                 return o;
             }
-            const { moduleName } = spec;
-            if (!moduleName) {
-                return o;
-            }
-            return {
-                ...o,
-                [moduleName]: o[moduleName] ? [...o[moduleName], spec] : [spec],
-            };
-        }, {});
+            return [...o, spec];
+        }, []);
     }
+    #findRuntimeApiSpec = (runtimeApiHash, version) => {
+        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);
+    };
 }
 exports.RuntimeApisGen = RuntimeApisGen;

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) {