@polkadot/types-codec 8.3.3-13 → 8.3.3-16

package/abstract/AbstractInt.js

@@ -14,13 +14,8 @@ function toPercentage(value, divisor) {
 /** @internal */
 
 
-function decodeAbstractInt(value, bitLength, isNegative) {
-  if (isU8a(value)) {
-    return u8aToBn(value.subarray(0, bitLength / 8), {
-      isLe: true,
-      isNegative
-    }).toString();
-  } else if (isBn(value)) {
+function decodeAbstractInt(value, isNegative) {
+  if (isBn(value)) {
     return value.toString();
   } else if (isHex(value, -1, true)) {
     return hexToBn(value, {
@@ -54,7 +49,7 @@ export class AbstractInt extends BN {
     isU8a(value) ? u8aToBn(value.subarray(0, bitLength / 8), {
       isLe: true,
       isNegative: isSigned
-    }).toString() : decodeAbstractInt(value, bitLength, isSigned));
+    }).toString() : decodeAbstractInt(value, isSigned));
     this.registry = registry;
     this.#bitLength = bitLength;
     this.encodedLength = this.#bitLength / 8;

package/base/Enum.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, isHex, isNumber, isObject, isString, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, stringPascalCase, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { assert, isCodec, isHex, isNumber, isObject, isString, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, stringPascalCase, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { mapToTypeMap, typesToMap } from "../utils/index.js";
 import { Null } from "./Null.js"; // export interface, this is used in Enum.with, so required as public by TS
 
@@ -72,7 +72,7 @@ function createFromValue(registry, def, index = 0, value) {
   assert(!isUndefined(entry), () => `Unable to create Enum via index ${index}, in ${Object.keys(def).join(', ')}`);
   return {
     index,
-    value: value instanceof entry.Type ? value : new entry.Type(registry, value)
+    value: isCodec(value) && value instanceof entry.Type ? value : new entry.Type(registry, value)
   };
 }
 
@@ -241,7 +241,7 @@ export class Enum {
 
 
   get isNull() {
-    return this.#raw instanceof Null;
+    return this.isNone;
   }
   /**
    * @description The available keys for this enum
@@ -290,7 +290,7 @@ export class Enum {
       return this.type === other;
     } else if (isHex(other)) {
       return this.toHex() === other;
-    } else if (other instanceof Enum) {
+    } else if (isCodec(other) && other instanceof Enum) {
       return this.index === other.index && this.value.eq(other.value);
     } else if (isObject(other)) {
       return this.value.eq(other[this.type]);
@@ -393,7 +393,7 @@ export class Enum {
 
 
   toString() {
-    return this.isNull ? this.type : stringify(this.toJSON());
+    return this.isNone ? this.type : stringify(this.toJSON());
   }
   /**
    * @description Encodes the value as a Uint8Array as per the SCALE specifications

package/cjs/abstract/AbstractInt.js

@@ -23,13 +23,8 @@ function toPercentage(value, divisor) {
 /** @internal */
 
 
-function decodeAbstractInt(value, bitLength, isNegative) {
-  if ((0, _util.isU8a)(value)) {
-    return (0, _util.u8aToBn)(value.subarray(0, bitLength / 8), {
-      isLe: true,
-      isNegative
-    }).toString();
-  } else if ((0, _util.isBn)(value)) {
+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, {
@@ -66,7 +61,7 @@ class AbstractInt extends _util.BN {
     (0, _util.isU8a)(value) ? (0, _util.u8aToBn)(value.subarray(0, bitLength / 8), {
       isLe: true,
       isNegative: isSigned
-    }).toString() : decodeAbstractInt(value, bitLength, isSigned));
+    }).toString() : decodeAbstractInt(value, isSigned));
     this.registry = registry;
     this.#bitLength = bitLength;
     this.encodedLength = this.#bitLength / 8;

package/cjs/base/Enum.js

@@ -86,7 +86,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: value instanceof entry.Type ? value : new entry.Type(registry, value)
+    value: (0, _util.isCodec)(value) && value instanceof entry.Type ? value : new entry.Type(registry, value)
   };
 }
 
@@ -258,7 +258,7 @@ class Enum {
 
 
   get isNull() {
-    return this.#raw instanceof _Null.Null;
+    return this.isNone;
   }
   /**
    * @description The available keys for this enum
@@ -307,7 +307,7 @@ class Enum {
       return this.type === other;
     } else if ((0, _util.isHex)(other)) {
       return this.toHex() === other;
-    } else if (other instanceof Enum) {
+    } else if ((0, _util.isCodec)(other) && 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]);
@@ -411,7 +411,7 @@ class Enum {
 
 
   toString() {
-    return this.isNull ? this.type : (0, _util.stringify)(this.toJSON());
+    return this.isNone ? this.type : (0, _util.stringify)(this.toJSON());
   }
   /**
    * @description Encodes the value as a Uint8Array as per the SCALE specifications

package/cjs/extended/BTreeSet.js

@@ -23,7 +23,7 @@ function decodeSetFromU8a(registry, ValClass, u8a) {
     output.add(values[i]);
   }
 
-  return [output, decodedLength];
+  return [ValClass, output, decodedLength];
 }
 /** @internal */
 
@@ -38,7 +38,7 @@ function decodeSetFromSet(registry, ValClass, value) {
       throw error;
     }
   });
-  return [output, 0];
+  return [ValClass, output, 0];
 }
 /**
  * Decode input to pass into constructor.
@@ -57,13 +57,11 @@ function decodeSetFromSet(registry, ValClass, value) {
 
 
 function decodeSet(registry, valType, value) {
-  if (!value) {
-    return [new Set(), 0];
-  }
-
   const ValClass = (0, _utils.typeToConstructor)(registry, valType);
 
-  if ((0, _util.isU8a)(value) || (0, _util.isHex)(value)) {
+  if (!value) {
+    return [ValClass, new Set(), 0];
+  } else if ((0, _util.isU8a)(value) || (0, _util.isHex)(value)) {
     return decodeSetFromU8a(registry, ValClass, (0, _util.u8aToU8a)(value));
   } else if (Array.isArray(value) || value instanceof Set) {
     return decodeSetFromSet(registry, ValClass, value);
@@ -76,11 +74,11 @@ class BTreeSet extends Set {
   #ValClass;
 
   constructor(registry, valType, rawValue) {
-    const [values, decodedLength] = decodeSet(registry, valType, rawValue);
+    const [ValClass, values, decodedLength] = decodeSet(registry, valType, rawValue);
     super((0, _utils.sortSet)(values));
     this.registry = registry;
     this.initialU8aLength = decodedLength;
-    this.#ValClass = (0, _utils.typeToConstructor)(registry, valType);
+    this.#ValClass = ValClass;
   }
 
   static with(valType) {

package/cjs/extended/Bytes.js

@@ -27,20 +27,6 @@ function decodeBytesU8a(value) {
   (0, _util.assert)(total <= value.length, () => `Bytes: required length less than remainder, expected at least ${total}, found ${value.length}`);
   return [value.subarray(offset, total), total];
 }
-/** @internal */
-
-
-function decodeBytes(value) {
-  if (Array.isArray(value) || (0, _util.isString)(value)) {
-    return [(0, _util.u8aToU8a)(value), 0];
-  } else if (!(value instanceof _Raw.Raw) && (0, _util.isU8a)(value)) {
-    // We are ensuring we are not a Raw instance. In the case of a Raw we already have gotten
-    // rid of the length, i.e. new Bytes(new Bytes(...)) will work as expected
-    return decodeBytesU8a(value);
-  }
-
-  return [value, 0];
-}
 /**
  * @name Bytes
  * @description
@@ -52,7 +38,7 @@ function decodeBytes(value) {
 
 class Bytes extends _Raw.Raw {
   constructor(registry, value) {
-    const [u8a, decodedLength] = decodeBytes(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];
     super(registry, u8a, decodedLength);
   }
   /**

package/cjs/extended/Map.js

@@ -36,7 +36,7 @@ function decodeMapFromU8a(registry, KeyClass, ValClass, u8a) {
     output.set(values[i], values[i + 1]);
   }
 
-  return [output, offset + decodedLength];
+  return [KeyClass, ValClass, output, offset + decodedLength];
 }
 /** @internal */
 
@@ -55,7 +55,7 @@ function decodeMapFromMap(registry, KeyClass, ValClass, value) {
     }
   }
 
-  return [output, 0];
+  return [KeyClass, ValClass, output, 0];
 }
 /**
  * Decode input to pass into constructor.
@@ -79,7 +79,7 @@ function decodeMap(registry, keyType, valType, value) {
   const ValClass = (0, _utils.typeToConstructor)(registry, valType);
 
   if (!value) {
-    return [new Map(), 0];
+    return [KeyClass, ValClass, new Map(), 0];
   } else if ((0, _util.isU8a)(value) || (0, _util.isHex)(value)) {
     return decodeMapFromU8a(registry, KeyClass, ValClass, (0, _util.u8aToU8a)(value));
   } else if (value instanceof Map) {
@@ -98,12 +98,12 @@ class CodecMap extends Map {
 
   constructor(registry, keyType, valType, rawValue) {
     let type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'HashMap';
-    const [decoded, decodedLength] = decodeMap(registry, keyType, valType, rawValue);
+    const [KeyClass, ValClass, decoded, decodedLength] = decodeMap(registry, keyType, valType, rawValue);
     super(type === 'BTreeMap' ? (0, _utils.sortMap)(decoded) : decoded);
     this.registry = registry;
     this.initialU8aLength = decodedLength;
-    this.#KeyClass = (0, _utils.typeToConstructor)(registry, keyType);
-    this.#ValClass = (0, _utils.typeToConstructor)(registry, valType);
+    this.#KeyClass = KeyClass;
+    this.#ValClass = ValClass;
     this.#type = type;
   }
   /**

package/cjs/native/Bool.js

@@ -10,29 +10,17 @@ var _util = require("@polkadot/util");
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-/** @internal */
-function decodeBool(value) {
-  if ((0, _util.isU8a)(value)) {
-    return value[0] === 1;
-  } else if (value instanceof Boolean) {
-    return value.valueOf();
-  }
-
-  return !!value;
-}
 /**
  * @name bool
  * @description
  * Representation for a boolean value in the system. It extends the base JS `Boolean` class
  * @noInheritDoc
  */
-
-
 class bool extends Boolean {
   // eslint-disable-next-line @typescript-eslint/ban-types
   constructor(registry) {
     let value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    super(decodeBool(value));
+    super((0, _util.isU8a)(value) ? value[0] === 1 : value instanceof Boolean ? value.valueOf() : !!value);
     this.registry = registry;
   }
   /**

package/cjs/native/Date.js

@@ -13,7 +13,7 @@ const BITLENGTH = 64;
 
 function decodeDate(value) {
   if ((0, _util.isU8a)(value)) {
-    value = (0, _util.u8aToBn)(value.subarray(0, BITLENGTH / 8), true);
+    value = (0, _util.u8aToBn)(value.subarray(0, BITLENGTH / 8));
   } else if (value instanceof Date) {
     return value;
   } else if ((0, _util.isString)(value)) {

package/cjs/native/Text.js

@@ -45,8 +45,6 @@ function decodeText(value) {
  * object, inheriting all methods exposed from `String`.
  * @noInheritDoc
  */
-// TODO
-//   - Strings should probably be trimmed (docs do come through with extra padding)
 
 
 class Text extends String {

package/cjs/packageInfo.js

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

package/extended/BTreeSet.js

@@ -14,7 +14,7 @@ function decodeSetFromU8a(registry, ValClass, u8a) {
     output.add(values[i]);
   }
 
-  return [output, decodedLength];
+  return [ValClass, output, decodedLength];
 }
 /** @internal */
 
@@ -29,7 +29,7 @@ function decodeSetFromSet(registry, ValClass, value) {
       throw error;
     }
   });
-  return [output, 0];
+  return [ValClass, output, 0];
 }
 /**
  * Decode input to pass into constructor.
@@ -48,13 +48,11 @@ function decodeSetFromSet(registry, ValClass, value) {
 
 
 function decodeSet(registry, valType, value) {
-  if (!value) {
-    return [new Set(), 0];
-  }
-
   const ValClass = typeToConstructor(registry, valType);
 
-  if (isU8a(value) || isHex(value)) {
+  if (!value) {
+    return [ValClass, new Set(), 0];
+  } else if (isU8a(value) || isHex(value)) {
     return decodeSetFromU8a(registry, ValClass, u8aToU8a(value));
   } else if (Array.isArray(value) || value instanceof Set) {
     return decodeSetFromSet(registry, ValClass, value);
@@ -67,11 +65,11 @@ export class BTreeSet extends Set {
   #ValClass;
 
   constructor(registry, valType, rawValue) {
-    const [values, decodedLength] = decodeSet(registry, valType, rawValue);
+    const [ValClass, values, decodedLength] = decodeSet(registry, valType, rawValue);
     super(sortSet(values));
     this.registry = registry;
     this.initialU8aLength = decodedLength;
-    this.#ValClass = typeToConstructor(registry, valType);
+    this.#ValClass = ValClass;
   }
 
   static with(valType) {

package/extended/Bytes.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, compactAddLength, compactFromU8a, compactToU8a, isString, isU8a, u8aToU8a } from '@polkadot/util';
+import { assert, compactAddLength, compactFromU8a, compactToU8a, isCodec, isString, isU8a, u8aToU8a } from '@polkadot/util';
 import { Raw } from "../native/Raw.js"; // Bytes are used for things like on-chain code, so it has a healthy limit
 
 const MAX_LENGTH = 10 * 1024 * 1024;
@@ -18,20 +18,6 @@ function decodeBytesU8a(value) {
   assert(total <= value.length, () => `Bytes: required length less than remainder, expected at least ${total}, found ${value.length}`);
   return [value.subarray(offset, total), total];
 }
-/** @internal */
-
-
-function decodeBytes(value) {
-  if (Array.isArray(value) || isString(value)) {
-    return [u8aToU8a(value), 0];
-  } else if (!(value instanceof Raw) && isU8a(value)) {
-    // We are ensuring we are not a Raw instance. In the case of a Raw we already have gotten
-    // rid of the length, i.e. new Bytes(new Bytes(...)) will work as expected
-    return decodeBytesU8a(value);
-  }
-
-  return [value, 0];
-}
 /**
  * @name Bytes
  * @description
@@ -43,7 +29,7 @@ function decodeBytes(value) {
 
 export class Bytes extends Raw {
   constructor(registry, value) {
-    const [u8a, decodedLength] = decodeBytes(value);
+    const [u8a, decodedLength] = isU8a(value) && !(isCodec(value) && value instanceof Raw) ? decodeBytesU8a(value) : Array.isArray(value) || isString(value) ? [u8aToU8a(value), 0] : [value, 0];
     super(registry, u8a, decodedLength);
   }
   /**

package/extended/Map.js

@@ -24,7 +24,7 @@ function decodeMapFromU8a(registry, KeyClass, ValClass, u8a) {
     output.set(values[i], values[i + 1]);
   }
 
-  return [output, offset + decodedLength];
+  return [KeyClass, ValClass, output, offset + decodedLength];
 }
 /** @internal */
 
@@ -43,7 +43,7 @@ function decodeMapFromMap(registry, KeyClass, ValClass, value) {
     }
   }
 
-  return [output, 0];
+  return [KeyClass, ValClass, output, 0];
 }
 /**
  * Decode input to pass into constructor.
@@ -67,7 +67,7 @@ function decodeMap(registry, keyType, valType, value) {
   const ValClass = typeToConstructor(registry, valType);
 
   if (!value) {
-    return [new Map(), 0];
+    return [KeyClass, ValClass, new Map(), 0];
   } else if (isU8a(value) || isHex(value)) {
     return decodeMapFromU8a(registry, KeyClass, ValClass, u8aToU8a(value));
   } else if (value instanceof Map) {
@@ -85,12 +85,12 @@ export class CodecMap extends Map {
   #type;
 
   constructor(registry, keyType, valType, rawValue, type = 'HashMap') {
-    const [decoded, decodedLength] = decodeMap(registry, keyType, valType, rawValue);
+    const [KeyClass, ValClass, decoded, decodedLength] = decodeMap(registry, keyType, valType, rawValue);
     super(type === 'BTreeMap' ? sortMap(decoded) : decoded);
     this.registry = registry;
     this.initialU8aLength = decodedLength;
-    this.#KeyClass = typeToConstructor(registry, keyType);
-    this.#ValClass = typeToConstructor(registry, valType);
+    this.#KeyClass = KeyClass;
+    this.#ValClass = ValClass;
     this.#type = type;
   }
   /**

package/native/Bool.js

@@ -1,17 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { isU8a, u8aToHex } from '@polkadot/util';
-/** @internal */
-
-function decodeBool(value) {
-  if (isU8a(value)) {
-    return value[0] === 1;
-  } else if (value instanceof Boolean) {
-    return value.valueOf();
-  }
-
-  return !!value;
-}
 /**
  * @name bool
  * @description
@@ -19,11 +8,10 @@ function decodeBool(value) {
  * @noInheritDoc
  */
 
-
 export class bool extends Boolean {
   // eslint-disable-next-line @typescript-eslint/ban-types
   constructor(registry, value = false) {
-    super(decodeBool(value));
+    super(isU8a(value) ? value[0] === 1 : value instanceof Boolean ? value.valueOf() : !!value);
     this.registry = registry;
   }
   /**

package/native/Date.js

@@ -5,7 +5,7 @@ const BITLENGTH = 64;
 
 function decodeDate(value) {
   if (isU8a(value)) {
-    value = u8aToBn(value.subarray(0, BITLENGTH / 8), true);
+    value = u8aToBn(value.subarray(0, BITLENGTH / 8));
   } else if (value instanceof Date) {
     return value;
   } else if (isString(value)) {

package/native/Text.js

@@ -36,8 +36,6 @@ function decodeText(value) {
  * object, inheriting all methods exposed from `String`.
  * @noInheritDoc
  */
-// TODO
-//   - Strings should probably be trimmed (docs do come through with extra padding)
 
 
 export class Text extends String {

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.3.3-13",
+  "version": "8.3.3-16",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -410,6 +410,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/util": "^9.1.2-11"
+    "@polkadot/util": "^9.2.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.3.3-13'
+  version: '8.3.3-16'
 };