@polkadot/types-codec 8.8.2 → 8.8.3-10

package/cjs/abstract/{AbstractInt.js → Int.js}

@@ -24,17 +24,21 @@ function toPercentage(value, divisor) {
 
 
 function decodeAbstractInt(value, isNegative) {
-  if ((0, _util.isBn)(value)) {
-    return value.toString();
-  } else if ((0, _util.isHex)(value, -1, true)) {
-    return (0, _util.hexToBn)(value, {
-      isLe: false,
-      isNegative
-    }).toString();
-  } else if ((0, _util.isNumber)(value)) {
+  if ((0, _util.isNumber)(value)) {
     (0, _util.assert)(value <= Number.MAX_SAFE_INTEGER && value >= Number.MIN_SAFE_INTEGER && Number.isInteger(value), 'Number needs to be an integer <= Number.MAX_SAFE_INTEGER, i.e. 2 ^ 53 - 1');
+    return value;
   } else if ((0, _util.isString)(value)) {
+    if ((0, _util.isHex)(value, -1, true)) {
+      return (0, _util.hexToBn)(value, {
+        isLe: false,
+        isNegative
+      }).toString();
+    }
+
     (0, _util.assert)(!(value.includes('.') || value.includes(',') || value.includes('e')), 'String should not contain decimal points or scientific notation');
+    return value;
+  } else if ((0, _util.isBn)(value)) {
+    return value.toString();
   }
 
   return (0, _util.bnToBn)(value).toString();
@@ -48,24 +52,25 @@ function decodeAbstractInt(value, isNegative) {
 
 class AbstractInt extends _util.BN {
   #bitLength;
-  #isSigned;
 
   constructor(registry) {
     let value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let bitLength = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : DEFAULT_UINT_BITS;
     let isSigned = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    // Construct via a string, which will be passed in the BN constructor.
+    // Construct via a string/number, which will be passed in the BN constructor.
     // It would be ideal to actually return a BN, but there is an issue:
     // https://github.com/indutny/bn.js/issues/206
     super( // shortcut isU8a as used in SCALE decoding
-    (0, _util.isU8a)(value) ? (0, _util.u8aToBn)(value.subarray(0, bitLength / 8), {
+    (0, _util.isU8a)(value) ? bitLength <= 48 ? (0, _util.u8aToNumber)(value.subarray(0, bitLength / 8), {
+      isNegative: isSigned
+    }) : (0, _util.u8aToBn)(value.subarray(0, bitLength / 8), {
       isLe: true,
       isNegative: isSigned
     }).toString() : decodeAbstractInt(value, isSigned));
     this.registry = registry;
     this.#bitLength = bitLength;
     this.encodedLength = this.#bitLength / 8;
-    this.#isSigned = isSigned;
+    this.isUnsigned = !isSigned;
     const isPositive = this.gte(_util.BN_ZERO);
     const maxBits = bitLength - (isSigned && isPositive ? 1 : 0);
     (0, _util.assert)(isSigned || isPositive, () => `${this.toRawType()}: Negative number passed to unsigned type`);
@@ -87,14 +92,6 @@ class AbstractInt extends _util.BN {
   get isEmpty() {
     return this.isZero();
   }
-  /**
-   * @description Checks if the value is an unsigned type
-   */
-
-
-  get isUnsigned() {
-    return !this.#isSigned;
-  }
   /**
    * @description Returns the number of bits in the value
    */
@@ -114,7 +111,7 @@ class AbstractInt extends _util.BN {
     // number and BN inputs (no `.eqn` needed) - numbers will be converted
     return super.eq((0, _util.isHex)(other) ? (0, _util.hexToBn)(other.toString(), {
       isLe: false,
-      isNegative: this.#isSigned
+      isNegative: !this.isUnsigned
     }) : (0, _util.bnToBn)(other));
   }
   /**

package/cjs/abstract/index.js

@@ -6,16 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "AbstractArray", {
   enumerable: true,
   get: function () {
-    return _AbstractArray.AbstractArray;
+    return _Array.AbstractArray;
+  }
+});
+Object.defineProperty(exports, "AbstractBase", {
+  enumerable: true,
+  get: function () {
+    return _Base.AbstractBase;
   }
 });
 Object.defineProperty(exports, "AbstractInt", {
   enumerable: true,
   get: function () {
-    return _AbstractInt.AbstractInt;
+    return _Int.AbstractInt;
   }
 });
 
-var _AbstractArray = require("./AbstractArray");
+var _Array = require("./Array");
+
+var _Base = require("./Base");
 
-var _AbstractInt = require("./AbstractInt");
+var _Int = require("./Int");

package/cjs/base/Compact.js

@@ -14,6 +14,20 @@ var _utils = require("../utils");
 function noopSetDefinition(d) {
   return d;
 }
+
+function decodeCompact(registry, Type, value) {
+  if ((0, _util.isU8a)(value)) {
+    const [decodedLength, bn] = (value[0] & 0b11) < 0b11 ? (0, _util.compactFromU8aLim)(value) : (0, _util.compactFromU8a)(value);
+    return [new Type(registry, bn), decodedLength];
+  } else if (value instanceof Compact) {
+    const raw = value.unwrap();
+    return raw instanceof Type ? [raw, 0] : [new Type(registry, raw), 0];
+  } else if (value instanceof Type) {
+    return [value, 0];
+  }
+
+  return [new Type(registry, value), 0];
+}
 /**
  * @name Compact
  * @description
@@ -36,7 +50,7 @@ class Compact {
     } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     this.registry = registry;
     this.#Type = definition || setDefinition((0, _utils.typeToConstructor)(registry, Type));
-    const [raw, decodedLength] = Compact.decodeCompact(registry, this.#Type, value);
+    const [raw, decodedLength] = decodeCompact(registry, this.#Type, value);
     this.initialU8aLength = decodedLength;
     this.#raw = raw;
   }
@@ -56,21 +70,6 @@ class Compact {
 
     };
   }
-  /** @internal */
-
-
-  static decodeCompact(registry, Type, value) {
-    if ((0, _util.isU8a)(value)) {
-      const [decodedLength, bn] = (0, _util.compactFromU8a)(value);
-      return [new Type(registry, bn), decodedLength];
-    } else if (value instanceof Compact) {
-      return [new Type(registry, value.#raw), 0];
-    } else if (value instanceof Type) {
-      return [value, 0];
-    }
-
-    return [new Type(registry, value), 0];
-  }
   /**
    * @description The length of the value when encoded as a Uint8Array
    */

package/cjs/base/Enum.js

@@ -89,7 +89,7 @@ function createFromValue(registry, def) {
   (0, _util.assert)(!(0, _util.isUndefined)(entry), () => `Unable to create Enum via index ${index}, in ${Object.keys(def).join(', ')}`);
   return {
     index,
-    value: (0, _util.isCodec)(value) && value instanceof entry.Type ? value : new entry.Type(registry, value)
+    value: value instanceof entry.Type ? value : new entry.Type(registry, value)
   };
 }
 
@@ -171,7 +171,7 @@ class Enum {
       } = _ref2;
       return index;
     });
-    this.#entryIndex = this.#indexes.indexOf(decoded.index) || 0;
+    this.#entryIndex = this.#indexes.indexOf(decoded.index);
     this.#raw = decoded.value;
 
     if (this.#raw.initialU8aLength) {
@@ -185,7 +185,7 @@ class Enum {
     const isKeys = new Array(keys.length);
 
     for (let i = 0; i < keys.length; i++) {
-      const name = (0, _util.stringPascalCase)(keys[i].replace(' ', '_'));
+      const name = (0, _util.stringPascalCase)(keys[i]);
       asKeys[i] = `as${name}`;
       isKeys[i] = `is${name}`;
     }
@@ -321,7 +321,7 @@ class Enum {
       return this.type === other;
     } else if ((0, _util.isHex)(other)) {
       return this.toHex() === other;
-    } else if ((0, _util.isCodec)(other) && other instanceof Enum) {
+    } else if (other instanceof Enum) {
       return this.index === other.index && this.value.eq(other.value);
     } else if ((0, _util.isObject)(other)) {
       return this.value.eq(other[this.type]);
@@ -336,7 +336,7 @@ class Enum {
 
 
   inspect() {
-    if (this.isBasic) {
+    if (this.#isBasic) {
       return {
         outer: [new Uint8Array([this.index])]
       };

package/cjs/base/Int.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Int = void 0;
 
-var _AbstractInt = require("../abstract/AbstractInt");
+var _Int = require("../abstract/Int");
 
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -20,7 +20,7 @@ var _AbstractInt = require("../abstract/AbstractInt");
  * is available here.
  * @noInheritDoc
  */
-class Int extends _AbstractInt.AbstractInt {
+class Int extends _Int.AbstractInt {
   constructor(registry) {
     let value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let bitLength = arguments.length > 2 ? arguments[2] : undefined;

package/cjs/base/Null.js

@@ -16,20 +16,14 @@ var _util = require("@polkadot/util");
  * Implements a type that does not contain anything (apart from `null`)
  */
 class Null {
+  encodedLength = 0;
+  isEmpty = true;
   // Added for compatibility reasons, e.g. see Option
   initialU8aLength = 0;
 
   constructor(registry) {
     this.registry = registry;
   }
-  /**
-   * @description The length of the value when encoded as a Uint8Array
-   */
-
-
-  get encodedLength() {
-    return 0;
-  }
   /**
    * @description returns a hash of the contents
    */
@@ -38,14 +32,6 @@ class Null {
   get hash() {
     throw new Error('.hash is not implemented on Null');
   }
-  /**
-   * @description Checks if the value is an empty value (always true)
-   */
-
-
-  get isEmpty() {
-    return true;
-  }
   /**
    * @description Compares the value of the input to see if there is a match
    */

package/cjs/base/Option.js

@@ -67,7 +67,6 @@ function decodeOption(registry, Type, value) {
 
 class Option {
   #Type;
-  #initialU8aLength;
   #raw;
 
   constructor(registry, typeName, value) {
@@ -82,7 +81,7 @@ class Option {
     this.#raw = decoded;
 
     if (decoded && decoded.initialU8aLength) {
-      this.#initialU8aLength = 1 + decoded.initialU8aLength;
+      this.initialU8aLength = 1 + decoded.initialU8aLength;
     }
   }
 
@@ -113,14 +112,6 @@ class Option {
     // boolean byte (has value, doesn't have) along with wrapped length
     return 1 + this.#raw.encodedLength;
   }
-  /**
-   * @description The length of the initial encoded value (Only available when constructed from a Uint8Array)
-   */
-
-
-  get initialU8aLength() {
-    return this.#initialU8aLength;
-  }
   /**
    * @description returns a hash of the contents
    */

package/cjs/base/Tuple.js

@@ -7,7 +7,7 @@ exports.Tuple = void 0;
 
 var _util = require("@polkadot/util");
 
-var _AbstractArray = require("../abstract/AbstractArray");
+var _Array = require("../abstract/Array");
 
 var _utils = require("../utils");
 
@@ -19,7 +19,7 @@ function noopSetDefinition(d) {
 /** @internal */
 
 
-function decodeTuple(registry, result, Classes, value) {
+function decodeTuple(registry, result, value, Classes) {
   if ((0, _util.isU8a)(value) || (0, _util.isHex)(value)) {
     return (0, _utils.decodeU8a)(registry, result, (0, _util.u8aToU8a)(value), Classes);
   }
@@ -45,7 +45,7 @@ function decodeTuple(registry, result, Classes, value) {
  */
 
 
-class Tuple extends _AbstractArray.AbstractArray {
+class Tuple extends _Array.AbstractArray {
   #Types;
 
   constructor(registry, Types, value) {
@@ -55,8 +55,7 @@ class Tuple extends _AbstractArray.AbstractArray {
     } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     const Classes = definition || setDefinition(Array.isArray(Types) ? [Types.map(t => (0, _utils.typeToConstructor)(registry, t)), []] : (0, _util.isFunction)(Types) || (0, _util.isString)(Types) ? [[(0, _utils.typeToConstructor)(registry, Types)], []] : (0, _utils.mapToTypeMap)(registry, Types));
     super(registry, Classes[0].length);
-    const [, decodedLength] = (0, _util.isU8a)(value) ? (0, _utils.decodeU8a)(registry, this, value, Classes, false) : decodeTuple(registry, this, Classes, value);
-    this.initialU8aLength = decodedLength;
+    this.initialU8aLength = ((0, _util.isU8a)(value) ? (0, _utils.decodeU8a)(registry, this, value, Classes) : decodeTuple(registry, this, value, Classes))[1];
     this.#Types = Classes;
   }
 

package/cjs/base/UInt.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.UInt = void 0;
 
-var _AbstractInt = require("../abstract/AbstractInt");
+var _Int = require("../abstract/Int");
 
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -20,7 +20,7 @@ var _AbstractInt = require("../abstract/AbstractInt");
  * is available here.
  * @noInheritDoc
  */
-class UInt extends _AbstractInt.AbstractInt {
+class UInt extends _Int.AbstractInt {
   static with(bitLength, typeName) {
     return class extends UInt {
       constructor(registry, value) {

package/cjs/base/Vec.js

@@ -8,7 +8,7 @@ exports.decodeVec = decodeVec;
 
 var _util = require("@polkadot/util");
 
-var _AbstractArray = require("../abstract/AbstractArray");
+var _Array = require("../abstract/Array");
 
 var _utils = require("../utils");
 
@@ -61,7 +61,7 @@ function decodeVec(registry, result, value, startAt, Type) {
  */
 
 
-class Vec extends _AbstractArray.AbstractArray {
+class Vec extends _Array.AbstractArray {
   #Type;
 
   constructor(registry, Type) {
@@ -73,8 +73,7 @@ class Vec extends _AbstractArray.AbstractArray {
     const [decodeFrom, length, startAt] = decodeVecLength(value);
     super(registry, length);
     this.#Type = definition || setDefinition((0, _utils.typeToConstructor)(registry, Type));
-    const [decodedLength] = (0, _util.isU8a)(decodeFrom) ? (0, _utils.decodeU8aVec)(registry, this, decodeFrom, startAt, this.#Type) : decodeVec(registry, this, decodeFrom, startAt, this.#Type);
-    this.initialU8aLength = decodedLength;
+    this.initialU8aLength = ((0, _util.isU8a)(decodeFrom) ? (0, _utils.decodeU8aVec)(registry, this, decodeFrom, startAt, this.#Type) : decodeVec(registry, this, decodeFrom, startAt, this.#Type))[0];
   }
 
   static with(Type) {

package/cjs/base/VecAny.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.VecAny = void 0;
 
-var _AbstractArray = require("../abstract/AbstractArray");
+var _Array = require("../abstract/Array");
 
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -17,7 +17,7 @@ var _AbstractArray = require("../abstract/AbstractArray");
  * a vector, this can be used to manage array-like structures with variable arguments of
  * any types
  */
-class VecAny extends _AbstractArray.AbstractArray {
+class VecAny extends _Array.AbstractArray {
   /**
    * @description Returns the base runtime type name for this instance
    */

package/cjs/base/VecFixed.js

@@ -7,7 +7,7 @@ exports.VecFixed = void 0;
 
 var _util = require("@polkadot/util");
 
-var _AbstractArray = require("../abstract/AbstractArray");
+var _Array = require("../abstract/Array");
 
 var _utils = require("../utils");
 
@@ -25,7 +25,7 @@ function noopSetDefinition(d) {
  */
 
 
-class VecFixed extends _AbstractArray.AbstractArray {
+class VecFixed extends _Array.AbstractArray {
   #Type;
 
   constructor(registry, Type, length) {
@@ -36,8 +36,7 @@ class VecFixed extends _AbstractArray.AbstractArray {
     } = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
     super(registry, length);
     this.#Type = definition || setDefinition((0, _utils.typeToConstructor)(registry, Type));
-    const [, decodedLengthNoOffset] = (0, _util.isU8a)(value) ? (0, _utils.decodeU8aVec)(registry, this, value, 0, this.#Type) : (0, _Vec.decodeVec)(registry, this, value, 0, this.#Type);
-    this.initialU8aLength = decodedLengthNoOffset;
+    this.initialU8aLength = ((0, _util.isU8a)(value) ? (0, _utils.decodeU8aVec)(registry, this, value, 0, this.#Type) : (0, _Vec.decodeVec)(registry, this, value, 0, this.#Type))[1];
   }
 
   static with(Type, length) {

package/cjs/base/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "Base", {
-  enumerable: true,
-  get: function () {
-    return _Base.Base;
-  }
-});
 Object.defineProperty(exports, "Compact", {
   enumerable: true,
   get: function () {
@@ -82,8 +76,6 @@ Object.defineProperty(exports, "VecFixed", {
   }
 });
 
-var _Base = require("./Base");
-
 var _Compact = require("./Compact");
 
 var _DoNotConstruct = require("./DoNotConstruct");

package/cjs/extended/Bytes.js

@@ -38,7 +38,7 @@ function decodeBytesU8a(value) {
 
 class Bytes extends _Raw.Raw {
   constructor(registry, value) {
-    const [u8a, decodedLength] = (0, _util.isU8a)(value) && !((0, _util.isCodec)(value) && value instanceof _Raw.Raw) ? decodeBytesU8a(value) : Array.isArray(value) || (0, _util.isString)(value) ? [(0, _util.u8aToU8a)(value), 0] : [value, 0];
+    const [u8a, decodedLength] = (0, _util.isU8a)(value) && !(value instanceof _Raw.Raw) ? decodeBytesU8a(value) : Array.isArray(value) || (0, _util.isString)(value) ? [(0, _util.u8aToU8a)(value), 0] : [value, 0];
     super(registry, u8a, decodedLength);
   }
   /**

package/cjs/extended/Map.js

@@ -7,7 +7,7 @@ exports.CodecMap = void 0;
 
 var _util = require("@polkadot/util");
 
-var _AbstractArray = require("../abstract/AbstractArray");
+var _Array = require("../abstract/Array");
 
 var _Enum = require("../base/Enum");
 
@@ -44,7 +44,7 @@ function decodeMapFromMap(registry, KeyClass, ValClass, value) {
   const output = new Map();
 
   for (const [key, val] of value.entries()) {
-    const isComplex = KeyClass.prototype instanceof _AbstractArray.AbstractArray || KeyClass.prototype instanceof _Struct.Struct || KeyClass.prototype instanceof _Enum.Enum;
+    const isComplex = KeyClass.prototype instanceof _Array.AbstractArray || KeyClass.prototype instanceof _Struct.Struct || KeyClass.prototype instanceof _Enum.Enum;
 
     try {
       output.set(key instanceof KeyClass ? key : new KeyClass(registry, isComplex ? JSON.parse(key) : key), val instanceof ValClass ? val : new ValClass(registry, val));

package/cjs/extended/OptionBool.js

@@ -29,6 +29,7 @@ function decodeU8a(registry, value) {
 class OptionBool extends _Option.Option {
   constructor(registry, value) {
     super(registry, _Bool.bool, (0, _util.isU8a)(value) || (0, _util.isHex)(value) ? decodeU8a(registry, (0, _util.u8aToU8a)(value)) : value);
+    this.initialU8aLength = 1;
   }
   /**
    * @description The length of the value when encoded as a Uint8Array
@@ -38,14 +39,6 @@ class OptionBool extends _Option.Option {
   get encodedLength() {
     return 1;
   }
-  /**
-   * @description The length of the initial encoded value (Only available when constructed from a Uint8Array)
-   */
-
-
-  get initialU8aLength() {
-    return 1;
-  }
   /**
    * @description Checks if the value is an empty value (always false)
    */

package/cjs/native/Struct.js

@@ -82,7 +82,6 @@ function decodeStructFromObject(registry, _ref, value, jsonMap) {
 
 
 class Struct extends Map {
-  #registry;
   #jsonMap;
   #Types;
 
@@ -93,10 +92,10 @@ class Struct extends Map {
       setDefinition = noopSetDefinition
     } = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
     const typeMap = definition || setDefinition((0, _utils.mapToTypeMap)(registry, Types));
-    const [decoded, decodedLength] = (0, _util.isU8a)(value) || (0, _util.isHex)(value) ? (0, _utils.decodeU8a)(registry, new Array(typeMap[0].length), (0, _util.u8aToU8a)(value), typeMap, true) : value instanceof Struct ? [value, 0] : decodeStructFromObject(registry, typeMap, value || {}, jsonMap);
+    const [decoded, decodedLength] = (0, _util.isU8a)(value) || (0, _util.isHex)(value) ? (0, _utils.decodeU8aStruct)(registry, new Array(typeMap[0].length), (0, _util.u8aToU8a)(value), typeMap) : value instanceof Struct ? [value, 0] : decodeStructFromObject(registry, typeMap, value || {}, jsonMap);
     super(decoded);
-    this.#registry = registry;
     this.initialU8aLength = decodedLength;
+    this.registry = registry;
     this.#jsonMap = jsonMap;
     this.#Types = typeMap;
   }
@@ -181,10 +180,6 @@ class Struct extends Map {
   get hash() {
     return this.registry.hash(this.toU8a());
   }
-
-  get registry() {
-    return this.#registry;
-  }
   /**
    * @description Compares the value of the input to see if there is a match
    */

package/cjs/native/Text.js

@@ -48,14 +48,13 @@ function decodeText(value) {
 
 
 class Text extends String {
-  #initialU8aLength;
   #override = null;
 
   constructor(registry, value) {
     const [str, decodedLength] = decodeText(value);
     super(str);
     this.registry = registry;
-    this.#initialU8aLength = decodedLength;
+    this.initialU8aLength = decodedLength;
   }
   /**
    * @description The length of the value when encoded as a Uint8Array
@@ -65,14 +64,6 @@ class Text extends String {
   get encodedLength() {
     return this.toU8a().length;
   }
-  /**
-   * @description The length of the initial encoded value (Only available when constructed from a Uint8Array)
-   */
-
-
-  get initialU8aLength() {
-    return this.#initialU8aLength;
-  }
   /**
    * @description returns a hash of the contents
    */

package/cjs/packageInfo.js

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