@thi.ng/trie 2.0.22 → 2.1.2

package/README.md

@@ -7,9 +7,11 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 215 standalone projects, maintained as part
-> of the [@thi.ng/umbrella](https://codeberg.org/thi.ng/umbrella/) ecosystem
-> and anti-framework.
+
+> This is one of 215 standalone projects. LLM-free, human-made and
+> cared for software, maintained as part of the
+> [@thi.ng/umbrella](https://codeberg.org/thi.ng/umbrella/) ecosystem and
+> anti-framework.
 >
 > 🚀 Please help me to work full-time on these projects by [sponsoring
 > me](https://codeberg.org/thi.ng/umbrella/src/branch/develop/CONTRIBUTING.md#donations).
@@ -144,7 +146,7 @@ For Node.js REPL:
 const trie = await import("@thi.ng/trie");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.14 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.21 KB
 
 ## Dependencies
 

package/multi-trie.d.ts

@@ -16,6 +16,7 @@ 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);
+    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>;

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.22",
+	"version": "2.1.2",
 	"description": "Trie-based ES6-like Map data structures with prefix search/query support",
 	"type": "module",
 	"module": "./index.js",
@@ -40,7 +40,7 @@
 		"tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
 	},
 	"dependencies": {
-		"@thi.ng/api": "^8.12.22"
+		"@thi.ng/api": "^8.12.24"
 	},
 	"devDependencies": {
 		"esbuild": "^0.28.0",
@@ -94,5 +94,5 @@
 		],
 		"year": 2020
 	},
-	"gitHead": "ecb3c8877c7f6d086daec889bf618fe3558d87f2"
+	"gitHead": "b302822c51b2ab255f8f27f8dd010433d95f29df"
 }

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]]);
+      }
     }
   }
 }