@polkadot-api/metadata-builders 0.3.1 → 0.3.2

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as scale from '@polkadot-api/substrate-bindings';
-import { StringRecord, V14, V15, Codec } from '@polkadot-api/substrate-bindings';
+import { StringRecord, V14Lookup, V14, V15, Codec } from '@polkadot-api/substrate-bindings';
 
 type MetadataPrimitives = "bool" | "char" | "str" | "u8" | "u16" | "u32" | "u64" | "u128" | "u256" | "i8" | "i16" | "i32" | "i64" | "i128" | "i256";
 type PrimitiveVar = {
@@ -68,106 +68,7 @@ type Var = TerminalVar | ComposedVar;
 type LookupEntry = {
     id: number;
 } & Var;
-declare const getLookupFn: (lookupData: {
-    id: number;
-    path: string[];
-    params: {
-        name: string;
-        type: number | undefined;
-    }[];
-    def: {
-        tag: "composite";
-        value: {
-            name: string | undefined;
-            type: number;
-            typeName: string | undefined;
-            docs: string[];
-        }[];
-    } | {
-        tag: "variant";
-        value: {
-            name: string;
-            fields: {
-                name: string | undefined;
-                type: number;
-                typeName: string | undefined;
-                docs: string[];
-            }[];
-            index: number;
-            docs: string[];
-        }[];
-    } | {
-        tag: "sequence";
-        value: number;
-    } | {
-        tag: "array";
-        value: {
-            len: number;
-            type: number;
-        };
-    } | {
-        tag: "tuple";
-        value: number[];
-    } | {
-        tag: "primitive";
-        value: {
-            tag: "bool";
-            value: undefined;
-        } | {
-            tag: "char";
-            value: undefined;
-        } | {
-            tag: "str";
-            value: undefined;
-        } | {
-            tag: "u8";
-            value: undefined;
-        } | {
-            tag: "u16";
-            value: undefined;
-        } | {
-            tag: "u32";
-            value: undefined;
-        } | {
-            tag: "u64";
-            value: undefined;
-        } | {
-            tag: "u128";
-            value: undefined;
-        } | {
-            tag: "u256";
-            value: undefined;
-        } | {
-            tag: "i8";
-            value: undefined;
-        } | {
-            tag: "i16";
-            value: undefined;
-        } | {
-            tag: "i32";
-            value: undefined;
-        } | {
-            tag: "i64";
-            value: undefined;
-        } | {
-            tag: "i128";
-            value: undefined;
-        } | {
-            tag: "i256";
-            value: undefined;
-        };
-    } | {
-        tag: "compact";
-        value: number;
-    } | {
-        tag: "bitSequence";
-        value: {
-            bitStoreType: number;
-            bitOrderType: number;
-        };
-    };
-    docs: string[];
-}[]) => (id: number) => LookupEntry;
+declare const getLookupFn: (lookupData: V14Lookup) => (id: number) => LookupEntry;
 
 declare const getDynamicBuilder: (metadata: V14 | V15) => {
     buildDefinition: (id: number) => Codec<any>;
@@ -176,21 +77,15 @@ declare const getDynamicBuilder: (metadata: V14 | V15) => {
         fallback: unknown;
         enc: (...args: any[]) => string;
         dec: scale.Decoder<unknown>;
-        keyDecoder: (value: string) => any[];
+        keyDecoder: (value: string) => { [K in keyof scale.EncoderWithHash<any>[]]: scale.EncoderWithHash<any>[][K] extends scale.EncoderWithHash<infer V> ? V : unknown; };
     };
     buildEvent: (pallet: string, name: string) => {
         codec: Codec<any>;
-        location: [
-            number,
-            number
-        ];
+        location: [number, number];
     };
     buildError: (pallet: string, name: string) => {
         codec: Codec<any>;
-        location: [
-            number,
-            number
-        ];
+        location: [number, number];
     };
     buildRuntimeCall: (api: string, method: string) => {
         args: Codec<any[]>;
@@ -198,10 +93,7 @@ declare const getDynamicBuilder: (metadata: V14 | V15) => {
     };
     buildCall: (pallet: string, name: string) => {
         codec: Codec<any>;
-        location: [
-            number,
-            number
-        ];
+        location: [number, number];
     };
     buildConstant: (pallet: string, constantName: string) => Codec<any>;
     ss58Prefix: number | undefined;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as scale from '@polkadot-api/substrate-bindings';
-import { StringRecord, V14, V15, Codec } from '@polkadot-api/substrate-bindings';
+import { StringRecord, V14Lookup, V14, V15, Codec } from '@polkadot-api/substrate-bindings';
 
 type MetadataPrimitives = "bool" | "char" | "str" | "u8" | "u16" | "u32" | "u64" | "u128" | "u256" | "i8" | "i16" | "i32" | "i64" | "i128" | "i256";
 type PrimitiveVar = {
@@ -68,106 +68,7 @@ type Var = TerminalVar | ComposedVar;
 type LookupEntry = {
     id: number;
 } & Var;
-declare const getLookupFn: (lookupData: {
-    id: number;
-    path: string[];
-    params: {
-        name: string;
-        type: number | undefined;
-    }[];
-    def: {
-        tag: "composite";
-        value: {
-            name: string | undefined;
-            type: number;
-            typeName: string | undefined;
-            docs: string[];
-        }[];
-    } | {
-        tag: "variant";
-        value: {
-            name: string;
-            fields: {
-                name: string | undefined;
-                type: number;
-                typeName: string | undefined;
-                docs: string[];
-            }[];
-            index: number;
-            docs: string[];
-        }[];
-    } | {
-        tag: "sequence";
-        value: number;
-    } | {
-        tag: "array";
-        value: {
-            len: number;
-            type: number;
-        };
-    } | {
-        tag: "tuple";
-        value: number[];
-    } | {
-        tag: "primitive";
-        value: {
-            tag: "bool";
-            value: undefined;
-        } | {
-            tag: "char";
-            value: undefined;
-        } | {
-            tag: "str";
-            value: undefined;
-        } | {
-            tag: "u8";
-            value: undefined;
-        } | {
-            tag: "u16";
-            value: undefined;
-        } | {
-            tag: "u32";
-            value: undefined;
-        } | {
-            tag: "u64";
-            value: undefined;
-        } | {
-            tag: "u128";
-            value: undefined;
-        } | {
-            tag: "u256";
-            value: undefined;
-        } | {
-            tag: "i8";
-            value: undefined;
-        } | {
-            tag: "i16";
-            value: undefined;
-        } | {
-            tag: "i32";
-            value: undefined;
-        } | {
-            tag: "i64";
-            value: undefined;
-        } | {
-            tag: "i128";
-            value: undefined;
-        } | {
-            tag: "i256";
-            value: undefined;
-        };
-    } | {
-        tag: "compact";
-        value: number;
-    } | {
-        tag: "bitSequence";
-        value: {
-            bitStoreType: number;
-            bitOrderType: number;
-        };
-    };
-    docs: string[];
-}[]) => (id: number) => LookupEntry;
+declare const getLookupFn: (lookupData: V14Lookup) => (id: number) => LookupEntry;
 
 declare const getDynamicBuilder: (metadata: V14 | V15) => {
     buildDefinition: (id: number) => Codec<any>;
@@ -176,21 +77,15 @@ declare const getDynamicBuilder: (metadata: V14 | V15) => {
         fallback: unknown;
         enc: (...args: any[]) => string;
         dec: scale.Decoder<unknown>;
-        keyDecoder: (value: string) => any[];
+        keyDecoder: (value: string) => { [K in keyof scale.EncoderWithHash<any>[]]: scale.EncoderWithHash<any>[][K] extends scale.EncoderWithHash<infer V> ? V : unknown; };
     };
     buildEvent: (pallet: string, name: string) => {
         codec: Codec<any>;
-        location: [
-            number,
-            number
-        ];
+        location: [number, number];
     };
     buildError: (pallet: string, name: string) => {
         codec: Codec<any>;
-        location: [
-            number,
-            number
-        ];
+        location: [number, number];
     };
     buildRuntimeCall: (api: string, method: string) => {
         args: Codec<any[]>;
@@ -198,10 +93,7 @@ declare const getDynamicBuilder: (metadata: V14 | V15) => {
     };
     buildCall: (pallet: string, name: string) => {
         codec: Codec<any>;
-        location: [
-            number,
-            number
-        ];
+        location: [number, number];
     };
     buildConstant: (pallet: string, constantName: string) => Codec<any>;
     ss58Prefix: number | undefined;

package/dist/index.js

@@ -38,6 +38,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/lookups.ts
 var isBytes = (value, nBytes) => value.type === "array" && value.len === nBytes && value.value.type === "primitive" && value.value.value === "u8";
+var _void = { type: "void" };
 var getLookupFn = (lookupData) => {
   const lookups = /* @__PURE__ */ new Map();
   const from = /* @__PURE__ */ new Set();
@@ -73,7 +74,7 @@ var getLookupFn = (lookupData) => {
   const getLookupEntryDef = withCache2((id) => {
     const { def, path, params } = lookupData[id];
     if (def.tag === "composite") {
-      if (def.value.length === 0) return { type: "void" };
+      if (def.value.length === 0) return _void;
       if (def.value.length === 1) {
         const inner = getLookupEntryDef(def.value[0].type);
         if (isAccountId32SearchOn && path.at(-1) === "AccountId32" && isBytes(inner, 32)) {
@@ -86,24 +87,7 @@ var getLookupFn = (lookupData) => {
         }
         return inner;
       }
-      let allKey = true;
-      const values = {};
-      const innerDocs = {};
-      def.value.forEach((x, idx) => {
-        allKey = allKey && !!x.name;
-        const key = x.name || idx;
-        values[key] = getLookupEntryDef(x.type);
-        innerDocs[key] = x.docs;
-      });
-      return allKey ? {
-        type: "struct",
-        value: values,
-        innerDocs
-      } : {
-        type: "tuple",
-        value: Object.values(values),
-        innerDocs: Object.values(innerDocs)
-      };
+      return getComplexVar(def.value);
     }
     if (def.tag === "variant") {
       if (path.length === 1 && path[0] === "Option" && params.length === 1 && params[0].name === "T") {
@@ -126,14 +110,14 @@ var getLookupFn = (lookupData) => {
           }
         };
       }
-      if (def.value.length === 0) return { type: "void" };
+      if (def.value.length === 0) return _void;
       const enumValue = {};
       const enumDocs = {};
       def.value.forEach((x) => {
         const key = x.name;
         enumDocs[key] = x.docs;
         if (x.fields.length === 0) {
-          enumValue[key] = { type: "void", idx: x.index };
+          enumValue[key] = { ..._void, idx: x.index };
           return;
         }
         if (x.fields.length === 1 && !x.fields[0].name) {
@@ -144,38 +128,7 @@ var getLookupFn = (lookupData) => {
           };
           return;
         }
-        let allKey = true;
-        const values = {};
-        const innerDocs = {};
-        x.fields.forEach((x2, idx) => {
-          allKey = allKey && !!x2.name;
-          const key2 = x2.name || idx;
-          values[key2] = getLookupEntryDef(x2.type);
-          innerDocs[key2] = x2.docs;
-        });
-        if (allKey) {
-          enumValue[key] = {
-            type: "struct",
-            value: values,
-            innerDocs,
-            idx: x.index
-          };
-        } else {
-          const valuesArr = Object.values(values);
-          const innerDocsArr = Object.values(innerDocs);
-          const areAllSame = valuesArr.every((v) => v.id === valuesArr[0].id);
-          enumValue[key] = areAllSame && innerDocsArr.every((doc) => doc.length === 0) ? {
-            type: "array",
-            value: valuesArr[0],
-            len: valuesArr.length,
-            idx: x.index
-          } : {
-            type: "tuple",
-            value: valuesArr,
-            innerDocs: innerDocsArr,
-            idx: x.index
-          };
-        }
+        enumValue[key] = { ...getComplexVar(x.fields), idx: x.index };
       });
       return {
         type: "enum",
@@ -183,43 +136,26 @@ var getLookupFn = (lookupData) => {
         innerDocs: enumDocs
       };
     }
-    if (def.tag === "sequence") {
-      const value = getLookupEntryDef(def.value);
+    if (def.tag === "sequence")
       return {
         type: "sequence",
-        value
+        value: getLookupEntryDef(def.value)
       };
-    }
     if (def.tag === "array") {
       const { len } = def.value;
       const value = getLookupEntryDef(def.value.type);
-      if (len === 0) return { type: "void" };
-      if (len === 1) return value;
-      return {
+      return !len || value.type === "void" ? _void : len > 0 ? {
         type: "array",
         value,
         len: def.value.len
-      };
+      } : value;
     }
     if (def.tag === "tuple") {
-      if (def.value.length === 0) return { type: "void" };
-      if (def.value.length === 1)
-        return getLookupEntryDef(def.value[0]);
-      const value = def.value.map((x) => getLookupEntryDef(x));
-      const innerDocs = def.value.map((x) => lookupData[x].docs);
-      const areAllSame = value.every((v) => v.id === value[0].id);
-      if (areAllSame && innerDocs.every((doc) => doc.length === 0)) {
-        return {
-          type: "array",
-          value: value[0],
-          len: value.length
-        };
-      }
-      return {
-        type: "tuple",
-        value,
-        innerDocs
-      };
+      if (def.value.length === 0) return _void;
+      return def.value.length > 1 ? getArrayOrTuple(
+        def.value.map((x) => getLookupEntryDef(x)),
+        def.value.map((x) => lookupData[x].docs)
+      ) : getLookupEntryDef(def.value[0]);
     }
     if (def.tag === "primitive") {
       return {
@@ -240,6 +176,40 @@ var getLookupFn = (lookupData) => {
       type: def.tag
     };
   });
+  const getComplexVar = (input) => {
+    let allKey = true;
+    const values = {};
+    const innerDocs = {};
+    input.forEach((x, idx) => {
+      allKey = allKey && !!x.name;
+      const key = x.name || idx;
+      const value = getLookupEntryDef(x.type);
+      if (value.type !== "void") {
+        values[key] = value;
+        innerDocs[key] = x.docs;
+      }
+    });
+    return allKey ? {
+      type: "struct",
+      value: values,
+      innerDocs
+    } : getArrayOrTuple(Object.values(values), Object.values(innerDocs));
+  };
+  const getArrayOrTuple = (values, innerDocs) => {
+    if (values.every((v) => v.id === values[0].id) && innerDocs.every((doc) => !doc.length)) {
+      const [value] = values;
+      return value.type === "void" ? _void : {
+        type: "array",
+        value: values[0],
+        len: values.length
+      };
+    }
+    return {
+      type: "tuple",
+      value: values,
+      innerDocs
+    };
+  };
   return getLookupEntryDef;
 };
 
@@ -267,12 +237,16 @@ var withCache = (fn, onEnterCircular, onExitCircular) => (input, cache, stack, .
 // src/dynamic-builder.ts
 var import_utils = require("@polkadot-api/utils");
 var _bytes = scale.Bin();
+var bigCompact = scale.createCodec(
+  scale.compact[0],
+  scale.enhanceDecoder(scale.compact[1], BigInt)
+);
 var _buildCodec = (input, cache, stack, _accountId) => {
   if (input.type === "primitive") return scale[input.value];
   if (input.type === "void") return scale._void;
   if (input.type === "AccountId32") return _accountId;
   if (input.type === "AccountId20") return scale.ethAccount;
-  if (input.type === "compact") return scale.compact;
+  if (input.type === "compact") return input.isBig ? bigCompact : scale.compact;
   if (input.type === "bitSequence") return scale.bitSequence;
   const buildNextCodec = (nextInput) => buildCodec(nextInput, cache, stack, _accountId);
   const buildVector = (inner2, len) => {