@polkadot/types-codec 8.8.3-12 → 8.8.3-13

package/base/Enum.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { isHex, isNumber, isObject, isString, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, stringPascalCase, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { isHex, isNumber, isObject, isString, isU8a, objectProperties, stringCamelCase, stringify, stringPascalCase, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { mapToTypeMap, typesToMap } from "../utils/index.js";
 import { Null } from "./Null.js"; // export interface, this is used in Enum.with, so required as public by TS
 
@@ -73,16 +73,36 @@ function extractDef(registry, _def) {
   };
 }
 
-function createFromValue(registry, def, index = 0, value) {
-  const entry = Object.values(def).find(e => e.index === index);
+function getEntryType(def, checkIdx) {
+  const values = Object.values(def);
+
+  for (let i = 0; i < values.length; i++) {
+    const {
+      Type,
+      index
+    } = values[i];
 
-  if (isUndefined(entry)) {
-    throw new Error(`Unable to create Enum via index ${index}, in ${Object.keys(def).join(', ')}`);
+    if (index === checkIdx) {
+      return Type;
+    }
   }
 
+  throw new Error(`Unable to create Enum via index ${checkIdx}, in ${Object.keys(def).join(', ')}`);
+}
+
+function createFromU8a(registry, def, index, value) {
+  const Type = getEntryType(def, index);
+  return {
+    index,
+    value: new Type(registry, value)
+  };
+}
+
+function createFromValue(registry, def, index = 0, value) {
+  const Type = getEntryType(def, index);
   return {
     index,
-    value: value instanceof entry.Type ? value : new entry.Type(registry, value)
+    value: value instanceof Type ? value : new Type(registry, value)
   };
 }
 
@@ -113,7 +133,7 @@ function decodeEnum(registry, def, value, index) {
     const u8a = u8aToU8a(value); // nested, we don't want to match isObject below
 
     if (u8a.length) {
-      return createFromValue(registry, def, u8a[0], u8a.subarray(1));
+      return createFromU8a(registry, def, u8a[0], u8a.subarray(1));
     }
   } else if (value instanceof Enum) {
     return createFromValue(registry, def, value.index, value.value);
@@ -155,7 +175,7 @@ export class Enum {
       isIndexed
     } = definition || setDefinition(extractDef(registry, Types)); // shortcut isU8a as used in SCALE decoding
 
-    const decoded = isU8a(value) && value.length && !isNumber(index) ? createFromValue(registry, def, value[0], value.subarray(1)) : decodeEnum(registry, def, value, index);
+    const decoded = isU8a(value) && value.length && !isNumber(index) ? createFromU8a(registry, def, value[0], value.subarray(1)) : decodeEnum(registry, def, value, index);
     this.registry = registry;
     this.#def = def;
     this.#isBasic = isBasic;

package/cjs/base/Enum.js

@@ -85,18 +85,38 @@ function extractDef(registry, _def) {
   };
 }
 
-function createFromValue(registry, def) {
-  let index = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  let value = arguments.length > 3 ? arguments[3] : undefined;
-  const entry = Object.values(def).find(e => e.index === index);
+function getEntryType(def, checkIdx) {
+  const values = Object.values(def);
+
+  for (let i = 0; i < values.length; i++) {
+    const {
+      Type,
+      index
+    } = values[i];
 
-  if ((0, _util.isUndefined)(entry)) {
-    throw new Error(`Unable to create Enum via index ${index}, in ${Object.keys(def).join(', ')}`);
+    if (index === checkIdx) {
+      return Type;
+    }
   }
 
+  throw new Error(`Unable to create Enum via index ${checkIdx}, in ${Object.keys(def).join(', ')}`);
+}
+
+function createFromU8a(registry, def, index, value) {
+  const Type = getEntryType(def, index);
+  return {
+    index,
+    value: new Type(registry, value)
+  };
+}
+
+function createFromValue(registry, def) {
+  let index = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  let value = arguments.length > 3 ? arguments[3] : undefined;
+  const Type = getEntryType(def, index);
   return {
     index,
-    value: value instanceof entry.Type ? value : new entry.Type(registry, value)
+    value: value instanceof Type ? value : new Type(registry, value)
   };
 }
 
@@ -127,7 +147,7 @@ function decodeEnum(registry, def, value, index) {
     const u8a = (0, _util.u8aToU8a)(value); // nested, we don't want to match isObject below
 
     if (u8a.length) {
-      return createFromValue(registry, def, u8a[0], u8a.subarray(1));
+      return createFromU8a(registry, def, u8a[0], u8a.subarray(1));
     }
   } else if (value instanceof Enum) {
     return createFromValue(registry, def, value.index, value.value);
@@ -170,7 +190,7 @@ class Enum {
       isIndexed
     } = definition || setDefinition(extractDef(registry, Types)); // shortcut isU8a as used in SCALE decoding
 
-    const decoded = (0, _util.isU8a)(value) && value.length && !(0, _util.isNumber)(index) ? createFromValue(registry, def, value[0], value.subarray(1)) : decodeEnum(registry, def, value, index);
+    const decoded = (0, _util.isU8a)(value) && value.length && !(0, _util.isNumber)(index) ? createFromU8a(registry, def, value[0], value.subarray(1)) : decodeEnum(registry, def, value, index);
     this.registry = registry;
     this.#def = def;
     this.#isBasic = isBasic;

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-12'
+  version: '8.8.3-13'
 };
 exports.packageInfo = packageInfo;

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "8.8.3-12",
+  "version": "8.8.3-13",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -415,6 +415,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.3",
-    "@polkadot/util": "^9.4.2-22"
+    "@polkadot/util": "^9.5.1"
   }
 }

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-12'
+  version: '8.8.3-13'
 };