@polkadot/types-codec 7.11.2-0 → 7.11.2-1

package/base/Option.cjs

@@ -13,23 +13,33 @@ var _Null = require("./Null.cjs");
 
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+class None extends _Null.Null {
+  /**
+   * @description Returns the base runtime type name for this instance
+   */
+  toRawType() {
+    return 'None';
+  }
 
+}
 /** @internal */
+
+
 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 instanceof _Null.Null || value === '0x') {
-    return new _Null.Null(registry);
+  if ((0, _util.isNull)(value) || (0, _util.isUndefined)(value) || value === '0x') {
+    return new None(registry);
   } else if (value instanceof Type) {
     // don't re-create, use as it (which also caters for derived types)
     return value;
   } 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
-    return !value.length || value[0] === 0 ? new _Null.Null(registry) : new Type(registry, value.subarray(1));
+    return !value.length || value[0] === 0 ? new None(registry) : new Type(registry, value.subarray(1));
   }
 
   return new Type(registry, value);
@@ -51,12 +61,12 @@ class Option {
 
   constructor(registry, typeName, value) {
     const Type = (0, _index.typeToConstructor)(registry, typeName);
-    const decoded = (0, _util.isU8a)(value) && value.length && !(0, _util.isCodec)(value) ? value[0] === 0 ? new _Null.Null(registry) : new Type(registry, value.subarray(1)) : decodeOption(registry, Type, value);
+    const decoded = (0, _util.isU8a)(value) && value.length && !(0, _util.isCodec)(value) ? value[0] === 0 ? new None(registry) : new Type(registry, value.subarray(1)) : decodeOption(registry, Type, value);
     this.registry = registry;
     this.#Type = Type;
     this.#raw = decoded;
 
-    if (decoded.initialU8aLength) {
+    if (decoded && decoded.initialU8aLength) {
       this.#initialU8aLength = 1 + decoded.initialU8aLength;
     }
   }
@@ -108,7 +118,7 @@ class Option {
 
 
   get isNone() {
-    return this.#raw instanceof _Null.Null;
+    return this.#raw instanceof None;
   }
   /**
    * @description Checks if the Option has a value

package/base/Option.js

@@ -3,23 +3,34 @@
 import { assert, isCodec, isNull, isU8a, isUndefined, u8aToHex } from '@polkadot/util';
 import { typeToConstructor } from "../utils/index.js";
 import { Null } from "./Null.js";
+
+class None extends Null {
+  /**
+   * @description Returns the base runtime type name for this instance
+   */
+  toRawType() {
+    return 'None';
+  }
+
+}
 /** @internal */
 
+
 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 instanceof Null || value === '0x') {
-    return new Null(registry);
+  if (isNull(value) || isUndefined(value) || value === '0x') {
+    return new None(registry);
   } else if (value instanceof Type) {
     // don't re-create, use as it (which also caters for derived types)
     return value;
   } 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
-    return !value.length || value[0] === 0 ? new Null(registry) : new Type(registry, value.subarray(1));
+    return !value.length || value[0] === 0 ? new None(registry) : new Type(registry, value.subarray(1));
   }
 
   return new Type(registry, value);
@@ -41,12 +52,12 @@ export class Option {
 
   constructor(registry, typeName, value) {
     const Type = typeToConstructor(registry, typeName);
-    const decoded = isU8a(value) && value.length && !isCodec(value) ? value[0] === 0 ? new Null(registry) : new Type(registry, value.subarray(1)) : decodeOption(registry, Type, value);
+    const decoded = isU8a(value) && value.length && !isCodec(value) ? value[0] === 0 ? new None(registry) : new Type(registry, value.subarray(1)) : decodeOption(registry, Type, value);
     this.registry = registry;
     this.#Type = Type;
     this.#raw = decoded;
 
-    if (decoded.initialU8aLength) {
+    if (decoded && decoded.initialU8aLength) {
       this.#initialU8aLength = 1 + decoded.initialU8aLength;
     }
   }
@@ -98,7 +109,7 @@ export class Option {
 
 
   get isNone() {
-    return this.#raw instanceof Null;
+    return this.#raw instanceof None;
   }
   /**
    * @description Checks if the Option has a value

package/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.11.2-0",
+  "version": "7.11.2-1",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",

package/packageInfo.cjs

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

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 : 'auto',
   type: 'esm',
-  version: '7.11.2-0'
+  version: '7.11.2-1'
 };