@polkadot/types-codec 8.12.1 → 8.14.1

package/abstract/Array.d.ts

@@ -57,6 +57,10 @@ export declare abstract class AbstractArray<T extends Codec> extends Array<T> im
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): AnyJson;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/abstract/Array.js

@@ -118,7 +118,7 @@ export class AbstractArray extends Array {
     const result = new Array(this.length);
 
     for (let i = 0; i < this.length; i++) {
-      result[i] = this[i].toHuman(isExtended);
+      result[i] = this[i] && this[i].toHuman(isExtended);
     }
 
     return result;
@@ -132,7 +132,23 @@ export class AbstractArray extends Array {
     const result = new Array(this.length);
 
     for (let i = 0; i < this.length; i++) {
-      result[i] = this[i].toJSON();
+      // We actually log inside the U8a decoding and use JSON.stringify(...), which
+      // means that the Vec may be partially populated (same applies to toHuman, same check)
+      result[i] = this[i] && this[i].toJSON();
+    }
+
+    return result;
+  }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const result = new Array(this.length);
+
+    for (let i = 0; i < this.length; i++) {
+      result[i] = this[i] && this[i].toPrimitive();
     }
 
     return result;

package/abstract/Base.d.ts

@@ -43,6 +43,10 @@ export declare abstract class AbstractBase<T extends Codec> implements Codec {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): AnyJson;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the string representation of the value
      */

package/abstract/Base.js

@@ -81,6 +81,14 @@ export class AbstractBase {
   toJSON() {
     return this.#raw.toJSON();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#raw.toPrimitive();
+  }
   /**
    * @description Returns the string representation of the value
    */

package/abstract/Int.d.ts

@@ -59,6 +59,10 @@ export declare abstract class AbstractInt extends BN implements INumber {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(onlyHex?: boolean): any;
+    /**
+     * @description Returns the value in a primitive form, either number when <= 52 bits, or string otherwise
+     */
+    toPrimitive(): number | string;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/abstract/Int.js

@@ -194,6 +194,14 @@ export class AbstractInt extends BN {
     //   - this.#bitLength - the type bits (this should be used, however contracts RPC is problematic)
     return onlyHex || super.bitLength() > MAX_NUMBER_BITS ? this.toHex() : this.toNumber();
   }
+  /**
+   * @description Returns the value in a primitive form, either number when <= 52 bits, or string otherwise
+   */
+
+
+  toPrimitive() {
+    return super.bitLength() > MAX_NUMBER_BITS ? this.toString() : this.toNumber();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/base/Compact.d.ts

@@ -69,6 +69,10 @@ export declare class Compact<T extends INumber> implements ICompact<T> {
      * @description Returns the number representation for the value
      */
     toNumber(): number;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): string | number;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/base/Compact.js

@@ -158,6 +158,14 @@ export class Compact {
   toNumber() {
     return this.#raw.toNumber();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#raw.toPrimitive();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/base/DoNotConstruct.d.ts

@@ -28,6 +28,7 @@ export declare class DoNotConstruct implements Codec {
     toHex(): HexString;
     toHuman(): AnyJson;
     toJSON(): AnyJson;
+    toPrimitive(): AnyJson;
     toRawType(): string;
     toString(): string;
     toU8a(): Uint8Array;

package/base/DoNotConstruct.js

@@ -68,6 +68,10 @@ export class DoNotConstruct {
     throw this.#neverError;
   }
 
+  toPrimitive() {
+    throw this.#neverError;
+  }
+
   toRawType() {
     throw this.#neverError;
   }

package/base/Enum.d.ts

@@ -103,6 +103,10 @@ export declare class Enum implements IEnum {
      * @description Returns the number representation for the value
      */
     toNumber(): number;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns a raw struct representation of the enum types
      */

package/base/Enum.js

@@ -402,6 +402,16 @@ export class Enum {
   toNumber() {
     return this.index;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#isBasic ? this.type : {
+      [stringCamelCase(this.type)]: this.#raw.toPrimitive()
+    };
+  }
   /**
    * @description Returns a raw struct representation of the enum types
    */

package/base/Null.d.ts

@@ -36,6 +36,10 @@ export declare class Null implements Codec {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): null;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): null;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/base/Null.js

@@ -64,6 +64,14 @@ export class Null {
   toJSON() {
     return null;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return null;
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/base/Option.d.ts

@@ -63,6 +63,10 @@ export declare class Option<T extends Codec> implements IOption<T> {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): AnyJson;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/base/Option.js

@@ -201,6 +201,14 @@ export class Option {
   toJSON() {
     return this.isNone ? null : this.#raw.toJSON();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.isNone ? null : this.#raw.toPrimitive();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/abstract/Array.js

@@ -127,7 +127,7 @@ class AbstractArray extends Array {
     const result = new Array(this.length);
 
     for (let i = 0; i < this.length; i++) {
-      result[i] = this[i].toHuman(isExtended);
+      result[i] = this[i] && this[i].toHuman(isExtended);
     }
 
     return result;
@@ -141,7 +141,23 @@ class AbstractArray extends Array {
     const result = new Array(this.length);
 
     for (let i = 0; i < this.length; i++) {
-      result[i] = this[i].toJSON();
+      // We actually log inside the U8a decoding and use JSON.stringify(...), which
+      // means that the Vec may be partially populated (same applies to toHuman, same check)
+      result[i] = this[i] && this[i].toJSON();
+    }
+
+    return result;
+  }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const result = new Array(this.length);
+
+    for (let i = 0; i < this.length; i++) {
+      result[i] = this[i] && this[i].toPrimitive();
     }
 
     return result;

package/cjs/abstract/Base.js

@@ -88,6 +88,14 @@ class AbstractBase {
   toJSON() {
     return this.#raw.toJSON();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#raw.toPrimitive();
+  }
   /**
    * @description Returns the string representation of the value
    */

package/cjs/abstract/Int.js

@@ -211,6 +211,14 @@ class AbstractInt extends _util.BN {
     //   - this.#bitLength - the type bits (this should be used, however contracts RPC is problematic)
     return onlyHex || super.bitLength() > MAX_NUMBER_BITS ? this.toHex() : this.toNumber();
   }
+  /**
+   * @description Returns the value in a primitive form, either number when <= 52 bits, or string otherwise
+   */
+
+
+  toPrimitive() {
+    return super.bitLength() > MAX_NUMBER_BITS ? this.toString() : this.toNumber();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/base/Compact.js

@@ -168,6 +168,14 @@ class Compact {
   toNumber() {
     return this.#raw.toNumber();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#raw.toPrimitive();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/base/DoNotConstruct.js

@@ -76,6 +76,10 @@ class DoNotConstruct {
     throw this.#neverError;
   }
 
+  toPrimitive() {
+    throw this.#neverError;
+  }
+
   toRawType() {
     throw this.#neverError;
   }

package/cjs/base/Enum.js

@@ -420,6 +420,16 @@ class Enum {
   toNumber() {
     return this.index;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#isBasic ? this.type : {
+      [(0, _util.stringCamelCase)(this.type)]: this.#raw.toPrimitive()
+    };
+  }
   /**
    * @description Returns a raw struct representation of the enum types
    */

package/cjs/base/Null.js

@@ -72,6 +72,14 @@ class Null {
   toJSON() {
     return null;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return null;
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/base/Option.js

@@ -211,6 +211,14 @@ class Option {
   toJSON() {
     return this.isNone ? null : this.#raw.toJSON();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.isNone ? null : this.#raw.toPrimitive();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/extended/BTreeSet.js

@@ -197,6 +197,20 @@ class BTreeSet extends Set {
   toRawType() {
     return `BTreeSet<${this.registry.getClassName(this.#ValClass) || new this.#ValClass(this.registry).toRawType()}>`;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const json = [];
+
+    for (const v of this.values()) {
+      json.push(v.toPrimitive());
+    }
+
+    return json;
+  }
   /**
    * @description Returns the string representation of the value
    */

package/cjs/extended/Map.js

@@ -11,6 +11,8 @@ var _Array = require("../abstract/Array");
 
 var _Enum = require("../base/Enum");
 
+var _Raw = require("../native/Raw");
+
 var _Struct = require("../native/Struct");
 
 var _utils = require("../utils");
@@ -178,7 +180,7 @@ class CodecMap extends Map {
     const json = {};
 
     for (const [k, v] of this.entries()) {
-      json[k.toString()] = v.toHuman(isExtended);
+      json[k instanceof _Raw.Raw && k.isAscii ? k.toUtf8() : k.toString()] = v.toHuman(isExtended);
     }
 
     return json;
@@ -197,6 +199,20 @@ class CodecMap extends Map {
 
     return json;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const json = {};
+
+    for (const [k, v] of this.entries()) {
+      json[k instanceof _Raw.Raw && k.isAscii ? k.toUtf8() : k.toString()] = v.toPrimitive();
+    }
+
+    return json;
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/extended/WrapperKeepOpaque.js

@@ -84,6 +84,14 @@ class WrapperKeepOpaque extends _Bytes.Bytes {
   toHuman(isExtended) {
     return this.#decoded ? this.#decoded.toHuman(isExtended) : super.toHuman();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#decoded ? this.#decoded.toPrimitive() : super.toPrimitive();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Bool.js

@@ -104,6 +104,14 @@ class bool extends Boolean {
   toJSON() {
     return this.valueOf();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toJSON();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Date.js

@@ -149,6 +149,14 @@ class CodecDate extends Date {
   toNumber() {
     return Math.ceil(this.getTime() / 1000);
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toNumber();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Float.js

@@ -112,6 +112,14 @@ class Float extends Number {
   toNumber() {
     return this.valueOf();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toNumber();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Json.js

@@ -116,6 +116,18 @@ class Json extends Map {
       return json;
     }, {});
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return [...this.entries()].reduce((json, _ref4) => {
+      let [key, value] = _ref4;
+      json[key] = (0, _util.isFunction)(value.toHuman) ? value.toPrimitive() : value;
+      return json;
+    }, {});
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Raw.js

@@ -117,6 +117,22 @@ class Raw extends Uint8Array {
 
 
   toHuman() {
+    return this.toPrimitive();
+  }
+  /**
+   * @description Converts the Object to JSON, typically used for RPC transfers
+   */
+
+
+  toJSON() {
+    return this.toHex();
+  }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
     if (this.isAscii) {
       const text = this.toUtf8(); // ensure we didn't end up with multibyte codepoints
 
@@ -127,14 +143,6 @@ class Raw extends Uint8Array {
 
     return this.toJSON();
   }
-  /**
-   * @description Converts the Object to JSON, typically used for RPC transfers
-   */
-
-
-  toJSON() {
-    return this.toHex();
-  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Set.js

@@ -238,6 +238,14 @@ class CodecSet extends Set {
   toNumber() {
     return this.valueEncoded.toNumber();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toJSON();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Struct.js

@@ -267,12 +267,31 @@ class Struct extends Map {
     const json = {};
 
     for (const [k, v] of this.entries()) {
-      const jsonKey = this.#jsonMap.get(k) || k;
+      const jsonKey = this.#jsonMap.get(k) || k; // We actually log inside the U8a decoding and use JSON.stringify(...), which
+      // means that the Vec may be partially populated (same applies to toHuman, same check)
+
       json[jsonKey] = v && v.toJSON();
     }
 
     return json;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const json = {};
+
+    for (const [k, v] of this.entries()) {
+      const jsonKey = this.#jsonMap.get(k) || k; // We actually log inside the U8a decoding and use JSON.stringify(...), which
+      // means that the Vec may be partially populated (same applies to toHuman, same check)
+
+      json[jsonKey] = v && v.toPrimitive();
+    }
+
+    return json;
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/native/Text.js

@@ -147,6 +147,14 @@ class Text extends String {
   toJSON() {
     return this.toString();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toJSON();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/package.json

@@ -1,3 +1,3 @@
 {
   "type": "commonjs"
-}
+}

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/types-codec',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '8.12.1'
+  version: '8.14.1'
 };
 exports.packageInfo = packageInfo;

package/cjs/utils/decodeU8a.js

@@ -13,7 +13,7 @@ var _util = require("@polkadot/util");
 // SPDX-License-Identifier: Apache-2.0
 
 /** @internal */
-function formatFailure(registry, _ref, u8a, i, count, Type, key) {
+function formatFailure(registry, result, _ref, u8a, i, count, Type, key) {
   let {
     message
   } = _ref;
@@ -22,7 +22,8 @@ function formatFailure(registry, _ref, u8a, i, count, Type, key) {
   try {
     type = `: ${new Type(registry).toRawType()}`;
   } catch {// ignore
-  }
+  } // console.error(JSON.stringify(result, null, 2));
+
 
   return `decodeU8a: failed at ${(0, _util.u8aToHex)(u8a.subarray(0, 16))}…${key ? ` on ${key}` : ''} (index ${i}/${count})${type}:: ${message}`;
 }
@@ -52,7 +53,7 @@ function decodeU8a(registry, result, u8a, _ref2) {
       i++;
     }
   } catch (error) {
-    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
+    throw new Error(formatFailure(registry, result, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
   }
 
   return [result, offset];
@@ -79,7 +80,7 @@ function decodeU8aStruct(registry, result, u8a, _ref3) {
       i++;
     }
   } catch (error) {
-    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
+    throw new Error(formatFailure(registry, result, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
   }
 
   return [result, offset];
@@ -105,7 +106,7 @@ function decodeU8aVec(registry, result, u8a, startAt, Type) {
       i++;
     }
   } catch (error) {
-    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Type));
+    throw new Error(formatFailure(registry, result, error, u8a.subarray(offset), i, count, Type));
   }
 
   return [offset, offset - startAt];

package/extended/BTreeSet.d.ts

@@ -47,6 +47,10 @@ export declare class BTreeSet<V extends Codec = Codec> extends Set<V> implements
      * @description Returns the base runtime type name for this instance
      */
     toRawType(): string;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the string representation of the value
      */

package/extended/BTreeSet.js

@@ -188,6 +188,20 @@ export class BTreeSet extends Set {
   toRawType() {
     return `BTreeSet<${this.registry.getClassName(this.#ValClass) || new this.#ValClass(this.registry).toRawType()}>`;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const json = [];
+
+    for (const v of this.values()) {
+      json.push(v.toPrimitive());
+    }
+
+    return json;
+  }
   /**
    * @description Returns the string representation of the value
    */

package/extended/Map.d.ts

@@ -38,6 +38,10 @@ export declare class CodecMap<K extends Codec = Codec, V extends Codec = Codec>
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): Record<string, AnyJson>;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/extended/Map.js

@@ -3,6 +3,7 @@
 import { compactFromU8aLim, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { AbstractArray } from "../abstract/Array.js";
 import { Enum } from "../base/Enum.js";
+import { Raw } from "../native/Raw.js";
 import { Struct } from "../native/Struct.js";
 import { compareMap, decodeU8a, sortMap, typeToConstructor } from "../utils/index.js";
 const l = logger('Map');
@@ -165,7 +166,7 @@ export class CodecMap extends Map {
     const json = {};
 
     for (const [k, v] of this.entries()) {
-      json[k.toString()] = v.toHuman(isExtended);
+      json[k instanceof Raw && k.isAscii ? k.toUtf8() : k.toString()] = v.toHuman(isExtended);
     }
 
     return json;
@@ -184,6 +185,20 @@ export class CodecMap extends Map {
 
     return json;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const json = {};
+
+    for (const [k, v] of this.entries()) {
+      json[k instanceof Raw && k.isAscii ? k.toUtf8() : k.toString()] = v.toPrimitive();
+    }
+
+    return json;
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/extended/WrapperKeepOpaque.d.ts

@@ -20,6 +20,10 @@ export declare class WrapperKeepOpaque<T extends Codec> extends Bytes {
      * @description Converts the Object to to a human-friendly JSON, with additional fields, expansion and formatting of information
      */
     toHuman(isExtended?: boolean): AnyJson;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): any;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/extended/WrapperKeepOpaque.js

@@ -73,6 +73,14 @@ export class WrapperKeepOpaque extends Bytes {
   toHuman(isExtended) {
     return this.#decoded ? this.#decoded.toHuman(isExtended) : super.toHuman();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.#decoded ? this.#decoded.toPrimitive() : super.toPrimitive();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Bool.d.ts

@@ -50,6 +50,10 @@ export declare class bool extends Boolean implements Codec {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): boolean;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): boolean;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Bool.js

@@ -95,6 +95,14 @@ export class bool extends Boolean {
   toJSON() {
     return this.valueOf();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toJSON();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Date.d.ts

@@ -64,6 +64,10 @@ export declare class CodecDate extends Date implements INumber {
      * @description Returns the number representation for the timestamp
      */
     toNumber(): number;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): number;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Date.js

@@ -139,6 +139,14 @@ export class CodecDate extends Date {
   toNumber() {
     return Math.ceil(this.getTime() / 1000);
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toNumber();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Float.d.ts

@@ -51,6 +51,10 @@ export declare class Float extends Number implements IFloat {
      * @description Returns the number representation (Same as valueOf)
      */
     toNumber(): number;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): number;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Float.js

@@ -103,6 +103,14 @@ export class Float extends Number {
   toNumber() {
     return this.valueOf();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toNumber();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Json.d.ts

@@ -48,6 +48,10 @@ export declare class Json extends Map<string, any> implements Codec {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): Record<string, AnyJson>;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): Record<string, AnyJson>;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Json.js

@@ -102,6 +102,17 @@ export class Json extends Map {
       return json;
     }, {});
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return [...this.entries()].reduce((json, [key, value]) => {
+      json[key] = isFunction(value.toHuman) ? value.toPrimitive() : value;
+      return json;
+    }, {});
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Raw.d.ts

@@ -63,6 +63,10 @@ export declare class Raw extends Uint8Array implements IU8a {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): string;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Raw.js

@@ -109,6 +109,22 @@ export class Raw extends Uint8Array {
 
 
   toHuman() {
+    return this.toPrimitive();
+  }
+  /**
+   * @description Converts the Object to JSON, typically used for RPC transfers
+   */
+
+
+  toJSON() {
+    return this.toHex();
+  }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
     if (this.isAscii) {
       const text = this.toUtf8(); // ensure we didn't end up with multibyte codepoints
 
@@ -119,14 +135,6 @@ export class Raw extends Uint8Array {
 
     return this.toJSON();
   }
-  /**
-   * @description Converts the Object to JSON, typically used for RPC transfers
-   */
-
-
-  toJSON() {
-    return this.toHex();
-  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Set.d.ts

@@ -63,6 +63,10 @@ export declare class CodecSet extends Set<string> implements ISet<string> {
      * @description The encoded value for the set members
      */
     toNumber(): number;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): string[];
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Set.js

@@ -226,6 +226,14 @@ export class CodecSet extends Set {
   toNumber() {
     return this.valueEncoded.toNumber();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toJSON();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Struct.d.ts

@@ -85,6 +85,10 @@ export declare class Struct<S extends TypesDef = TypesDef, V extends {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): Record<string, AnyJson>;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): Record<string, AnyJson>;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Struct.js

@@ -256,12 +256,31 @@ export class Struct extends Map {
     const json = {};
 
     for (const [k, v] of this.entries()) {
-      const jsonKey = this.#jsonMap.get(k) || k;
+      const jsonKey = this.#jsonMap.get(k) || k; // We actually log inside the U8a decoding and use JSON.stringify(...), which
+      // means that the Vec may be partially populated (same applies to toHuman, same check)
+
       json[jsonKey] = v && v.toJSON();
     }
 
     return json;
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    const json = {};
+
+    for (const [k, v] of this.entries()) {
+      const jsonKey = this.#jsonMap.get(k) || k; // We actually log inside the U8a decoding and use JSON.stringify(...), which
+      // means that the Vec may be partially populated (same applies to toHuman, same check)
+
+      json[jsonKey] = v && v.toPrimitive();
+    }
+
+    return json;
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/native/Text.d.ts

@@ -56,6 +56,10 @@ export declare class Text extends String implements IText {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): string;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): string;
     /**
      * @description Returns the base runtime type name for this instance
      */

package/native/Text.js

@@ -138,6 +138,14 @@ export class Text extends String {
   toJSON() {
     return this.toString();
   }
+  /**
+   * @description Converts the value in a best-fit primitive form
+   */
+
+
+  toPrimitive() {
+    return this.toJSON();
+  }
   /**
    * @description Returns the base runtime type name for this instance
    */

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.12.1",
+  "version": "8.14.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -434,8 +434,8 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.6",
-    "@polkadot/util": "^10.0.1",
-    "@polkadot/x-bigint": "^10.0.1"
+    "@babel/runtime": "^7.18.9",
+    "@polkadot/util": "^10.1.1",
+    "@polkadot/x-bigint": "^10.1.1"
   }
-}
+}

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/types-codec',
   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: '8.12.1'
+  version: '8.14.1'
 };

package/types/codec.d.ts

@@ -60,6 +60,10 @@ export interface Codec {
      * @description Converts the Object to JSON, typically used for RPC transfers
      */
     toJSON(): AnyJson;
+    /**
+     * @description Converts the value in a best-fit primitive form
+     */
+    toPrimitive(): AnyJson;
     /**
      * @description Returns the base runtime type name for this instance
      */
@@ -81,5 +85,5 @@ export interface CodecClass<T = Codec> {
     readonly __fallbackType?: string;
     new (registry: Registry, ...args: any[]): T;
 }
-export declare type CodecTo = 'toHex' | 'toJSON' | 'toString' | 'toU8a';
+export declare type CodecTo = 'toHex' | 'toJSON' | 'toPrimitive' | 'toString' | 'toU8a';
 export declare type ArgsDef = Record<string, CodecClass | string>;

package/types/interfaces.d.ts

@@ -24,6 +24,7 @@ export interface INumber extends Codec {
     toBigInt(): bigint;
     toBn(): BN;
     toNumber(): number;
+    toPrimitive(): string | number;
 }
 export interface IFloat extends Codec {
     toNumber(): number;

package/utils/decodeU8a.js

@@ -3,7 +3,7 @@
 import { u8aToHex } from '@polkadot/util';
 /** @internal */
 
-function formatFailure(registry, {
+function formatFailure(registry, result, {
   message
 }, u8a, i, count, Type, key) {
   let type = '';
@@ -11,7 +11,8 @@ function formatFailure(registry, {
   try {
     type = `: ${new Type(registry).toRawType()}`;
   } catch {// ignore
-  }
+  } // console.error(JSON.stringify(result, null, 2));
+
 
   return `decodeU8a: failed at ${u8aToHex(u8a.subarray(0, 16))}…${key ? ` on ${key}` : ''} (index ${i}/${count})${type}:: ${message}`;
 }
@@ -40,7 +41,7 @@ export function decodeU8a(registry, result, u8a, [Types, keys]) {
       i++;
     }
   } catch (error) {
-    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
+    throw new Error(formatFailure(registry, result, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
   }
 
   return [result, offset];
@@ -65,7 +66,7 @@ export function decodeU8aStruct(registry, result, u8a, [Types, keys]) {
       i++;
     }
   } catch (error) {
-    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
+    throw new Error(formatFailure(registry, result, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
   }
 
   return [result, offset];
@@ -90,7 +91,7 @@ export function decodeU8aVec(registry, result, u8a, startAt, Type) {
       i++;
     }
   } catch (error) {
-    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Type));
+    throw new Error(formatFailure(registry, result, error, u8a.subarray(offset), i, count, Type));
   }
 
   return [offset, offset - startAt];