@btc-vision/transaction 1.7.3 → 1.7.5

package/src/deterministic/Map.ts

@@ -1,10 +1,8 @@
-import { i32 } from '../utils/types.js';
-
 export class Map<K, V> {
     protected _keys: K[] = [];
-    protected _values: V[] = [];
+    protected _values: Record<string, V> = {};
 
-    public get size(): i32 {
+    public get size(): number {
         return this._keys.length;
     }
 
@@ -13,66 +11,77 @@ export class Map<K, V> {
     }
 
     public *values(): IterableIterator<V> {
-        yield* this._values;
+        for (const key of this._keys) {
+            yield this._values[this.keyToString(key)];
+        }
     }
 
     public *entries(): IterableIterator<[K, V]> {
-        for (let i: i32 = 0; i < this._keys.length; i++) {
-            yield [this._keys[i], this._values[i]];
+        for (const key of this._keys) {
+            yield [key, this._values[this.keyToString(key)]];
         }
     }
 
     public set(key: K, value: V): void {
-        const index: i32 = this.indexOf(key);
-        if (index == -1) {
+        const keyStr = this.keyToString(key);
+        if (!this.has(key)) {
             this._keys.push(key);
-            this._values.push(value);
-        } else {
-            this._values[index] = value;
         }
+
+        this._values[keyStr] = value;
     }
 
-    public indexOf(key: K): i32 {
-        for (let i: i32 = 0; i < this._keys.length; i++) {
-            if (this._keys[i] == key) {
+    public indexOf(key: K): number {
+        for (let i = 0; i < this._keys.length; i++) {
+            if (this._keys[i] === key) {
                 return i;
             }
         }
-
         return -1;
     }
 
     public get(key: K): V | undefined {
-        const index: i32 = this.indexOf(key);
-        if (index == -1) {
-            return undefined;
-        }
-        return this._values[index];
+        return this._values[this.keyToString(key)];
     }
 
     public has(key: K): boolean {
-        return this.indexOf(key) != -1;
+        return Object.prototype.hasOwnProperty.call(this._values, this.keyToString(key));
     }
 
     public delete(key: K): boolean {
-        const index: i32 = this.indexOf(key);
-        if (index == -1) {
+        const index = this.indexOf(key);
+        if (index === -1) {
             return false;
         }
 
+        const keyStr = this.keyToString(key);
         this._keys.splice(index, 1);
-        this._values.splice(index, 1);
+        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+        delete this._values[keyStr];
         return true;
     }
 
     public clear(): void {
         this._keys = [];
-        this._values = [];
+        this._values = {};
     }
 
     *[Symbol.iterator](): IterableIterator<[K, V]> {
-        for (let i: i32 = 0; i < this._keys.length; i++) {
-            yield [this._keys[i], this._values[i]];
+        for (const key of this._keys) {
+            yield [key, this._values[this.keyToString(key)]];
+        }
+    }
+
+    private keyToString(key: K): string {
+        if (typeof key === 'string') {
+            return key;
+        }
+        if (typeof key === 'number' || typeof key === 'boolean') {
+            return String(key);
+        }
+        if (typeof key === 'object' && key !== null) {
+            return JSON.stringify(key);
         }
+        return String(key);
     }
 }

package/src/opnet.ts

@@ -126,6 +126,7 @@ export * from './keypair/Secp256k1PointDeriver.js';
 export * from './transaction/ContractAddress.js';
 
 export * from './deterministic/Map.js';
+export * from './deterministic/CustomMap.js';
 
 declare global {
     interface Window {