@yorozu/utils 0.1.1 → 0.1.4

package/lib/index.cjs

@@ -1382,94 +1382,59 @@ var Deque = class {
 // src/structures/lru-map.ts
 var LruMap = class {
   #capacity;
-  #head;
-  #tail;
   #map;
-  #size = 0;
   constructor(capacity, MapImpl = Map) {
     this.#capacity = capacity;
     this.#map = new MapImpl();
   }
   get size() {
-    return this.#size;
+    return this.#map.size;
   }
   get(key) {
-    let item = this.#map.get(key);
-    if (!item) return void 0;
-    this.#markUsed(item);
-    return item.value;
+    if (!this.#map.has(key)) return void 0;
+    let value = this.#map.get(key);
+    this.#map.delete(key);
+    this.#map.set(key, value);
+    return value;
   }
   has(key) {
     return this.#map.has(key);
   }
   set(key, value) {
-    let item = this.#map.get(key);
-    if (item) {
-      item.value = value;
-      this.#markUsed(item);
-      return;
-    }
-    item = {
-      key,
-      value,
-      next: void 0,
-      prev: void 0
-    };
-    this.#map.set(key, item);
-    if (this.#head) {
-      this.#head.prev = item;
-      item.next = this.#head;
-    } else {
-      this.#tail = item;
+    if (this.#map.has(key)) {
+      this.#map.delete(key);
     }
-    this.#head = item;
-    this.#size += 1;
-    if (this.#size > this.#capacity) {
-      let oldest = this.#tail;
-      if (oldest) this.#remove(oldest);
+    this.#map.set(key, value);
+    if (this.#map.size > this.#capacity) {
+      let oldest = this.#map.keys().next().value;
+      if (oldest !== void 0) {
+        this.#map.delete(oldest);
+      }
     }
   }
   delete(key) {
-    let item = this.#map.get(key);
-    if (item) this.#remove(item);
+    this.#map.delete(key);
   }
   clear() {
     this.#map.clear();
-    this.#head = void 0;
-    this.#tail = void 0;
-    this.#size = 0;
-  }
-  #markUsed(item) {
-    if (item === this.#head) return;
-    if (item.prev) {
-      if (item === this.#tail) this.#tail = item.prev;
-      item.prev.next = item.next;
-    }
-    if (item.next) item.next.prev = item.prev;
-    item.prev = void 0;
-    item.next = this.#head;
-    if (this.#head) this.#head.prev = item;
-    this.#head = item;
-  }
-  #remove(item) {
-    if (item.prev) {
-      this.#tail = item.prev;
-      this.#tail.next = void 0;
-    } else {
-      this.#tail = void 0;
-      this.#head = void 0;
-    }
-    item.prev = item.next = void 0;
-    this.#map.delete(item.key);
-    this.#size -= 1;
+  }
+  *[Symbol.iterator]() {
+    yield* this.#map;
+  }
+  entries() {
+    return this.#map.entries();
+  }
+  keys() {
+    return this.#map.keys();
+  }
+  values() {
+    return this.#map.values();
   }
 };
 
 // src/structures/lru-set.ts
 var LruSet = class {
   #capacity;
-  #head;
-  #tail;
   #set;
   constructor(capacity, SetImpl = Set) {
     this.#capacity = capacity;
@@ -1479,26 +1444,29 @@ var LruSet = class {
     return this.#set.size;
   }
   add(value) {
-    if (this.#set.has(value)) return;
-    if (!this.#head) this.#head = { value };
-    if (!this.#tail) this.#tail = this.#head;
-    else {
-      this.#tail.next = { value };
-      this.#tail = this.#tail.next;
+    if (this.#set.has(value)) {
+      this.#set.delete(value);
     }
     this.#set.add(value);
-    if (this.#set.size > this.#capacity && this.#head !== void 0) {
-      this.#set.delete(this.#head.value);
-      this.#head = this.#head.next;
+    if (this.#set.size > this.#capacity) {
+      let oldest = this.#set.keys().next().value;
+      if (oldest !== void 0) {
+        this.#set.delete(oldest);
+      }
     }
   }
   has(value) {
     return this.#set.has(value);
   }
   clear() {
-    this.#head = this.#tail = void 0;
     this.#set.clear();
   }
+  *[Symbol.iterator]() {
+    yield* this.#set;
+  }
+  toArray() {
+    return Array.from(this.#set);
+  }
 };
 
 // src/not-sync/async-lock.ts

package/lib/index.d.cts

@@ -327,21 +327,19 @@ declare class Deque<T> {
     [Symbol.iterator](): Iterator<T>;
 }
 
-interface TwoWayLinkedList<K, V> {
-    key: K;
-    value: V;
-    prev?: TwoWayLinkedList<K, V>;
-    next?: TwoWayLinkedList<K, V>;
-}
 declare class LruMap<K, V> {
     #private;
-    constructor(capacity: number, MapImpl?: new () => Map<K, TwoWayLinkedList<K, V>>);
+    constructor(capacity: number, MapImpl?: new () => Map<K, V>);
     get size(): number;
     get(key: K): V | undefined;
     has(key: K): boolean;
     set(key: K, value: V): void;
     delete(key: K): void;
     clear(): void;
+    [Symbol.iterator](): IterableIterator<[K, V]>;
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
 }
 
 declare class LruSet<T> {
@@ -351,6 +349,8 @@ declare class LruSet<T> {
     add(value: T): void;
     has(value: T): boolean;
     clear(): void;
+    [Symbol.iterator](): IterableIterator<T>;
+    toArray(): Array<T>;
 }
 
 declare class AsyncQueue<T> {

package/lib/index.d.ts

@@ -327,21 +327,19 @@ declare class Deque<T> {
     [Symbol.iterator](): Iterator<T>;
 }
 
-interface TwoWayLinkedList<K, V> {
-    key: K;
-    value: V;
-    prev?: TwoWayLinkedList<K, V>;
-    next?: TwoWayLinkedList<K, V>;
-}
 declare class LruMap<K, V> {
     #private;
-    constructor(capacity: number, MapImpl?: new () => Map<K, TwoWayLinkedList<K, V>>);
+    constructor(capacity: number, MapImpl?: new () => Map<K, V>);
     get size(): number;
     get(key: K): V | undefined;
     has(key: K): boolean;
     set(key: K, value: V): void;
     delete(key: K): void;
     clear(): void;
+    [Symbol.iterator](): IterableIterator<[K, V]>;
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
 }
 
 declare class LruSet<T> {
@@ -351,6 +349,8 @@ declare class LruSet<T> {
     add(value: T): void;
     has(value: T): boolean;
     clear(): void;
+    [Symbol.iterator](): IterableIterator<T>;
+    toArray(): Array<T>;
 }
 
 declare class AsyncQueue<T> {

package/lib/index.js

@@ -1297,94 +1297,59 @@ var Deque = class {
 // src/structures/lru-map.ts
 var LruMap = class {
   #capacity;
-  #head;
-  #tail;
   #map;
-  #size = 0;
   constructor(capacity, MapImpl = Map) {
     this.#capacity = capacity;
     this.#map = new MapImpl();
   }
   get size() {
-    return this.#size;
+    return this.#map.size;
   }
   get(key) {
-    let item = this.#map.get(key);
-    if (!item) return void 0;
-    this.#markUsed(item);
-    return item.value;
+    if (!this.#map.has(key)) return void 0;
+    let value = this.#map.get(key);
+    this.#map.delete(key);
+    this.#map.set(key, value);
+    return value;
   }
   has(key) {
     return this.#map.has(key);
   }
   set(key, value) {
-    let item = this.#map.get(key);
-    if (item) {
-      item.value = value;
-      this.#markUsed(item);
-      return;
-    }
-    item = {
-      key,
-      value,
-      next: void 0,
-      prev: void 0
-    };
-    this.#map.set(key, item);
-    if (this.#head) {
-      this.#head.prev = item;
-      item.next = this.#head;
-    } else {
-      this.#tail = item;
+    if (this.#map.has(key)) {
+      this.#map.delete(key);
     }
-    this.#head = item;
-    this.#size += 1;
-    if (this.#size > this.#capacity) {
-      let oldest = this.#tail;
-      if (oldest) this.#remove(oldest);
+    this.#map.set(key, value);
+    if (this.#map.size > this.#capacity) {
+      let oldest = this.#map.keys().next().value;
+      if (oldest !== void 0) {
+        this.#map.delete(oldest);
+      }
     }
   }
   delete(key) {
-    let item = this.#map.get(key);
-    if (item) this.#remove(item);
+    this.#map.delete(key);
   }
   clear() {
     this.#map.clear();
-    this.#head = void 0;
-    this.#tail = void 0;
-    this.#size = 0;
-  }
-  #markUsed(item) {
-    if (item === this.#head) return;
-    if (item.prev) {
-      if (item === this.#tail) this.#tail = item.prev;
-      item.prev.next = item.next;
-    }
-    if (item.next) item.next.prev = item.prev;
-    item.prev = void 0;
-    item.next = this.#head;
-    if (this.#head) this.#head.prev = item;
-    this.#head = item;
-  }
-  #remove(item) {
-    if (item.prev) {
-      this.#tail = item.prev;
-      this.#tail.next = void 0;
-    } else {
-      this.#tail = void 0;
-      this.#head = void 0;
-    }
-    item.prev = item.next = void 0;
-    this.#map.delete(item.key);
-    this.#size -= 1;
+  }
+  *[Symbol.iterator]() {
+    yield* this.#map;
+  }
+  entries() {
+    return this.#map.entries();
+  }
+  keys() {
+    return this.#map.keys();
+  }
+  values() {
+    return this.#map.values();
   }
 };
 
 // src/structures/lru-set.ts
 var LruSet = class {
   #capacity;
-  #head;
-  #tail;
   #set;
   constructor(capacity, SetImpl = Set) {
     this.#capacity = capacity;
@@ -1394,26 +1359,29 @@ var LruSet = class {
     return this.#set.size;
   }
   add(value) {
-    if (this.#set.has(value)) return;
-    if (!this.#head) this.#head = { value };
-    if (!this.#tail) this.#tail = this.#head;
-    else {
-      this.#tail.next = { value };
-      this.#tail = this.#tail.next;
+    if (this.#set.has(value)) {
+      this.#set.delete(value);
     }
     this.#set.add(value);
-    if (this.#set.size > this.#capacity && this.#head !== void 0) {
-      this.#set.delete(this.#head.value);
-      this.#head = this.#head.next;
+    if (this.#set.size > this.#capacity) {
+      let oldest = this.#set.keys().next().value;
+      if (oldest !== void 0) {
+        this.#set.delete(oldest);
+      }
     }
   }
   has(value) {
     return this.#set.has(value);
   }
   clear() {
-    this.#head = this.#tail = void 0;
     this.#set.clear();
   }
+  *[Symbol.iterator]() {
+    yield* this.#set;
+  }
+  toArray() {
+    return Array.from(this.#set);
+  }
 };
 
 // src/not-sync/async-lock.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yorozu/utils",
-    "version": "0.1.1",
+    "version": "0.1.4",
     "type": "module",
     "sideEffects": false,
     "author": "inshinrei",