@dedot/codegen 0.0.1-next.c3d95ac1.3 → 0.0.1-next.d9aff57d.57

package/generator/ConstsGen.js

@@ -2,10 +2,10 @@ import { normalizeName, stringCamelCase } from '@dedot/utils';
 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,7 +20,7 @@ export class ConstsGen extends ApiGen {
         ${commentBlock('Generic pallet constant')}[name: string]: any,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('consts.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }

package/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/ErrorsGen.js

@@ -1,11 +1,11 @@
+import { assert, stringCamelCase, stringPascalCase } 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() {
+    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,13 +16,13 @@ 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 importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('errors.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }

package/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/EventsGen.js

@@ -1,11 +1,11 @@
+import { assert, stringCamelCase, stringPascalCase } 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() {
+    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,13 +28,13 @@ 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 importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('events.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }

package/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/generator/IndexGen.js

@@ -1,13 +1,17 @@
-import { beautifySourceCode, compileTemplate } from './utils.js';
 import { stringPascalCase } from '@dedot/utils';
+import { TypeImports } from './TypeImports.js';
+import { beautifySourceCode, compileTemplate } from './utils.js';
 export class IndexGen {
     chain;
     constructor(chain) {
         this.chain = chain;
     }
-    async generate() {
+    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('index.hbs');
-        return beautifySourceCode(template({ interfaceName }));
+        return beautifySourceCode(template({ importTypes, interfaceName }));
     }
 }

package/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/JsonRpcGen.js

@@ -1,6 +1,6 @@
-import { ApiGen } from '../generator/index.js';
+import { subscriptionsInfo } from '@dedot/api';
+import { ApiGen } from './ApiGen.js';
 import { beautifySourceCode, compileTemplate } from './utils.js';
-import { subscriptionsInfo } from '@dedot/specs';
 const HIDDEN_RPCS = [
     // Ref: https://github.com/paritytech/polkadot-sdk/blob/43415ef58c143b985e09015cd000dbd65f6d3997/substrate/client/rpc-servers/src/lib.rs#L152C9-L158
     'rpc_methods',
@@ -38,12 +38,12 @@ 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 importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('json-rpc.hbs');
         const jsonRpcMethods = this.rpcMethods
             .filter((one) => !ALIAS_RPCS.includes(one)) // exclude alias rpcs

package/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/QueryGen.js

@@ -2,37 +2,45 @@ import { normalizeName, stringCamelCase } from '@dedot/utils';
 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;
             if (!storage)
                 continue;
             const queries = storage.entries.map((one) => this.#generateEntry(one));
-            const queryDefs = queries.map(({ name, valueType, keyType, docs }) => `${commentBlock(docs)}${name}: GenericStorageQuery<(${keyType}) => ${valueType}>`);
+            const queryDefs = queries.map(({ name, valueType, keyType, docs, keyTypeOut }) => {
+                if (keyTypeOut) {
+                    return `${commentBlock(docs)}${name}: GenericStorageQuery<Rv, (${keyType}) => ${valueType}, ${keyTypeOut}>`;
+                }
+                else {
+                    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 importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('query.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }
     #generateEntry(entry) {
         const { name, type, docs, modifier } = entry;
-        let valueType, keyType;
+        let valueType, keyTypeOut, keyTypeIn;
         if (type.tag === 'Plain') {
             valueType = this.typesGen.generateType(type.value.valueTypeId, 1, true);
         }
         else if (type.tag === 'Map') {
             valueType = this.typesGen.generateType(type.value.valueTypeId, 1, true);
-            keyType = this.typesGen.generateType(type.value.keyTypeId, 1);
+            keyTypeOut = this.typesGen.generateType(type.value.keyTypeId, 1, true);
+            keyTypeIn = this.typesGen.generateType(type.value.keyTypeId, 1);
         }
         else {
             throw Error('Invalid entry type!');
@@ -40,14 +48,15 @@ export class QueryGen extends ApiGen {
         const isOptional = modifier === 'Optional';
         valueType = `${valueType}${isOptional ? ' | undefined' : ''}`;
         docs.push('\n');
-        if (keyType) {
-            docs.push(`@param {${keyType}} arg`);
+        if (keyTypeIn) {
+            docs.push(`@param {${keyTypeIn}} arg`);
         }
         docs.push(`@param {Callback<${valueType}> =} callback`);
         return {
             name: normalizeName(name),
             valueType,
-            keyType: keyType ? `arg: ${keyType}` : '',
+            keyType: keyTypeIn ? `arg: ${keyTypeIn}` : '',
+            keyTypeOut,
             docs,
         };
     }

package/generator/RuntimeApisGen.d.ts

@@ -1,9 +1,9 @@
-import { TypesGen } from './TypesGen.js';
 import { ApiGen } from './ApiGen.js';
+import { TypesGen } from './TypesGen.js';
 export declare class RuntimeApisGen extends ApiGen {
     #private;
     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/RuntimeApisGen.js

@@ -1,8 +1,8 @@
-import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/specs';
-import { beautifySourceCode, commentBlock, compileTemplate, isNativeType, TUPLE_TYPE_REGEX, WRAPPER_TYPE_REGEX, } from './utils.js';
+import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/runtime-specs';
 import { calcRuntimeApiHash, stringSnakeCase, stringCamelCase } from '@dedot/utils';
 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,11 +39,11 @@ 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 importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('runtime.hbs');
         return beautifySourceCode(template({ importTypes, runtimeCallsOut }));
     }
@@ -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/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/TxGen.js

@@ -1,11 +1,11 @@
-import { ApiGen } from '../generator/index.js';
 import { stringCamelCase, stringPascalCase } from '@dedot/utils';
+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', 'TransactionStatusLegacy', 'TransactionStatusV2');
         const { callTypeId, addressTypeId, signatureTypeId } = this.metadata.extrinsic;
         const callTypeIn = this.typesGen.generateType(callTypeId, 1);
         const addressTypeIn = this.typesGen.generateType(addressTypeId, 1);
@@ -41,20 +41,22 @@ 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, TransactionStatusV2>>
+          : ISubmittableExtrinsicLegacy<ISubmittableResult<FrameSystemEventRecord, TransactionStatusLegacy>>)
         
-    export type TxCall = (...args: any[]) => ChainSubmittableExtrinsic;    
+    export type TxCall<Rv extends RpcVersion> = (...args: any[]) => ChainSubmittableExtrinsic<Rv>;    
 `;
         const template = compileTemplate('tx.hbs');
         return beautifySourceCode(template({ importTypes, defTypes, txDefsOut }));

package/generator/TypeImports.d.ts

@@ -1,16 +1,21 @@
+type ImportConfig = {
+    excludeModules?: string[];
+    useSubPaths?: boolean;
+};
 export declare class TypeImports {
     #private;
     portableTypes: Set<string>;
     codecTypes: Set<string>;
     knownTypes: Set<string>;
-    specTypes: Set<string>;
+    knownJsonRpcTypes: Set<string>;
     outTypes: Set<string>;
     constructor();
     clear(): void;
-    toImports(...excludeModules: string[]): string;
+    toImports(config?: ImportConfig): string;
     addPortableType(...types: string[]): void;
     addCodecType(...types: string[]): void;
     addKnownType(...types: string[]): void;
-    addSpecType(...types: string[]): void;
+    addKnownJsonRpcType(...types: string[]): void;
     addOutType(...types: string[]): void;
 }
+export {};

package/generator/TypeImports.js

@@ -5,29 +5,31 @@ export class TypeImports {
     codecTypes;
     // Known types that're not codecs or chain/portable types defined in @dedot/types
     knownTypes;
-    specTypes;
+    knownJsonRpcTypes;
     // External types to define explicitly
     outTypes;
     constructor() {
         this.portableTypes = new Set();
         this.codecTypes = new Set();
         this.knownTypes = new Set();
-        this.specTypes = new Set();
+        this.knownJsonRpcTypes = new Set();
         this.outTypes = new Set();
     }
     clear() {
         this.portableTypes.clear();
         this.codecTypes.clear();
         this.knownTypes.clear();
-        this.specTypes.clear();
+        this.knownJsonRpcTypes.clear();
         this.outTypes.clear();
     }
-    toImports(...excludeModules) {
+    toImports(config) {
+        const { excludeModules = [], useSubPaths = false } = config || {};
         // TODO generate outTypes!
+        const prefix = useSubPaths ? '' : '@';
         const toImports = [
-            [this.knownTypes, '@dedot/types'],
-            [this.specTypes, '@dedot/specs'],
-            [this.codecTypes, '@dedot/codecs'],
+            [this.knownTypes, `${prefix}dedot/types`],
+            [this.knownJsonRpcTypes, `${prefix}dedot/types/json-rpc`],
+            [this.codecTypes, `${prefix}dedot/codecs`],
             [this.portableTypes, './types'],
         ];
         return toImports
@@ -51,8 +53,8 @@ export class TypeImports {
     addKnownType(...types) {
         types.forEach((one) => this.knownTypes.add(one));
     }
-    addSpecType(...types) {
-        types.forEach((one) => this.specTypes.add(one));
+    addKnownJsonRpcType(...types) {
+        types.forEach((one) => this.knownJsonRpcTypes.add(one));
     }
     addOutType(...types) {
         types.forEach((one) => this.outTypes.add(one));

package/generator/TypesGen.d.ts

@@ -18,7 +18,7 @@ export declare class TypesGen {
     registry: PortableRegistry;
     typeImports: TypeImports;
     constructor(metadata: MetadataLatest);
-    generate(): Promise<string>;
+    generate(useSubPaths?: boolean): Promise<string>;
     typeCache: Record<string, string>;
     clearCache(): void;
     generateType(typeId: TypeId, nestedLevel?: number, typeOut?: boolean): string;

package/generator/TypesGen.js

@@ -1,8 +1,8 @@
 import { PortableRegistry } from '@dedot/codecs';
 import { normalizeName, stringPascalCase } from '@dedot/utils';
-import { beautifySourceCode, commentBlock, compileTemplate, isNativeType } from './utils.js';
 import { TypeImports } from './TypeImports.js';
 import { findKnownCodec, findKnownCodecType, isKnownCodecType } from './known-codecs.js';
+import { beautifySourceCode, commentBlock, compileTemplate, isNativeType } from './utils.js';
 // Skip generate types for these
 // as we do have native types for them
 const SKIP_TYPES = [
@@ -40,7 +40,7 @@ export class TypesGen {
         this.includedTypes = this.#includedTypes();
         this.typeImports = new TypeImports();
     }
-    generate() {
+    generate(useSubPaths = false) {
         this.clearCache();
         let defTypeOut = '';
         Object.values(this.includedTypes)
@@ -51,7 +51,7 @@ export class TypesGen {
                 defTypeOut += `export type ${name} = ${this.generateType(id)};\n\n`;
             }
         });
-        const importTypes = this.typeImports.toImports('./types');
+        const importTypes = this.typeImports.toImports({ useSubPaths, excludeModules: ['./types'] });
         const template = compileTemplate('types.hbs');
         return beautifySourceCode(template({ importTypes, defTypeOut }));
     }

package/generator/known-codecs.d.ts

@@ -1,5 +1,5 @@
-import * as $ from '@dedot/shape';
 import { AnyShape } from '@dedot/shape';
+import * as $ from '@dedot/shape';
 export type CodecName = `$${string}`;
 export interface CodecType {
     name: CodecName;

package/generator/known-codecs.js

@@ -1,6 +1,6 @@
-import * as $ from '@dedot/shape';
 import * as Codecs from '@dedot/codecs';
 import { $AccountId20, $AccountId32, $Bytes, $ConsensusEngineId, $Era, $EthereumAddress, $MultiAddress, $OpaqueExtrinsic, $PrefixedStorageKey, $RawBytes, $StorageData, $StorageKey, $UncheckedExtrinsic, } from '@dedot/codecs';
+import * as $ from '@dedot/shape';
 import { assert } from '@dedot/utils';
 export const normalizeCodecName = (name) => {
     return name.startsWith('$') ? name : `$${name}`;

package/index.d.ts

@@ -1,3 +1,3 @@
 import { MetadataLatest } from '@dedot/codecs';
-export declare function generateTypesFromEndpoint(chain: string, endpoint: string, outDir?: string, extension?: string): Promise<void>;
-export declare function generateTypes(chain: string, metadata: MetadataLatest, rpcMethods: string[], runtimeApis: Record<string, number>, outDir?: string, extension?: string): Promise<void>;
+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/index.js

@@ -1,19 +1,20 @@
-import { Dedot } from 'dedot';
+import { Dedot } 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, QueryGen, JsonRpcGen, RuntimeApisGen, TxGen, TypesGen, } from './generator/index.js';
-import { stringCamelCase } from '@dedot/utils';
-export async function generateTypesFromEndpoint(chain, endpoint, outDir, extension = 'd.ts') {
-    const api = await Dedot.new(endpoint);
+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 Dedot.new(new WsProvider(endpoint));
     const { methods } = await api.rpc.rpc_methods();
     const apis = api.runtimeVersion.apis || {};
     if (!chain) {
-        chain = stringCamelCase(api.runtimeVersion.specName || api.runtimeChain || 'local');
+        chain = stringCamelCase(api.runtimeVersion.specName || 'local');
     }
-    await generateTypes(chain, api.metadata.latest, methods, apis, outDir, extension);
+    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') {
+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}`);
@@ -36,13 +37,13 @@ export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, ou
     const eventsGen = new EventsGen(typesGen);
     const runtimeApisGen = new RuntimeApisGen(typesGen, runtimeApis);
     const txGen = new TxGen(typesGen);
-    fs.writeFileSync(defTypesFileName, await typesGen.generate());
-    fs.writeFileSync(errorsFileName, await errorsGen.generate());
-    fs.writeFileSync(eventsFileName, await eventsGen.generate());
-    fs.writeFileSync(jsonRpcFileName, await jsonRpcGen.generate());
-    fs.writeFileSync(queryTypesFileName, await queryGen.generate());
-    fs.writeFileSync(constsTypesFileName, await constsGen.generate());
-    fs.writeFileSync(txFileName, await txGen.generate());
-    fs.writeFileSync(indexFileName, await indexGen.generate());
-    fs.writeFileSync(runtimeApisFileName, await runtimeApisGen.generate());
+    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));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.0.1-next.c3d95ac1.3+c3d95ac",
+  "version": "0.0.1-next.d9aff57d.57+d9aff57",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,32 +18,30 @@
     "copy": "cp -R ./src/templates ./dist && cp -R ./src/templates ./dist/cjs"
   },
   "dependencies": {
-    "@dedot/codecs": "0.0.1-next.c3d95ac1.3+c3d95ac",
-    "@dedot/shape": "0.0.1-next.c3d95ac1.3+c3d95ac",
-    "@dedot/specs": "0.0.1-next.c3d95ac1.3+c3d95ac",
-    "@dedot/utils": "0.0.1-next.c3d95ac1.3+c3d95ac",
-    "dedot": "0.0.1-next.c3d95ac1.3+c3d95ac",
-    "handlebars": "^4.7.8",
-    "prettier": "^3.0.3"
+    "@dedot/api": "0.0.1-next.d9aff57d.57+d9aff57",
+    "@dedot/codecs": "0.0.1-next.d9aff57d.57+d9aff57",
+    "@dedot/providers": "0.0.1-next.d9aff57d.57+d9aff57",
+    "@dedot/runtime-specs": "0.0.1-next.d9aff57d.57+d9aff57",
+    "@dedot/shape": "0.0.1-next.d9aff57d.57+d9aff57",
+    "@dedot/types": "0.0.1-next.d9aff57d.57+d9aff57",
+    "@dedot/utils": "0.0.1-next.d9aff57d.57+d9aff57",
+    "handlebars": "^4.7.7",
+    "prettier": "^3.2.5"
   },
   "publishConfig": {
     "access": "public",
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "c3d95ac146c0f96577f1984aac754b3f88d13d91",
+  "gitHead": "d9aff57dcbd8e15455da9627cbc43f07cb6c0afc",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.js"
-      },
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./cjs/index.js"
-      }
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "require": "./cjs/index.js",
+      "default": "./index.js"
     }
   }
 }