@polkadot/types-create 8.5.1 → 8.5.2-10

package/cjs/create/class.js

@@ -116,7 +116,10 @@ const infoMapping = {
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   [_types.TypeDefInfo.Null]: (registry, _) => _typesCodec.Null,
-  [_types.TypeDefInfo.Option]: (registry, value) => createWithSub(_typesCodec.Option, value),
+  [_types.TypeDefInfo.Option]: (registry, value) => {
+    (0, _util.assert)(value.sub && !Array.isArray(value.sub), 'Expected type information for Option');
+    return value.sub.type === 'bool' ? _typesCodec.OptionBool : createWithSub(_typesCodec.Option, value);
+  },
   [_types.TypeDefInfo.Plain]: (registry, value) => registry.getOrUnknown(value.type),
   [_types.TypeDefInfo.Range]: (registry, value) => createWithSub(_typesCodec.Range, value),
   [_types.TypeDefInfo.RangeInclusive]: (registry, value) => createWithSub(_typesCodec.RangeInclusive, value),
@@ -183,5 +186,8 @@ function getTypeClass(registry, typeDef) {
 }
 
 function createClassUnsafe(registry, type) {
-  return getTypeClass(registry, registry.isLookupType(type) ? registry.lookup.getTypeDef(type) : (0, _getTypeDef.getTypeDef)(type));
+  return (// just retrieve via name, no creation via typeDef
+    registry.getUnsafe(type) || // we don't have an existing type, create the class via typeDef
+    getTypeClass(registry, registry.isLookupType(type) ? registry.lookup.getTypeDef(type) : (0, _getTypeDef.getTypeDef)(type))
+  );
 }

package/cjs/create/type.js

@@ -27,14 +27,11 @@ function checkInstance(created, matcher) {
 
 function checkPedantic(created, _ref) {
   let [value] = _ref;
-  let isPedantic = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
-  if (isPedantic) {
-    if ((0, _util.isU8a)(value)) {
-      checkInstance(created, value);
-    } else if ((0, _util.isHex)(value)) {
-      checkInstance(created, (0, _util.u8aToU8a)(value));
-    }
+  if ((0, _util.isU8a)(value)) {
+    checkInstance(created, value);
+  } else if ((0, _util.isHex)(value)) {
+    checkInstance(created, (0, _util.u8aToU8a)(value));
   }
 } // Initializes a type with a value. This also checks for fallbacks and in the cases
 // where isPedantic is specified (storage decoding), also check the format/structure
@@ -48,7 +45,7 @@ function initType(registry, Type) {
     isPedantic
   } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   const created = new (isOptional ? _typesCodec.Option.with(Type) : Type)(registry, ...params);
-  checkPedantic(created, params, isPedantic);
+  isPedantic && checkPedantic(created, params);
 
   if (blockHash) {
     created.createdAtHash = createTypeUnsafe(registry, 'Hash', [blockHash]);

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/types-create',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '8.5.1'
+  version: '8.5.2-10'
 };
 exports.packageInfo = packageInfo;

package/create/class.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-create authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { BTreeMap, BTreeSet, Bytes, CodecSet, Compact, DoNotConstruct, Enum, HashMap, Int, Null, Option, Range, RangeInclusive, Result, Struct, Tuple, U8aFixed, UInt, Vec, VecFixed, WrapperKeepOpaque, WrapperOpaque } from '@polkadot/types-codec';
+import { BTreeMap, BTreeSet, Bytes, CodecSet, Compact, DoNotConstruct, Enum, HashMap, Int, Null, Option, OptionBool, Range, RangeInclusive, Result, Struct, Tuple, U8aFixed, UInt, Vec, VecFixed, WrapperKeepOpaque, WrapperOpaque } from '@polkadot/types-codec';
 import { assert, isNumber, stringify } from '@polkadot/util';
 import { TypeDefInfo } from "../types/index.js";
 import { getTypeDef } from "../util/getTypeDef.js";
@@ -97,7 +97,10 @@ const infoMapping = {
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   [TypeDefInfo.Null]: (registry, _) => Null,
-  [TypeDefInfo.Option]: (registry, value) => createWithSub(Option, value),
+  [TypeDefInfo.Option]: (registry, value) => {
+    assert(value.sub && !Array.isArray(value.sub), 'Expected type information for Option');
+    return value.sub.type === 'bool' ? OptionBool : createWithSub(Option, value);
+  },
   [TypeDefInfo.Plain]: (registry, value) => registry.getOrUnknown(value.type),
   [TypeDefInfo.Range]: (registry, value) => createWithSub(Range, value),
   [TypeDefInfo.RangeInclusive]: (registry, value) => createWithSub(RangeInclusive, value),
@@ -158,5 +161,8 @@ export function getTypeClass(registry, typeDef) {
   return registry.getUnsafe(typeDef.type, false, typeDef);
 }
 export function createClassUnsafe(registry, type) {
-  return getTypeClass(registry, registry.isLookupType(type) ? registry.lookup.getTypeDef(type) : getTypeDef(type));
+  return (// just retrieve via name, no creation via typeDef
+    registry.getUnsafe(type) || // we don't have an existing type, create the class via typeDef
+    getTypeClass(registry, registry.isLookupType(type) ? registry.lookup.getTypeDef(type) : getTypeDef(type))
+  );
 }

package/create/type.js

@@ -15,13 +15,11 @@ function checkInstance(created, matcher) {
   assert(isOk, () => `${rawType}:: Decoded input doesn't match input, received ${u8aToHex(matcher, 512)} (${matcher.length} bytes), created ${u8aToHex(u8a, 512)} (${u8a.length} bytes)`);
 }
 
-function checkPedantic(created, [value], isPedantic = false) {
-  if (isPedantic) {
-    if (isU8a(value)) {
-      checkInstance(created, value);
-    } else if (isHex(value)) {
-      checkInstance(created, u8aToU8a(value));
-    }
+function checkPedantic(created, [value]) {
+  if (isU8a(value)) {
+    checkInstance(created, value);
+  } else if (isHex(value)) {
+    checkInstance(created, u8aToU8a(value));
   }
 } // Initializes a type with a value. This also checks for fallbacks and in the cases
 // where isPedantic is specified (storage decoding), also check the format/structure
@@ -33,7 +31,7 @@ function initType(registry, Type, params = [], {
   isPedantic
 } = {}) {
   const created = new (isOptional ? Option.with(Type) : Type)(registry, ...params);
-  checkPedantic(created, params, isPedantic);
+  isPedantic && checkPedantic(created, params);
 
   if (blockHash) {
     created.createdAtHash = createTypeUnsafe(registry, 'Hash', [blockHash]);

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.5.2-10",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -121,7 +121,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/util": "^9.2.1"
+    "@polkadot/types-codec": "8.5.2-10",
+    "@polkadot/util": "^9.2.2-15"
   }
 }

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/types-create',
   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.5.1'
+  version: '8.5.2-10'
 };