@polkadot/types-codec 8.7.2-7 → 8.8.1

package/base/Option.js

@@ -21,16 +21,23 @@ class None extends Null {
 
 
 function decodeOption(registry, Type, value) {
-  // In the case of an option, unwrap the inner
-  if (value instanceof Option) {
-    value = value.value;
-  }
-
-  if (isNull(value) || isUndefined(value) || value === '0x' || value instanceof None) {
-    return new None(registry);
-  } else if (value instanceof Type) {
+  if (value instanceof Type) {
     // don't re-create, use as it (which also caters for derived types)
     return value;
+  } else if (value instanceof Option) {
+    if (value.value instanceof Type) {
+      // same instance, return it
+      return value.value;
+    } else if (value.isNone) {
+      // internal is None, we are also none
+      return new None(registry);
+    } // convert the actual value into known
+
+
+    return new Type(registry, value.value);
+  } else if (isNull(value) || isUndefined(value) || value === '0x' || value instanceof None) {
+    // anyhting empty we pass as-is
+    return new None(registry);
   } else if (isU8a(value)) {
     // the isU8a check happens last in the if-tree - since the wrapped value
     // may be an instance of it, so Type and Option checks go in first

package/cjs/base/Option.js

@@ -30,16 +30,23 @@ class None extends _Null.Null {
 
 
 function decodeOption(registry, Type, value) {
-  // In the case of an option, unwrap the inner
-  if (value instanceof Option) {
-    value = value.value;
-  }
-
-  if ((0, _util.isNull)(value) || (0, _util.isUndefined)(value) || value === '0x' || value instanceof None) {
-    return new None(registry);
-  } else if (value instanceof Type) {
+  if (value instanceof Type) {
     // don't re-create, use as it (which also caters for derived types)
     return value;
+  } else if (value instanceof Option) {
+    if (value.value instanceof Type) {
+      // same instance, return it
+      return value.value;
+    } else if (value.isNone) {
+      // internal is None, we are also none
+      return new None(registry);
+    } // convert the actual value into known
+
+
+    return new Type(registry, value.value);
+  } else if ((0, _util.isNull)(value) || (0, _util.isUndefined)(value) || value === '0x' || value instanceof None) {
+    // anyhting empty we pass as-is
+    return new None(registry);
   } else if ((0, _util.isU8a)(value)) {
     // the isU8a check happens last in the if-tree - since the wrapped value
     // may be an instance of it, so Type and Option checks go in first

package/cjs/extended/Range.js

@@ -19,18 +19,17 @@ class Range extends _Tuple.Tuple {
   #rangeName;
 
   constructor(registry, Type, value) {
-    let rangeName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'Range';
-    super(registry, {
-      end: Type,
-      start: Type
-    }, value);
+    let {
+      rangeName = 'Range'
+    } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    super(registry, [Type, Type], value);
     this.#rangeName = rangeName;
   }
 
-  static with(Types) {
+  static with(Type) {
     return class extends Range {
       constructor(registry, value) {
-        super(registry, Types, value);
+        super(registry, Type, value);
       }
 
     };

package/cjs/extended/RangeInclusive.js

@@ -11,7 +11,9 @@ var _Range = require("./Range");
 // SPDX-License-Identifier: Apache-2.0
 class RangeInclusive extends _Range.Range {
   constructor(registry, Type, value) {
-    super(registry, Type, value, 'RangeInclusive');
+    super(registry, Type, value, {
+      rangeName: 'RangeInclusive'
+    });
   }
 
   static with(Type) {

package/cjs/extended/WrapperKeepOpaque.js

@@ -37,7 +37,9 @@ class WrapperKeepOpaque extends _Bytes.Bytes {
   #opaqueName;
 
   constructor(registry, typeName, value) {
-    let opaqueName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'WrapperKeepOpaque';
+    let {
+      opaqueName = 'WrapperKeepOpaque'
+    } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
     super(registry, u8a);
     this.#Type = Type;

package/cjs/extended/WrapperOpaque.js

@@ -11,7 +11,9 @@ var _WrapperKeepOpaque = require("./WrapperKeepOpaque");
 // SPDX-License-Identifier: Apache-2.0
 class WrapperOpaque extends _WrapperKeepOpaque.WrapperKeepOpaque {
   constructor(registry, typeName, value) {
-    super(registry, typeName, value, 'WrapperOpaque');
+    super(registry, typeName, value, {
+      opaqueName: 'WrapperOpaque'
+    });
   }
 
   static with(Type) {

package/cjs/packageInfo.js

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

package/extended/Range.d.ts

@@ -1,6 +1,9 @@
 import type { AnyTuple, CodecClass, INumber, Registry } from '../types';
 import { Tuple } from '../base/Tuple';
 declare type RangeType = 'Range' | 'RangeInclusive';
+interface Options {
+    rangeName?: RangeType;
+}
 /**
  * @name Range
  * @description
@@ -8,8 +11,8 @@ declare type RangeType = 'Range' | 'RangeInclusive';
  */
 export declare class Range<T extends INumber> extends Tuple {
     #private;
-    constructor(registry: Registry, Type: CodecClass<T> | string, value?: AnyTuple, rangeName?: RangeType);
-    static with<T extends INumber>(Types: CodecClass<T> | string): CodecClass<Range<T>>;
+    constructor(registry: Registry, Type: CodecClass<T> | string, value?: AnyTuple, { rangeName }?: Options);
+    static with<T extends INumber>(Type: CodecClass<T> | string): CodecClass<Range<T>>;
     /**
      * @description Returns the starting range value
      */

package/extended/Range.js

@@ -10,18 +10,17 @@ import { Tuple } from "../base/Tuple.js";
 export class Range extends Tuple {
   #rangeName;
 
-  constructor(registry, Type, value, rangeName = 'Range') {
-    super(registry, {
-      end: Type,
-      start: Type
-    }, value);
+  constructor(registry, Type, value, {
+    rangeName = 'Range'
+  } = {}) {
+    super(registry, [Type, Type], value);
     this.#rangeName = rangeName;
   }
 
-  static with(Types) {
+  static with(Type) {
     return class extends Range {
       constructor(registry, value) {
-        super(registry, Types, value);
+        super(registry, Type, value);
       }
 
     };

package/extended/RangeInclusive.js

@@ -3,7 +3,9 @@
 import { Range } from "./Range.js";
 export class RangeInclusive extends Range {
   constructor(registry, Type, value) {
-    super(registry, Type, value, 'RangeInclusive');
+    super(registry, Type, value, {
+      rangeName: 'RangeInclusive'
+    });
   }
 
   static with(Type) {

package/extended/WrapperKeepOpaque.d.ts

@@ -1,9 +1,12 @@
 import type { AnyJson, Codec, CodecClass, Inspect, Registry } from '../types';
 import { Bytes } from './Bytes';
 declare type OpaqueName = 'WrapperKeepOpaque' | 'WrapperOpaque';
+interface Options {
+    opaqueName?: OpaqueName;
+}
 export declare class WrapperKeepOpaque<T extends Codec> extends Bytes {
     #private;
-    constructor(registry: Registry, typeName: CodecClass<T> | string, value?: unknown, opaqueName?: OpaqueName);
+    constructor(registry: Registry, typeName: CodecClass<T> | string, value?: unknown, { opaqueName }?: Options);
     static with<T extends Codec>(Type: CodecClass<T> | string): CodecClass<WrapperKeepOpaque<T>>;
     /**
      * @description Checks if the wrapper is decodable

package/extended/WrapperKeepOpaque.js

@@ -26,7 +26,9 @@ export class WrapperKeepOpaque extends Bytes {
   #decoded;
   #opaqueName;
 
-  constructor(registry, typeName, value, opaqueName = 'WrapperKeepOpaque') {
+  constructor(registry, typeName, value, {
+    opaqueName = 'WrapperKeepOpaque'
+  } = {}) {
     const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
     super(registry, u8a);
     this.#Type = Type;

package/extended/WrapperOpaque.js

@@ -3,7 +3,9 @@
 import { WrapperKeepOpaque } from "./WrapperKeepOpaque.js";
 export class WrapperOpaque extends WrapperKeepOpaque {
   constructor(registry, typeName, value) {
-    super(registry, typeName, value, 'WrapperOpaque');
+    super(registry, typeName, value, {
+      opaqueName: 'WrapperOpaque'
+    });
   }
 
   static with(Type) {

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.7.2-7",
+  "version": "8.8.1",
   "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.7.2-7'
+  version: '8.8.1'
 };