@polkadot/types-codec 8.3.3-1 → 8.3.3-12

package/base/Compact.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { compactFromU8a, compactToU8a, isBigInt, isBn, isNumber, isString } from '@polkadot/util';
+import { compactFromU8a, compactToU8a, isU8a } from '@polkadot/util';
 import { typeToConstructor } from "../utils/index.js";
 /**
  * @name Compact
@@ -35,16 +35,16 @@ export class Compact {
 
 
   static decodeCompact(registry, Type, value) {
-    if (value instanceof Compact) {
+    if (isU8a(value)) {
+      const [decodedLength, bn] = 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];
-    } else if (isString(value) || isNumber(value) || isBn(value) || isBigInt(value)) {
-      return [new Type(registry, value), 0];
     }
 
-    const [decodedLength, bn] = compactFromU8a(value);
-    return [new Type(registry, bn), decodedLength];
+    return [new Type(registry, value), 0];
   }
   /**
    * @description The length of the value when encoded as a Uint8Array

package/cjs/base/Compact.js

@@ -45,16 +45,16 @@ class Compact {
 
 
   static decodeCompact(registry, Type, value) {
-    if (value instanceof Compact) {
+    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];
-    } else if ((0, _util.isString)(value) || (0, _util.isNumber)(value) || (0, _util.isBn)(value) || (0, _util.isBigInt)(value)) {
-      return [new Type(registry, value), 0];
     }
 
-    const [decodedLength, bn] = (0, _util.compactFromU8a)(value);
-    return [new Type(registry, bn), decodedLength];
+    return [new Type(registry, value), 0];
   }
   /**
    * @description The length of the value when encoded as a Uint8Array

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-1'
+  version: '8.3.3-12'
 };
 exports.packageInfo = packageInfo;

package/cjs/utils/sanitize.js

@@ -73,8 +73,8 @@ function cleanupCompact() {
       if (value[index] === '<') {
         const end = findClosing(value, index + 1) - 14;
 
-        if (value.substr(end, 14) === ' as HasCompact') {
-          value = `Compact<${value.substr(index + 1, end - index - 1)}>`;
+        if (value.substring(end, end + 14) === ' as HasCompact') {
+          value = `Compact<${value.substring(index + 1, end)}>`;
         }
       }
     }
@@ -106,7 +106,7 @@ function replaceTagWith(value, matcher, replacer) {
 
     const start = index + matcher.length;
     const end = findClosing(value, start);
-    value = `${value.substr(0, index)}${replacer(value.substr(start, end - start))}${value.substr(end + 1)}`;
+    value = `${value.substring(0, index)}${replacer(value.substring(start, end))}${value.substring(end + 1)}`;
   }
 } // remove the Bounded* or Weak* wrappers
 
@@ -134,7 +134,7 @@ function removeColons() {
       index = value.indexOf('::');
 
       if (index === 0) {
-        value = value.substr(2);
+        value = value.substring(2);
       } else if (index !== -1) {
         if (allowNamespaces) {
           return value;
@@ -146,7 +146,7 @@ function removeColons() {
           start--;
         }
 
-        value = `${value.substr(0, start + 1)}${value.substr(index + 2)}`;
+        value = `${value.substring(0, start + 1)}${value.substring(index + 2)}`;
       }
     }
 
@@ -161,13 +161,13 @@ 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.substr(start, box.length) === box && ( // make sure it is stand-alone, i.e. don't catch ElectionResult<...> as Result<...>
+          return start >= 0 && value.substring(start, start + box.length) === 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
 
         if (!box) {
           const end = findClosing(value, index + 1);
-          value = `${value.substr(0, index)}${value.substr(end + 1)}`;
+          value = `${value.substring(0, index)}${value.substring(end + 1)}`;
         }
       }
     }

package/native/Text.d.ts

@@ -1,5 +1,5 @@
 import type { HexString } from '@polkadot/util/types';
-import type { AnyU8a, Codec, Inspect, IU8a, Registry } from '../types';
+import type { AnyU8a, Inspect, IText, IU8a, Registry } from '../types';
 /**
  * @name Text
  * @description
@@ -8,7 +8,7 @@ import type { AnyU8a, Codec, Inspect, IU8a, Registry } from '../types';
  * object, inheriting all methods exposed from `String`.
  * @noInheritDoc
  */
-export declare class Text extends String implements Codec {
+export declare class Text extends String implements IText {
     #private;
     readonly registry: Registry;
     createdAtHash?: IU8a;

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.3.3-1",
+  "version": "8.3.3-12",
   "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.1"
+    "@polkadot/util": "^9.1.2-7"
   }
 }

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-1'
+  version: '8.3.3-12'
 };

package/types/interfaces.d.ts

@@ -47,6 +47,8 @@ export interface IStruct<K = string, V extends Codec = Codec> extends Map<K, V>,
     getAtIndex(index: number): Codec;
     toArray(): Codec[];
 }
+export interface IText extends String, Codec {
+}
 export declare type ITuple<T extends AnyTuple = Codec[]> = T & Codec;
 export interface IU8a extends Uint8Array, Codec {
     readonly isAscii: boolean;

package/utils/sanitize.js

@@ -54,8 +54,8 @@ export function cleanupCompact() {
       if (value[index] === '<') {
         const end = findClosing(value, index + 1) - 14;
 
-        if (value.substr(end, 14) === ' as HasCompact') {
-          value = `Compact<${value.substr(index + 1, end - index - 1)}>`;
+        if (value.substring(end, end + 14) === ' as HasCompact') {
+          value = `Compact<${value.substring(index + 1, end)}>`;
         }
       }
     }
@@ -86,7 +86,7 @@ function replaceTagWith(value, matcher, replacer) {
 
     const start = index + matcher.length;
     const end = findClosing(value, start);
-    value = `${value.substr(0, index)}${replacer(value.substr(start, end - start))}${value.substr(end + 1)}`;
+    value = `${value.substring(0, index)}${replacer(value.substring(start, end))}${value.substring(end + 1)}`;
   }
 } // remove the Bounded* or Weak* wrappers
 
@@ -112,7 +112,7 @@ export function removeColons() {
       index = value.indexOf('::');
 
       if (index === 0) {
-        value = value.substr(2);
+        value = value.substring(2);
       } else if (index !== -1) {
         if (allowNamespaces) {
           return value;
@@ -124,7 +124,7 @@ export function removeColons() {
           start--;
         }
 
-        value = `${value.substr(0, start + 1)}${value.substr(index + 2)}`;
+        value = `${value.substring(0, start + 1)}${value.substring(index + 2)}`;
       }
     }
 
@@ -138,13 +138,13 @@ 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.substr(start, box.length) === box && ( // make sure it is stand-alone, i.e. don't catch ElectionResult<...> as Result<...>
+          return start >= 0 && value.substring(start, start + box.length) === 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
 
         if (!box) {
           const end = findClosing(value, index + 1);
-          value = `${value.substr(0, index)}${value.substr(end + 1)}`;
+          value = `${value.substring(0, index)}${value.substring(end + 1)}`;
         }
       }
     }