@pezkuwi/typegen 16.5.17 → 16.5.31

package/cjs/generate/lookup.js

@@ -163,16 +163,45 @@ function generateLookupTypes(registry, filtered, destDir, subPath) {
         ...(0, index_js_1.createImports)({ '@pezkuwi/types/interfaces': defaultDefinitions }, { types: {} }),
         interfaces: []
     };
-    const items = filtered
-        .map(([, typeDef]) => {
-        // Deep rebrand the type names (including nested sub types) before generating interfaces
-        const rebranded = deepRebrandTypeDef(typeDef);
-        return rebranded.lookupNameRoot && rebranded.lookupName
-            ? (0, index_js_1.exportInterface)(rebranded.lookupIndex, rebranded.lookupName, rebranded.lookupNameRoot)
-            : tsDef_js_1.typeEncoders[rebranded.info](registry, imports.definitions, rebranded, imports);
-    })
-        .filter((t) => !!t)
-        .map((t) => t.replace(/\nexport /, '\n'));
+    // Special type mappings: PezkuwiChain types that should extend standard types
+    const TYPE_MAPPINGS = {
+        PezspCoreCryptoAccountId32: 'AccountId32',
+        PezspRuntimeMultiAddress: 'MultiAddress'
+    };
+    // Add imports for AccountId32 and MultiAddress - needed for all lookup files that use TYPE_MAPPINGS
+    const runtimePath = '@pezkuwi/types/interfaces/runtime';
+    if (imports.localTypes[runtimePath]) {
+        imports.localTypes[runtimePath]['AccountId32'] = true;
+        imports.localTypes[runtimePath]['MultiAddress'] = true;
+    }
+    // For non-bizinikiwi files, add base type definitions at the start
+    const baseTypeDefs = [];
+    if (subPath && subPath !== 'bizinikiwi') {
+        // Add PezspCoreCryptoAccountId32 and PezspRuntimeMultiAddress definitions
+        // These extend the standard types and are needed in all lookup files
+        baseTypeDefs.push('  /** @name PezspCoreCryptoAccountId32 (0) */\n  interface PezspCoreCryptoAccountId32 extends AccountId32 {}', '  /** @name PezspRuntimeMultiAddress (1) */\n  interface PezspRuntimeMultiAddress extends MultiAddress {}');
+    }
+    const items = [
+        ...baseTypeDefs,
+        ...filtered
+            .map(([, typeDef]) => {
+            // Deep rebrand the type names (including nested sub types) before generating interfaces
+            const rebranded = deepRebrandTypeDef(typeDef);
+            // Check for special type mappings first - skip if already in base types for this file
+            if (rebranded.lookupName && TYPE_MAPPINGS[rebranded.lookupName]) {
+                // For bizinikiwi, include the mapping; for others, skip (already in baseTypeDefs)
+                if (subPath === 'bizinikiwi') {
+                    return (0, index_js_1.exportInterface)(rebranded.lookupIndex, rebranded.lookupName, TYPE_MAPPINGS[rebranded.lookupName]);
+                }
+                return null;
+            }
+            return rebranded.lookupNameRoot && rebranded.lookupName
+                ? (0, index_js_1.exportInterface)(rebranded.lookupIndex, rebranded.lookupName, rebranded.lookupNameRoot)
+                : tsDef_js_1.typeEncoders[rebranded.info](registry, imports.definitions, rebranded, imports);
+        })
+            .filter((t) => !!t)
+            .map((t) => t.replace(/\nexport /, '\n'))
+    ];
     (0, index_js_1.writeFile)(node_path_1.default.join(destDir, `types${subPath ? `-${subPath}` : ''}.ts`), () => generateLookupTypesTmpl({
         headerType: 'defs',
         imports,

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@pezkuwi/typegen', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.5.17' };
+exports.packageInfo = { name: '@pezkuwi/typegen', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.5.31' };

package/cjs/util/derived.js

@@ -32,6 +32,16 @@ function getSimilarTypes(registry, definitions, _type, imports) {
     else if (type === '()') {
         return ['null'];
     }
+    // Handle lookup types by name pattern before class-based checks
+    // Lookup types like PezspRuntimeMultiAddress may not be properly registered as children of GenericMultiAddress
+    if (type.includes('MultiAddress') || type.endsWith('RuntimeMultiAddress')) {
+        possibleTypes.push('AccountId', 'AccountIndex', 'Address', 'LookupSource', 'string', 'Uint8Array');
+        return possibleTypes;
+    }
+    else if (type.includes('AccountId32') || type.endsWith('CryptoAccountId32')) {
+        possibleTypes.push('string', 'Uint8Array');
+        return possibleTypes;
+    }
     const Clazz = registry.createClass(type);
     if ((0, util_1.isChildClass)(types_codec_1.Vec, Clazz)) {
         const vecDef = (0, types_create_1.getTypeDef)(type);
@@ -56,6 +66,11 @@ function getSimilarTypes(registry, definitions, _type, imports) {
             }
         }
     }
+    else if ((0, util_1.isChildClass)(generic_1.GenericMultiAddress, Clazz)) {
+        // MultiAddress can accept string addresses, Uint8Array, or various address variants
+        // Check before Enum since GenericMultiAddress extends Enum
+        possibleTypes.push('AccountId', 'AccountIndex', 'Address', 'LookupSource', 'string', 'Uint8Array');
+    }
     else if ((0, util_1.isChildClass)(types_codec_1.Enum, Clazz)) {
         const { defKeys, isBasic } = new Clazz(registry);
         const keys = defKeys.filter((v) => !v.startsWith('__Unused'));

package/cjs/util/formatting.js

@@ -187,6 +187,11 @@ const formatters = {
     [types_create_1.TypeDefInfo.VecFixed]: (registry, typeDef, definitions, imports, withShortcut) => {
         const sub = typeDef.sub;
         if (sub.type === 'u8') {
+            // Use lookupName if available (e.g., PezspCoreCryptoAccountId32) instead of generic U8aFixed
+            if (typeDef.lookupName) {
+                (0, imports_js_1.setImports)(definitions, imports, [rebrandTypeName(typeDef.lookupName)]);
+                return rebrandTypeName(typeDef.lookupName);
+            }
             (0, imports_js_1.setImports)(definitions, imports, ['U8aFixed']);
             return 'U8aFixed';
         }

package/generate/lookup.js

@@ -158,16 +158,45 @@ function generateLookupTypes(registry, filtered, destDir, subPath) {
         ...createImports({ '@pezkuwi/types/interfaces': defaultDefinitions }, { types: {} }),
         interfaces: []
     };
-    const items = filtered
-        .map(([, typeDef]) => {
-        // Deep rebrand the type names (including nested sub types) before generating interfaces
-        const rebranded = deepRebrandTypeDef(typeDef);
-        return rebranded.lookupNameRoot && rebranded.lookupName
-            ? exportInterface(rebranded.lookupIndex, rebranded.lookupName, rebranded.lookupNameRoot)
-            : typeEncoders[rebranded.info](registry, imports.definitions, rebranded, imports);
-    })
-        .filter((t) => !!t)
-        .map((t) => t.replace(/\nexport /, '\n'));
+    // Special type mappings: PezkuwiChain types that should extend standard types
+    const TYPE_MAPPINGS = {
+        PezspCoreCryptoAccountId32: 'AccountId32',
+        PezspRuntimeMultiAddress: 'MultiAddress'
+    };
+    // Add imports for AccountId32 and MultiAddress - needed for all lookup files that use TYPE_MAPPINGS
+    const runtimePath = '@pezkuwi/types/interfaces/runtime';
+    if (imports.localTypes[runtimePath]) {
+        imports.localTypes[runtimePath]['AccountId32'] = true;
+        imports.localTypes[runtimePath]['MultiAddress'] = true;
+    }
+    // For non-bizinikiwi files, add base type definitions at the start
+    const baseTypeDefs = [];
+    if (subPath && subPath !== 'bizinikiwi') {
+        // Add PezspCoreCryptoAccountId32 and PezspRuntimeMultiAddress definitions
+        // These extend the standard types and are needed in all lookup files
+        baseTypeDefs.push('  /** @name PezspCoreCryptoAccountId32 (0) */\n  interface PezspCoreCryptoAccountId32 extends AccountId32 {}', '  /** @name PezspRuntimeMultiAddress (1) */\n  interface PezspRuntimeMultiAddress extends MultiAddress {}');
+    }
+    const items = [
+        ...baseTypeDefs,
+        ...filtered
+            .map(([, typeDef]) => {
+            // Deep rebrand the type names (including nested sub types) before generating interfaces
+            const rebranded = deepRebrandTypeDef(typeDef);
+            // Check for special type mappings first - skip if already in base types for this file
+            if (rebranded.lookupName && TYPE_MAPPINGS[rebranded.lookupName]) {
+                // For bizinikiwi, include the mapping; for others, skip (already in baseTypeDefs)
+                if (subPath === 'bizinikiwi') {
+                    return exportInterface(rebranded.lookupIndex, rebranded.lookupName, TYPE_MAPPINGS[rebranded.lookupName]);
+                }
+                return null;
+            }
+            return rebranded.lookupNameRoot && rebranded.lookupName
+                ? exportInterface(rebranded.lookupIndex, rebranded.lookupName, rebranded.lookupNameRoot)
+                : typeEncoders[rebranded.info](registry, imports.definitions, rebranded, imports);
+        })
+            .filter((t) => !!t)
+            .map((t) => t.replace(/\nexport /, '\n'))
+    ];
     writeFile(path.join(destDir, `types${subPath ? `-${subPath}` : ''}.ts`), () => generateLookupTypesTmpl({
         headerType: 'defs',
         imports,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "author": "Dijital Kurdistan Tech Institute <dev@pezkuwichain.io>",
+  "author": "PezkuwiChain <dev@pezkuwichain.io>",
   "bugs": "https://github.com/pezkuwichain/pezkuwi-api/issues",
   "description": "Type generation scripts",
   "engines": {
@@ -18,7 +18,7 @@
     "./cjs/packageDetect.js"
   ],
   "type": "module",
-  "version": "16.5.17",
+  "version": "16.5.31",
   "bin": {
     "pezkuwi-types-chain-info": "./scripts/pezkuwi-types-chain-info.mjs",
     "pezkuwi-types-from-chain": "./scripts/pezkuwi-types-from-chain.mjs",
@@ -527,19 +527,19 @@
     }
   },
   "dependencies": {
-    "@pezkuwi/api": "16.5.17",
-    "@pezkuwi/api-augment": "16.5.17",
-    "@pezkuwi/api-derive": "16.5.17",
-    "@pezkuwi/rpc-augment": "16.5.17",
-    "@pezkuwi/rpc-provider": "16.5.17",
-    "@pezkuwi/types": "16.5.17",
-    "@pezkuwi/types-augment": "16.5.17",
-    "@pezkuwi/types-codec": "16.5.17",
-    "@pezkuwi/types-create": "16.5.17",
-    "@pezkuwi/types-support": "16.5.17",
-    "@pezkuwi/util": "14.0.12",
-    "@pezkuwi/util-crypto": "14.0.12",
-    "@pezkuwi/x-ws": "14.0.12",
+    "@pezkuwi/api": "16.5.31",
+    "@pezkuwi/api-augment": "16.5.31",
+    "@pezkuwi/api-derive": "16.5.31",
+    "@pezkuwi/rpc-augment": "16.5.31",
+    "@pezkuwi/rpc-provider": "16.5.31",
+    "@pezkuwi/types": "16.5.31",
+    "@pezkuwi/types-augment": "16.5.31",
+    "@pezkuwi/types-codec": "16.5.31",
+    "@pezkuwi/types-create": "16.5.31",
+    "@pezkuwi/types-support": "16.5.31",
+    "@pezkuwi/util": "14.0.20",
+    "@pezkuwi/util-crypto": "14.0.20",
+    "@pezkuwi/x-ws": "14.0.20",
     "comment-parser": "^1.4.1",
     "handlebars": "^4.7.8",
     "tslib": "^2.8.1",

package/packageInfo.js

@@ -1 +1 @@
-export const packageInfo = { name: '@pezkuwi/typegen', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '16.5.17' };
+export const packageInfo = { name: '@pezkuwi/typegen', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '16.5.31' };

package/util/derived.js

@@ -1,4 +1,4 @@
-import { GenericAccountId, GenericCall, GenericLookupSource, GenericVote } from '@pezkuwi/types/generic';
+import { GenericAccountId, GenericCall, GenericLookupSource, GenericMultiAddress, GenericVote } from '@pezkuwi/types/generic';
 import { AllConvictions } from '@pezkuwi/types/interfaces/democracy/definitions';
 import { AbstractInt, bool, Compact, Enum, Null, Option, Struct, Tuple, Vec, WrapperKeepOpaque, WrapperOpaque } from '@pezkuwi/types-codec';
 import { getTypeDef, TypeDefInfo } from '@pezkuwi/types-create';
@@ -29,6 +29,16 @@ export function getSimilarTypes(registry, definitions, _type, imports) {
     else if (type === '()') {
         return ['null'];
     }
+    // Handle lookup types by name pattern before class-based checks
+    // Lookup types like PezspRuntimeMultiAddress may not be properly registered as children of GenericMultiAddress
+    if (type.includes('MultiAddress') || type.endsWith('RuntimeMultiAddress')) {
+        possibleTypes.push('AccountId', 'AccountIndex', 'Address', 'LookupSource', 'string', 'Uint8Array');
+        return possibleTypes;
+    }
+    else if (type.includes('AccountId32') || type.endsWith('CryptoAccountId32')) {
+        possibleTypes.push('string', 'Uint8Array');
+        return possibleTypes;
+    }
     const Clazz = registry.createClass(type);
     if (isChildClass(Vec, Clazz)) {
         const vecDef = getTypeDef(type);
@@ -53,6 +63,11 @@ export function getSimilarTypes(registry, definitions, _type, imports) {
             }
         }
     }
+    else if (isChildClass(GenericMultiAddress, Clazz)) {
+        // MultiAddress can accept string addresses, Uint8Array, or various address variants
+        // Check before Enum since GenericMultiAddress extends Enum
+        possibleTypes.push('AccountId', 'AccountIndex', 'Address', 'LookupSource', 'string', 'Uint8Array');
+    }
     else if (isChildClass(Enum, Clazz)) {
         const { defKeys, isBasic } = new Clazz(registry);
         const keys = defKeys.filter((v) => !v.startsWith('__Unused'));

package/util/formatting.js

@@ -180,6 +180,11 @@ const formatters = {
     [TypeDefInfo.VecFixed]: (registry, typeDef, definitions, imports, withShortcut) => {
         const sub = typeDef.sub;
         if (sub.type === 'u8') {
+            // Use lookupName if available (e.g., PezspCoreCryptoAccountId32) instead of generic U8aFixed
+            if (typeDef.lookupName) {
+                setImports(definitions, imports, [rebrandTypeName(typeDef.lookupName)]);
+                return rebrandTypeName(typeDef.lookupName);
+            }
             setImports(definitions, imports, ['U8aFixed']);
             return 'U8aFixed';
         }