@polkadot/types-codec 10.11.2 → 10.12.1

package/cjs/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("./detectPackage.js");
+require("./packageDetect.js");
 tslib_1.__exportStar(require("./bundle.js"), exports);

package/cjs/packageDetect.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("@polkadot/util");
+const packageInfo_js_1 = require("./packageInfo.js");
+(0, util_1.detectPackage)(packageInfo_js_1.packageInfo, null, []);

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@polkadot/types-codec', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '10.11.2' };
+exports.packageInfo = { name: '@polkadot/types-codec', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '10.12.1' };

package/cjs/utils/sortValues.js

@@ -10,6 +10,10 @@ function isArrayLike(arg) {
 function isEnum(arg) {
     return (0, util_1.isCodec)(arg) && (0, util_1.isNumber)(arg.index) && (0, util_1.isCodec)(arg.value);
 }
+/** @internal **/
+function isOption(arg) {
+    return (0, util_1.isCodec)(arg) && (0, util_1.isBoolean)(arg.isSome) && (0, util_1.isCodec)(arg.value);
+}
 /** @internal */
 function isNumberLike(arg) {
     return (0, util_1.isNumber)(arg) || (0, util_1.isBn)(arg) || (0, util_1.isBigInt)(arg);
@@ -27,6 +31,20 @@ function sortArray(a, b) {
     }
     return a.length - b.length;
 }
+/** @internal */
+function checkForDuplicates(container, seen, arg) {
+    // Convert the value to hex.
+    if ((0, util_1.isCodec)(arg)) {
+        const hex = arg.toHex();
+        // Check if we have seen the value.
+        if (seen.has(hex)) {
+            // Duplicates are not allowed.
+            throw new Error(`Duplicate value in ${container}: ${(0, util_1.stringify)(arg)}`);
+        }
+        seen.add(hex);
+    }
+    return true;
+}
 /**
 * Sort keys/values of BTreeSet/BTreeMap in ascending order for encoding compatibility with Rust's BTreeSet/BTreeMap
 * (https://doc.rust-lang.org/stable/std/collections/struct.BTreeSet.html)
@@ -42,6 +60,9 @@ function sortAsc(a, b) {
     else if (isEnum(a) && isEnum(b)) {
         return sortAsc(a.index, b.index) || sortAsc(a.value, b.value);
     }
+    else if (isOption(a) && isOption(b)) {
+        return sortAsc(a.isNone ? 0 : 1, b.isNone ? 0 : 1) || sortAsc(a.value, b.value);
+    }
     else if (isArrayLike(a) && isArrayLike(b)) {
         return sortArray(a, b);
     }
@@ -53,10 +74,12 @@ function sortAsc(a, b) {
 }
 exports.sortAsc = sortAsc;
 function sortSet(set) {
-    return new Set(Array.from(set).sort(sortAsc));
+    const seen = new Set();
+    return new Set(Array.from(set).filter((value) => checkForDuplicates('BTreeSet', seen, value)).sort(sortAsc));
 }
 exports.sortSet = sortSet;
 function sortMap(map) {
-    return new Map(Array.from(map.entries()).sort(([keyA], [keyB]) => sortAsc(keyA, keyB)));
+    const seen = new Set();
+    return new Map(Array.from(map.entries()).filter(([key]) => checkForDuplicates('BTreeMap', seen, key)).sort(([keyA], [keyB]) => sortAsc(keyA, keyB)));
 }
 exports.sortMap = sortMap;

package/index.d.ts

@@ -1,2 +1,2 @@
-import './detectPackage.js';
+import './packageDetect.js';
 export * from './bundle.js';

package/index.js

@@ -1,2 +1,2 @@
-import './detectPackage.js';
+import './packageDetect.js';
 export * from './bundle.js';

package/package.json

@@ -14,11 +14,11 @@
     "url": "https://github.com/polkadot-js/api.git"
   },
   "sideEffects": [
-    "./detectPackage.js",
-    "./cjs/detectPackage.js"
+    "./packageDetect.js",
+    "./cjs/packageDetect.js"
   ],
   "type": "module",
-  "version": "10.11.2",
+  "version": "10.12.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -145,18 +145,6 @@
       "require": "./cjs/bundle.js",
       "default": "./bundle.js"
     },
-    "./detectOther": {
-      "types": "./detectOther.d.ts",
-      "module": "./detectOther.js",
-      "require": "./cjs/detectOther.js",
-      "default": "./detectOther.js"
-    },
-    "./detectPackage": {
-      "types": "./detectPackage.d.ts",
-      "module": "./detectPackage.js",
-      "require": "./cjs/detectPackage.js",
-      "default": "./detectPackage.js"
-    },
     "./extended": {
       "types": "./extended/index.d.ts",
       "module": "./extended/index.js",
@@ -310,6 +298,12 @@
       "require": "./cjs/package.json",
       "default": "./package.json"
     },
+    "./packageDetect": {
+      "types": "./packageDetect.d.ts",
+      "module": "./packageDetect.js",
+      "require": "./cjs/packageDetect.js",
+      "default": "./packageDetect.js"
+    },
     "./packageInfo.js": {
       "types": "./packageInfo.d.ts",
       "module": "./packageInfo.js",

package/{detectPackage.js → packageDetect.js}

@@ -1,4 +1,3 @@
 import { detectPackage } from '@polkadot/util';
-import others from './detectOther.js';
 import { packageInfo } from './packageInfo.js';
-detectPackage(packageInfo, null, others);
+detectPackage(packageInfo, null, []);

package/packageInfo.js

@@ -1 +1 @@
-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: '10.11.2' };
+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: '10.12.1' };

package/utils/sortValues.js

@@ -1,4 +1,4 @@
-import { bnToBn, isBigInt, isBn, isCodec, isNumber, stringify } from '@polkadot/util';
+import { bnToBn, isBigInt, isBn, isBoolean, isCodec, isNumber, stringify } from '@polkadot/util';
 /** @internal **/
 function isArrayLike(arg) {
     return arg instanceof Uint8Array || Array.isArray(arg);
@@ -7,6 +7,10 @@ function isArrayLike(arg) {
 function isEnum(arg) {
     return isCodec(arg) && isNumber(arg.index) && isCodec(arg.value);
 }
+/** @internal **/
+function isOption(arg) {
+    return isCodec(arg) && isBoolean(arg.isSome) && isCodec(arg.value);
+}
 /** @internal */
 function isNumberLike(arg) {
     return isNumber(arg) || isBn(arg) || isBigInt(arg);
@@ -24,6 +28,20 @@ function sortArray(a, b) {
     }
     return a.length - b.length;
 }
+/** @internal */
+function checkForDuplicates(container, seen, arg) {
+    // Convert the value to hex.
+    if (isCodec(arg)) {
+        const hex = arg.toHex();
+        // Check if we have seen the value.
+        if (seen.has(hex)) {
+            // Duplicates are not allowed.
+            throw new Error(`Duplicate value in ${container}: ${stringify(arg)}`);
+        }
+        seen.add(hex);
+    }
+    return true;
+}
 /**
 * Sort keys/values of BTreeSet/BTreeMap in ascending order for encoding compatibility with Rust's BTreeSet/BTreeMap
 * (https://doc.rust-lang.org/stable/std/collections/struct.BTreeSet.html)
@@ -39,6 +57,9 @@ export function sortAsc(a, b) {
     else if (isEnum(a) && isEnum(b)) {
         return sortAsc(a.index, b.index) || sortAsc(a.value, b.value);
     }
+    else if (isOption(a) && isOption(b)) {
+        return sortAsc(a.isNone ? 0 : 1, b.isNone ? 0 : 1) || sortAsc(a.value, b.value);
+    }
     else if (isArrayLike(a) && isArrayLike(b)) {
         return sortArray(a, b);
     }
@@ -49,8 +70,10 @@ export function sortAsc(a, b) {
     throw new Error(`Attempting to sort unrecognized values: ${stringify(a)} (typeof ${typeof a}) <-> ${stringify(b)} (typeof ${typeof b})`);
 }
 export function sortSet(set) {
-    return new Set(Array.from(set).sort(sortAsc));
+    const seen = new Set();
+    return new Set(Array.from(set).filter((value) => checkForDuplicates('BTreeSet', seen, value)).sort(sortAsc));
 }
 export function sortMap(map) {
-    return new Map(Array.from(map.entries()).sort(([keyA], [keyB]) => sortAsc(keyA, keyB)));
+    const seen = new Set();
+    return new Map(Array.from(map.entries()).filter(([key]) => checkForDuplicates('BTreeMap', seen, key)).sort(([keyA], [keyB]) => sortAsc(keyA, keyB)));
 }

package/cjs/detectOther.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = [];

package/cjs/detectPackage.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const util_1 = require("@polkadot/util");
-const detectOther_js_1 = tslib_1.__importDefault(require("./detectOther.js"));
-const packageInfo_js_1 = require("./packageInfo.js");
-(0, util_1.detectPackage)(packageInfo_js_1.packageInfo, null, detectOther_js_1.default);

package/detectOther.d.ts

@@ -1,2 +0,0 @@
-declare const _default: never[];
-export default _default;

package/detectOther.js

@@ -1 +0,0 @@
-export default [];