@dedot/codegen 0.15.3-next.65898ecf.10 → 0.16.0

package/chaintypes/generator/IndexGen.js

@@ -12,7 +12,7 @@ export class IndexGen {
         const interfaceName = this.interfaceName;
         // Clear cache and setup type imports
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericSubstrateApi', 'GenericChainTypes', 'RpcLegacy', 'RpcV2', 'RpcVersion');
+        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)

package/chaintypes/templates/index.hbs

@@ -12,7 +12,7 @@ import { ChainTx } from './tx.js';
 
 export * from './types.js';
 
-interface ChainTypes extends GenericChainTypes {
+interface ChainKnownTypes extends GenericChainKnownTypes {
   Address: {{{addressType}}};
   Signature: {{{signatureType}}};
   RuntimeCall: {{{runtimeCallType}}};
@@ -29,7 +29,7 @@ export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends Gen
   view: ChainViewFunctions<Rv>;
   tx: ChainTx<Rv>;
   
-  types: ChainTypes;
+  types: ChainKnownTypes;
 }
 
 {{interfaceDocs}}export interface {{{interfaceName}}} {

package/cjs/chaintypes/generator/IndexGen.js

@@ -15,7 +15,7 @@ class IndexGen {
         const interfaceName = this.interfaceName;
         // Clear cache and setup type imports
         this.typesGen.clearCache();
-        this.typesGen.typeImports.addKnownType('GenericSubstrateApi', 'GenericChainTypes', 'RpcLegacy', 'RpcV2', 'RpcVersion');
+        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)

package/cjs/chaintypes/templates/index.hbs

@@ -12,7 +12,7 @@ import { ChainTx } from './tx.js';
 
 export * from './types.js';
 
-interface ChainTypes extends GenericChainTypes {
+interface ChainKnownTypes extends GenericChainKnownTypes {
   Address: {{{addressType}}};
   Signature: {{{signatureType}}};
   RuntimeCall: {{{runtimeCallType}}};
@@ -29,7 +29,7 @@ export interface Versioned{{{interfaceName}}}<Rv extends RpcVersion> extends Gen
   view: ChainViewFunctions<Rv>;
   tx: ChainTx<Rv>;
   
-  types: ChainTypes;
+  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.3-next.65898ecf.10+65898ecf",
+  "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.3-next.65898ecf.10+65898ecf",
-    "@dedot/codecs": "0.15.3-next.65898ecf.10+65898ecf",
-    "@dedot/contracts": "0.15.3-next.65898ecf.10+65898ecf",
-    "@dedot/providers": "0.15.3-next.65898ecf.10+65898ecf",
-    "@dedot/runtime-specs": "0.15.3-next.65898ecf.10+65898ecf",
-    "@dedot/shape": "0.15.3-next.65898ecf.10+65898ecf",
-    "@dedot/types": "0.15.3-next.65898ecf.10+65898ecf",
-    "@dedot/utils": "0.15.3-next.65898ecf.10+65898ecf",
+    "@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": "65898ecf2226162fc6632d3f4f64ad5fe1179643",
+  "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');
     }