@polkadot/types-codec 8.5.2-7 → 8.6.1

package/abstract/AbstractArray.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { compactToU8a, u8aConcat, u8aToHex } from '@polkadot/util';
+import { compactToU8a, u8aConcatStrict, u8aToHex } from '@polkadot/util';
 import { compareArray } from "../utils/compareArray.js";
 /**
  * @name AbstractArray
@@ -154,7 +154,7 @@ export class AbstractArray extends Array {
 
   toU8a(isBare) {
     const encoded = this.toU8aInner();
-    return isBare ? u8aConcat(...encoded) : u8aConcat(compactToU8a(this.length), ...encoded);
+    return isBare ? u8aConcatStrict(encoded) : u8aConcatStrict([compactToU8a(this.length), ...encoded]);
   }
 
   toU8aInner(isBare) {

package/base/Enum.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, isCodec, 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, u8aConcatStrict, 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
 
@@ -416,7 +416,7 @@ export class Enum {
 
 
   toU8a(isBare) {
-    return u8aConcat(new Uint8Array(isBare ? [] : [this.index]), this.#raw.toU8a(isBare));
+    return isBare ? this.#raw.toU8a(isBare) : u8aConcatStrict([new Uint8Array([this.index]), this.#raw.toU8a(isBare)]);
   }
 
 }

package/base/Tuple.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { isFunction, isHex, isString, isU8a, stringify, u8aConcat, u8aToU8a } from '@polkadot/util';
+import { isFunction, isHex, isString, isU8a, stringify, u8aConcatStrict, u8aToU8a } from '@polkadot/util';
 import { AbstractArray } from "../abstract/AbstractArray.js";
 import { decodeU8a, mapToTypeMap, typeToConstructor } from "../utils/index.js";
 
@@ -122,7 +122,7 @@ export class Tuple extends AbstractArray {
 
 
   toU8a(isBare) {
-    return u8aConcat(...this.toU8aInner(isBare));
+    return u8aConcatStrict(this.toU8aInner(isBare));
   }
 
 }

package/base/Vec.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, compactFromU8a, isU8a, logger, u8aToU8a } from '@polkadot/util';
+import { assert, compactFromU8aLim, isU8a, logger, u8aToU8a } from '@polkadot/util';
 import { AbstractArray } from "../abstract/AbstractArray.js";
 import { decodeU8aVec, typeToConstructor } from "../utils/index.js";
 const MAX_LENGTH = 64 * 1024;
@@ -16,9 +16,9 @@ function decodeVecLength(value) {
   }
 
   const u8a = u8aToU8a(value);
-  const [startAt, length] = compactFromU8a(u8a);
-  assert(length.lten(MAX_LENGTH), () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
-  return [u8a, length.toNumber(), startAt];
+  const [startAt, length] = compactFromU8aLim(u8a);
+  assert(length <= MAX_LENGTH, () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
+  return [u8a, length, startAt];
 }
 
 export function decodeVec(registry, result, value, startAt, Type) {

package/base/VecFixed.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { isU8a, u8aConcat } from '@polkadot/util';
+import { isU8a, u8aConcatStrict } from '@polkadot/util';
 import { AbstractArray } from "../abstract/AbstractArray.js";
 import { decodeU8aVec, typeToConstructor } from "../utils/index.js";
 import { decodeVec } from "./Vec.js";
@@ -80,7 +80,7 @@ export class VecFixed extends AbstractArray {
     // we override, we don't add the length prefix for ourselves, and at the same time we
     // ignore isBare on entries, since they should be properly encoded at all times
     const encoded = this.toU8aInner();
-    return encoded.length ? u8aConcat(...encoded) : new Uint8Array([]);
+    return encoded.length ? u8aConcatStrict(encoded) : new Uint8Array([]);
   }
   /**
    * @description Returns the base runtime type name for this instance

package/cjs/abstract/AbstractArray.js

@@ -163,7 +163,7 @@ class AbstractArray extends Array {
 
   toU8a(isBare) {
     const encoded = this.toU8aInner();
-    return isBare ? (0, _util.u8aConcat)(...encoded) : (0, _util.u8aConcat)((0, _util.compactToU8a)(this.length), ...encoded);
+    return isBare ? (0, _util.u8aConcatStrict)(encoded) : (0, _util.u8aConcatStrict)([(0, _util.compactToU8a)(this.length), ...encoded]);
   }
 
   toU8aInner(isBare) {

package/cjs/base/Enum.js

@@ -435,7 +435,7 @@ class Enum {
 
 
   toU8a(isBare) {
-    return (0, _util.u8aConcat)(new Uint8Array(isBare ? [] : [this.index]), this.#raw.toU8a(isBare));
+    return isBare ? this.#raw.toU8a(isBare) : (0, _util.u8aConcatStrict)([new Uint8Array([this.index]), this.#raw.toU8a(isBare)]);
   }
 
 }

package/cjs/base/Tuple.js

@@ -132,7 +132,7 @@ class Tuple extends _AbstractArray.AbstractArray {
 
 
   toU8a(isBare) {
-    return (0, _util.u8aConcat)(...this.toU8aInner(isBare));
+    return (0, _util.u8aConcatStrict)(this.toU8aInner(isBare));
   }
 
 }

package/cjs/base/Vec.js

@@ -27,9 +27,9 @@ function decodeVecLength(value) {
   }
 
   const u8a = (0, _util.u8aToU8a)(value);
-  const [startAt, length] = (0, _util.compactFromU8a)(u8a);
-  (0, _util.assert)(length.lten(MAX_LENGTH), () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
-  return [u8a, length.toNumber(), startAt];
+  const [startAt, length] = (0, _util.compactFromU8aLim)(u8a);
+  (0, _util.assert)(length <= MAX_LENGTH, () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
+  return [u8a, length, startAt];
 }
 
 function decodeVec(registry, result, value, startAt, Type) {

package/cjs/base/VecFixed.js

@@ -92,7 +92,7 @@ class VecFixed extends _AbstractArray.AbstractArray {
     // we override, we don't add the length prefix for ourselves, and at the same time we
     // ignore isBare on entries, since they should be properly encoded at all times
     const encoded = this.toU8aInner();
-    return encoded.length ? (0, _util.u8aConcat)(...encoded) : new Uint8Array([]);
+    return encoded.length ? (0, _util.u8aConcatStrict)(encoded) : new Uint8Array([]);
   }
   /**
    * @description Returns the base runtime type name for this instance

package/cjs/extended/BTreeSet.js

@@ -16,8 +16,7 @@ const l = (0, _util.logger)('BTreeSet');
 
 function decodeSetFromU8a(registry, ValClass, u8a) {
   const output = new Set();
-  const [offset, length] = (0, _util.compactFromU8a)(u8a);
-  const count = length.toNumber();
+  const [offset, count] = (0, _util.compactFromU8aLim)(u8a);
   const result = new Array(count);
   const [decodedLength] = (0, _utils.decodeU8aVec)(registry, result, u8a, offset, ValClass);
 
@@ -223,7 +222,7 @@ class BTreeSet extends Set {
       encoded.push(v.toU8a(isBare));
     }
 
-    return (0, _util.u8aConcat)(...encoded);
+    return (0, _util.u8aConcatStrict)(encoded);
   }
 
 }

package/cjs/extended/BitVec.js

@@ -19,10 +19,10 @@ function decodeBitVecU8a(value) {
   } // handle all other Uint8Array inputs, these do have a length prefix which is the number of bits encoded
 
 
-  const [offset, length] = (0, _util.compactFromU8a)(value);
-  const total = offset + Math.ceil(length.toNumber() / 8);
+  const [offset, length] = (0, _util.compactFromU8aLim)(value);
+  const total = offset + Math.ceil(length / 8);
   (0, _util.assert)(total <= value.length, () => `BitVec: required length less than remainder, expected at least ${total}, found ${value.length}`);
-  return [length.toNumber(), value.subarray(offset, total)];
+  return [length, value.subarray(offset, total)];
 }
 /** @internal */
 
@@ -94,7 +94,7 @@ class BitVec extends _Raw.Raw {
 
   toU8a(isBare) {
     const bitVec = super.toU8a();
-    return isBare ? bitVec : (0, _util.u8aConcat)((0, _util.compactToU8a)(this.#decodedLength), bitVec);
+    return isBare ? bitVec : (0, _util.u8aConcatStrict)([(0, _util.compactToU8a)(this.#decodedLength), bitVec]);
   }
 
 }

package/cjs/extended/Bytes.js

@@ -21,9 +21,9 @@ function decodeBytesU8a(value) {
   } // handle all other Uint8Array inputs, these do have a length prefix
 
 
-  const [offset, length] = (0, _util.compactFromU8a)(value);
-  const total = offset + length.toNumber();
-  (0, _util.assert)(length.lten(MAX_LENGTH), () => `Bytes length ${length.toString()} exceeds ${MAX_LENGTH}`);
+  const [offset, length] = (0, _util.compactFromU8aLim)(value);
+  const total = offset + length;
+  (0, _util.assert)(length <= MAX_LENGTH, () => `Bytes length ${length.toString()} exceeds ${MAX_LENGTH}`);
   (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];
 }
@@ -54,10 +54,10 @@ class Bytes extends _Raw.Raw {
    */
 
 
-  inspect() {
+  inspect(isBare) {
     const clength = (0, _util.compactToU8a)(this.length);
     return {
-      outer: this.length ? [clength, super.toU8a()] : [clength]
+      outer: isBare ? [super.toU8a()] : this.length ? [clength, super.toU8a()] : [clength]
     };
   }
   /**

package/cjs/extended/Map.js

@@ -22,8 +22,7 @@ const l = (0, _util.logger)('Map');
 
 function decodeMapFromU8a(registry, KeyClass, ValClass, u8a) {
   const output = new Map();
-  const [offset, length] = (0, _util.compactFromU8a)(u8a);
-  const count = length.toNumber();
+  const [offset, count] = (0, _util.compactFromU8aLim)(u8a);
   const types = [];
 
   for (let i = 0; i < count; i++) {
@@ -231,7 +230,7 @@ class CodecMap extends Map {
       encoded.push(k.toU8a(isBare), v.toU8a(isBare));
     }
 
-    return (0, _util.u8aConcat)(...encoded);
+    return (0, _util.u8aConcatStrict)(encoded);
   }
 
 }

package/cjs/native/Struct.js

@@ -215,11 +215,11 @@ class Struct extends Map {
    */
 
 
-  inspect() {
+  inspect(isBare) {
     const inner = new Array();
 
     for (const [k, v] of this.entries()) {
-      inner.push({ ...v.inspect(),
+      inner.push({ ...v.inspect(!isBare || (0, _util.isBoolean)(isBare) ? isBare : isBare[k]),
         name: (0, _util.stringCamelCase)(k)
       });
     }
@@ -304,7 +304,7 @@ class Struct extends Map {
       }
     }
 
-    return (0, _util.u8aConcat)(...encoded);
+    return (0, _util.u8aConcatStrict)(encoded);
   }
 
 }

package/cjs/native/Text.js

@@ -26,9 +26,9 @@ function decodeText(value) {
       return [(0, _util.u8aToString)(value), 0];
     }
 
-    const [offset, length] = (0, _util.compactFromU8a)(value);
-    const total = offset + length.toNumber();
-    (0, _util.assert)(length.lten(MAX_LENGTH), () => `Text: length ${length.toString()} exceeds ${MAX_LENGTH}`);
+    const [offset, length] = (0, _util.compactFromU8aLim)(value);
+    const total = offset + length;
+    (0, _util.assert)(length <= MAX_LENGTH, () => `Text: length ${length.toString()} exceeds ${MAX_LENGTH}`);
     (0, _util.assert)(total <= value.length, () => `Text: required length less than remainder, expected at least ${total}, found ${value.length}`);
     return [(0, _util.u8aToString)(value.subarray(offset, total)), total];
   } else if ((0, _util.isHex)(value)) {

package/cjs/packageInfo.js

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

package/extended/BTreeSet.js

@@ -1,14 +1,13 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { compactFromU8a, compactToU8a, isHex, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8aLim, compactToU8a, isHex, isU8a, logger, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { compareSet, decodeU8aVec, sortSet, typeToConstructor } from "../utils/index.js";
 const l = logger('BTreeSet');
 /** @internal */
 
 function decodeSetFromU8a(registry, ValClass, u8a) {
   const output = new Set();
-  const [offset, length] = compactFromU8a(u8a);
-  const count = length.toNumber();
+  const [offset, count] = compactFromU8aLim(u8a);
   const result = new Array(count);
   const [decodedLength] = decodeU8aVec(registry, result, u8a, offset, ValClass);
 
@@ -214,7 +213,7 @@ export class BTreeSet extends Set {
       encoded.push(v.toU8a(isBare));
     }
 
-    return u8aConcat(...encoded);
+    return u8aConcatStrict(encoded);
   }
 
 }

package/extended/BitVec.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, compactFromU8a, compactToU8a, isString, u8aConcat, u8aToU8a } from '@polkadot/util';
+import { assert, compactFromU8aLim, compactToU8a, isString, u8aConcatStrict, u8aToU8a } from '@polkadot/util';
 import { Raw } from "../native/Raw.js";
 /** @internal */
 
@@ -10,10 +10,10 @@ function decodeBitVecU8a(value) {
   } // handle all other Uint8Array inputs, these do have a length prefix which is the number of bits encoded
 
 
-  const [offset, length] = compactFromU8a(value);
-  const total = offset + Math.ceil(length.toNumber() / 8);
+  const [offset, length] = compactFromU8aLim(value);
+  const total = offset + Math.ceil(length / 8);
   assert(total <= value.length, () => `BitVec: required length less than remainder, expected at least ${total}, found ${value.length}`);
-  return [length.toNumber(), value.subarray(offset, total)];
+  return [length, value.subarray(offset, total)];
 }
 /** @internal */
 
@@ -84,7 +84,7 @@ export class BitVec extends Raw {
 
   toU8a(isBare) {
     const bitVec = super.toU8a();
-    return isBare ? bitVec : u8aConcat(compactToU8a(this.#decodedLength), bitVec);
+    return isBare ? bitVec : u8aConcatStrict([compactToU8a(this.#decodedLength), bitVec]);
   }
 
 }

package/extended/Bytes.d.ts

@@ -16,7 +16,7 @@ export declare class Bytes extends Raw {
     /**
      * @description Returns a breakdown of the hex encoding for this Codec
      */
-    inspect(): Inspect;
+    inspect(isBare?: boolean): Inspect;
     /**
      * @description Returns the base runtime type name for this instance
      */

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, isCodec, isString, isU8a, u8aToU8a } from '@polkadot/util';
+import { assert, compactAddLength, compactFromU8aLim, 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;
@@ -12,9 +12,9 @@ function decodeBytesU8a(value) {
   } // handle all other Uint8Array inputs, these do have a length prefix
 
 
-  const [offset, length] = compactFromU8a(value);
-  const total = offset + length.toNumber();
-  assert(length.lten(MAX_LENGTH), () => `Bytes length ${length.toString()} exceeds ${MAX_LENGTH}`);
+  const [offset, length] = compactFromU8aLim(value);
+  const total = offset + length;
+  assert(length <= MAX_LENGTH, () => `Bytes length ${length.toString()} exceeds ${MAX_LENGTH}`);
   assert(total <= value.length, () => `Bytes: required length less than remainder, expected at least ${total}, found ${value.length}`);
   return [value.subarray(offset, total), total];
 }
@@ -45,10 +45,10 @@ export class Bytes extends Raw {
    */
 
 
-  inspect() {
+  inspect(isBare) {
     const clength = compactToU8a(this.length);
     return {
-      outer: this.length ? [clength, super.toU8a()] : [clength]
+      outer: isBare ? [super.toU8a()] : this.length ? [clength, super.toU8a()] : [clength]
     };
   }
   /**

package/extended/Map.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { compactFromU8a, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8aLim, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { AbstractArray } from "../abstract/AbstractArray.js";
 import { Enum } from "../base/Enum.js";
 import { Struct } from "../native/Struct.js";
@@ -10,8 +10,7 @@ const l = logger('Map');
 
 function decodeMapFromU8a(registry, KeyClass, ValClass, u8a) {
   const output = new Map();
-  const [offset, length] = compactFromU8a(u8a);
-  const count = length.toNumber();
+  const [offset, count] = compactFromU8aLim(u8a);
   const types = [];
 
   for (let i = 0; i < count; i++) {
@@ -218,7 +217,7 @@ export class CodecMap extends Map {
       encoded.push(k.toU8a(isBare), v.toU8a(isBare));
     }
 
-    return u8aConcat(...encoded);
+    return u8aConcatStrict(encoded);
   }
 
 }

package/native/Struct.d.ts

@@ -68,7 +68,7 @@ export declare class Struct<S extends TypesDef = TypesDef, V extends {
     /**
      * @description Returns a breakdown of the hex encoding for this Codec
      */
-    inspect(): Inspect;
+    inspect(isBare?: BareOpts): Inspect;
     /**
      * @description Converts the Object to an standard JavaScript Array
      */

package/native/Struct.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { assert, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { compareMap, decodeU8a, mapToTypeMap, typesToMap } from "../utils/index.js";
 
 function noopSetDefinition(d) {
@@ -204,11 +204,11 @@ export class Struct extends Map {
    */
 
 
-  inspect() {
+  inspect(isBare) {
     const inner = new Array();
 
     for (const [k, v] of this.entries()) {
-      inner.push({ ...v.inspect(),
+      inner.push({ ...v.inspect(!isBare || isBoolean(isBare) ? isBare : isBare[k]),
         name: stringCamelCase(k)
       });
     }
@@ -293,7 +293,7 @@ export class Struct extends Map {
       }
     }
 
-    return u8aConcat(...encoded);
+    return u8aConcatStrict(encoded);
   }
 
 }

package/native/Text.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assert, compactAddLength, compactFromU8a, compactToU8a, hexToU8a, isHex, isString, isU8a, stringToU8a, u8aToHex, u8aToString } from '@polkadot/util';
+import { assert, compactAddLength, compactFromU8aLim, compactToU8a, hexToU8a, isHex, isString, isU8a, stringToU8a, u8aToHex, u8aToString } from '@polkadot/util';
 import { Raw } from "./Raw.js";
 const MAX_LENGTH = 128 * 1024;
 /** @internal */
@@ -17,9 +17,9 @@ function decodeText(value) {
       return [u8aToString(value), 0];
     }
 
-    const [offset, length] = compactFromU8a(value);
-    const total = offset + length.toNumber();
-    assert(length.lten(MAX_LENGTH), () => `Text: length ${length.toString()} exceeds ${MAX_LENGTH}`);
+    const [offset, length] = compactFromU8aLim(value);
+    const total = offset + length;
+    assert(length <= MAX_LENGTH, () => `Text: length ${length.toString()} exceeds ${MAX_LENGTH}`);
     assert(total <= value.length, () => `Text: required length less than remainder, expected at least ${total}, found ${value.length}`);
     return [u8aToString(value.subarray(offset, total)), total];
   } else if (isHex(value)) {

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.5.2-7",
+  "version": "8.6.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -414,7 +414,7 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/util": "^9.3.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.5.2-7'
+  version: '8.6.1'
 };

package/types/codec.d.ts

@@ -47,7 +47,7 @@ export interface Codec {
     /**
      * @description Returns a breakdown of the hex encoding for this Codec
      */
-    inspect(): Inspect;
+    inspect(isBare?: BareOpts): Inspect;
     /**
      * @description Returns a hex string representation of the value. isLe returns a LE (number-only) representation
      */