@polkadot/types-codec 9.3.3 → 9.4.1

package/abstract/Int.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_QUINTILL, bnToBn, bnToHex, bnToU8a, formatBalance, formatNumber, hexToBn, isBn, isHex, isNumber, isString, isU8a, u8aToBn, u8aToNumber } from '@polkadot/util';
+import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_QUINTILL, bnToBn, bnToHex, bnToU8a, formatBalance, formatNumber, hexToBn, isBn, isFunction, isHex, isNumber, isObject, isString, isU8a, u8aToBn, u8aToNumber } from '@polkadot/util';
 export const DEFAULT_UINT_BITS = 64; // Maximum allowed integer for JS is 2^53 - 1, set limit at 52
 // In this case however, we always print any >32 as hex
 
@@ -36,6 +36,23 @@ function decodeAbstractInt(value, isNegative) {
     return value;
   } else if (isBn(value)) {
     return value.toString();
+  } else if (isObject(value) && !isFunction(value.toBn)) {
+    // Allow the construction from an object with a single top-level key. This means that
+    // single key objects can be treated equivalently to numbers, assuming they meet the
+    // specific requirements. (This is useful in Weights 1.5 where Objects are compact)
+    const keys = Object.keys(value);
+
+    if (keys.length !== 1) {
+      throw new Error('Unable to construct number from multi-key object');
+    }
+
+    const inner = value[keys[0]];
+
+    if (!isString(inner) && !isNumber(inner)) {
+      throw new Error('Unable to construct from object with non-string/non-number value');
+    }
+
+    return decodeAbstractInt(inner, isNegative);
   }
 
   return bnToBn(value).toString();

package/cjs/abstract/Int.js

@@ -45,6 +45,23 @@ function decodeAbstractInt(value, isNegative) {
     return value;
   } else if ((0, _util.isBn)(value)) {
     return value.toString();
+  } else if ((0, _util.isObject)(value) && !(0, _util.isFunction)(value.toBn)) {
+    // Allow the construction from an object with a single top-level key. This means that
+    // single key objects can be treated equivalently to numbers, assuming they meet the
+    // specific requirements. (This is useful in Weights 1.5 where Objects are compact)
+    const keys = Object.keys(value);
+
+    if (keys.length !== 1) {
+      throw new Error('Unable to construct number from multi-key object');
+    }
+
+    const inner = value[keys[0]];
+
+    if (!(0, _util.isString)(inner) && !(0, _util.isNumber)(inner)) {
+      throw new Error('Unable to construct from object with non-string/non-number value');
+    }
+
+    return decodeAbstractInt(inner, isNegative);
   }
 
   return (0, _util.bnToBn)(value).toString();

package/cjs/packageInfo.js

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

package/package.json

@@ -20,7 +20,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "9.3.3",
+  "version": "9.4.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -434,8 +434,8 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.9",
-    "@polkadot/util": "^10.1.7",
-    "@polkadot/x-bigint": "^10.1.7"
+    "@babel/runtime": "^7.19.0",
+    "@polkadot/util": "^10.1.8",
+    "@polkadot/x-bigint": "^10.1.8"
   }
 }

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: '9.3.3'
+  version: '9.4.1'
 };