cspell-trie-lib 6.10.1 → 6.11.0

package/dist/lib/find.d.ts

@@ -63,7 +63,7 @@ export declare function findWordExact(root: Root | TrieNode | undefined, word: s
 export declare function isEndOfWordNode(n: TrieNode | undefined): boolean;
 declare function findLegacyCompoundWord(roots: (TrieNode | undefined)[], word: string, minCompoundLength: number): FindResult;
 export declare function isForbiddenWord(root: Root | TrieNode | undefined, word: string, forbiddenPrefix: string): boolean;
-export declare function createFindOptions(options: PartialFindOptions | undefined): FindOptions;
+export declare const createFindOptions: (p: PartialFindOptions) => FindOptions;
 export declare const __testing__: {
     findLegacyCompoundWord: typeof findLegacyCompoundWord;
 };

package/dist/lib/find.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__testing__ = exports.createFindOptions = exports.isForbiddenWord = exports.isEndOfWordNode = exports.findWordExact = exports.findCompoundNode = exports.findLegacyCompound = exports.findWordNode = exports.findWord = void 0;
 const constants_1 = require("./constants");
+const memorizeLastCall_1 = require("./utils/memorizeLastCall");
 const trie_util_1 = require("./trie-util");
 const TrieNode_1 = require("./TrieNode");
 const defaultLegacyMinCompoundLength = 3;
@@ -22,7 +23,7 @@ const knownCompoundModes = new Map(arrayCompoundModes.map((a) => [a, a]));
  * @param options
  */
 function findWord(root, word, options) {
-    return _findWord(root, word, createFindOptions(options));
+    return _findWord(root, word, (0, exports.createFindOptions)(options));
 }
 exports.findWord = findWord;
 /**
@@ -32,7 +33,7 @@ exports.findWord = findWord;
  * @param options
  */
 function findWordNode(root, word, options) {
-    return _findWordNode(root, word, createFindOptions(options));
+    return _findWordNode(root, word, (0, exports.createFindOptions)(options));
 }
 exports.findWordNode = findWordNode;
 /**
@@ -282,10 +283,10 @@ function isForbiddenWord(root, word, forbiddenPrefix) {
     return findWordExact(root?.c?.get(forbiddenPrefix), word);
 }
 exports.isForbiddenWord = isForbiddenWord;
-function createFindOptions(options) {
+exports.createFindOptions = (0, memorizeLastCall_1.memorizeLastCall)(_createFindOptions);
+function _createFindOptions(options) {
     return (0, trie_util_1.mergeDefaults)(options, _defaultFindOptions);
 }
-exports.createFindOptions = createFindOptions;
 exports.__testing__ = {
     findLegacyCompoundWord,
 };

package/dist/lib/io/importExportV4.js

@@ -23,7 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__testing__ = exports.importTrie = exports.serializeTrie = exports.DATA = void 0;
-const cspell_pipe_1 = require("@cspell/cspell-pipe");
+const sync_1 = require("@cspell/cspell-pipe/sync");
 const gensequence_1 = require("gensequence");
 const trie_util_1 = require("../trie-util");
 const TrieNode_1 = require("../TrieNode");
@@ -194,7 +194,7 @@ function buildReferenceMap(root, base) {
     walk(root);
     // sorted highest to lowest
     const refCountAndNode = [
-        ...(0, cspell_pipe_1.pipeSync)(refCount, (0, cspell_pipe_1.opFilter)(([_, ref]) => ref.c >= 2)),
+        ...(0, sync_1.pipe)(refCount, (0, sync_1.opFilter)(([_, ref]) => ref.c >= 2)),
     ].sort((a, b) => b[1].c - a[1].c || a[1].n - b[1].n);
     let adj = 0;
     const baseLogScale = 1 / Math.log(base);
@@ -215,7 +215,7 @@ function importTrie(linesX) {
     linesX = typeof linesX === 'string' ? linesX.split(/(?<=\n)/) : linesX;
     let radix = 10;
     const comment = /^\s*#/;
-    const iter = tapIterable((0, cspell_pipe_1.pipeSync)(linesX, (0, cspell_pipe_1.opConcatMap)((a) => a.split(/(?<=\n)(?!$)/))));
+    const iter = tapIterable((0, sync_1.pipe)(linesX, (0, sync_1.opConcatMap)((a) => a.split(/(?<=\n)(?!$)/))));
     function parseHeaderRows(headerRows) {
         const header = headerRows.slice(0, 2).join('\n');
         const headerReg = /^TrieXv[34]\nbase=(\d+)$/;

package/dist/lib/mappers/mapDictionaryInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapDictionaryInformationToAdjustment = exports.mapDictionaryInformation = void 0;
-const cspell_pipe_1 = require("@cspell/cspell-pipe");
+const sync_1 = require("@cspell/cspell-pipe/sync");
 const locale_1 = require("../models/locale");
 const util_1 = require("../utils/util");
 const mapCosts_1 = require("./mapCosts");
@@ -27,7 +27,7 @@ exports.mapDictionaryInformation = mapDictionaryInformation;
 function processAlphabet(alphabet, locale, editCost) {
     const csAlphabet = toCharSets(alphabet, 'a-zA-Z', editCost.baseCost);
     return [
-        ...(0, cspell_pipe_1.pipeSync)(csAlphabet, (0, cspell_pipe_1.opMap)((cs) => (0, mapToSuggestionCostDef_1.parseAlphabet)(cs, locale, editCost)), (0, cspell_pipe_1.opFlatten)()),
+        ...(0, sync_1.pipeSync)(csAlphabet, (0, sync_1.opMap)((cs) => (0, mapToSuggestionCostDef_1.parseAlphabet)(cs, locale, editCost)), (0, sync_1.opFlatten)()),
         ...(0, mapToSuggestionCostDef_1.calcFirstCharacterReplaceDefs)(csAlphabet, editCost),
     ];
 }

package/dist/lib/mappers/mapHunspellInformation.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__testing__ = exports.joinLetters = exports.hunspellInformationToSuggestionCostDef = void 0;
-const cspell_pipe_1 = require("@cspell/cspell-pipe");
+const sync_1 = require("@cspell/cspell-pipe/sync");
 const text_1 = require("../utils/text");
 const util_1 = require("../utils/util");
 const mapCosts_1 = require("./mapCosts");
@@ -30,7 +30,7 @@ function hunspellInformationToSuggestionCostDef(hunInfo, locales) {
             .map((a) => a.trim())
             .filter((a) => regSupportedAff.test(a))
             .filter((a) => !rejectAff.test(a));
-        const defs = (0, cspell_pipe_1.pipeSync)(lines, (0, cspell_pipe_1.opMap)((line) => (0, cspell_pipe_1.pipeSync)(operations, (0, cspell_pipe_1.opMap)((fn) => fn(line, costs)), (0, cspell_pipe_1.opMap)(asArrayOf), (0, cspell_pipe_1.opFlatten)())), (0, cspell_pipe_1.opFlatten)(), (0, cspell_pipe_1.opFilter)(util_1.isDefined));
+        const defs = (0, sync_1.pipe)(lines, (0, sync_1.opMap)((line) => (0, sync_1.pipe)(operations, (0, sync_1.opMap)((fn) => fn(line, costs)), (0, sync_1.opMap)(asArrayOf), (0, sync_1.opFlatten)())), (0, sync_1.opFlatten)(), (0, sync_1.opFilter)(util_1.isDefined));
         return [...defs];
     }
     return parseAff(hunInfo.aff, costs);

package/dist/lib/mappers/mapToSuggestionCostDef.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitMap = exports.calcCostsForAccentedLetters = exports.parseAccents = exports.calcFirstCharacterReplace = exports.calcFirstCharacterReplaceDefs = exports.parseAlphabetCaps = exports.parseAlphabet = void 0;
-const cspell_pipe_1 = require("@cspell/cspell-pipe");
+const sync_1 = require("@cspell/cspell-pipe/sync");
 const operators_1 = require("gensequence/dist/operators");
 const text_1 = require("../utils/text");
 const util_1 = require("../utils/util");
@@ -10,10 +10,10 @@ function parseAlphabet(cs, locale, editCost) {
     const { cost, penalty } = cs;
     const characters = (0, text_1.expandCharacterSet)(cs.characters);
     const charForms = [
-        ...(0, cspell_pipe_1.pipeSync)(characters, (0, cspell_pipe_1.opMap)((c) => (0, text_1.caseForms)(c, locale).sort())),
+        ...(0, sync_1.pipe)(characters, (0, sync_1.opMap)((c) => (0, text_1.caseForms)(c, locale).sort())),
     ];
     const alphabet = (0, mapHunspellInformation_1.joinLetters)([
-        ...(0, cspell_pipe_1.pipeSync)(charForms, (0, cspell_pipe_1.opFlatten)(), (0, cspell_pipe_1.opMap)((letter) => (0, text_1.accentForms)(letter)), (0, cspell_pipe_1.opFlatten)(), (0, cspell_pipe_1.opUnique)()),
+        ...(0, sync_1.pipe)(charForms, (0, sync_1.opFlatten)(), (0, sync_1.opMap)((letter) => (0, text_1.accentForms)(letter)), (0, sync_1.opFlatten)(), (0, sync_1.opUnique)()),
     ].sort());
     const sugAlpha = (0, util_1.clean)({
         map: alphabet,
@@ -32,7 +32,7 @@ exports.parseAlphabet = parseAlphabet;
 function parseAlphabetCaps(alphabet, locale, editCost) {
     const characters = (0, text_1.expandCharacterSet)(alphabet);
     const charForms = [
-        ...(0, cspell_pipe_1.pipeSync)(characters, (0, cspell_pipe_1.opMap)((c) => (0, text_1.caseForms)(c, locale).sort())),
+        ...(0, sync_1.pipe)(characters, (0, sync_1.opMap)((c) => (0, text_1.caseForms)(c, locale).sort())),
     ];
     const caps = charForms.map((a) => (0, mapHunspellInformation_1.joinLetters)(a)).join('|');
     const sugCaps = {
@@ -48,7 +48,7 @@ function calcFirstCharacterReplaceDefs(alphabets, editCost) {
 exports.calcFirstCharacterReplaceDefs = calcFirstCharacterReplaceDefs;
 function calcFirstCharacterReplace(cs, editCost) {
     const mapOfFirstLetters = [
-        ...(0, cspell_pipe_1.pipeSync)((0, text_1.expandCharacterSet)(cs.characters), (0, cspell_pipe_1.opUnique)(), (0, cspell_pipe_1.opMap)((letter) => `(^${letter})`)),
+        ...(0, sync_1.pipe)((0, text_1.expandCharacterSet)(cs.characters), (0, sync_1.opUnique)(), (0, sync_1.opMap)((letter) => `(^${letter})`)),
     ]
         .sort()
         .join('') + '(^)';
@@ -65,7 +65,7 @@ exports.calcFirstCharacterReplace = calcFirstCharacterReplace;
 function parseAccents(cs, _editCost) {
     const { cost, penalty } = cs;
     const accents = (0, mapHunspellInformation_1.joinLetters)([
-        ...(0, cspell_pipe_1.pipeSync)((0, text_1.expandCharacterSet)(cs.characters), (0, operators_1.map)((char) => (0, text_1.stripNonAccents)(char))),
+        ...(0, sync_1.pipe)((0, text_1.expandCharacterSet)(cs.characters), (0, operators_1.map)((char) => (0, text_1.stripNonAccents)(char))),
     ]);
     if (!accents)
         return undefined;
@@ -79,9 +79,9 @@ function parseAccents(cs, _editCost) {
 exports.parseAccents = parseAccents;
 function calcCostsForAccentedLetters(simpleMap, locale, costs) {
     const charactersWithAccents = [
-        ...(0, cspell_pipe_1.pipeSync)(splitMap(simpleMap), (0, cspell_pipe_1.opMap)((char) => (0, text_1.caseForms)(char, locale)), (0, cspell_pipe_1.opFlatten)(), (0, cspell_pipe_1.opMap)((char) => [...(0, text_1.accentForms)(char)]), (0, cspell_pipe_1.opFilter)((forms) => forms.length > 1)),
+        ...(0, sync_1.pipe)(splitMap(simpleMap), (0, sync_1.opMap)((char) => (0, text_1.caseForms)(char, locale)), (0, sync_1.opFlatten)(), (0, sync_1.opMap)((char) => [...(0, text_1.accentForms)(char)]), (0, sync_1.opFilter)((forms) => forms.length > 1)),
     ];
-    const characters = (0, cspell_pipe_1.pipeSync)(charactersWithAccents, (0, cspell_pipe_1.opMap)((forms) => new Set([...forms, ...forms.map((char) => (0, text_1.stripAccents)(char))])), (0, cspell_pipe_1.opMap)((forms) => [...forms].sort()), (0, cspell_pipe_1.opFilter)((forms) => forms.length > 1), (0, cspell_pipe_1.opMap)(mapHunspellInformation_1.joinLetters), (0, cspell_pipe_1.opUnique)());
+    const characters = (0, sync_1.pipe)(charactersWithAccents, (0, sync_1.opMap)((forms) => new Set([...forms, ...forms.map((char) => (0, text_1.stripAccents)(char))])), (0, sync_1.opMap)((forms) => [...forms].sort()), (0, sync_1.opFilter)((forms) => forms.length > 1), (0, sync_1.opMap)(mapHunspellInformation_1.joinLetters), (0, sync_1.opUnique)());
     const replaceAccentMap = [...characters].join('|');
     const cost = costs.accentCosts;
     const costToReplaceAccent = !replaceAccentMap ? [] : [{ map: replaceAccentMap, replace: cost }];

package/dist/lib/trie.d.ts

@@ -18,6 +18,8 @@ export declare class Trie {
     readonly root: TrieRoot;
     private count?;
     private _options;
+    private _findOptionsDefaults;
+    private _findOptionsExact;
     readonly isLegacy: boolean;
     private hasForbidden;
     constructor(root: TrieRoot, count?: number | undefined);
@@ -91,6 +93,8 @@ export declare class Trie {
     private calcIsLegacy;
     static create(words: Iterable<string> | IterableIterator<string>, options?: PartialTrieOptions): Trie;
     private createFindOptions;
+    private lastCreateFindOptionsMatchCaseMap;
+    private createFindOptionsMatchCase;
 }
 export interface FindWordOptions {
     caseSensitive?: boolean;

package/dist/lib/trie.js

@@ -27,9 +27,16 @@ class Trie {
     constructor(root, count) {
         this.root = root;
         this.count = count;
+        this.lastCreateFindOptionsMatchCaseMap = new Map();
         this._options = (0, trie_util_1.mergeOptionalWithDefaults)(root);
         this.isLegacy = this.calcIsLegacy();
         this.hasForbidden = !!root.c.get(root.forbiddenWordPrefix);
+        this._findOptionsDefaults = {
+            caseInsensitivePrefix: this._options.stripCaseAndAccentsPrefix,
+            compoundFix: this._options.compoundCharacter,
+            forbidPrefix: this._options.forbiddenWordPrefix,
+        };
+        this._findOptionsExact = this.createFindOptions({ compoundMode: 'none' });
     }
     /**
      * Number of words in the Trie
@@ -72,8 +79,7 @@ class Trie {
         return r.node;
     }
     findExact(text) {
-        const options = this.createFindOptions({ compoundMode: 'none' });
-        return (0, find_1.findWordNode)(this.root, text, options).node;
+        return (0, find_1.findWordNode)(this.root, text, this._findOptionsExact).node;
     }
     has(word, minLegacyCompoundLength) {
         if (this.hasWord(word, false))
@@ -105,7 +111,7 @@ class Trie {
             });
             return (0, find_1.findLegacyCompound)(this.root, word, findOptions);
         }
-        const findOptions = this.createFindOptions({ matchCase: options?.caseSensitive });
+        const findOptions = this.createFindOptionsMatchCase(options?.caseSensitive);
         return (0, find_1.findWord)(this.root, word, findOptions);
     }
     /**
@@ -194,15 +200,20 @@ class Trie {
         return new Trie(root, undefined);
     }
     createFindOptions(options = {}) {
-        const { caseInsensitivePrefix = this._options.stripCaseAndAccentsPrefix, compoundFix = this._options.compoundCharacter, forbidPrefix = this._options.forbiddenWordPrefix, } = (0, trie_util_1.clean)(options);
         const findOptions = (0, find_1.createFindOptions)({
+            ...this._findOptionsDefaults,
             ...options,
-            caseInsensitivePrefix,
-            compoundFix,
-            forbidPrefix,
         });
         return findOptions;
     }
+    createFindOptionsMatchCase(matchCase) {
+        const f = this.lastCreateFindOptionsMatchCaseMap.get(matchCase);
+        if (f !== undefined)
+            return f;
+        const findOptions = this.createFindOptions({ matchCase });
+        this.lastCreateFindOptionsMatchCaseMap.set(matchCase, findOptions);
+        return findOptions;
+    }
 }
 exports.Trie = Trie;
 //# sourceMappingURL=trie.js.map

package/dist/lib/utils/memorizeLastCall.d.ts

@@ -0,0 +1,2 @@
+export declare function memorizeLastCall<P, R>(fn: (p: P) => R): (p: P) => R;
+//# sourceMappingURL=memorizeLastCall.d.ts.map

package/dist/lib/utils/memorizeLastCall.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memorizeLastCall = void 0;
+const SymEmpty = Symbol('memorizeLastCall');
+function memorizeLastCall(fn) {
+    let lastP = undefined;
+    let lastR = SymEmpty;
+    function calc(p) {
+        if (lastR !== SymEmpty && lastP === p)
+            return lastR;
+        lastP = p;
+        lastR = fn(p);
+        return lastR;
+    }
+    return calc;
+}
+exports.memorizeLastCall = memorizeLastCall;
+//# sourceMappingURL=memorizeLastCall.js.map

package/dist/lib/utils/util.d.ts

@@ -28,4 +28,11 @@ export declare function regexQuote(text: string): string;
  * @param replaceWithText - the text to substitute.
  */
 export declare function replaceAllFactory(match: string, replaceWithText: string): (text: string) => string;
+/**
+ * Shallow is Equal test.
+ * @param a - array of values
+ * @param b - array of values
+ * @returns true if the values of `a` are exactly equal to the values of `b`
+ */
+export declare function isArrayEqual<K>(a: K[], b: K[]): boolean;
 //# sourceMappingURL=util.d.ts.map

package/dist/lib/utils/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceAllFactory = exports.regexQuote = exports.replaceAll = exports.flatten = exports.unique = exports.clean = exports.cleanCopy = exports.isDefined = void 0;
+exports.isArrayEqual = exports.replaceAllFactory = exports.regexQuote = exports.replaceAll = exports.flatten = exports.unique = exports.clean = exports.cleanCopy = exports.isDefined = void 0;
 function isDefined(a) {
     return a !== undefined;
 }
@@ -64,4 +64,21 @@ function replaceAllFactory(match, replaceWithText) {
     return (text) => text.replace(r, replaceWithText);
 }
 exports.replaceAllFactory = replaceAllFactory;
+/**
+ * Shallow is Equal test.
+ * @param a - array of values
+ * @param b - array of values
+ * @returns true if the values of `a` are exactly equal to the values of `b`
+ */
+function isArrayEqual(a, b) {
+    if (a === b)
+        return true;
+    let isMatch = a.length === b.length;
+    const len = a.length;
+    for (let i = 0; isMatch && i < len; ++i) {
+        isMatch = a[i] === b[i];
+    }
+    return isMatch;
+}
+exports.isArrayEqual = isArrayEqual;
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-trie-lib",
-  "version": "6.10.1",
+  "version": "6.11.0",
   "description": "Trie Data Structure to support cspell.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,8 +37,8 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-pipe": "^6.10.1",
-    "@cspell/cspell-types": "^6.10.1",
+    "@cspell/cspell-pipe": "^6.11.0",
+    "@cspell/cspell-types": "^6.11.0",
     "fs-extra": "^10.1.0",
     "gensequence": "^4.0.2"
   },
@@ -47,11 +47,11 @@
   },
   "devDependencies": {
     "@cspell/dict-en_us": "^2.3.3",
-    "@cspell/dict-es-es": "^2.2.1",
+    "@cspell/dict-es-es": "^2.2.2",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^18.7.18",
-    "jest": "^29.0.3",
+    "@types/node": "^18.7.23",
+    "jest": "^29.1.1",
     "rimraf": "^3.0.2"
   },
-  "gitHead": "03625a3f7ca4ef85f3549ccae73d90d2cd3ac0f0"
+  "gitHead": "664676692898c3b6aa150fb2c6656b56f49a54b8"
 }