@thi.ng/trie 2.0.21 → 2.1.0

package/README.md

@@ -91,13 +91,13 @@ import { defMultiTrie } from "@thi.ng/trie";
 import { ArraySet } from "@thi.ng/associative";
 
 // init w/ custom value set type (here purely for illustration)
-const t = defMultiTrie<string, string>(null, { values: () => new ArraySet() });
+const t = defMultiTrie<string, number>(null, { values: () => new ArraySet() });
 
 t.add("to be or not to be".split(" "), 1);
 t.add("to be or not to be".split(" "), 2);
 t.add("to be and to live".split(" "), 3);
 
-console.log(t.get("to be or not to be".split(" ")))
+console.log(t.get("to be or not to be".split(" ")));
 // Set(2) { 1, 2 }
 
 console.log(t.knownPrefix(["to", "be", "not"]));

package/multi-trie.d.ts

@@ -16,10 +16,11 @@ export declare class MultiTrie<K, V> {
     next: Map<K, MultiTrie<K, V>>;
     vals?: Set<V>;
     constructor(pairs?: Nullable<Iterable<Pair<K[], V>>>, opts?: Partial<MultiTrieOpts<V>> | undefined);
-    [Symbol.iterator](): Generator<Pair<K, V>, void, any>;
+    get size(): number;
+    [Symbol.iterator](): Generator<Pair<K[], V>, void, any>;
     keys(prefix?: K[], includePrefix?: boolean): Generator<K[], void, any>;
     values(prefix?: K[]): Generator<V, void, any>;
-    entries(prefix?: K[], includePrefix?: boolean): Generator<Pair<K, V>, void, any>;
+    entries(prefix?: K[], includePrefix?: boolean): Generator<Pair<K[], V>, void, any>;
     clear(): void;
     has(key: K[]): boolean;
     hasPrefix(prefix: K[]): boolean;
@@ -34,7 +35,7 @@ export declare class MultiTrie<K, V> {
     knownPrefix(key: K[]): K[];
     hasKnownPrefix(key: K[]): boolean;
     add(key: K[], val: V): void;
-    into(pairs: Iterable<[K[], V]>): void;
+    into(pairs: Iterable<Pair<K[], V>>): void;
     delete(prefix: K[], val?: V): boolean;
     toJSON(): SerializedMultiTrie<V>;
     protected iterate<T>(fn: Fn2<K[], MultiTrie<K, V>, Iterable<T>>, prefix?: K[], includePrefix?: boolean): Generator<T, void, any>;

package/multi-trie.js

@@ -6,6 +6,16 @@ class MultiTrie {
   opts;
   next = /* @__PURE__ */ new Map();
   vals;
+  get size() {
+    let size = 0;
+    const stack = [this];
+    while (stack.length) {
+      const node = stack.pop();
+      size += node.vals?.size ?? 0;
+      if (node.next) stack.push(...node.next.values());
+    }
+    return size;
+  }
   [Symbol.iterator]() {
     return this.iterate(
       (key, node) => [...node.vals].map((v) => [key, v])
@@ -131,17 +141,15 @@ class MultiTrie {
   *iterate(fn, prefix = [], includePrefix = true) {
     const root = this.find(prefix);
     if (!root) return;
-    const queue = [
+    const stack = [
       [includePrefix ? prefix : [], root]
     ];
-    while (queue.length) {
-      const [key, node] = queue.pop();
+    while (stack.length) {
+      const [key, node] = stack.pop();
       if (node.vals) yield* fn(key, node);
-      queue.push(
-        ...[...node.next].map(
-          ([k, v]) => [key.concat(k), v]
-        )
-      );
+      for (let [k, v] of node.next) {
+        stack.push([key.concat(k), v]);
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thi.ng/trie",
-	"version": "2.0.21",
+	"version": "2.1.0",
 	"description": "Trie-based ES6-like Map data structures with prefix search/query support",
 	"type": "module",
 	"module": "./index.js",
@@ -94,5 +94,5 @@
 		],
 		"year": 2020
 	},
-	"gitHead": "17d2d1a6542704f55f2daa37550a4213b4a32cd8"
+	"gitHead": "c7cac408d745321039d308ce3680a81c7fc23114"
 }

package/trie-map.d.ts

@@ -4,6 +4,7 @@ export declare class TrieMap<T> {
     val?: T;
     protected n: number;
     constructor(pairs?: Iterable<Pair<string, T>>);
+    get size(): number;
     [Symbol.iterator](): Generator<Pair<string, T>, void, unknown>;
     keys(prefix?: string, includePrefix?: boolean): Generator<string, void, unknown>;
     values(prefix?: string): Generator<NonNullable<T>, void, unknown>;

package/trie-map.js

@@ -5,6 +5,16 @@ class TrieMap {
   constructor(pairs) {
     pairs && this.into(pairs);
   }
+  get size() {
+    let size = 0;
+    const stack = [this];
+    while (stack.length) {
+      const node = stack.pop();
+      if (node.val !== void 0) size++;
+      if (node.next) stack.push(...Object.values(node.next));
+    }
+    return size;
+  }
   [Symbol.iterator]() {
     return this.iterate((key, node) => [key, node.val]);
   }
@@ -102,17 +112,16 @@ class TrieMap {
   *iterate(fn, prefix = "", includePrefix = true) {
     const root = this.find(prefix);
     if (!root) return;
-    const queue = [
+    const stack = [
       [includePrefix ? prefix : "", root]
     ];
-    while (queue.length) {
-      const [key, node] = queue.pop();
+    while (stack.length) {
+      const [key, node] = stack.pop();
       if (node.val !== void 0) yield fn(key, node);
-      queue.push(
-        ...Object.entries(node.next).map(
-          ([k, v]) => [key + k, v]
-        )
-      );
+      const next = node.next;
+      for (let k in next) {
+        stack.push([key + k, next[k]]);
+      }
     }
   }
 }