@dedot/codegen 0.15.2 → 0.16.0

package/chaintypes/generator/ApiGen.d.ts

@@ -248,5 +248,5 @@ export declare abstract class ApiGen {
             }>;
         };
     };
-    get registry(): import("@dedot/codecs").PortableRegistry;
+    get registry(): import("@dedot/codecs").PortableRegistry<import("@dedot/types").GenericSubstrateApi<import("@dedot/types").RpcVersion>>;
 }

package/chaintypes/generator/IndexGen.d.ts

@@ -1,7 +1,9 @@
 import { SubstrateRuntimeVersion } from '@dedot/api';
+import { TypesGen } from './TypesGen.js';
 export declare class IndexGen {
     readonly interfaceName: string;
     readonly runtimeVersion: SubstrateRuntimeVersion;
-    constructor(interfaceName: string, runtimeVersion: SubstrateRuntimeVersion);
+    readonly typesGen: TypesGen;
+    constructor(interfaceName: string, runtimeVersion: SubstrateRuntimeVersion, typesGen: TypesGen);
     generate(useSubPaths?: boolean): Promise<string>;
 }

package/chaintypes/generator/IndexGen.js

@@ -1,22 +1,47 @@
-import { TypeImports } from '../../shared/index.js';
 import { beautifySourceCode, commentBlock, compileTemplate } from '../../utils.js';
 export class IndexGen {
     interfaceName;
     runtimeVersion;
-    constructor(interfaceName, runtimeVersion) {
+    typesGen;
+    constructor(interfaceName, runtimeVersion, typesGen) {
         this.interfaceName = interfaceName;
         this.runtimeVersion = runtimeVersion;
+        this.typesGen = typesGen;
     }
     async generate(useSubPaths = false) {
         const interfaceName = this.interfaceName;
-        const typeImports = new TypeImports();
-        typeImports.addKnownType('GenericSubstrateApi', 'RpcLegacy', 'RpcV2', 'RpcVersion');
-        const importTypes = typeImports.toImports({ useSubPaths });
+        // Clear cache and setup type imports
+        this.typesGen.clearCache();
+        this.typesGen.typeImports.addKnownType('GenericSubstrateApi', 'GenericChainKnownTypes', 'RpcLegacy', 'RpcV2', 'RpcVersion');
+        // Extract type IDs from metadata.extrinsic
+        const { callTypeId, addressTypeId, signatureTypeId, signedExtensions } = this.typesGen.metadata.extrinsic;
+        // Generate proper TypeScript types using typeOut format (0, true)
+        const runtimeCallType = this.typesGen.generateType(callTypeId, 1, true);
+        const addressType = this.typesGen.generateType(addressTypeId, 1, true);
+        const signatureType = this.typesGen.generateType(signatureTypeId, 1, true);
+        // Generate Extra type from signed extensions
+        let extraType = 'any[]'; // Default fallback
+        if (signedExtensions && signedExtensions.length > 0) {
+            const signedExtensionTypes = signedExtensions.map(({ typeId }) => this.typesGen.generateType(typeId, 1, true));
+            extraType = `[${signedExtensionTypes.join(', ')}]`;
+        }
+        // Add generated types to imports
+        const generatedTypes = [runtimeCallType, addressType, signatureType, extraType];
+        this.typesGen.addTypeImport(generatedTypes);
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const interfaceDocs = commentBlock([
             `@name: ${interfaceName}`, // prettier-end-here
             `@specVersion: ${this.runtimeVersion.specVersion}`,
         ]);
         const template = compileTemplate('chaintypes/templates/index.hbs');
-        return beautifySourceCode(template({ interfaceName, interfaceDocs, importTypes }));
+        return beautifySourceCode(template({
+            interfaceName,
+            interfaceDocs,
+            importTypes,
+            addressType,
+            signatureType,
+            runtimeCallType,
+            extraType,
+        }));
     }
 }

package/chaintypes/index.js

@@ -33,12 +33,12 @@ export async function generateTypes(chain, metadata, rpcMethods, runtimeVersion,
     const constsGen = new ConstsGen(typesGen);
     const queryGen = new QueryGen(typesGen);
     const jsonRpcGen = new JsonRpcGen(typesGen, rpcMethods);
-    const indexGen = new IndexGen(interfaceName, runtimeVersion);
     const errorsGen = new ErrorsGen(typesGen);
     const eventsGen = new EventsGen(typesGen);
     const runtimeApisGen = new RuntimeApisGen(typesGen, runtimeVersion.apis);
     const txGen = new TxGen(typesGen);
     const viewFunctionGen = new ViewFunctionsGen(typesGen);
+    const indexGen = new IndexGen(interfaceName, runtimeVersion, typesGen);
     fs.writeFileSync(defTypesFileName, await typesGen.generate(useSubPaths));
     fs.writeFileSync(errorsFileName, await errorsGen.generate(useSubPaths));
     fs.writeFileSync(eventsFileName, await eventsGen.generate(useSubPaths));
@@ -46,8 +46,8 @@ export async function generateTypes(chain, metadata, rpcMethods, runtimeVersion,
     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));
     fs.writeFileSync(viewFunctionsFileName, await viewFunctionGen.generate(useSubPaths));
+    fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
     return { interfaceName, outputFolder: dirPath };
 }

package/chaintypes/templates/index.hbs

@@ -12,6 +12,13 @@ import { ChainTx } from './tx.js';
 
 export * from './types.js';
 
+interface ChainKnownTypes extends GenericChainKnownTypes {
+  Address: {{{addressType}}};
+  Signature: {{{signatureType}}};
+  RuntimeCall: {{{runtimeCallType}}};
+  Extra: {{{extraType}}};
+}
+
 export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
   rpc: ChainJsonRpcApis<Rv>;
   consts: ChainConsts<Rv>;
@@ -21,6 +28,8 @@ export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends Gen
   call: RuntimeApis<Rv>;
   view: ChainViewFunctions<Rv>;
   tx: ChainTx<Rv>;
+  
+  types: ChainKnownTypes;
 }
 
 {{interfaceDocs}}export interface {{{interfaceName}}} {

package/cjs/chaintypes/generator/IndexGen.js

@@ -1,26 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexGen = void 0;
-const index_js_1 = require("../../shared/index.js");
 const utils_js_1 = require("../../utils.js");
 class IndexGen {
     interfaceName;
     runtimeVersion;
-    constructor(interfaceName, runtimeVersion) {
+    typesGen;
+    constructor(interfaceName, runtimeVersion, typesGen) {
         this.interfaceName = interfaceName;
         this.runtimeVersion = runtimeVersion;
+        this.typesGen = typesGen;
     }
     async generate(useSubPaths = false) {
         const interfaceName = this.interfaceName;
-        const typeImports = new index_js_1.TypeImports();
-        typeImports.addKnownType('GenericSubstrateApi', 'RpcLegacy', 'RpcV2', 'RpcVersion');
-        const importTypes = typeImports.toImports({ useSubPaths });
+        // Clear cache and setup type imports
+        this.typesGen.clearCache();
+        this.typesGen.typeImports.addKnownType('GenericSubstrateApi', 'GenericChainKnownTypes', 'RpcLegacy', 'RpcV2', 'RpcVersion');
+        // Extract type IDs from metadata.extrinsic
+        const { callTypeId, addressTypeId, signatureTypeId, signedExtensions } = this.typesGen.metadata.extrinsic;
+        // Generate proper TypeScript types using typeOut format (0, true)
+        const runtimeCallType = this.typesGen.generateType(callTypeId, 1, true);
+        const addressType = this.typesGen.generateType(addressTypeId, 1, true);
+        const signatureType = this.typesGen.generateType(signatureTypeId, 1, true);
+        // Generate Extra type from signed extensions
+        let extraType = 'any[]'; // Default fallback
+        if (signedExtensions && signedExtensions.length > 0) {
+            const signedExtensionTypes = signedExtensions.map(({ typeId }) => this.typesGen.generateType(typeId, 1, true));
+            extraType = `[${signedExtensionTypes.join(', ')}]`;
+        }
+        // Add generated types to imports
+        const generatedTypes = [runtimeCallType, addressType, signatureType, extraType];
+        this.typesGen.addTypeImport(generatedTypes);
+        const importTypes = this.typesGen.typeImports.toImports({ useSubPaths });
         const interfaceDocs = (0, utils_js_1.commentBlock)([
             `@name: ${interfaceName}`, // prettier-end-here
             `@specVersion: ${this.runtimeVersion.specVersion}`,
         ]);
         const template = (0, utils_js_1.compileTemplate)('chaintypes/templates/index.hbs');
-        return (0, utils_js_1.beautifySourceCode)(template({ interfaceName, interfaceDocs, importTypes }));
+        return (0, utils_js_1.beautifySourceCode)(template({
+            interfaceName,
+            interfaceDocs,
+            importTypes,
+            addressType,
+            signatureType,
+            runtimeCallType,
+            extraType,
+        }));
     }
 }
 exports.IndexGen = IndexGen;

package/cjs/chaintypes/index.js

@@ -60,12 +60,12 @@ async function generateTypes(chain, metadata, rpcMethods, runtimeVersion, outDir
     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(interfaceName, runtimeVersion);
     const errorsGen = new index_js_1.ErrorsGen(typesGen);
     const eventsGen = new index_js_1.EventsGen(typesGen);
     const runtimeApisGen = new index_js_1.RuntimeApisGen(typesGen, runtimeVersion.apis);
     const txGen = new index_js_1.TxGen(typesGen);
     const viewFunctionGen = new index_js_1.ViewFunctionsGen(typesGen);
+    const indexGen = new index_js_1.IndexGen(interfaceName, runtimeVersion, typesGen);
     fs.writeFileSync(defTypesFileName, await typesGen.generate(useSubPaths));
     fs.writeFileSync(errorsFileName, await errorsGen.generate(useSubPaths));
     fs.writeFileSync(eventsFileName, await eventsGen.generate(useSubPaths));
@@ -73,9 +73,9 @@ async function generateTypes(chain, metadata, rpcMethods, runtimeVersion, outDir
     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));
     fs.writeFileSync(viewFunctionsFileName, await viewFunctionGen.generate(useSubPaths));
+    fs.writeFileSync(indexFileName, await indexGen.generate(useSubPaths));
     return { interfaceName, outputFolder: dirPath };
 }
 exports.generateTypes = generateTypes;

package/cjs/chaintypes/templates/index.hbs

@@ -12,6 +12,13 @@ import { ChainTx } from './tx.js';
 
 export * from './types.js';
 
+interface ChainKnownTypes extends GenericChainKnownTypes {
+  Address: {{{addressType}}};
+  Signature: {{{signatureType}}};
+  RuntimeCall: {{{runtimeCallType}}};
+  Extra: {{{extraType}}};
+}
+
 export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends GenericSubstrateApi<Rv> {
   rpc: ChainJsonRpcApis<Rv>;
   consts: ChainConsts<Rv>;
@@ -21,6 +28,8 @@ export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends Gen
   call: RuntimeApis<Rv>;
   view: ChainViewFunctions<Rv>;
   tx: ChainTx<Rv>;
+  
+  types: ChainKnownTypes;
 }
 
 {{interfaceDocs}}export interface {{{interfaceName}}} {

package/cjs/shared/BaseTypesGen.js

@@ -58,7 +58,12 @@ class BaseTypesGen {
                 }
                 else {
                     pathsCount.get(joinedPath).push(id);
-                    typeSuffixes.set(id, this.extractDupTypeSuffix(id, firstOccurrenceTypeId, pathsCount.get(joinedPath).length));
+                    const existingSuffixes = pathsCount
+                        .get(joinedPath)
+                        .map((id) => typeSuffixes.get(id))
+                        .filter((x) => x);
+                    typeSuffixes.set(id, this.extractDupTypeSuffix(id, // --
+                    firstOccurrenceTypeId, pathsCount.get(joinedPath).length, existingSuffixes));
                 }
             }
             else {
@@ -340,13 +345,9 @@ class BaseTypesGen {
             (param1.typeId === undefined) === (param2.typeId === undefined) &&
             (param1.typeId === undefined || this.#typeEql(param1.typeId, param2.typeId)));
     }
-    extractDupTypeSuffix(dupTypeId, originalTypeId, dupCount) {
-        const originalTypeParams = this.types[originalTypeId].params;
-        const dupTypeParams = this.types[dupTypeId].params;
-        const diffParam = dupTypeParams.find((one, idx) => !this.#eqlTypeParam(one, originalTypeParams[idx]));
-        // TODO make sure these suffix is unique if a type is duplicated more than 2 times
-        if (diffParam?.typeId) {
-            const diffType = this.types[diffParam.typeId];
+    #getTypeSuffix(typeId) {
+        if (typeId) {
+            const diffType = this.types[typeId];
             if (diffType.path.length > 0) {
                 return (0, utils_1.stringPascalCase)(diffType.path.at(-1));
             }
@@ -354,6 +355,17 @@ class BaseTypesGen {
                 return (0, utils_1.stringPascalCase)(diffType.typeDef.value.kind);
             }
         }
+    }
+    extractDupTypeSuffix(dupTypeId, originalTypeId, dupCount, existingSuffixes = []) {
+        const originalTypeParams = this.types[originalTypeId].params;
+        const dupTypeParams = this.types[dupTypeId].params;
+        const diffParam = dupTypeParams.find((one, idx) => !this.#eqlTypeParam(one, originalTypeParams[idx]));
+        if (diffParam?.typeId) {
+            const suffix = this.#getTypeSuffix(diffParam.typeId);
+            if (suffix && !existingSuffixes.includes(suffix)) {
+                return suffix;
+            }
+        }
         // Last resort!
         return dupCount.toString().padStart(3, '0');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.15.2",
+  "version": "0.16.0",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -18,16 +18,16 @@
     "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.15.2",
-    "@dedot/codecs": "0.15.2",
-    "@dedot/contracts": "0.15.2",
-    "@dedot/providers": "0.15.2",
-    "@dedot/runtime-specs": "0.15.2",
-    "@dedot/shape": "0.15.2",
-    "@dedot/types": "0.15.2",
-    "@dedot/utils": "0.15.2",
+    "@dedot/api": "0.16.0",
+    "@dedot/codecs": "0.16.0",
+    "@dedot/contracts": "0.16.0",
+    "@dedot/providers": "0.16.0",
+    "@dedot/runtime-specs": "0.16.0",
+    "@dedot/shape": "0.16.0",
+    "@dedot/types": "0.16.0",
+    "@dedot/utils": "0.16.0",
     "handlebars": "^4.7.8",
-    "prettier": "^3.5.3"
+    "prettier": "^3.6.2"
   },
   "publishConfig": {
     "access": "public",
@@ -37,7 +37,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "75231d6888303dcf598cfd31592df13230707cb4",
+  "gitHead": "3e78a8eebb8977de0c5fb956154e5b09c4448f31",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/shared/BaseTypesGen.d.ts

@@ -27,7 +27,7 @@ export declare abstract class BaseTypesGen {
     cleanPath(path: string[]): string;
     eqlCache: Map<string, boolean>;
     typeEql(idA: number, idB: number, level?: number): boolean;
-    extractDupTypeSuffix(dupTypeId: TypeId, originalTypeId: TypeId, dupCount: number): string;
+    extractDupTypeSuffix(dupTypeId: TypeId, originalTypeId: TypeId, dupCount: number, existingSuffixes?: string[]): string;
     addTypeImport(typeName: string | string[]): void;
     getEnumOptions(_typeId: TypeId): EnumOptions;
 }

package/shared/BaseTypesGen.js

@@ -55,7 +55,12 @@ export class BaseTypesGen {
                 }
                 else {
                     pathsCount.get(joinedPath).push(id);
-                    typeSuffixes.set(id, this.extractDupTypeSuffix(id, firstOccurrenceTypeId, pathsCount.get(joinedPath).length));
+                    const existingSuffixes = pathsCount
+                        .get(joinedPath)
+                        .map((id) => typeSuffixes.get(id))
+                        .filter((x) => x);
+                    typeSuffixes.set(id, this.extractDupTypeSuffix(id, // --
+                    firstOccurrenceTypeId, pathsCount.get(joinedPath).length, existingSuffixes));
                 }
             }
             else {
@@ -337,13 +342,9 @@ export class BaseTypesGen {
             (param1.typeId === undefined) === (param2.typeId === undefined) &&
             (param1.typeId === undefined || this.#typeEql(param1.typeId, param2.typeId)));
     }
-    extractDupTypeSuffix(dupTypeId, originalTypeId, dupCount) {
-        const originalTypeParams = this.types[originalTypeId].params;
-        const dupTypeParams = this.types[dupTypeId].params;
-        const diffParam = dupTypeParams.find((one, idx) => !this.#eqlTypeParam(one, originalTypeParams[idx]));
-        // TODO make sure these suffix is unique if a type is duplicated more than 2 times
-        if (diffParam?.typeId) {
-            const diffType = this.types[diffParam.typeId];
+    #getTypeSuffix(typeId) {
+        if (typeId) {
+            const diffType = this.types[typeId];
             if (diffType.path.length > 0) {
                 return stringPascalCase(diffType.path.at(-1));
             }
@@ -351,6 +352,17 @@ export class BaseTypesGen {
                 return stringPascalCase(diffType.typeDef.value.kind);
             }
         }
+    }
+    extractDupTypeSuffix(dupTypeId, originalTypeId, dupCount, existingSuffixes = []) {
+        const originalTypeParams = this.types[originalTypeId].params;
+        const dupTypeParams = this.types[dupTypeId].params;
+        const diffParam = dupTypeParams.find((one, idx) => !this.#eqlTypeParam(one, originalTypeParams[idx]));
+        if (diffParam?.typeId) {
+            const suffix = this.#getTypeSuffix(diffParam.typeId);
+            if (suffix && !existingSuffixes.includes(suffix)) {
+                return suffix;
+            }
+        }
         // Last resort!
         return dupCount.toString().padStart(3, '0');
     }