@polkadot/types-codec 8.8.3-3 → 8.8.3-6

package/cjs/utils/sanitize.js

@@ -140,10 +140,7 @@ function removeExtensions(type, isSized) {
 }
 
 function removeColons() {
-  return function (value) {
-    let {
-      allowNamespaces
-    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return value => {
     let index = 0;
 
     while (index !== -1) {
@@ -152,10 +149,6 @@ function removeColons() {
       if (index === 0) {
         value = value.substring(2);
       } else if (index !== -1) {
-        if (allowNamespaces) {
-          return value;
-        }
-
         let start = index;
 
         while (start !== -1 && !BOX_PRECEDING.includes(value[start])) {
@@ -177,7 +170,7 @@ function removeGenerics() {
         // check against the allowed wrappers, be it Vec<..>, Option<...> ...
         const box = ALLOWED_BOXES.find(box => {
           const start = index - box.length;
-          return start >= 0 && value.substring(start, start + box.length) === box && ( // make sure it is stand-alone, i.e. don't catch ElectionResult<...> as Result<...>
+          return start >= 0 && value.substring(start, index) === box && ( // make sure it is stand-alone, i.e. don't catch ElectionResult<...> as Result<...>
           start === 0 || BOX_PRECEDING.includes(value[start - 1]));
         }); // we have not found anything, unwrap generic innards
 
@@ -190,17 +183,13 @@ function removeGenerics() {
 
     return value;
   };
-}
-/** @internal */
-
-
-function pairOfReplacer(v) {
-  return `(${v},${v})`;
 } // remove the PairOf wrappers
 
 
 function removePairOf() {
-  return value => replaceTagWith(value, 'PairOf<', pairOfReplacer);
+  const replacer = v => `(${v},${v})`;
+
+  return value => replaceTagWith(value, 'PairOf<', replacer);
 } // remove the type traits
 
 
@@ -226,40 +215,31 @@ function removeTraits() {
     .replace(from5, 'Lookup') // replace `<...>::Type`
     .replace(from6, '');
   };
-}
-/** @internal */
-
-
-function wrapReplacer(v) {
-  return v;
 } // remove wrapping values, i.e. Box<Proposal> -> Proposal
 
 
 function removeWrap(check) {
-  return value => replaceTagWith(value, check, wrapReplacer);
+  const replacer = v => v;
+
+  return value => replaceTagWith(value, check, replacer);
 }
 
-const sanitizeMap = new Map(); // eslint-disable-next-line @typescript-eslint/ban-types
+const sanitizeMap = new Map();
 
-function sanitize(value, options) {
+function sanitize(value) {
   const startValue = value.toString();
-  let result = startValue;
+  const memoized = sanitizeMap.get(startValue);
 
-  if (!options) {
-    const memoized = sanitizeMap.get(startValue);
-
-    if (memoized) {
-      return memoized;
-    }
+  if (memoized) {
+    return memoized;
   }
 
-  for (let i = 0; i < mappings.length; i++) {
-    result = mappings[i](result, options);
-  }
+  let result = startValue;
 
-  if (!options) {
-    sanitizeMap.set(startValue, result);
+  for (let i = 0; i < mappings.length; i++) {
+    result = mappings[i](result);
   }
 
+  sanitizeMap.set(startValue, result);
   return result;
 }

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, compactFromU8aLim, compactToU8a, isCodec, isString, isU8a, u8aToU8a } from '@polkadot/util';
+import { assert, compactAddLength, compactFromU8aLim, compactToU8a, 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;
@@ -29,7 +29,7 @@ function decodeBytesU8a(value) {
 
 export class Bytes extends Raw {
   constructor(registry, value) {
-    const [u8a, decodedLength] = isU8a(value) && !(isCodec(value) && value instanceof Raw) ? decodeBytesU8a(value) : Array.isArray(value) || isString(value) ? [u8aToU8a(value), 0] : [value, 0];
+    const [u8a, decodedLength] = isU8a(value) && !(value instanceof Raw) ? decodeBytesU8a(value) : Array.isArray(value) || isString(value) ? [u8aToU8a(value), 0] : [value, 0];
     super(registry, u8a, decodedLength);
   }
   /**

package/extended/Map.js

@@ -1,7 +1,7 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { compactFromU8aLim, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
-import { AbstractArray } from "../abstract/AbstractArray.js";
+import { AbstractArray } from "../abstract/Array.js";
 import { Enum } from "../base/Enum.js";
 import { Struct } from "../native/Struct.js";
 import { compareMap, decodeU8a, sortMap, typeToConstructor } from "../utils/index.js";

package/extended/OptionBool.d.ts

@@ -12,10 +12,6 @@ export declare class OptionBool extends Option<Bool> {
      * @description The length of the value when encoded as a Uint8Array
      */
     get encodedLength(): number;
-    /**
-     * @description The length of the initial encoded value (Only available when constructed from a Uint8Array)
-     */
-    get initialU8aLength(): number;
     /**
      * @description Checks if the value is an empty value (always false)
      */

package/extended/OptionBool.js

@@ -20,6 +20,7 @@ function decodeU8a(registry, value) {
 export class OptionBool extends Option {
   constructor(registry, value) {
     super(registry, Bool, isU8a(value) || isHex(value) ? decodeU8a(registry, u8aToU8a(value)) : value);
+    this.initialU8aLength = 1;
   }
   /**
    * @description The length of the value when encoded as a Uint8Array
@@ -29,14 +30,6 @@ export class OptionBool extends 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/native/Raw.d.ts

@@ -10,9 +10,9 @@ import type { AnyJson, AnyU8a, Inspect, IU8a, Registry } from '../types';
  * @noInheritDoc
  */
 export declare class Raw extends Uint8Array implements IU8a {
-    readonly registry: Registry;
     createdAtHash?: IU8a;
     readonly initialU8aLength?: number;
+    readonly registry: Registry;
     constructor(registry: Registry, value?: AnyU8a, initialU8aLength?: number);
     /**
      * @description The length of the value when encoded as a Uint8Array

package/native/Struct.d.ts

@@ -28,6 +28,7 @@ export declare class Struct<S extends TypesDef = TypesDef, V extends {
     #private;
     createdAtHash?: IU8a;
     readonly initialU8aLength?: number;
+    readonly registry: Registry;
     constructor(registry: Registry, Types: S, value?: V | Map<unknown, unknown> | unknown[] | HexString | null, jsonMap?: Map<string, string>, { definition, setDefinition }?: Options);
     static with<S extends TypesDef>(Types: S, jsonMap?: Map<string, string>): CodecClass<Struct<S>>;
     /**
@@ -51,7 +52,6 @@ export declare class Struct<S extends TypesDef = TypesDef, V extends {
      * @description returns a hash of the contents
      */
     get hash(): IU8a;
-    get registry(): Registry;
     /**
      * @description Compares the value of the input to see if there is a match
      */

package/native/Struct.js

@@ -1,7 +1,7 @@
 // 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, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
-import { compareMap, decodeU8a, mapToTypeMap, typesToMap } from "../utils/index.js";
+import { compareMap, decodeU8aStruct, mapToTypeMap, typesToMap } from "../utils/index.js";
 
 function noopSetDefinition(d) {
   return d;
@@ -73,7 +73,6 @@ function decodeStructFromObject(registry, [Types, keys], value, jsonMap) {
 
 
 export class Struct extends Map {
-  #registry;
   #jsonMap;
   #Types;
 
@@ -82,10 +81,10 @@ export class Struct extends Map {
     setDefinition = noopSetDefinition
   } = {}) {
     const typeMap = definition || setDefinition(mapToTypeMap(registry, Types));
-    const [decoded, decodedLength] = isU8a(value) || isHex(value) ? decodeU8a(registry, new Array(typeMap[0].length), u8aToU8a(value), typeMap, true) : value instanceof Struct ? [value, 0] : decodeStructFromObject(registry, typeMap, value || {}, jsonMap);
+    const [decoded, decodedLength] = isU8a(value) || isHex(value) ? decodeU8aStruct(registry, new Array(typeMap[0].length), 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;
   }
@@ -170,10 +169,6 @@ export 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/native/Text.d.ts

@@ -10,8 +10,9 @@ import type { AnyString, AnyU8a, Inspect, IText, IU8a, Registry } from '../types
  */
 export declare class Text extends String implements IText {
     #private;
-    readonly registry: Registry;
     createdAtHash?: IU8a;
+    readonly initialU8aLength?: number;
+    readonly registry: Registry;
     constructor(registry: Registry, value?: null | AnyString | AnyU8a | {
         toString: () => string;
     });
@@ -19,10 +20,6 @@ export declare class Text extends String implements IText {
      * @description The length of the value when encoded as a Uint8Array
      */
     get encodedLength(): number;
-    /**
-     * @description The length of the initial encoded value (Only available when constructed from a Uint8Array)
-     */
-    get initialU8aLength(): number | undefined;
     /**
      * @description returns a hash of the contents
      */

package/native/Text.js

@@ -39,14 +39,13 @@ function decodeText(value) {
 
 
 export 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
@@ -56,14 +55,6 @@ export 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/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.8.3-3",
+  "version": "8.8.3-6",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -37,26 +37,26 @@
       "require": "./cjs/abstract/index.js",
       "default": "./abstract/index.js"
     },
-    "./abstract/AbstractArray": {
-      "types": "./abstract/AbstractArray.d.ts",
-      "require": "./cjs/abstract/AbstractArray.js",
-      "default": "./abstract/AbstractArray.js"
+    "./abstract/Array": {
+      "types": "./abstract/Array.d.ts",
+      "require": "./cjs/abstract/Array.js",
+      "default": "./abstract/Array.js"
     },
-    "./abstract/AbstractInt": {
-      "types": "./abstract/AbstractInt.d.ts",
-      "require": "./cjs/abstract/AbstractInt.js",
-      "default": "./abstract/AbstractInt.js"
+    "./abstract/Base": {
+      "types": "./abstract/Base.d.ts",
+      "require": "./cjs/abstract/Base.js",
+      "default": "./abstract/Base.js"
+    },
+    "./abstract/Int": {
+      "types": "./abstract/Int.d.ts",
+      "require": "./cjs/abstract/Int.js",
+      "default": "./abstract/Int.js"
     },
     "./base": {
       "types": "./base/index.d.ts",
       "require": "./cjs/base/index.js",
       "default": "./base/index.js"
     },
-    "./base/Base": {
-      "types": "./base/Base.d.ts",
-      "require": "./cjs/base/Base.js",
-      "default": "./base/Base.js"
-    },
     "./base/Compact": {
       "types": "./base/Compact.d.ts",
       "require": "./cjs/base/Compact.js",

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.8.3-3'
+  version: '8.8.3-6'
 };

package/utils/decodeU8a.d.ts

@@ -1,5 +1,7 @@
 import type { Codec, CodecClass, Registry } from '../types';
 /**
+ * @internal
+ *
  * Given an u8a, and an array of Type constructors, decode the u8a against the
  * types, and return an array of decoded values.
  *
@@ -7,5 +9,18 @@ import type { Codec, CodecClass, Registry } from '../types';
  * @param result - The result array (will be returned with values pushed)
  * @param types - The array of CodecClass to decode the U8a against.
  */
-export declare function decodeU8a<T extends Codec = Codec, E = T>(registry: Registry, result: unknown[], u8a: Uint8Array, [Types, keys]: [CodecClass[], string[]], withZip?: boolean): [E[], number];
+export declare function decodeU8a<T extends Codec = Codec>(registry: Registry, result: T[], u8a: Uint8Array, [Types, keys]: [CodecClass<T>[], string[]]): [T[], number];
+/**
+ * @internal
+ *
+ * Split from decodeU8a since this is specialized to zip returns ... while we duplicate, this
+ * is all on the hot-path, so it is not great, however there is (some) method behind the madness
+ */
+export declare function decodeU8aStruct(registry: Registry, result: [string, Codec][], u8a: Uint8Array, [Types, keys]: [CodecClass[], string[]]): [[string, Codec][], number];
+/**
+ * @internal
+ *
+ * Split from decodeU8a since this is specialized to 1 instance ... while we duplicate, this
+ * is all on the hot-path, so it is not great, however there is (some) method behind the madness
+ */
 export declare function decodeU8aVec<T extends Codec = Codec>(registry: Registry, result: unknown[], u8a: Uint8Array, startAt: number, Type: CodecClass<T>): [number, number];

package/utils/decodeU8a.js

@@ -1,19 +1,23 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { u8aToHex } from '@polkadot/util';
+/** @internal */
 
-function formatFailure(error, type, u8a, key) {
-  return `decodeU8a: failed at ${u8aToHex(u8a)}…${key ? ` on ${key}` : ''}${type ? `: ${type}` : ''}:: ${error.message}`;
-}
+function formatFailure(registry, {
+  message
+}, u8a, i, count, Type, key) {
+  let type = '';
 
-function getRawType(registry, Type) {
   try {
-    return new Type(registry).toRawType();
-  } catch {
-    return null;
+    type = `: ${new Type(registry).toRawType()}`;
+  } catch {// ignore
   }
+
+  return `decodeU8a: failed at ${u8aToHex(u8a.subarray(0, 16))}…${key ? ` on ${key}` : ''} (index ${i}/${count})${type}:: ${message}`;
 }
 /**
+ * @internal
+ *
  * Given an u8a, and an array of Type constructors, decode the u8a against the
  * types, and return an array of decoded values.
  *
@@ -23,36 +27,70 @@ function getRawType(registry, Type) {
  */
 
 
-export function decodeU8a(registry, result, u8a, [Types, keys], withZip) {
+export function decodeU8a(registry, result, u8a, [Types, keys]) {
   const count = result.length;
   let offset = 0;
+  let i = 0;
 
-  for (let i = 0; i < count; i++) {
-    try {
+  try {
+    while (i < count) {
       const value = new Types[i](registry, u8a.subarray(offset));
       offset += value.initialU8aLength || value.encodedLength;
-      result[i] = withZip ? [keys[i], value] : value;
-    } catch (error) {
-      throw new Error(formatFailure(error, getRawType(registry, Types[i]), u8a.subarray(offset, offset + 16), keys[i]));
+      result[i] = value;
+      i++;
     }
+  } catch (error) {
+    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
   }
 
   return [result, offset];
-} // Split from decodeU8a since this is specialized to 1 instance ... yes duplication, but
-// since we have to do less checks (and these are intensive anyway), much faster
+}
+/**
+ * @internal
+ *
+ * Split from decodeU8a since this is specialized to zip returns ... while we duplicate, this
+ * is all on the hot-path, so it is not great, however there is (some) method behind the madness
+ */
+
+export function decodeU8aStruct(registry, result, u8a, [Types, keys]) {
+  const count = result.length;
+  let offset = 0;
+  let i = 0;
+
+  try {
+    while (i < count) {
+      const value = new Types[i](registry, u8a.subarray(offset));
+      offset += value.initialU8aLength || value.encodedLength;
+      result[i] = [keys[i], value];
+      i++;
+    }
+  } catch (error) {
+    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Types[i], keys[i]));
+  }
+
+  return [result, offset];
+}
+/**
+ * @internal
+ *
+ * Split from decodeU8a since this is specialized to 1 instance ... while we duplicate, this
+ * is all on the hot-path, so it is not great, however there is (some) method behind the madness
+ */
 
 export function decodeU8aVec(registry, result, u8a, startAt, Type) {
   const count = result.length;
   let offset = startAt;
+  let i = 0;
 
-  for (let i = 0; i < count; i++) {
-    try {
+  try {
+    while (i < count) {
       const value = new Type(registry, u8a.subarray(offset));
       offset += value.initialU8aLength || value.encodedLength;
       result[i] = value;
-    } catch (error) {
-      throw new Error(formatFailure(error, getRawType(registry, Type), u8a.subarray(offset, offset + 16)));
+      i++;
     }
+  } catch (error) {
+    throw new Error(formatFailure(registry, error, u8a.subarray(offset), i, count, Type));
   }
 
   return [offset, offset - startAt];

package/utils/index.d.ts

@@ -1,7 +1,7 @@
 export { compareArray } from './compareArray';
 export { compareMap } from './compareMap';
 export { compareSet } from './compareSet';
-export { decodeU8a, decodeU8aVec } from './decodeU8a';
+export { decodeU8a, decodeU8aStruct, decodeU8aVec } from './decodeU8a';
 export { mapToTypeMap } from './mapToTypeMap';
 export { typeToConstructor } from './typeToConstructor';
 export { sanitize } from './sanitize';

package/utils/index.js

@@ -3,7 +3,7 @@
 export { compareArray } from "./compareArray.js";
 export { compareMap } from "./compareMap.js";
 export { compareSet } from "./compareSet.js";
-export { decodeU8a, decodeU8aVec } from "./decodeU8a.js";
+export { decodeU8a, decodeU8aStruct, decodeU8aVec } from "./decodeU8a.js";
 export { mapToTypeMap } from "./mapToTypeMap.js";
 export { typeToConstructor } from "./typeToConstructor.js";
 export { sanitize } from "./sanitize.js";

package/utils/mapToTypeMap.js

@@ -10,7 +10,7 @@ export function mapToTypeMap(registry, input) {
   const count = entries.length;
   const output = [new Array(count), new Array(count)];
 
-  for (let i = 0; i < entries.length; i++) {
+  for (let i = 0; i < count; i++) {
     output[1][i] = entries[i][0];
     output[0][i] = typeToConstructor(registry, entries[i][1]);
   }

package/utils/sanitize.d.ts

@@ -1,7 +1,5 @@
-interface SanitizeOptions {
-    allowNamespaces?: boolean;
-}
-declare type Mapper = (value: string, options?: SanitizeOptions) => string;
+import { AnyString } from '../types';
+declare type Mapper = (value: string) => string;
 export declare function trim(): Mapper;
 export declare function findClosing(value: string, start: number): number;
 export declare function alias(src: string, dest: string, withChecks?: boolean): Mapper;
@@ -13,5 +11,5 @@ export declare function removeGenerics(): Mapper;
 export declare function removePairOf(): Mapper;
 export declare function removeTraits(): Mapper;
 export declare function removeWrap(check: string): Mapper;
-export declare function sanitize(value: String | string, options?: SanitizeOptions): string;
+export declare function sanitize(value: AnyString): string;
 export {};

package/utils/sanitize.js

@@ -117,9 +117,7 @@ export function removeExtensions(type, isSized) {
   };
 }
 export function removeColons() {
-  return (value, {
-    allowNamespaces
-  } = {}) => {
+  return value => {
     let index = 0;
 
     while (index !== -1) {
@@ -128,10 +126,6 @@ export function removeColons() {
       if (index === 0) {
         value = value.substring(2);
       } else if (index !== -1) {
-        if (allowNamespaces) {
-          return value;
-        }
-
         let start = index;
 
         while (start !== -1 && !BOX_PRECEDING.includes(value[start])) {
@@ -152,7 +146,7 @@ export function removeGenerics() {
         // check against the allowed wrappers, be it Vec<..>, Option<...> ...
         const box = ALLOWED_BOXES.find(box => {
           const start = index - box.length;
-          return start >= 0 && value.substring(start, start + box.length) === box && ( // make sure it is stand-alone, i.e. don't catch ElectionResult<...> as Result<...>
+          return start >= 0 && value.substring(start, index) === box && ( // make sure it is stand-alone, i.e. don't catch ElectionResult<...> as Result<...>
           start === 0 || BOX_PRECEDING.includes(value[start - 1]));
         }); // we have not found anything, unwrap generic innards
 
@@ -165,16 +159,12 @@ export function removeGenerics() {
 
     return value;
   };
-}
-/** @internal */
-
-function pairOfReplacer(v) {
-  return `(${v},${v})`;
 } // remove the PairOf wrappers
 
-
 export function removePairOf() {
-  return value => replaceTagWith(value, 'PairOf<', pairOfReplacer);
+  const replacer = v => `(${v},${v})`;
+
+  return value => replaceTagWith(value, 'PairOf<', replacer);
 } // remove the type traits
 
 export function removeTraits() {
@@ -199,38 +189,28 @@ export function removeTraits() {
     .replace(from5, 'Lookup') // replace `<...>::Type`
     .replace(from6, '');
   };
-}
-/** @internal */
-
-function wrapReplacer(v) {
-  return v;
 } // remove wrapping values, i.e. Box<Proposal> -> Proposal
 
-
 export function removeWrap(check) {
-  return value => replaceTagWith(value, check, wrapReplacer);
-}
-const sanitizeMap = new Map(); // eslint-disable-next-line @typescript-eslint/ban-types
+  const replacer = v => v;
 
-export function sanitize(value, options) {
+  return value => replaceTagWith(value, check, replacer);
+}
+const sanitizeMap = new Map();
+export function sanitize(value) {
   const startValue = value.toString();
-  let result = startValue;
+  const memoized = sanitizeMap.get(startValue);
 
-  if (!options) {
-    const memoized = sanitizeMap.get(startValue);
-
-    if (memoized) {
-      return memoized;
-    }
+  if (memoized) {
+    return memoized;
   }
 
-  for (let i = 0; i < mappings.length; i++) {
-    result = mappings[i](result, options);
-  }
+  let result = startValue;
 
-  if (!options) {
-    sanitizeMap.set(startValue, result);
+  for (let i = 0; i < mappings.length; i++) {
+    result = mappings[i](result);
   }
 
+  sanitizeMap.set(startValue, result);
   return result;
 }