@dedot/codegen 0.0.1-next.fecbe32d.13 → 0.1.0

package/{generator → chaintypes/generator}/ApiGen.d.ts

@@ -1,4 +1,4 @@
-import { TypesGen } from '../generator/index.js';
+import { TypesGen } from './TypesGen.js';
 export declare abstract class ApiGen {
     readonly typesGen: TypesGen;
     constructor(typesGen: TypesGen);
@@ -10,49 +10,49 @@ export declare abstract class ApiGen {
                 name: string;
                 typeId: number | undefined;
             }[];
-            type: {
-                tag: "Struct";
+            typeDef: {
+                type: "Struct";
                 value: {
-                    fields: import("dedot").Field[];
+                    fields: import("@dedot/codecs").Field[];
                 };
             } | {
-                tag: "Enum";
+                type: "Enum";
                 value: {
                     members: {
                         name: string;
-                        fields: import("dedot").Field[];
+                        fields: import("@dedot/codecs").Field[];
                         index: number;
                         docs: string[];
                     }[];
                 };
             } | {
-                tag: "Sequence";
+                type: "Sequence";
                 value: {
                     typeParam: number;
                 };
             } | {
-                tag: "SizedVec";
+                type: "SizedVec";
                 value: {
                     len: number;
                     typeParam: number;
                 };
             } | {
-                tag: "Tuple";
+                type: "Tuple";
                 value: {
                     fields: number[];
                 };
             } | {
-                tag: "Primitive";
+                type: "Primitive";
                 value: {
                     kind: "bool" | "u8" | "i8" | "u16" | "i16" | "u32" | "i32" | "u64" | "i64" | "u128" | "i128" | "u256" | "i256" | "str" | "char";
                 };
             } | {
-                tag: "Compact";
+                type: "Compact";
                 value: {
                     typeParam: number;
                 };
             } | {
-                tag: "BitSequence";
+                type: "BitSequence";
                 value: {
                     bitOrderType: number;
                     bitStoreType: number;
@@ -67,13 +67,13 @@ export declare abstract class ApiGen {
                 entries: {
                     name: string;
                     modifier: string;
-                    type: {
-                        tag: "Plain";
+                    storageType: {
+                        type: "Plain";
                         value: {
                             valueTypeId: number;
                         };
                     } | {
-                        tag: "Map";
+                        type: "Map";
                         value: {
                             hashers: ("identity" | "blake2_128" | "blake2_256" | "blake2_128Concat" | "twox128" | "twox256" | "twox64Concat")[];
                             keyTypeId: number;
@@ -134,5 +134,5 @@ export declare abstract class ApiGen {
             }>;
         };
     };
-    get registry(): import("dedot").PortableRegistry;
+    get registry(): import("@dedot/codecs").PortableRegistry;
 }

package/{generator → chaintypes/generator}/ConstsGen.d.ts

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

package/{generator → chaintypes/generator}/ConstsGen.js

@@ -1,11 +1,11 @@
 import { normalizeName, stringCamelCase } from '@dedot/utils';
+import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 import { ApiGen } from './ApiGen.js';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class ConstsGen extends ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericChainConsts');
+        this.typesGen.typeImports.addKnownType('GenericChainConsts', 'RpcVersion');
         let defTypeOut = '';
         for (let pallet of pallets) {
             const typedConstants = pallet.constants.map((one) => ({
@@ -20,8 +20,8 @@ export class ConstsGen extends ApiGen {
         ${commentBlock('Generic pallet constant')}[name: string]: any,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
-        const template = compileTemplate('consts.hbs');
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/consts.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }
 }

package/{generator → chaintypes/generator}/ErrorsGen.d.ts

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

package/{generator → chaintypes/generator}/ErrorsGen.js

@@ -1,11 +1,11 @@
 import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 import { ApiGen } from './ApiGen.js';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class ErrorsGen extends ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericChainErrors', 'GenericPalletError');
+        this.typesGen.typeImports.addKnownType('GenericChainErrors', 'GenericPalletError', 'RpcVersion');
         let defTypeOut = '';
         for (let pallet of pallets) {
             const errorTypeId = pallet.error;
@@ -16,21 +16,21 @@ export class ErrorsGen extends ApiGen {
             defTypeOut += commentBlock(`Pallet \`${pallet.name}\`'s errors`);
             defTypeOut += `${stringCamelCase(pallet.name)}: {
         ${errorDefs
-                .map(({ name, docs }) => `${commentBlock(docs)}${stringPascalCase(name)}: GenericPalletError`)
+                .map(({ name, docs }) => `${commentBlock(docs)}${stringPascalCase(name)}: GenericPalletError<Rv>`)
                 .join(',\n')}
           
-        ${commentBlock('Generic pallet error')}[error: string]: GenericPalletError,
+        ${commentBlock('Generic pallet error')}[error: string]: GenericPalletError<Rv>,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
-        const template = compileTemplate('errors.hbs');
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/errors.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }
     #getErrorDefs(errorTypeId) {
         const def = this.metadata.types[errorTypeId];
         assert(def, `Error def not found for id ${errorTypeId}`);
-        const { tag, value } = def.type;
-        assert(tag === 'Enum', `Invalid pallet error type!`);
+        const { type, value } = def.typeDef;
+        assert(type === 'Enum', 'Invalid pallet error type!');
         return value.members;
     }
 }

package/{generator → chaintypes/generator}/EventsGen.d.ts

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

package/{generator → chaintypes/generator}/EventsGen.js

@@ -1,11 +1,11 @@
 import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 import { ApiGen } from './ApiGen.js';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class EventsGen extends ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericChainEvents', 'GenericPalletEvent');
+        this.typesGen.typeImports.addKnownType('GenericChainEvents', 'GenericPalletEvent', 'RpcVersion');
         let defTypeOut = '';
         for (let pallet of pallets) {
             const eventTypeId = pallet.event;
@@ -28,21 +28,21 @@ export class EventsGen extends ApiGen {
                 }
                 return { ...def, genericParts };
             })
-                .map(({ name, docs, fields, genericParts }) => `${commentBlock(docs)}${stringPascalCase(name)}: GenericPalletEvent<${genericParts.join(', ')}>`)
+                .map(({ name, docs, fields, genericParts }) => `${commentBlock(docs)}${stringPascalCase(name)}: GenericPalletEvent<Rv, ${genericParts.join(', ')}>`)
                 .join(',\n')}
           
-        ${commentBlock('Generic pallet event')}[prop: string]: GenericPalletEvent,
+        ${commentBlock('Generic pallet event')}[prop: string]: GenericPalletEvent<Rv>,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
-        const template = compileTemplate('events.hbs');
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/events.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }
     #getEventDefs(typeId) {
         const def = this.metadata.types[typeId];
         assert(def, `Event def not found for id ${typeId}`);
-        const { tag, value } = def.type;
-        assert(tag === 'Enum', 'Invalid pallet event type!');
+        const { type, value } = def.typeDef;
+        assert(type === 'Enum', 'Invalid pallet event type!');
         return value.members;
     }
     #generateMemberDefType(fields) {

package/{generator → chaintypes/generator}/IndexGen.d.ts

@@ -1,5 +1,5 @@
 export declare class IndexGen {
     readonly chain: string;
     constructor(chain: string);
-    generate(): Promise<string>;
+    generate(useSubPaths?: boolean): Promise<string>;
 }

package/chaintypes/generator/IndexGen.js

@@ -0,0 +1,17 @@
+import { stringPascalCase } from '@dedot/utils';
+import { TypeImports } from '../../shared/index.js';
+import { beautifySourceCode, compileTemplate } from '../../utils.js';
+export class IndexGen {
+    chain;
+    constructor(chain) {
+        this.chain = chain;
+    }
+    async generate(useSubPaths = false) {
+        const interfaceName = stringPascalCase(this.chain);
+        const typeImports = new TypeImports();
+        typeImports.addKnownType('GenericSubstrateApi', 'RpcLegacy', 'RpcV2', 'RpcVersion');
+        const importTypes = typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/index.hbs');
+        return beautifySourceCode(template({ importTypes, interfaceName }));
+    }
+}

package/{generator → chaintypes/generator}/JsonRpcGen.d.ts

@@ -1,7 +1,8 @@
-import { ApiGen, TypesGen } from '../generator/index.js';
+import { ApiGen } from './ApiGen.js';
+import { TypesGen } from './TypesGen.js';
 export declare class JsonRpcGen extends ApiGen {
     readonly typesGen: TypesGen;
     readonly rpcMethods: string[];
     constructor(typesGen: TypesGen, rpcMethods: string[]);
-    generate(): Promise<string>;
+    generate(useSubPaths?: boolean): Promise<string>;
 }

package/{generator → chaintypes/generator}/JsonRpcGen.js

@@ -1,6 +1,6 @@
-import { subscriptionsInfo } from '@dedot/specs';
-import { ApiGen } from '../generator/index.js';
-import { beautifySourceCode, compileTemplate } from './utils.js';
+import { subscriptionsInfo } from '@dedot/api';
+import { beautifySourceCode, compileTemplate } from '../../utils.js';
+import { ApiGen } from './ApiGen.js';
 const HIDDEN_RPCS = [
     // Ref: https://github.com/paritytech/polkadot-sdk/blob/43415ef58c143b985e09015cd000dbd65f6d3997/substrate/client/rpc-servers/src/lib.rs#L152C9-L158
     'rpc_methods',
@@ -38,13 +38,13 @@ export class JsonRpcGen extends ApiGen {
         HIDDEN_RPCS.filter((one) => !rpcMethods.includes(one)).forEach((one) => rpcMethods.push(one));
         rpcMethods.sort();
     }
-    generate() {
+    generate(useSubPaths = false) {
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericJsonRpcApis');
-        this.typesGen.typeImports.addSpecType('JsonRpcApis');
+        this.typesGen.typeImports.addKnownType('GenericJsonRpcApis', 'RpcVersion');
+        this.typesGen.typeImports.addKnownJsonRpcType('JsonRpcApis');
         const toExclude = Object.values(subscriptionsInfo).flat();
-        const importTypes = this.typesGen.typeImports.toImports();
-        const template = compileTemplate('json-rpc.hbs');
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/json-rpc.hbs');
         const jsonRpcMethods = this.rpcMethods
             .filter((one) => !ALIAS_RPCS.includes(one)) // exclude alias rpcs
             .filter((one) => !toExclude.includes(one)) // exclude unsubscribe methods

package/{generator → chaintypes/generator}/QueryGen.d.ts

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

package/{generator → chaintypes/generator}/QueryGen.js

@@ -1,11 +1,11 @@
 import { normalizeName, stringCamelCase } from '@dedot/utils';
+import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 import { ApiGen } from './ApiGen.js';
-import { beautifySourceCode, commentBlock, compileTemplate } from './utils.js';
 export class QueryGen extends ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericChainStorage', 'GenericStorageQuery', 'Callback');
+        this.typesGen.typeImports.addKnownType('GenericChainStorage', 'GenericStorageQuery', 'Callback', 'RpcVersion');
         let defTypeOut = '';
         for (let pallet of pallets) {
             const storage = pallet.storage;
@@ -14,33 +14,33 @@ export class QueryGen extends ApiGen {
             const queries = storage.entries.map((one) => this.#generateEntry(one));
             const queryDefs = queries.map(({ name, valueType, keyType, docs, keyTypeOut }) => {
                 if (keyTypeOut) {
-                    return `${commentBlock(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}, ${keyTypeOut}>`;
+                    return `${commentBlock(docs)}${name}: GenericStorageQuery<Rv, (${keyType}) => ${valueType}, ${keyTypeOut}>`;
                 }
                 else {
-                    return `${commentBlock(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`;
+                    return `${commentBlock(docs)}${name}: GenericStorageQuery<Rv, (${keyType}) => ${valueType}>`;
                 }
             });
             defTypeOut += commentBlock(`Pallet \`${pallet.name}\`'s storage queries`);
             defTypeOut += `${stringCamelCase(pallet.name)}: {
         ${queryDefs.join(',\n')}
         
-        ${commentBlock('Generic pallet storage query')}[storage: string]: GenericStorageQuery;
+        ${commentBlock('Generic pallet storage query')}[storage: string]: GenericStorageQuery<Rv>;
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
-        const template = compileTemplate('query.hbs');
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/query.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }
     #generateEntry(entry) {
-        const { name, type, docs, modifier } = entry;
+        const { name, storageType, docs, modifier } = entry;
         let valueType, keyTypeOut, keyTypeIn;
-        if (type.tag === 'Plain') {
-            valueType = this.typesGen.generateType(type.value.valueTypeId, 1, true);
+        if (storageType.type === 'Plain') {
+            valueType = this.typesGen.generateType(storageType.value.valueTypeId, 1, true);
         }
-        else if (type.tag === 'Map') {
-            valueType = this.typesGen.generateType(type.value.valueTypeId, 1, true);
-            keyTypeOut = this.typesGen.generateType(type.value.keyTypeId, 1, true);
-            keyTypeIn = this.typesGen.generateType(type.value.keyTypeId, 1);
+        else if (storageType.type === 'Map') {
+            valueType = this.typesGen.generateType(storageType.value.valueTypeId, 1, true);
+            keyTypeOut = this.typesGen.generateType(storageType.value.keyTypeId, 1, true);
+            keyTypeIn = this.typesGen.generateType(storageType.value.keyTypeId, 1);
         }
         else {
             throw Error('Invalid entry type!');

package/{generator → chaintypes/generator}/RuntimeApisGen.d.ts

@@ -5,5 +5,5 @@ export declare class RuntimeApisGen extends ApiGen {
     readonly typesGen: TypesGen;
     readonly runtimeApis: Record<string, number>;
     constructor(typesGen: TypesGen, runtimeApis: Record<string, number>);
-    generate(): Promise<string>;
+    generate(useSubPaths?: boolean): Promise<string>;
 }

package/{generator → chaintypes/generator}/RuntimeApisGen.js

@@ -1,8 +1,8 @@
-import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/specs';
+import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/runtime-specs';
 import { calcRuntimeApiHash, stringSnakeCase, stringCamelCase } from '@dedot/utils';
+import { findKnownCodecType } from '../../shared/index.js';
+import { beautifySourceCode, commentBlock, compileTemplate, isNativeType, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX, } from '../../utils.js';
 import { ApiGen } from './ApiGen.js';
-import { findKnownCodecType } from './known-codecs.js';
-import { beautifySourceCode, commentBlock, compileTemplate, isNativeType, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX, } from './utils.js';
 export class RuntimeApisGen extends ApiGen {
     typesGen;
     runtimeApis;
@@ -11,9 +11,9 @@ export class RuntimeApisGen extends ApiGen {
         this.typesGen = typesGen;
         this.runtimeApis = runtimeApis;
     }
-    generate() {
+    generate(useSubPaths = false) {
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericRuntimeApis', 'GenericRuntimeApiMethod');
+        this.typesGen.typeImports.addKnownType('GenericRuntimeApis', 'GenericRuntimeApiMethod', 'RpcVersion');
         let runtimeCallsOut = '';
         if (this.metadata.apis.length > 0) {
             this.metadata.apis.forEach((runtimeApi) => {
@@ -22,7 +22,7 @@ export class RuntimeApisGen extends ApiGen {
                 runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
             ${methods.map((method) => this.#generateMethodDef(runtimeApiName, method)).join('\n')} 
               
-            ${commentBlock('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
+            ${commentBlock('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod<Rv>
         }`;
             });
         }
@@ -39,12 +39,12 @@ export class RuntimeApisGen extends ApiGen {
                 }))
                     .join('\n')} 
               
-            ${commentBlock('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
+            ${commentBlock('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod<Rv>
           }`;
             });
         }
-        const importTypes = this.typesGen.typeImports.toImports();
-        const template = compileTemplate('runtime.hbs');
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
+        const template = compileTemplate('chaintypes/templates/runtime.hbs');
         return beautifySourceCode(template({ importTypes, runtimeCallsOut }));
     }
     #isOptionalType(type) {
@@ -68,7 +68,7 @@ export class RuntimeApisGen extends ApiGen {
             .map(({ name, isOptional, plainType }) => `${stringCamelCase(name)}${isOptional ? '?' : ''}: ${plainType}`)
             .join(', ');
         const typeOut = this.#getGeneratedTypeName(type, false);
-        return `${commentBlock(docs, '\n', defaultDocs, typedParams.map(({ plainType, name }) => `@param {${plainType}} ${name}`))}${methodName}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
+        return `${commentBlock(docs, '\n', defaultDocs, typedParams.map(({ plainType, name }) => `@param {${plainType}} ${name}`))}${methodName}: GenericRuntimeApiMethod<Rv, (${paramsOut}) => Promise<${typeOut}>>`;
     }
     #generateMethodDef(runtimeApiName, methodDef) {
         const { name: methodName, inputs, output, docs } = methodDef;
@@ -89,7 +89,7 @@ export class RuntimeApisGen extends ApiGen {
         const paramsOut = typedInputs
             .map(({ name, type, isOptional }) => `${stringCamelCase(name)}${isOptional ? '?' : ''}: ${type}`)
             .join(', ');
-        return `${commentBlock(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${stringCamelCase(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
+        return `${commentBlock(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${stringCamelCase(methodName)}: GenericRuntimeApiMethod<Rv, (${paramsOut}) => Promise<${typeOut}>>`;
     }
     #targetRuntimeApiSpecs() {
         const specs = Object.entries(this.runtimeApis).map(([runtimeApiHash, version]) => {

package/{generator → chaintypes/generator}/TxGen.d.ts

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

package/{generator → chaintypes/generator}/TxGen.js

@@ -1,11 +1,11 @@
 import { stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { beautifySourceCode, commentBlock, compileTemplate, isReservedWord } from '../../utils.js';
 import { ApiGen } from '../generator/index.js';
-import { beautifySourceCode, commentBlock, compileTemplate, isReservedWord } from './utils.js';
 export class TxGen extends ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets, types } = this.metadata;
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericChainTx', 'GenericTxCall', 'ISubmittableExtrinsic', 'ISubmittableResult', 'IRuntimeTxCall');
+        this.typesGen.typeImports.addKnownType('GenericChainTx', 'GenericTxCall', 'ISubmittableExtrinsic', 'ISubmittableResult', 'IRuntimeTxCall', 'RpcVersion', 'RpcV2', 'ISubmittableExtrinsicLegacy');
         const { callTypeId, addressTypeId, signatureTypeId } = this.metadata.extrinsic;
         const callTypeIn = this.typesGen.generateType(callTypeId, 1);
         const addressTypeIn = this.typesGen.generateType(addressTypeId, 1);
@@ -17,11 +17,11 @@ export class TxGen extends ApiGen {
         for (let pallet of pallets) {
             if (pallet.calls === undefined)
                 continue;
-            const { type } = types[pallet.calls];
-            if (type.tag !== 'Enum')
+            const { typeDef } = types[pallet.calls];
+            if (typeDef.type !== 'Enum')
                 continue;
-            const isFlatEnum = type.value.members.every((m) => m.fields.length === 0);
-            const typedTxs = type.value.members
+            const isFlatEnum = typeDef.value.members.every((m) => m.fields.length === 0);
+            const typedTxs = typeDef.value.members
                 .map((one) => ({
                 functionName: stringCamelCase(one.name),
                 params: one.fields.map((f) => ({
@@ -41,22 +41,24 @@ export class TxGen extends ApiGen {
             txDefsOut += commentBlock(`Pallet \`${pallet.name}\`'s transaction calls`);
             txDefsOut += `${stringCamelCase(pallet.name)}: {
           ${typedTxs
-                .map(({ functionName, params, docs, callInput }) => `${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 }) => `${commentBlock(docs, '\n', params.map((p) => `@param {${p.type}} ${p.normalizedName} ${p.docs}`))}${functionName}: GenericTxCall<Rv, (${params.map((p) => `${p.normalizedName}: ${p.type}`).join(', ')}) => ChainSubmittableExtrinsic<Rv, ${callInput}>>`)
                 .join(',\n')}
             
-          ${commentBlock('Generic pallet tx call')}[callName: string]: GenericTxCall<TxCall>,
+          ${commentBlock('Generic pallet tx call')}[callName: string]: GenericTxCall<Rv, TxCall<Rv>>,
         },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         // TODO make explicit separate type for Extra
         const defTypes = `
-    export type ChainSubmittableExtrinsic<T extends IRuntimeTxCall = ${callTypeIn}> = 
+    export type ChainSubmittableExtrinsic<Rv extends RpcVersion, T extends IRuntimeTxCall = ${callTypeIn}> = 
         Extrinsic<${addressTypeIn}, T, ${signatureTypeIn}, any[]> &
-        ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
+        (Rv extends RpcV2
+          ? ISubmittableExtrinsic<ISubmittableResult<FrameSystemEventRecord>>
+          : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord>>)
         
-    export type TxCall = (...args: any[]) => ChainSubmittableExtrinsic;    
+    export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;    
 `;
-        const template = compileTemplate('tx.hbs');
+        const template = compileTemplate('chaintypes/templates/tx.hbs');
         return beautifySourceCode(template({ importTypes, defTypes, txDefsOut }));
     }
     #normalizeParamName(name) {

package/chaintypes/generator/TypesGen.d.ts

@@ -0,0 +1,11 @@
+import { MetadataLatest, PortableRegistry, TypeId } from '@dedot/codecs';
+import { EnumOptions } from '@dedot/shape';
+import { BaseTypesGen } from '../../shared/index.js';
+export declare class TypesGen extends BaseTypesGen {
+    metadata: MetadataLatest;
+    registry: PortableRegistry;
+    constructor(metadata: MetadataLatest);
+    generate(useSubPaths?: boolean): Promise<string>;
+    shouldGenerateTypeIn(id: TypeId): boolean;
+    getEnumOptions(typeId: TypeId): EnumOptions;
+}

package/chaintypes/generator/TypesGen.js

@@ -0,0 +1,55 @@
+import { PortableRegistry } from '@dedot/codecs';
+import { BaseTypesGen } from '../../shared/index.js';
+import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
+// Skip generate types for these
+// as we do have native types for them
+const SKIP_TYPES = [
+    'BoundedBTreeMap',
+    'BoundedBTreeSet',
+    'BoundedVec',
+    'Box',
+    'BTreeMap',
+    'BTreeSet',
+    'Cow',
+    'Option',
+    'Range',
+    'RangeInclusive',
+    'Result',
+    'WeakBoundedVec',
+    'WrapperKeepOpaque',
+    'WrapperOpaque',
+];
+export class TypesGen extends BaseTypesGen {
+    metadata;
+    registry;
+    constructor(metadata) {
+        super(metadata.types);
+        this.metadata = metadata;
+        this.skipTypes = SKIP_TYPES;
+        this.registry = new PortableRegistry(this.metadata);
+        this.includedTypes = this.includeTypes();
+    }
+    generate(useSubPaths = false) {
+        this.clearCache();
+        let defTypeOut = '';
+        Object.values(this.includedTypes)
+            .filter(({ skip, knownType }) => !(skip || knownType))
+            .forEach(({ name, nameOut, id, docs }) => {
+            defTypeOut += `${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({ excludeModules: ['./types'], useSubPaths });
+        const template = compileTemplate('chaintypes/templates/types.hbs');
+        return beautifySourceCode(template({ importTypes, defTypeOut }));
+    }
+    shouldGenerateTypeIn(id) {
+        const { callTypeId } = this.metadata.extrinsic;
+        const palletCallTypeIds = this.registry.getFieldTypeIdsFromEnum(callTypeId);
+        return callTypeId === id || palletCallTypeIds.includes(id);
+    }
+    getEnumOptions(typeId) {
+        return this.registry.getEnumOptions(typeId);
+    }
+}

package/chaintypes/index.d.ts

@@ -0,0 +1,3 @@
+import { MetadataLatest } from '@dedot/codecs';
+export declare function generateTypesFromEndpoint(chain: string, endpoint: string, outDir?: string, extension?: string, useSubPaths?: boolean): Promise<void>;
+export declare function generateTypes(chain: string, metadata: MetadataLatest, rpcMethods: string[], runtimeApis: Record<string, number>, outDir?: string, extension?: string, useSubPaths?: boolean): Promise<void>;

package/chaintypes/index.js

@@ -0,0 +1,49 @@
+import { LegacyClient } from '@dedot/api';
+import { WsProvider } from '@dedot/providers';
+import { stringCamelCase } from '@dedot/utils';
+import * as fs from 'fs';
+import * as path from 'path';
+import { ConstsGen, ErrorsGen, EventsGen, IndexGen, JsonRpcGen, QueryGen, RuntimeApisGen, TxGen, TypesGen, } from './generator/index.js';
+export async function generateTypesFromEndpoint(chain, endpoint, outDir, extension = 'd.ts', useSubPaths = false) {
+    const api = await LegacyClient.new(new WsProvider(endpoint));
+    const { methods } = await api.rpc.rpc_methods();
+    const apis = api.runtimeVersion.apis || {};
+    if (!chain) {
+        chain = stringCamelCase(api.runtimeVersion.specName || 'local');
+    }
+    await generateTypes(chain, api.metadata.latest, methods, apis, outDir, extension, useSubPaths);
+    await api.disconnect();
+}
+export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir = '.', extension = 'd.ts', useSubPaths = false) {
+    const dirPath = path.resolve(outDir, chain);
+    const defTypesFileName = path.join(dirPath, `types.${extension}`);
+    const constsTypesFileName = path.join(dirPath, `consts.${extension}`);
+    const queryTypesFileName = path.join(dirPath, `query.${extension}`);
+    const jsonRpcFileName = path.join(dirPath, `json-rpc.${extension}`);
+    const indexFileName = path.join(dirPath, `index.${extension}`);
+    const errorsFileName = path.join(dirPath, `errors.${extension}`);
+    const eventsFileName = path.join(dirPath, `events.${extension}`);
+    const runtimeApisFileName = path.join(dirPath, `runtime.${extension}`);
+    const txFileName = path.join(dirPath, `tx.${extension}`);
+    if (!fs.existsSync(dirPath)) {
+        fs.mkdirSync(dirPath, { recursive: true });
+    }
+    const typesGen = new TypesGen(metadata);
+    const constsGen = new ConstsGen(typesGen);
+    const queryGen = new QueryGen(typesGen);
+    const jsonRpcGen = new JsonRpcGen(typesGen, rpcMethods);
+    const indexGen = new IndexGen(chain);
+    const errorsGen = new ErrorsGen(typesGen);
+    const eventsGen = new EventsGen(typesGen);
+    const runtimeApisGen = new RuntimeApisGen(typesGen, runtimeApis);
+    const txGen = new TxGen(typesGen);
+    fs.writeFileSync(defTypesFileName, await typesGen.generate(useSubPaths));
+    fs.writeFileSync(errorsFileName, await errorsGen.generate(useSubPaths));
+    fs.writeFileSync(eventsFileName, await eventsGen.generate(useSubPaths));
+    fs.writeFileSync(jsonRpcFileName, await jsonRpcGen.generate(useSubPaths));
+    fs.writeFileSync(queryTypesFileName, await queryGen.generate(useSubPaths));
+    fs.writeFileSync(constsTypesFileName, await constsGen.generate(useSubPaths));
+    fs.writeFileSync(txFileName, await txGen.generate(useSubPaths));
+    fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
+    fs.writeFileSync(runtimeApisFileName, await runtimeApisGen.generate(useSubPaths));
+}