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

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.3-5'
+  version: '8.8.3-6'
 };
 exports.packageInfo = packageInfo;

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/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.8.3-5",
+  "version": "8.8.3-6",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",

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

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;
 }