dubc-ds-tmap 1.0.1 → 1.0.5

package/README.md

@@ -149,7 +149,7 @@ Returns an iterable iterator over the keys in the map.
 
 ### `.range(start:K, end:K, include?:Include)` O(1)
 
-Returns an iterable iterator over a range of keys in the map. The 
+Returns an iterable over a range of keys in the map. The 
 iterator will produce key/value pairs.
 
 The optional third parameter specifies whether the range is inclusive
@@ -197,6 +197,15 @@ The provided pairs can be in one of the three forms accepted by
 `TMap`'s constructor (objects with key and value fields, tuples of
 keys and values, or, for string keys, a JavaScript object.)
 
+### `.slice(start:number, end:number)`
+
+Returns an iterable over a range of indices. `end` is always exclusive.
+
+### `.to(k:K)` O(log n)
+
+Returns the key/value pair whose key is less than or equal to the provided
+key, or `undefined` if no such pair exists in the map.
+
 ### `.unhear(n:number)` O(1)
 
 Removes the listener registered with the specified number.
@@ -217,8 +226,9 @@ Returns an iterable iterator over the values in the map.
 * `TMap` itself is an iterable, so you can use it directly in `for...of`
 * `i` to get an iterator 
 * `keys()` if you just want the keys
-* `range(start,end,include)` for partial iteration
+* `range(start,end,include)` for partial iteration over a range of keys
 * `reversed()` to iterate backwards
+* `slice(start,end)` for partial iteration over a range of indices
 * `values()` if you just want the values
 
 ### Keys

package/dist/index.d.ts

@@ -42,6 +42,7 @@ export interface Conf<K extends {}, V> {
     readonly valueEq: (a: V, b: V) => boolean;
 }
 export declare class TMap<K extends {}, V> extends Base<Pair<K, V>> {
+    #private;
     private root;
     private _compare;
     protected conf: Conf<K, V>;
@@ -50,7 +51,7 @@ export declare class TMap<K extends {}, V> extends Base<Pair<K, V>> {
     toEmpty(): TMap<K, V>;
     get size(): number;
     clear(): void;
-    replace(i: Pairs<K, V>): void;
+    replace(i: Pairs<K, V>): boolean;
     drop(f: (pair: Pair<K, V>) => boolean): number;
     get compare(): (a: K, b: K) => number;
     set compare(cmp: (a: K, b: K) => number);
@@ -59,10 +60,11 @@ export declare class TMap<K extends {}, V> extends Base<Pair<K, V>> {
     get first(): Pair<K, V> | undefined;
     get last(): Pair<K, V> | undefined;
     [Symbol.iterator](): Generator<Pair<K, V>>;
-    keys(): Generator<K, void, unknown>;
-    values(): Generator<V, void, unknown>;
-    reversed(): Generator<Pair<K, V>, void, unknown>;
-    range(startKey: K, endKey: K, inc?: Include): Generator<Pair<K, V>, void, unknown>;
+    keys(): Iterable<K>;
+    values(): Iterable<V>;
+    reversed(): Iterable<Pair<K, V>>;
+    range(startKey: K, endKey: K, inc?: Include): Iterable<Pair<K, V>>;
+    slice(start: number, end: number): Iterable<Pair<K, V>>;
     private find;
     get(key: K): V | undefined;
     has(key: K): boolean;

package/dist/index.js

@@ -1,18 +1,23 @@
 import { Base } from "dubc-ds-base";
+import { iterable } from "dubc-ds-iterables";
 import { forEach } from "dubc-ds-pairs";
 export const IN_IN = { start: true, end: true };
 export const IN_EX = { start: true, end: false };
 export const EX_IN = { start: false, end: true };
 export const EX_EX = { start: false, end: false };
 class Node {
+    key;
+    value;
+    weight = 1;
+    parent;
+    left;
+    right;
     constructor(key, value) {
         this.key = key;
         this.value = value;
-        this.weight = 1;
     }
     weigh() {
-        var _a, _b, _c, _d;
-        this.weight = 1 + ((_b = (_a = this.left) === null || _a === void 0 ? void 0 : _a.weight) !== null && _b !== void 0 ? _b : 0) + ((_d = (_c = this.right) === null || _c === void 0 ? void 0 : _c.weight) !== null && _d !== void 0 ? _d : 0);
+        this.weight = 1 + (this.left?.weight ?? 0) + (this.right?.weight ?? 0);
     }
     index() {
         let i = -1;
@@ -60,7 +65,7 @@ class Node {
     rotateLeft() {
         let a = this;
         let b = a.right;
-        let r = b === null || b === void 0 ? void 0 : b.left;
+        let r = b?.left;
         b.parent = a.parent;
         b.left = a;
         a.parent = b;
@@ -68,13 +73,13 @@ class Node {
         if (r)
             r.parent = a;
         a.weigh();
-        b === null || b === void 0 ? void 0 : b.weigh();
+        b?.weigh();
         return b;
     }
     rotateRight() {
         let a = this;
         let b = a.left;
-        let l = b === null || b === void 0 ? void 0 : b.right;
+        let l = b?.right;
         b.parent = a.parent;
         b.right = a;
         a.parent = b;
@@ -82,7 +87,7 @@ class Node {
         if (l)
             l.parent = a;
         a.weigh();
-        b === null || b === void 0 ? void 0 : b.weigh();
+        b?.weigh();
         return b;
     }
 }
@@ -93,6 +98,9 @@ const LE = { lset: true, rset: false, eset: true, eright: true };
 const GT = { lset: false, rset: true, eset: false, eright: true };
 const GE = { lset: false, rset: true, eset: true, eright: false };
 export class TMap extends Base {
+    root;
+    _compare;
+    conf;
     constructor(input, c) {
         super();
         this._compare = c.compare;
@@ -106,7 +114,7 @@ export class TMap extends Base {
     toEmpty() {
         return new TMap([], this.conf);
     }
-    get size() { var _a, _b; return (_b = (_a = this.root) === null || _a === void 0 ? void 0 : _a.weight) !== null && _b !== void 0 ? _b : 0; }
+    get size() { return this.root?.weight ?? 0; }
     clear() {
         const sz = this.size;
         this.root = undefined;
@@ -122,9 +130,15 @@ export class TMap extends Base {
                 this.fire({ cleared: sz });
             else
                 this.fire({ cleared: sz, added: { items: this, at: 0 } });
+            return true;
         }
-        else if (this.root !== undefined)
+        else if (this.root !== undefined) {
             this.fire({ added: { items: this, at: 0 } });
+            return true;
+        }
+        else {
+            return false;
+        }
     }
     drop(f) {
         let n = this.first;
@@ -157,7 +171,6 @@ export class TMap extends Base {
         this.fire({ cleared: this.size, added: { items: this, at: 0 } });
     }
     at(i) {
-        var _a;
         let node = this.root;
         let weight = this.size;
         if (!Number.isSafeInteger(i))
@@ -165,11 +178,11 @@ export class TMap extends Base {
         if (i < 0 || i >= weight)
             throw new TypeError("bounds");
         while (true) {
-            const left = node === null || node === void 0 ? void 0 : node.left;
-            const lw = (_a = left === null || left === void 0 ? void 0 : left.weight) !== null && _a !== void 0 ? _a : 0;
+            const left = node?.left;
+            const lw = left?.weight ?? 0;
             if (i > lw) {
                 i -= lw + 1;
-                node = node === null || node === void 0 ? void 0 : node.right;
+                node = node?.right;
             }
             else if (i < lw) {
                 node = left;
@@ -209,22 +222,31 @@ export class TMap extends Base {
             n = n.next();
         }
     }
-    *keys() {
+    *#keys() {
         for (const x of this)
             yield x.key;
     }
-    *values() {
+    keys() {
+        return iterable(() => this.#keys());
+    }
+    *#values() {
         for (const x of this)
             yield x.value;
     }
-    *reversed() {
+    values() {
+        return iterable(() => this.#values());
+    }
+    *#reversed() {
         let n = this.last;
         while (n) {
             yield n;
             n = n.prev();
         }
     }
-    *range(startKey, endKey, inc = IN_EX) {
+    reversed() {
+        return iterable(() => this.#reversed());
+    }
+    *#range(startKey, endKey, inc) {
         const start = this.find(startKey, inc.start ? GE : GT);
         const cmp = this.compare;
         if (inc.end)
@@ -236,6 +258,21 @@ export class TMap extends Base {
                 yield n;
             }
     }
+    range(startKey, endKey, inc = IN_EX) {
+        return iterable(() => this.#range(startKey, endKey, inc));
+    }
+    slice(start, end) {
+        if (end <= start)
+            throw new TypeError("end <= start");
+        const s = this.at(start);
+        if (end === this.size) {
+            return this.range(s.key, this.last.key, IN_IN);
+        }
+        else {
+            const e = this.at(end);
+            return this.range(s.key, e.key, IN_EX);
+        }
+    }
     find(key, op = EQ) {
         let node = this.root;
         let ret;
@@ -265,7 +302,7 @@ export class TMap extends Base {
         }
         return ret;
     }
-    get(key) { var _a; return (_a = this.find(key, EQ)) === null || _a === void 0 ? void 0 : _a.value; }
+    get(key) { return this.find(key, EQ)?.value; }
     has(key) { return this.find(key, EQ) !== undefined; }
     from(key) { return this.find(key, GE); }
     to(key) { return this.find(key, LE); }
@@ -278,8 +315,7 @@ export class TMap extends Base {
         return true;
     }
     rank(key) {
-        var _a;
-        return (_a = this.find(key, EQ)) === null || _a === void 0 ? void 0 : _a.index();
+        return this.find(key, EQ)?.index();
     }
     rawPut(key, value) {
         let previous = undefined, node = this.root;
@@ -414,13 +450,13 @@ export class TMap extends Base {
             let lw = weight(left);
             let rw = weight(right);
             if (rw * 5 + 2 < lw * 2) {
-                if (weight(left === null || left === void 0 ? void 0 : left.left) * 5 < lw * 2)
-                    node.left = left === null || left === void 0 ? void 0 : left.rotateLeft();
+                if (weight(left?.left) * 5 < lw * 2)
+                    node.left = left?.rotateLeft();
                 node = node.rotateRight();
             }
             else if (lw * 5 + 2 < rw * 2) {
-                if (weight(right === null || right === void 0 ? void 0 : right.right) * 5 < rw * 2)
-                    node.right = right === null || right === void 0 ? void 0 : right.rotateRight();
+                if (weight(right?.right) * 5 < rw * 2)
+                    node.right = right?.rotateRight();
                 node = node.rotateLeft();
             }
             else {
@@ -437,7 +473,6 @@ export class TMap extends Base {
     }
 }
 function weight(n) {
-    var _a;
-    return (_a = n === null || n === void 0 ? void 0 : n.weight) !== null && _a !== void 0 ? _a : 0;
+    return n?.weight ?? 0;
 }
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dubc-ds-tmap",
   "type": "module",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Observable map based on a weighted binary search tree.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,14 +26,15 @@
   },
   "homepage": "https://github.com/p-jack/dubc#readme",
   "dependencies": {
-    "dubc-ds-base": "^1.0.2",
-    "dubc-ds-pairs": "^1.0.1"
+    "dubc-ds-base": "^1.0.5",
+    "dubc-ds-iterables": "^1.0.0",
+    "dubc-ds-pairs": "^1.0.5"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^3.2.4",
-    "dubc-ds-test": "^1.0.1",
+    "@vitest/coverage-v8": "^4.1.8",
+    "dubc-ds-test": "^1.0.5",
     "jsdom": "^27.0.1",
     "typescript": "^5.9.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.1.8"
   }
 }