@polkadot/types-codec 8.12.2 → 8.14.2-11

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

@@ -109,20 +109,23 @@ class CodecSet extends Set {
   }
 
   static with(values, bitLength) {
-    const keys = Object.keys(values);
-    const isKeys = new Array(keys.length);
+    var _class;
 
-    for (let i = 0; i < keys.length; i++) {
-      isKeys[i] = `is${(0, _util.stringPascalCase)(keys[i])}`;
-    }
-
-    return class extends CodecSet {
+    return _class = class extends CodecSet {
       constructor(registry, value) {
         super(registry, values, value, bitLength);
-        (0, _util.objectProperties)(this, isKeys, (_, i) => this.strings.includes(keys[i]));
       }
 
-    };
+    }, (() => {
+      const keys = Object.keys(values);
+      const isKeys = new Array(keys.length);
+
+      for (let i = 0; i < keys.length; i++) {
+        isKeys[i] = `is${(0, _util.stringPascalCase)(keys[i])}`;
+      }
+
+      (0, _util.objectProperties)(_class.prototype, isKeys, (_, i, self) => self.strings.includes(keys[i]));
+    })(), _class;
   }
   /**
    * @description The length of the value when encoded as a Uint8Array
@@ -238,6 +241,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

@@ -106,21 +106,24 @@ class Struct extends Map {
   }
 
   static with(Types, jsonMap) {
-    const keys = Object.keys(Types);
+    var _class;
+
     let definition; // eslint-disable-next-line no-return-assign
 
     const setDefinition = d => definition = d;
 
-    return class extends Struct {
+    return _class = class extends Struct {
       constructor(registry, value) {
         super(registry, Types, value, jsonMap, {
           definition,
           setDefinition
         });
-        (0, _util.objectProperties)(this, keys, k => this.get(k));
       }
 
-    };
+    }, (() => {
+      const keys = Object.keys(Types);
+      (0, _util.objectProperties)(_class.prototype, keys, (k, _, self) => self.get(k));
+    })(), _class;
   }
   /**
    * @description The available keys for this struct
@@ -130,10 +133,6 @@ class Struct extends Map {
   get defKeys() {
     return this.#Types[1];
   }
-
-  getT(key) {
-    return this.get(key);
-  }
   /**
    * @description Checks if the value is an empty value
    */
@@ -148,21 +147,6 @@ class Struct extends Map {
 
     return true;
   }
-  /**
-   * @description Returns the Type description of the structure
-   */
-
-
-  get Type() {
-    const result = {};
-    const [Types, keys] = this.#Types;
-
-    for (let i = 0; i < keys.length; i++) {
-      result[keys[i]] = new Types[i](this.registry).toRawType();
-    }
-
-    return result;
-  }
   /**
    * @description The length of the value when encoded as a Uint8Array
    */
@@ -185,6 +169,21 @@ class Struct extends Map {
   get hash() {
     return this.registry.hash(this.toU8a());
   }
+  /**
+   * @description Returns the Type description of the structure
+   */
+
+
+  get Type() {
+    const result = {};
+    const [Types, keys] = this.#Types;
+
+    for (let i = 0; i < keys.length; i++) {
+      result[keys[i]] = new Types[i](this.registry).toRawType();
+    }
+
+    return result;
+  }
   /**
    * @description Compares the value of the input to see if there is a match
    */
@@ -195,12 +194,12 @@ class Struct extends Map {
   }
   /**
    * @description Returns a specific names entry in the structure
-   * @param name The name of the entry to retrieve
+   * @param key The name of the entry to retrieve
    */
 
 
-  get(name) {
-    return super.get(name);
+  get(key) {
+    return super.get(key);
   }
   /**
    * @description Returns the values of a member at a specific index (Rather use get(name) for performance)
@@ -210,6 +209,14 @@ class Struct extends Map {
   getAtIndex(index) {
     return this.toArray()[index];
   }
+  /**
+   * @description Returns the a types value by name
+   */
+
+
+  getT(key) {
+    return super.get(key);
+  }
   /**
    * @description Returns a breakdown of the hex encoding for this Codec
    */
@@ -267,12 +274,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.2'
+  version: '8.14.2-11'
 };
 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
      */