@dedot/codegen 0.2.0 → 0.4.0

package/chaintypes/generator/IndexGen.d.ts

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

package/chaintypes/generator/IndexGen.js

@@ -1,13 +1,12 @@
-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;
+    interfaceName;
+    constructor(interfaceName) {
+        this.interfaceName = interfaceName;
     }
     async generate(useSubPaths = false) {
-        const interfaceName = stringPascalCase(this.chain);
+        const interfaceName = this.interfaceName;
         const typeImports = new TypeImports();
         typeImports.addKnownType('GenericSubstrateApi', 'RpcLegacy', 'RpcV2', 'RpcVersion');
         const importTypes = typeImports.toImports({ useSubPaths });

package/chaintypes/index.d.ts

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

package/chaintypes/index.js

@@ -1,21 +1,21 @@
 import { LegacyClient } from '@dedot/api';
 import { WsProvider } from '@dedot/providers';
-import { stringCamelCase } from '@dedot/utils';
+import { stringDashCase, stringPascalCase } 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));
+    // Immediately throw error if cannot connect to provider for the first time.
+    const api = await LegacyClient.new(new WsProvider({ endpoint, retryDelayMs: 0, timeout: 0 }));
     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);
+    chain = chain || api.runtimeVersion.specName || 'local';
+    const result = await generateTypes(chain, api.metadata.latest, methods, apis, outDir, extension, useSubPaths);
     await api.disconnect();
+    return result;
 }
 export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir = '.', extension = 'd.ts', useSubPaths = false) {
-    const dirPath = path.resolve(outDir, chain);
+    const dirPath = path.resolve(outDir, stringDashCase(chain));
     const defTypesFileName = path.join(dirPath, `types.${extension}`);
     const constsTypesFileName = path.join(dirPath, `consts.${extension}`);
     const queryTypesFileName = path.join(dirPath, `query.${extension}`);
@@ -28,11 +28,12 @@ export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, ou
     if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath, { recursive: true });
     }
+    const interfaceName = `${stringPascalCase(chain)}Api`;
     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 indexGen = new IndexGen(interfaceName);
     const errorsGen = new ErrorsGen(typesGen);
     const eventsGen = new EventsGen(typesGen);
     const runtimeApisGen = new RuntimeApisGen(typesGen, runtimeApis);
@@ -46,4 +47,5 @@ export async function generateTypes(chain, metadata, rpcMethods, runtimeApis, ou
     fs.writeFileSync(txFileName, await txGen.generate(useSubPaths));
     fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
     fs.writeFileSync(runtimeApisFileName, await runtimeApisGen.generate(useSubPaths));
+    return { interfaceName };
 }

package/chaintypes/templates/index.hbs

@@ -11,7 +11,7 @@ import { ChainTx } from './tx';
 
 export * from './types';
 
-export interface Versioned{{{interfaceName}}}Api<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
+export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
   rpc: ChainJsonRpcApis<Rv>;
   consts: ChainConsts<Rv>;
   query: ChainStorage<Rv>;
@@ -21,7 +21,7 @@ export interface Versioned{{{interfaceName}}}Api<Rv extends RpcVersion> extends
   tx: ChainTx<Rv>;
 }
 
-export interface {{{interfaceName}}}Api {
-  legacy: Versioned{{{interfaceName}}}Api<RpcLegacy>;
-  v2: Versioned{{{interfaceName}}}Api<RpcV2>;
+export interface {{{interfaceName}}} {
+  legacy: Versioned{{{interfaceName}}}<RpcLegacy>;
+  v2: Versioned{{{interfaceName}}}<RpcV2>;
 }

package/cjs/chaintypes/generator/IndexGen.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexGen = void 0;
-const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../../shared/index.js");
 const utils_js_1 = require("../../utils.js");
 class IndexGen {
-    chain;
-    constructor(chain) {
-        this.chain = chain;
+    interfaceName;
+    constructor(interfaceName) {
+        this.interfaceName = interfaceName;
     }
     async generate(useSubPaths = false) {
-        const interfaceName = (0, utils_1.stringPascalCase)(this.chain);
+        const interfaceName = this.interfaceName;
         const typeImports = new index_js_1.TypeImports();
         typeImports.addKnownType('GenericSubstrateApi', 'RpcLegacy', 'RpcV2', 'RpcVersion');
         const importTypes = typeImports.toImports({ useSubPaths });

package/cjs/chaintypes/index.js

@@ -31,18 +31,18 @@ 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', useSubPaths = false) {
-    const api = await api_1.LegacyClient.new(new providers_1.WsProvider(endpoint));
+    // Immediately throw error if cannot connect to provider for the first time.
+    const api = await api_1.LegacyClient.new(new providers_1.WsProvider({ endpoint, retryDelayMs: 0, timeout: 0 }));
     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, useSubPaths);
+    chain = chain || api.runtimeVersion.specName || 'local';
+    const result = await generateTypes(chain, api.metadata.latest, methods, apis, outDir, extension, useSubPaths);
     await api.disconnect();
+    return result;
 }
 exports.generateTypesFromEndpoint = generateTypesFromEndpoint;
 async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir = '.', extension = 'd.ts', useSubPaths = false) {
-    const dirPath = path.resolve(outDir, chain);
+    const dirPath = path.resolve(outDir, (0, utils_1.stringDashCase)(chain));
     const defTypesFileName = path.join(dirPath, `types.${extension}`);
     const constsTypesFileName = path.join(dirPath, `consts.${extension}`);
     const queryTypesFileName = path.join(dirPath, `query.${extension}`);
@@ -55,11 +55,12 @@ async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir =
     if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath, { recursive: true });
     }
+    const interfaceName = `${(0, utils_1.stringPascalCase)(chain)}Api`;
     const typesGen = new index_js_1.TypesGen(metadata);
     const constsGen = new index_js_1.ConstsGen(typesGen);
     const queryGen = new index_js_1.QueryGen(typesGen);
     const jsonRpcGen = new index_js_1.JsonRpcGen(typesGen, rpcMethods);
-    const indexGen = new index_js_1.IndexGen(chain);
+    const indexGen = new index_js_1.IndexGen(interfaceName);
     const errorsGen = new index_js_1.ErrorsGen(typesGen);
     const eventsGen = new index_js_1.EventsGen(typesGen);
     const runtimeApisGen = new index_js_1.RuntimeApisGen(typesGen, runtimeApis);
@@ -73,5 +74,6 @@ async function generateTypes(chain, metadata, rpcMethods, runtimeApis, outDir =
     fs.writeFileSync(txFileName, await txGen.generate(useSubPaths));
     fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
     fs.writeFileSync(runtimeApisFileName, await runtimeApisGen.generate(useSubPaths));
+    return { interfaceName };
 }
 exports.generateTypes = generateTypes;

package/cjs/chaintypes/templates/index.hbs

@@ -11,7 +11,7 @@ import { ChainTx } from './tx';
 
 export * from './types';
 
-export interface Versioned{{{interfaceName}}}Api<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
+export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
   rpc: ChainJsonRpcApis<Rv>;
   consts: ChainConsts<Rv>;
   query: ChainStorage<Rv>;
@@ -21,7 +21,7 @@ export interface Versioned{{{interfaceName}}}Api<Rv extends RpcVersion> extends
   tx: ChainTx<Rv>;
 }
 
-export interface {{{interfaceName}}}Api {
-  legacy: Versioned{{{interfaceName}}}Api<RpcLegacy>;
-  v2: Versioned{{{interfaceName}}}Api<RpcV2>;
+export interface {{{interfaceName}}} {
+  legacy: Versioned{{{interfaceName}}}<RpcLegacy>;
+  v2: Versioned{{{interfaceName}}}<RpcV2>;
 }

package/cjs/index.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./types.js"), exports);
 __exportStar(require("./chaintypes/index.js"), exports);
 __exportStar(require("./typink/index.js"), exports);

package/cjs/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/typink/generator/EventsGen.js

@@ -7,6 +7,7 @@ const QueryGen_js_1 = require("./QueryGen.js");
 class EventsGen extends QueryGen_js_1.QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
+        this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractEvents', 'GenericContractEvent');
         const { events } = this.contractMetadata.spec;
         let eventsOut = '';

package/cjs/typink/generator/IndexGen.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexGen = void 0;
-const utils_1 = require("@dedot/utils");
 const index_js_1 = require("../../shared/index.js");
 const utils_js_1 = require("../../utils.js");
-const SUFFIX = 'contract_api';
 class IndexGen {
+    interfaceName;
     contractMetadata;
     typesGen;
-    constructor(contractMetadata, typesGen) {
+    constructor(interfaceName, contractMetadata, typesGen) {
+        this.interfaceName = interfaceName;
         this.contractMetadata = contractMetadata;
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
-        const contractName = (0, utils_1.stringPascalCase)(`${this.contractMetadata.contract.name}_${SUFFIX}`);
+        const interfaceName = this.interfaceName;
         const langErrorId = this.contractMetadata.spec.lang_error.type;
         const langErrorName = this.typesGen.cleanPath(this.contractMetadata.types[langErrorId].type.path);
         const typeImports = new index_js_1.TypeImports();
@@ -23,7 +23,7 @@ class IndexGen {
         typeImports.addPortableType(langErrorName);
         const importTypes = typeImports.toImports({ useSubPaths });
         const template = (0, utils_js_1.compileTemplate)('typink/templates/index.hbs');
-        return (0, utils_js_1.beautifySourceCode)(template({ contractName, langErrorName, importTypes }));
+        return (0, utils_js_1.beautifySourceCode)(template({ interfaceName, langErrorName, importTypes }));
     }
 }
 exports.IndexGen = IndexGen;

package/cjs/typink/index.js

@@ -5,13 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateContractTypes = void 0;
 const contracts_1 = require("@dedot/contracts");
+const utils_1 = require("@dedot/utils");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const index_js_1 = require("./generator/index.js");
 async function generateContractTypes(metadata, contract, outDir = '.', extension = 'd.ts', useSubPaths = false) {
     let contractMetadata = typeof metadata === 'string' ? (0, contracts_1.parseRawMetadata)(metadata) : metadata;
-    contract = contract || contractMetadata.contract.name;
-    const dirPath = path_1.default.resolve(outDir, contract);
+    const contractName = contract || contractMetadata.contract.name;
+    const dirPath = path_1.default.resolve(outDir, (0, utils_1.stringDashCase)(contractName));
     const typesFileName = path_1.default.join(dirPath, `types.${extension}`);
     const queryTypesFileName = path_1.default.join(dirPath, `query.${extension}`);
     const txTypesFileName = path_1.default.join(dirPath, `tx.${extension}`);
@@ -22,13 +23,14 @@ async function generateContractTypes(metadata, contract, outDir = '.', extension
     if (!fs_1.default.existsSync(dirPath)) {
         fs_1.default.mkdirSync(dirPath, { recursive: true });
     }
+    const interfaceName = `${(0, utils_1.stringPascalCase)(`${contractName}`)}ContractApi`;
     const typesGen = new index_js_1.TypesGen(contractMetadata);
     const queryGen = new index_js_1.QueryGen(contractMetadata, typesGen);
     const txGen = new index_js_1.TxGen(contractMetadata, typesGen);
     const constructorTxGen = new index_js_1.ConstructorTxGen(contractMetadata, typesGen);
     const constructorQueryGen = new index_js_1.ConstructorQueryGen(contractMetadata, typesGen);
     const eventsGen = new index_js_1.EventsGen(contractMetadata, typesGen);
-    const indexGen = new index_js_1.IndexGen(contractMetadata, typesGen);
+    const indexGen = new index_js_1.IndexGen(interfaceName, contractMetadata, typesGen);
     fs_1.default.writeFileSync(typesFileName, await typesGen.generate(useSubPaths));
     fs_1.default.writeFileSync(queryTypesFileName, await queryGen.generate(useSubPaths));
     fs_1.default.writeFileSync(txTypesFileName, await txGen.generate(useSubPaths));
@@ -36,5 +38,6 @@ async function generateContractTypes(metadata, contract, outDir = '.', extension
     fs_1.default.writeFileSync(constructorTxTypesFileName, await constructorTxGen.generate(useSubPaths));
     fs_1.default.writeFileSync(eventsTypesFile, await eventsGen.generate(useSubPaths));
     fs_1.default.writeFileSync(indexTypesFileName, await indexGen.generate(useSubPaths));
+    return { interfaceName };
 }
 exports.generateContractTypes = generateContractTypes;

package/cjs/typink/templates/events.hbs

@@ -1,6 +1,5 @@
 // Generated by dedot cli
 
-import { GenericSubstrateApi } from '@dedot/types';
 {{{ importTypes }}}
 
 export interface ContractEvents<ChainApi extends GenericSubstrateApi> extends GenericContractEvents<ChainApi> {

package/cjs/typink/templates/index.hbs

@@ -5,9 +5,11 @@ import { ContractQuery } from './query';
 import { ContractTx } from './tx';
 import { ConstructorQuery } from './constructor-query';
 import { ConstructorTx } from './constructor-tx';
-import { ContractEvents } from './events'
+import { ContractEvents } from './events';
 
-export interface {{{contractName}}}<Rv extends RpcVersion = RpcV2, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
+export * from './types';
+
+export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcV2, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
     query: ContractQuery<ChainApi[Rv]>;
     tx: ContractTx<ChainApi[Rv]>;
     constructorQuery: ConstructorQuery<ChainApi[Rv]>;

package/index.d.ts

@@ -1,2 +1,3 @@
+export * from './types.js';
 export * from './chaintypes/index.js';
 export * from './typink/index.js';

package/index.js

@@ -1,2 +1,3 @@
+export * from './types.js';
 export * from './chaintypes/index.js';
 export * from './typink/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -18,14 +18,14 @@
     "copy": "cp -R ./src/chaintypes/templates ./dist/chaintypes && cp -R ./src/chaintypes/templates ./dist/cjs/chaintypes && cp -R ./src/typink/templates ./dist/typink && cp -R ./src/typink/templates ./dist/cjs/typink"
   },
   "dependencies": {
-    "@dedot/api": "0.2.0",
-    "@dedot/codecs": "0.2.0",
-    "@dedot/contracts": "0.2.0",
-    "@dedot/providers": "0.2.0",
-    "@dedot/runtime-specs": "0.2.0",
-    "@dedot/shape": "0.2.0",
-    "@dedot/types": "0.2.0",
-    "@dedot/utils": "0.2.0",
+    "@dedot/api": "0.4.0",
+    "@dedot/codecs": "0.4.0",
+    "@dedot/contracts": "0.4.0",
+    "@dedot/providers": "0.4.0",
+    "@dedot/runtime-specs": "0.4.0",
+    "@dedot/shape": "0.4.0",
+    "@dedot/types": "0.4.0",
+    "@dedot/utils": "0.4.0",
     "handlebars": "^4.7.8",
     "prettier": "^3.3.3"
   },
@@ -34,7 +34,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "f29e8784997251518df1e33ef782f1d87207b126",
+  "gitHead": "f6271b5c12d8bf909e4b1a186417bf26db504c63",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/types.d.ts

@@ -0,0 +1,3 @@
+export interface GeneratedResult {
+    interfaceName: string;
+}

package/types.js

@@ -0,0 +1 @@
+export {};

package/typink/generator/EventsGen.js

@@ -4,6 +4,7 @@ import { QueryGen } from './QueryGen.js';
 export class EventsGen extends QueryGen {
     generate(useSubPaths = false) {
         this.typesGen.clearCache();
+        this.typesGen.typeImports.addKnownType('GenericSubstrateApi');
         this.typesGen.typeImports.addContractType('GenericContractEvents', 'GenericContractEvent');
         const { events } = this.contractMetadata.spec;
         let eventsOut = '';

package/typink/generator/IndexGen.d.ts

@@ -1,8 +1,9 @@
 import { ContractMetadata } from '@dedot/contracts';
 import { TypesGen } from './TypesGen.js';
 export declare class IndexGen {
+    interfaceName: string;
     contractMetadata: ContractMetadata;
     typesGen: TypesGen;
-    constructor(contractMetadata: ContractMetadata, typesGen: TypesGen);
+    constructor(interfaceName: string, contractMetadata: ContractMetadata, typesGen: TypesGen);
     generate(useSubPaths?: boolean): Promise<string>;
 }

package/typink/generator/IndexGen.js

@@ -1,16 +1,16 @@
-import { stringPascalCase } from '@dedot/utils';
 import { TypeImports } from '../../shared/index.js';
 import { beautifySourceCode, compileTemplate } from '../../utils.js';
-const SUFFIX = 'contract_api';
 export class IndexGen {
+    interfaceName;
     contractMetadata;
     typesGen;
-    constructor(contractMetadata, typesGen) {
+    constructor(interfaceName, contractMetadata, typesGen) {
+        this.interfaceName = interfaceName;
         this.contractMetadata = contractMetadata;
         this.typesGen = typesGen;
     }
     generate(useSubPaths = false) {
-        const contractName = stringPascalCase(`${this.contractMetadata.contract.name}_${SUFFIX}`);
+        const interfaceName = this.interfaceName;
         const langErrorId = this.contractMetadata.spec.lang_error.type;
         const langErrorName = this.typesGen.cleanPath(this.contractMetadata.types[langErrorId].type.path);
         const typeImports = new TypeImports();
@@ -20,6 +20,6 @@ export class IndexGen {
         typeImports.addPortableType(langErrorName);
         const importTypes = typeImports.toImports({ useSubPaths });
         const template = compileTemplate('typink/templates/index.hbs');
-        return beautifySourceCode(template({ contractName, langErrorName, importTypes }));
+        return beautifySourceCode(template({ interfaceName, langErrorName, importTypes }));
     }
 }

package/typink/index.d.ts

@@ -1,2 +1,3 @@
 import { ContractMetadata } from '@dedot/contracts';
-export declare function generateContractTypes(metadata: ContractMetadata | string, contract?: string, outDir?: string, extension?: string, useSubPaths?: boolean): Promise<void>;
+import { GeneratedResult } from '../types.js';
+export declare function generateContractTypes(metadata: ContractMetadata | string, contract?: string, outDir?: string, extension?: string, useSubPaths?: boolean): Promise<GeneratedResult>;

package/typink/index.js

@@ -1,11 +1,12 @@
 import { parseRawMetadata } from '@dedot/contracts';
+import { stringDashCase, stringPascalCase } from '@dedot/utils';
 import fs from 'fs';
 import path from 'path';
 import { IndexGen, QueryGen, EventsGen, TxGen, TypesGen, ConstructorTxGen, ConstructorQueryGen, } from './generator/index.js';
 export async function generateContractTypes(metadata, contract, outDir = '.', extension = 'd.ts', useSubPaths = false) {
     let contractMetadata = typeof metadata === 'string' ? parseRawMetadata(metadata) : metadata;
-    contract = contract || contractMetadata.contract.name;
-    const dirPath = path.resolve(outDir, contract);
+    const contractName = contract || contractMetadata.contract.name;
+    const dirPath = path.resolve(outDir, stringDashCase(contractName));
     const typesFileName = path.join(dirPath, `types.${extension}`);
     const queryTypesFileName = path.join(dirPath, `query.${extension}`);
     const txTypesFileName = path.join(dirPath, `tx.${extension}`);
@@ -16,13 +17,14 @@ export async function generateContractTypes(metadata, contract, outDir = '.', ex
     if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath, { recursive: true });
     }
+    const interfaceName = `${stringPascalCase(`${contractName}`)}ContractApi`;
     const typesGen = new TypesGen(contractMetadata);
     const queryGen = new QueryGen(contractMetadata, typesGen);
     const txGen = new TxGen(contractMetadata, typesGen);
     const constructorTxGen = new ConstructorTxGen(contractMetadata, typesGen);
     const constructorQueryGen = new ConstructorQueryGen(contractMetadata, typesGen);
     const eventsGen = new EventsGen(contractMetadata, typesGen);
-    const indexGen = new IndexGen(contractMetadata, typesGen);
+    const indexGen = new IndexGen(interfaceName, contractMetadata, typesGen);
     fs.writeFileSync(typesFileName, await typesGen.generate(useSubPaths));
     fs.writeFileSync(queryTypesFileName, await queryGen.generate(useSubPaths));
     fs.writeFileSync(txTypesFileName, await txGen.generate(useSubPaths));
@@ -30,4 +32,5 @@ export async function generateContractTypes(metadata, contract, outDir = '.', ex
     fs.writeFileSync(constructorTxTypesFileName, await constructorTxGen.generate(useSubPaths));
     fs.writeFileSync(eventsTypesFile, await eventsGen.generate(useSubPaths));
     fs.writeFileSync(indexTypesFileName, await indexGen.generate(useSubPaths));
+    return { interfaceName };
 }

package/typink/templates/events.hbs

@@ -1,6 +1,5 @@
 // Generated by dedot cli
 
-import { GenericSubstrateApi } from '@dedot/types';
 {{{ importTypes }}}
 
 export interface ContractEvents<ChainApi extends GenericSubstrateApi> extends GenericContractEvents<ChainApi> {

package/typink/templates/index.hbs

@@ -5,9 +5,11 @@ import { ContractQuery } from './query';
 import { ContractTx } from './tx';
 import { ConstructorQuery } from './constructor-query';
 import { ConstructorTx } from './constructor-tx';
-import { ContractEvents } from './events'
+import { ContractEvents } from './events';
 
-export interface {{{contractName}}}<Rv extends RpcVersion = RpcV2, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
+export * from './types';
+
+export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcV2, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends GenericContractApi<Rv, ChainApi> {
     query: ContractQuery<ChainApi[Rv]>;
     tx: ContractTx<ChainApi[Rv]>;
     constructorQuery: ConstructorQuery<ChainApi[Rv]>;