cspell-trie-lib 5.12.6 → 5.13.3

package/dist/lib/TrieBuilder.js

@@ -4,6 +4,7 @@ exports.TrieBuilder = exports.buildTrieFast = exports.buildTrie = void 0;
 const trie_1 = require("./trie");
 const consolidate_1 = require("./consolidate");
 const util_1 = require("./util");
+const secondChanceCache_1 = require("./secondChanceCache");
 /**
  * Builds an optimized Trie from a Iterable<string>. It attempts to reduce the size of the trie
  * by finding common endings.
@@ -24,12 +25,16 @@ function buildTrieFast(words, trieOptions) {
     return new trie_1.Trie(root, undefined);
 }
 exports.buildTrieFast = buildTrieFast;
+// cspell:words sigs
+const MAX_NUM_SIGS = 100000;
+const MAX_TRANSFORMS = 1000000;
+const MAX_CACHE_SIZE = 1000000;
 class TrieBuilder {
     constructor(words, trieOptions) {
         this.count = 0;
-        this.signatures = new Map();
-        this.cached = new Map();
-        this.transforms = new Map();
+        this.signatures = new secondChanceCache_1.SecondChanceCache(MAX_NUM_SIGS);
+        this.cached = new secondChanceCache_1.SecondChanceCache(MAX_CACHE_SIZE);
+        this.transforms = new secondChanceCache_1.SecondChanceCache(MAX_TRANSFORMS);
         this._eow = Object.freeze({ f: 1 });
         /** position 0 of lastPath is always the root */
         this.lastPath = [{ s: '', n: { f: undefined, c: undefined } }];
@@ -63,8 +68,9 @@ class TrieBuilder {
         return true;
     }
     tryCacheFrozen(n) {
-        if (this.cached.has(n))
+        if (this.cached.has(n)) {
             return n;
+        }
         this.cached.set(n, this.count++);
         return n;
     }
@@ -196,6 +202,9 @@ class TrieBuilder {
         this._root = (0, util_1.createTrieRoot)(this.trieOptions);
         this.cached.clear();
         this.signatures.clear();
+        this.signatures.set(this.signature(this._eow), this._eow);
+        this.count = 0;
+        this.cached.set(this._eow, this.count++);
     }
     build(consolidateSuffixes = false) {
         const root = this._root;

package/dist/lib/index.d.ts

@@ -3,7 +3,7 @@ export { TrieNode, FLAG_WORD, ChildMap, TrieRoot } from './TrieNode';
 export * from './util';
 export * from './walker';
 export * from './importExport';
-export * from './TrieBuilder';
+export { buildTrie, buildTrieFast, TrieBuilder } from './TrieBuilder';
 export * from './consolidate';
 export { SuggestionResult, MaxCost, suggestionCollector, SuggestionCollector } from './suggestCollector';
 export { parseDictionaryLines, parseDictionary } from './SimpleDictionaryParser';

package/dist/lib/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDictionary = exports.parseDictionaryLines = exports.suggestionCollector = exports.ChildMap = exports.FLAG_WORD = void 0;
+exports.parseDictionary = exports.parseDictionaryLines = exports.suggestionCollector = exports.TrieBuilder = exports.buildTrieFast = exports.buildTrie = exports.ChildMap = exports.FLAG_WORD = void 0;
 __exportStar(require("./trie"), exports);
 var TrieNode_1 = require("./TrieNode");
 Object.defineProperty(exports, "FLAG_WORD", { enumerable: true, get: function () { return TrieNode_1.FLAG_WORD; } });
@@ -18,7 +18,10 @@ Object.defineProperty(exports, "ChildMap", { enumerable: true, get: function ()
 __exportStar(require("./util"), exports);
 __exportStar(require("./walker"), exports);
 __exportStar(require("./importExport"), exports);
-__exportStar(require("./TrieBuilder"), exports);
+var TrieBuilder_1 = require("./TrieBuilder");
+Object.defineProperty(exports, "buildTrie", { enumerable: true, get: function () { return TrieBuilder_1.buildTrie; } });
+Object.defineProperty(exports, "buildTrieFast", { enumerable: true, get: function () { return TrieBuilder_1.buildTrieFast; } });
+Object.defineProperty(exports, "TrieBuilder", { enumerable: true, get: function () { return TrieBuilder_1.TrieBuilder; } });
 __exportStar(require("./consolidate"), exports);
 var suggestCollector_1 = require("./suggestCollector");
 Object.defineProperty(exports, "suggestionCollector", { enumerable: true, get: function () { return suggestCollector_1.suggestionCollector; } });

package/dist/lib/secondChanceCache.d.ts

@@ -0,0 +1,16 @@
+export declare class SecondChanceCache<Key, Value> {
+    readonly maxL0Size: number;
+    private map0;
+    private map1;
+    constructor(maxL0Size: number);
+    has(key: Key): boolean;
+    get(key: Key): Value | undefined;
+    set(key: Key, value: Value): this;
+    get size(): number;
+    get size0(): number;
+    get size1(): number;
+    clear(): this;
+    private get1;
+    toArray(): [Key, Value][];
+}
+//# sourceMappingURL=secondChanceCache.d.ts.map

package/dist/lib/secondChanceCache.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SecondChanceCache = void 0;
+class SecondChanceCache {
+    constructor(maxL0Size) {
+        this.maxL0Size = maxL0Size;
+        this.map0 = new Map();
+        this.map1 = new Map();
+    }
+    has(key) {
+        if (this.map0.has(key))
+            return true;
+        if (this.map1.has(key)) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            this.set(key, this.get1(key));
+            return true;
+        }
+        return false;
+    }
+    get(key) {
+        var _a;
+        return (_a = this.map0.get(key)) !== null && _a !== void 0 ? _a : this.get1(key);
+    }
+    set(key, value) {
+        if (this.map0.size >= this.maxL0Size && !this.map0.has(key)) {
+            this.map1 = this.map0;
+            this.map0 = new Map();
+        }
+        this.map0.set(key, value);
+        return this;
+    }
+    get size() {
+        return this.map0.size + this.map1.size;
+    }
+    get size0() {
+        return this.map0.size;
+    }
+    get size1() {
+        return this.map1.size;
+    }
+    clear() {
+        this.map0.clear();
+        this.map1.clear();
+        return this;
+    }
+    get1(key) {
+        if (this.map1.has(key)) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const v = this.map1.get(key);
+            this.map1.delete(key);
+            this.set(key, v);
+            return v;
+        }
+        return undefined;
+    }
+    toArray() {
+        return [...this.map1, ...this.map0];
+    }
+}
+exports.SecondChanceCache = SecondChanceCache;
+//# sourceMappingURL=secondChanceCache.js.map

package/dist/lib/util.d.ts

@@ -43,7 +43,7 @@ export declare const normalizeWord: (text: string) => string;
  * converts text to lower case and removes any accents.
  * @param text - text to convert
  * @returns lowercase word without accents
- * @deprecated
+ * @deprecated true
  */
 export declare const normalizeWordToLowercase: (text: string) => string;
 /**

package/dist/lib/util.js

@@ -202,7 +202,7 @@ exports.normalizeWord = normalizeWord;
  * converts text to lower case and removes any accents.
  * @param text - text to convert
  * @returns lowercase word without accents
- * @deprecated
+ * @deprecated true
  */
 const normalizeWordToLowercase = (text) => text.toLowerCase().normalize('NFD').replace(/\p{M}/gu, '');
 exports.normalizeWordToLowercase = normalizeWordToLowercase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-trie-lib",
-  "version": "5.12.6",
+  "version": "5.13.3",
   "description": "Trie Data Structure to support cspell.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,12 +43,12 @@
     "node": ">=12.13.0"
   },
   "devDependencies": {
-    "@cspell/dict-en_us": "^2.1.3",
-    "@cspell/dict-es-es": "^2.0.2",
+    "@cspell/dict-en_us": "^2.1.4",
+    "@cspell/dict-es-es": "^2.1.0",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^16.11.6",
-    "jest": "^27.3.1",
+    "@types/node": "^16.11.10",
+    "jest": "^27.4.0",
     "rimraf": "^3.0.2"
   },
-  "gitHead": "430bb6103b03793d5f0b746e7c643d12fa313216"
+  "gitHead": "f49cb2d98eed1f7274b1e6ad1ef076e7140347b5"
 }