@polkadot/types-codec 8.7.2-17 → 8.7.2-18

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/packageInfo.js

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

package/package.json

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