@dedot/codegen 0.0.1-next.59796573.28 → 0.0.1-next.5d366dea.50

package/cjs/generator/ConstsGen.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstsGen = void 0;
-const utils_1 = require("@dedot/utils");
+const utils_1 = require("dedot/utils");
 const ApiGen_js_1 = require("./ApiGen.js");
 const utils_js_1 = require("./utils.js");
 class ConstsGen extends ApiGen_js_1.ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericChainConsts', 'RpcVersion');
@@ -23,7 +23,7 @@ class ConstsGen extends ApiGen_js_1.ApiGen {
         ${(0, utils_js_1.commentBlock)('Generic pallet constant')}[name: string]: any,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('consts.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }

package/cjs/generator/ErrorsGen.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorsGen = void 0;
-const utils_1 = require("@dedot/utils");
+const utils_1 = require("dedot/utils");
 const ApiGen_js_1 = require("./ApiGen.js");
 const utils_js_1 = require("./utils.js");
 class ErrorsGen extends ApiGen_js_1.ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericChainErrors', 'GenericPalletError', 'RpcVersion');
@@ -25,7 +25,7 @@ class ErrorsGen extends ApiGen_js_1.ApiGen {
         ${(0, utils_js_1.commentBlock)('Generic pallet error')}[error: string]: GenericPalletError<Rv>,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('errors.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }

package/cjs/generator/EventsGen.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventsGen = void 0;
-const utils_1 = require("@dedot/utils");
+const utils_1 = require("dedot/utils");
 const ApiGen_js_1 = require("./ApiGen.js");
 const utils_js_1 = require("./utils.js");
 class EventsGen extends ApiGen_js_1.ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericChainEvents', 'GenericPalletEvent', 'RpcVersion');
@@ -37,7 +37,7 @@ class EventsGen extends ApiGen_js_1.ApiGen {
         ${(0, utils_js_1.commentBlock)('Generic pallet event')}[prop: string]: GenericPalletEvent<Rv>,
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('events.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }

package/cjs/generator/IndexGen.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexGen = void 0;
-const utils_1 = require("@dedot/utils");
+const utils_1 = require("dedot/utils");
 const utils_js_1 = require("./utils.js");
 class IndexGen {
     chain;
     constructor(chain) {
         this.chain = chain;
     }
-    async generate() {
+    async generate(useSubPaths = false) {
         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 }));

package/cjs/generator/JsonRpcGen.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonRpcGen = void 0;
-const specs_1 = require("@dedot/specs");
+const dedot_1 = require("dedot");
 const index_js_1 = require("../generator/index.js");
 const utils_js_1 = require("./utils.js");
 const HIDDEN_RPCS = [
@@ -41,12 +41,12 @@ class JsonRpcGen extends index_js_1.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', 'RpcVersion');
-        this.typesGen.typeImports.addSpecType('JsonRpcApis');
-        const toExclude = Object.values(specs_1.subscriptionsInfo).flat();
-        const importTypes = this.typesGen.typeImports.toImports();
+        this.typesGen.typeImports.addKnownJsonRpcType('JsonRpcApis');
+        const toExclude = Object.values(dedot_1.subscriptionsInfo).flat();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('json-rpc.hbs');
         const jsonRpcMethods = this.rpcMethods
             .filter((one) => !ALIAS_RPCS.includes(one)) // exclude alias rpcs

package/cjs/generator/QueryGen.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryGen = void 0;
-const utils_1 = require("@dedot/utils");
+const utils_1 = require("dedot/utils");
 const ApiGen_js_1 = require("./ApiGen.js");
 const utils_js_1 = require("./utils.js");
 class QueryGen extends ApiGen_js_1.ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets } = this.metadata;
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericChainStorage', 'GenericStorageQuery', 'Callback', 'RpcVersion');
@@ -30,7 +30,7 @@ class QueryGen extends ApiGen_js_1.ApiGen {
         ${(0, utils_js_1.commentBlock)('Generic pallet storage query')}[storage: string]: GenericStorageQuery<Rv>;
       },`;
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('query.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }

package/cjs/generator/RuntimeApisGen.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeApisGen = void 0;
-const specs_1 = require("@dedot/specs");
-const utils_1 = require("@dedot/utils");
+const runtime_specs_1 = require("dedot/runtime-specs");
+const utils_1 = require("dedot/utils");
 const ApiGen_js_1 = require("./ApiGen.js");
 const known_codecs_js_1 = require("./known-codecs.js");
 const utils_js_1 = require("./utils.js");
@@ -14,7 +14,7 @@ class RuntimeApisGen extends ApiGen_js_1.ApiGen {
         this.typesGen = typesGen;
         this.runtimeApis = runtimeApis;
     }
-    generate() {
+    generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericRuntimeApis', 'GenericRuntimeApiMethod', 'RpcVersion');
         let runtimeCallsOut = '';
@@ -46,7 +46,7 @@ class RuntimeApisGen extends ApiGen_js_1.ApiGen {
           }`;
             });
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('runtime.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, runtimeCallsOut }));
     }
@@ -112,8 +112,8 @@ class RuntimeApisGen extends ApiGen_js_1.ApiGen {
         }, []);
     }
     #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);
+        const runtimeApiName = (0, runtime_specs_1.getRuntimeApiNames)().find((one) => (0, utils_1.calcRuntimeApiHash)(one) === runtimeApiHash);
+        return (0, runtime_specs_1.getRuntimeApiSpecs)().find((one) => one.runtimeApiName === runtimeApiName && one.version === version);
     };
     // TODO check typeIn, typeOut if param type, or rpc type isScale
     #addTypeImport(type, toTypeIn = true) {

package/cjs/generator/TxGen.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxGen = void 0;
-const utils_1 = require("@dedot/utils");
+const utils_1 = require("dedot/utils");
 const index_js_1 = require("../generator/index.js");
 const utils_js_1 = require("./utils.js");
 class TxGen extends index_js_1.ApiGen {
-    generate() {
+    generate(useSubPaths = false) {
         const { pallets, types } = this.metadata;
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericChainTx', 'GenericTxCall', 'ISubmittableExtrinsic', 'ISubmittableResult', 'IRuntimeTxCall', 'RpcVersion', 'RpcV2', 'ISubmittableExtrinsicLegacy', 'TransactionStatusLegacy', 'TransactionStatusV2');
@@ -50,7 +50,7 @@ class TxGen extends index_js_1.ApiGen {
           ${(0, utils_js_1.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<Rv extends RpcVersion, T extends IRuntimeTxCall = ${callTypeIn}> = 

package/cjs/generator/TypeImports.js

@@ -8,29 +8,31 @@ 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
@@ -54,8 +56,8 @@ 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/cjs/generator/TypesGen.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypesGen = exports.BASIC_KNOWN_TYPES = void 0;
-const codecs_1 = require("@dedot/codecs");
-const utils_1 = require("@dedot/utils");
+const codecs_1 = require("dedot/codecs");
+const utils_1 = require("dedot/utils");
 const TypeImports_js_1 = require("./TypeImports.js");
 const known_codecs_js_1 = require("./known-codecs.js");
 const utils_js_1 = require("./utils.js");
@@ -43,7 +43,7 @@ class TypesGen {
         this.includedTypes = this.#includedTypes();
         this.typeImports = new TypeImports_js_1.TypeImports();
     }
-    generate() {
+    generate(useSubPaths = false) {
         this.clearCache();
         let defTypeOut = '';
         Object.values(this.includedTypes)
@@ -54,7 +54,7 @@ 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 = (0, utils_js_1.compileTemplate)('types.hbs');
         return (0, utils_js_1.beautifySourceCode)(template({ importTypes, defTypeOut }));
     }

package/cjs/generator/known-codecs.js

@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isKnownCodecType = exports.findKnownWrapperCodec = exports.findKnownCodec = exports.findKnownCodecType = exports.looseTypeCodecs = exports.normalizeCodecName = void 0;
-const Codecs = __importStar(require("@dedot/codecs"));
-const codecs_1 = require("@dedot/codecs");
-const $ = __importStar(require("@dedot/shape"));
-const utils_1 = require("@dedot/utils");
+const dedot_1 = require("dedot");
+const Codecs = __importStar(require("dedot/codecs"));
+const codecs_1 = require("dedot/codecs");
+const utils_1 = require("dedot/utils");
 const normalizeCodecName = (name) => {
     return name.startsWith('$') ? name : `$${name}`;
 };
@@ -96,7 +96,7 @@ function findKnownCodecType(name) {
         };
     }
     const $codec = findKnownCodec(name);
-    if ($codec.nativeType && $[name]) {
+    if ($codec.nativeType && dedot_1.$[name]) {
         return {
             name: normalizedName,
             $codec,
@@ -114,7 +114,7 @@ function findKnownCodecType(name) {
 exports.findKnownCodecType = findKnownCodecType;
 function findKnownCodec(typeName) {
     // @ts-ignore
-    const $codec = findKnownWrapperCodec(typeName) || Codecs[(0, exports.normalizeCodecName)(typeName)] || $[typeName];
+    const $codec = findKnownWrapperCodec(typeName) || Codecs[(0, exports.normalizeCodecName)(typeName)] || dedot_1.$[typeName];
     (0, utils_1.assert)($codec, `Known codec not found - ${typeName}`);
     return $codec;
 }
@@ -125,7 +125,7 @@ function findKnownWrapperCodec(typeName) {
         const [_, wrapper, inner] = matchNames;
         if (KNOWN_WRAPPER_TYPES.includes(wrapper)) {
             // @ts-ignore
-            const $Wrapper = $[wrapper];
+            const $Wrapper = dedot_1.$[wrapper];
             if (inner.match(TUPLE_TYPE_REGEX) || inner.match(WRAPPER_TYPE_REGEX)) {
                 return $Wrapper(findKnownWrapperCodec(inner));
             }
@@ -140,7 +140,7 @@ function findKnownWrapperCodec(typeName) {
             .split(',')
             .filter((x) => x)
             .map((one) => findKnownCodec(one.trim()));
-        return $.Tuple(...$inner);
+        return dedot_1.$.Tuple(...$inner);
     }
 }
 exports.findKnownWrapperCodec = findKnownWrapperCodec;

package/cjs/index.js

@@ -24,23 +24,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTypes = exports.generateTypesFromEndpoint = void 0;
-const utils_1 = require("@dedot/utils");
 const dedot_1 = require("dedot");
+const utils_1 = require("dedot/utils");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const index_js_1 = require("./generator/index.js");
-async function generateTypesFromEndpoint(chain, endpoint, outDir, extension = 'd.ts') {
+async function generateTypesFromEndpoint(chain, endpoint, outDir, extension = 'd.ts', useSubPaths = false) {
     const api = await dedot_1.Dedot.new(new dedot_1.WsProvider(endpoint));
     const { methods } = await api.rpc.rpc_methods();
     const apis = api.runtimeVersion.apis || {};
     if (!chain) {
         chain = (0, utils_1.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();
 }
 exports.generateTypesFromEndpoint = generateTypesFromEndpoint;
-async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir = '.', extension = 'd.ts') {
+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}`);
@@ -63,14 +63,14 @@ async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir =
     const eventsGen = new index_js_1.EventsGen(typesGen);
     const runtimeApisGen = new index_js_1.RuntimeApisGen(typesGen, runtimeApis);
     const txGen = new index_js_1.TxGen(typesGen);
-    fs.writeFileSync(defTypesFileName, await typesGen.generate());
-    fs.writeFileSync(errorsFileName, await errorsGen.generate());
-    fs.writeFileSync(eventsFileName, await eventsGen.generate());
-    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));
 }
 exports.generateTypes = generateTypes;

package/generator/ApiGen.d.ts

@@ -13,14 +13,14 @@ export declare abstract class ApiGen {
             type: {
                 tag: "Struct";
                 value: {
-                    fields: import("dedot").Field[];
+                    fields: import("@dedot/codecs").Field[];
                 };
             } | {
                 tag: "Enum";
                 value: {
                     members: {
                         name: string;
-                        fields: import("dedot").Field[];
+                        fields: import("@dedot/codecs").Field[];
                         index: number;
                         docs: string[];
                     }[];
@@ -134,5 +134,5 @@ export declare abstract class ApiGen {
             }>;
         };
     };
-    get registry(): import("dedot").PortableRegistry;
+    get registry(): import("@dedot/codecs").PortableRegistry;
 }

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

@@ -1,8 +1,8 @@
-import { normalizeName, stringCamelCase } from '@dedot/utils';
+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', 'RpcVersion');
@@ -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,8 +1,8 @@
-import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { assert, stringCamelCase, stringPascalCase } from 'dedot/utils';
 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', 'RpcVersion');
@@ -22,7 +22,7 @@ export class ErrorsGen extends ApiGen {
         ${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,8 +1,8 @@
-import { assert, stringCamelCase, stringPascalCase } from '@dedot/utils';
+import { assert, stringCamelCase, stringPascalCase } from 'dedot/utils';
 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', 'RpcVersion');
@@ -34,7 +34,7 @@ export class EventsGen extends ApiGen {
         ${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,11 +1,11 @@
-import { stringPascalCase } from '@dedot/utils';
+import { stringPascalCase } from 'dedot/utils';
 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 template = compileTemplate('index.hbs');
         return beautifySourceCode(template({ interfaceName }));

package/generator/JsonRpcGen.d.ts

@@ -3,5 +3,5 @@ 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,4 +1,4 @@
-import { subscriptionsInfo } from '@dedot/specs';
+import { subscriptionsInfo } from 'dedot';
 import { ApiGen } from '../generator/index.js';
 import { beautifySourceCode, compileTemplate } from './utils.js';
 const HIDDEN_RPCS = [
@@ -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', 'RpcVersion');
-        this.typesGen.typeImports.addSpecType('JsonRpcApis');
+        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

@@ -1,8 +1,8 @@
-import { normalizeName, stringCamelCase } from '@dedot/utils';
+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', 'RpcVersion');
@@ -27,7 +27,7 @@ export class QueryGen extends ApiGen {
         ${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 }));
     }

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

@@ -1,5 +1,5 @@
-import { getRuntimeApiNames, getRuntimeApiSpecs } from '@dedot/specs';
-import { calcRuntimeApiHash, stringSnakeCase, stringCamelCase } from '@dedot/utils';
+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';
@@ -11,7 +11,7 @@ export class RuntimeApisGen extends ApiGen {
         this.typesGen = typesGen;
         this.runtimeApis = runtimeApis;
     }
-    generate() {
+    generate(useSubPaths = false) {
         this.typesGen.clearCache();
         this.typesGen.typeImports.addKnownType('GenericRuntimeApis', 'GenericRuntimeApiMethod', 'RpcVersion');
         let runtimeCallsOut = '';
@@ -43,7 +43,7 @@ export class RuntimeApisGen extends ApiGen {
           }`;
             });
         }
-        const importTypes = this.typesGen.typeImports.toImports();
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const template = compileTemplate('runtime.hbs');
         return beautifySourceCode(template({ importTypes, runtimeCallsOut }));
     }

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,8 +1,8 @@
-import { stringCamelCase, stringPascalCase } from '@dedot/utils';
+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', 'RpcVersion', 'RpcV2', 'ISubmittableExtrinsicLegacy', 'TransactionStatusLegacy', 'TransactionStatusV2');
@@ -47,7 +47,7 @@ export class TxGen extends ApiGen {
           ${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<Rv extends RpcVersion, T extends IRuntimeTxCall = ${callTypeIn}> = 

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

@@ -1,4 +1,4 @@
-import { Field, MetadataLatest, PortableRegistry, PortableType, TypeId } from '@dedot/codecs';
+import { Field, MetadataLatest, PortableRegistry, PortableType, TypeId } from 'dedot/codecs';
 import { TypeImports } from './TypeImports.js';
 interface NamedType extends PortableType {
     name: string;
@@ -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,5 +1,5 @@
-import { PortableRegistry } from '@dedot/codecs';
-import { normalizeName, stringPascalCase } from '@dedot/utils';
+import { PortableRegistry } from 'dedot/codecs';
+import { normalizeName, stringPascalCase } from 'dedot/utils';
 import { TypeImports } from './TypeImports.js';
 import { findKnownCodec, findKnownCodecType, isKnownCodecType } from './known-codecs.js';
 import { beautifySourceCode, commentBlock, compileTemplate, isNativeType } from './utils.js';
@@ -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 { $ } from 'dedot';
+import { AnyShape } from 'dedot/shape';
 export type CodecName = `$${string}`;
 export interface CodecType {
     name: CodecName;

package/generator/known-codecs.js

@@ -1,7 +1,7 @@
-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';
+import { $ } from 'dedot';
+import * as Codecs from 'dedot/codecs';
+import { $AccountId20, $AccountId32, $Bytes, $ConsensusEngineId, $Era, $EthereumAddress, $MultiAddress, $OpaqueExtrinsic, $PrefixedStorageKey, $RawBytes, $StorageData, $StorageKey, $UncheckedExtrinsic, } from 'dedot/codecs';
+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>;
+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/index.js

@@ -1,19 +1,19 @@
-import { stringCamelCase } from '@dedot/utils';
 import { Dedot, WsProvider } from 'dedot';
+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';
-export async function generateTypesFromEndpoint(chain, endpoint, outDir, extension = 'd.ts') {
+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 || '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 +36,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.59796573.28+5979657",
+  "version": "0.0.1-next.5d366dea.50+5d366de",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,20 +18,16 @@
     "copy": "cp -R ./src/templates ./dist && cp -R ./src/templates ./dist/cjs"
   },
   "dependencies": {
-    "@dedot/codecs": "0.0.1-next.59796573.28+5979657",
-    "@dedot/shape": "0.0.1-next.59796573.28+5979657",
-    "@dedot/specs": "0.0.1-next.59796573.28+5979657",
-    "@dedot/utils": "0.0.1-next.59796573.28+5979657",
-    "dedot": "0.0.1-next.59796573.28+5979657",
-    "handlebars": "^4.7.8",
-    "prettier": "^3.0.3"
+    "dedot": "0.0.1-next.5d366dea.50+5d366de",
+    "handlebars": "^4.7.7",
+    "prettier": "^3.2.5"
   },
   "publishConfig": {
     "access": "public",
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "59796573a5449c47e2f6c06a913275660a0441e1",
+  "gitHead": "5d366dea6b6c3d076a616746d80b80ef37434ff7",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {