cspell-trie-lib 10.0.0 → 10.1.0

package/dist/index.js

@@ -483,8 +483,17 @@ function _createFindOptions$1(options) {
 const JOIN_SEPARATOR = "+";
 const WORD_SEPARATOR = " ";
 const CompoundWordsMethod = {
+	/**
+	* Do not compound words.
+	*/
 	NONE: 0,
+	/**
+	* Create word compounds separated by spaces.
+	*/
 	SEPARATE_WORDS: 1,
+	/**
+	* Create word compounds without separation.
+	*/
 	JOIN_WORDS: 2,
 	0: "NONE",
 	1: "SEPARATE_WORDS",
@@ -605,10 +614,11 @@ function* walkerWordsITrie(root) {
 	let depth = 0;
 	const stack = [];
 	const entries = root.entries();
+	const c = Array.isArray(entries) ? entries : [...entries];
 	stack[depth] = {
 		t: "",
 		n: root,
-		c: Array.isArray(entries) ? entries : [...entries],
+		c,
 		ci: 0
 	};
 	while (depth >= 0) {
@@ -1294,7 +1304,7 @@ function highest(a, b) {
 	return a >= b ? a : b;
 }
 function normalize(s) {
-	const f = new Set([s]);
+	const f = /* @__PURE__ */ new Set([s]);
 	f.add(s.normalize("NFC"));
 	f.add(s.normalize("NFD"));
 	return f;
@@ -1739,7 +1749,7 @@ function replaceAllFactory(match, replaceWithText) {
 const defaultMaxNumberSuggestions = 10;
 const BASE_COST = 100;
 const MAX_NUM_CHANGES = 5;
-const MAX_ALLOWED_COST_SCALE = 1.03 * .5;
+const MAX_ALLOWED_COST_SCALE = .515;
 const collator = new Intl.Collator();
 const regexSeparator = new RegExp(`[${regexQuote(" ")}]`, "g");
 const wordLengthCost = [
@@ -3247,7 +3257,7 @@ var StringTableBuilder = class StringTableBuilder {
 	}
 	#build() {
 		this.#locked = true;
-		if (!this.#data.length) return new StringTable([], new Uint8Array(0), 8);
+		if (!this.#data.length) return new StringTable([], /* @__PURE__ */ new Uint8Array(0), 8);
 		const sortedBySize = this.#data.map((b, i) => ({
 			b,
 			i
@@ -3330,7 +3340,7 @@ function encodeStringTableToBinary(table, endian) {
 * @returns The decoded StringTable.
 */
 function decodeStringTableFromBinary(data, endian) {
-	if (!data?.length) return new StringTable([], new Uint8Array(0), 8);
+	if (!data?.length) return new StringTable([], /* @__PURE__ */ new Uint8Array(0), 8);
 	const reader = new BinaryDataReader(data, getStringTableBinaryFormat(), endian);
 	const indexBits = reader.getUint8("indexBits");
 	const strLenBits = reader.getUint8("strLenBits");
@@ -3407,7 +3417,7 @@ function expandRange(a, b) {
 * @returns the set of found cases.
 */
 function caseForms(letter, locale) {
-	const forms = new Set([letter]);
+	const forms = /* @__PURE__ */ new Set([letter]);
 	function tryCases(s) {
 		forms.add(s.toLocaleLowerCase(locale));
 		forms.add(s.toLocaleUpperCase(locale));
@@ -3422,7 +3432,7 @@ function caseForms(letter, locale) {
 * @returns combined set of possible forms.
 */
 function accentForms(letter) {
-	return new Set([
+	return /* @__PURE__ */ new Set([
 		letter,
 		letter.normalize("NFC"),
 		letter.normalize("NFD")
@@ -3666,7 +3676,8 @@ var CharIndex = class CharIndex {
 		return { charIndex: [...this.charIndex].join("") };
 	}
 	static fromJSON(json) {
-		return new CharIndex(new Set(json.charIndex));
+		const charIndex = new Set(json.charIndex);
+		return new CharIndex(charIndex);
 	}
 	static fromIterable(charIndex) {
 		const charSet = /* @__PURE__ */ new Set();
@@ -3883,7 +3894,7 @@ function optimizeNodesWithStringTable(src) {
 	const endPerf = measurePerf("TrieBlob.optimizeNodesWithStringTable");
 	const { nodes, stringTableBuilder: builder } = copyNodesAndStringTable(src);
 	const multipleNodeRefs = calcHasMultipleReferences(nodes);
-	const multiStringRefs = new Set([0]);
+	const multiStringRefs = /* @__PURE__ */ new Set([0]);
 	if (!builder.length) builder.addString("");
 	walkNodes(nodes, 0, { after: processNode });
 	const r = {
@@ -3917,7 +3928,7 @@ function optimizeNodesWithStringTable(src) {
 		const prefixBytes = [charByte, ...childBytes];
 		const prefixIdx = builder.addStringBytes(prefixBytes);
 		const newNode = Uint32Array.from(childNode);
-		newNode[0] = prefixIdx << 9 | childHeader & ~NodeHeaderPrefixMask;
+		newNode[0] = prefixIdx << 9 | childHeader & -1073741313;
 		nodes[nodeIdx] = newNode;
 	}
 }
@@ -4112,7 +4123,8 @@ var TrieBlobINode = class TrieBlobINode {
 	entries() {
 		if (this._entries) return this._entries;
 		if (!this.hasChildren) return EMPTY_ENTRIES;
-		this._entries = this.getNodesEntries().map(([key, value]) => [key, new TrieBlobINode(this.trie, value)]);
+		const entries = this.getNodesEntries();
+		this._entries = entries.map(([key, value]) => [key, new TrieBlobINode(this.trie, value)]);
 		return this._entries;
 	}
 	entryAt(keyIdx) {
@@ -4889,7 +4901,7 @@ var TrieBlobBuilder = class TrieBlobBuilder {
 		}
 		assert(this.nodes.length === 2);
 		const eowNodeIndex = 1;
-		const eowShifted = eowNodeIndex << nodeChildRefShift;
+		const eowShifted = 256;
 		const nodes = this.nodes;
 		const stack = [{
 			nodeIdx: 0,
@@ -5124,7 +5136,7 @@ var TrieBlobBuilder = class TrieBlobBuilder {
 		const NodeMaskEOW = 256;
 		const tf = new TrieBlobBuilder(void 0, root);
 		const IdxEOW = tf.IdxEOW;
-		const known = new Map([[root, 0]]);
+		const known = /* @__PURE__ */ new Map([[root, 0]]);
 		function resolveNode(n) {
 			if (n.f && !n.c) return IdxEOW;
 			const node = [n.f ? NodeMaskEOW : 0];
@@ -5184,7 +5196,7 @@ var TrieBlobBuilder = class TrieBlobBuilder {
 		const NodeMaskEOW = 256;
 		const tf = new TrieBlobBuilder(void 0, root);
 		const IdxEOW = tf.IdxEOW;
-		const known = new Map([[root.id, 0]]);
+		const known = /* @__PURE__ */ new Map([[root.id, 0]]);
 		function resolveNode(n) {
 			if (n.eow && !n.hasChildren()) return IdxEOW;
 			const node = [n.eow ? NodeMaskEOW : 0];
@@ -5475,7 +5487,8 @@ var ITrieImpl = class ITrieImpl {
 	static create(words, info) {
 		const builder = new TrieBlobBuilder(info);
 		builder.insert(words);
-		return new ITrieImpl(builder.build());
+		const root = builder.build();
+		return new ITrieImpl(root);
 	}
 	createFindOptions(options) {
 		return createFindOptions$1(options);
@@ -6086,10 +6099,12 @@ var TrieNodeTrie = class TrieNodeTrie {
 		return this._size ??= countNodes(this.root);
 	}
 	static createFromWords(words, options) {
-		return new TrieNodeTrie(createTrieRootFromList(words, options));
+		const root = createTrieRootFromList(words, options);
+		return new TrieNodeTrie(root);
 	}
 	static createFromWordsAndConsolidate(words, options) {
-		return new TrieNodeTrie(consolidate(createTrieRootFromList(words, options)));
+		const root = createTrieRootFromList(words, options);
+		return new TrieNodeTrie(consolidate(root));
 	}
 };
 //#endregion
@@ -6424,7 +6439,7 @@ function convertToTrieRefNodes(root) {
 		f: 1,
 		c: void 0
 	};
-	const tallies = new Map([[eow, 0]]);
+	const tallies = /* @__PURE__ */ new Map([[eow, 0]]);
 	let count = 0;
 	const cached = /* @__PURE__ */ new Map();
 	const rollupTally = /* @__PURE__ */ new Map();
@@ -6900,7 +6915,10 @@ ${INLINE_DATA_COMMENT_LINE}* `;
 			return;
 		}
 		if (node.c) {
-			if (depth > 0 && depth <= 2) yield* emit(comment_begin + wordChars.slice(0, depth).map(escape).join("") + comment_end);
+			if (depth > 0 && depth <= 2) {
+				const chars = wordChars.slice(0, depth).map(escape).join("");
+				yield* emit(comment_begin + chars + comment_end);
+			}
 			cache.set(node, count++);
 			const c = Object.entries(node.c).sort((a, b) => a[0] < b[0] ? -1 : 1);
 			for (const [s, n] of c) {
@@ -7312,7 +7330,7 @@ var TrieNodeBuilder = class {
 };
 //#endregion
 //#region src/lib/io/importV3.ts
-const characterMap = new Map([...new Map([
+const characterMap = new Map([.../* @__PURE__ */ new Map([
 	["\n", "\\n"],
 	["\r", "\\r"],
 	["\\", "\\\\"]
@@ -7424,7 +7442,7 @@ function parseStream(radix) {
 	function parseIgnore(acc, _) {
 		return acc;
 	}
-	const parsers = new Map([
+	const parsers = /* @__PURE__ */ new Map([
 		["$", parseEOW],
 		["<", parseBack],
 		["#", parseReference],
@@ -7498,7 +7516,7 @@ const insertSpaceCost = -1;
 const mapSubCost = opCosts.visuallySimilar;
 const maxCostScale = opCosts.wordLengthCostFactor;
 const discourageInsertCost = baseCost;
-const setOfSeparators = new Set(["+", " "]);
+const setOfSeparators = /* @__PURE__ */ new Set(["+", " "]);
 function suggest(root, word, options = {}) {
 	const opts = createSuggestionOptions(options);
 	const collector = suggestionCollector(word, clean(opts));
@@ -7534,9 +7552,7 @@ function* genCompoundableSuggestions(root, word, options = {}) {
 			case "number":
 				costLimit = maxCost;
 				break;
-			case "symbol":
-				stopNow = true;
-				break;
+			case "symbol": stopNow = true;
 		}
 	}
 	const a = 0;
@@ -8032,11 +8048,13 @@ var TrieBuilder = class {
 			const n = this.transforms.get(node)?.get(s.join(""));
 			if (n) return this.#tryCacheFrozen(n);
 		}
-		if (!s.length) if (!node.c) return this._eow;
-		else {
-			node = this.#copyIfFrozen(node);
-			node.f = this._eow.f;
-			return node;
+		if (!s.length) {
+			if (!node.c) return this._eow;
+			else {
+				node = this.#copyIfFrozen(node);
+				node.f = this._eow.f;
+				return node;
+			}
 		}
 		const head = s[0];
 		const tail = s.slice(1);
@@ -8239,9 +8257,7 @@ function createDictionaryLineParserMapper(options) {
 				case "no-generate-alternatives":
 					stripCaseAndAccents = false;
 					break;
-				case "generate-alternatives":
-					stripCaseAndAccents = true;
-					break;
+				case "generate-alternatives": stripCaseAndAccents = true;
 			}
 		}
 		return line.slice(0, idx).trim();
@@ -8531,7 +8547,7 @@ const specialCharacters = stringToCharSet([
 	"0123456789",
 	"`~!@#$%^&*()_-+=[]{};:'\"<>,./?\\|"
 ].join(""));
-const specialCharacterMap = new Map([
+const specialCharacterMap = /* @__PURE__ */ new Map([
 	["\n", "\\n"],
 	["\r", "\\r"],
 	["\\", "\\\\"]
@@ -10961,7 +10977,7 @@ function parseAccents(cs, _editCost) {
 }
 function calcCostsForAccentedLetters(simpleMap, locale, costs) {
 	const charactersWithAccents = [...pipeSync(splitMap(simpleMap), opMapSync((char) => caseForms(char, locale)), opFlattenSync(), opMapSync((char) => [...accentForms(char)]), opFilterSync((forms) => forms.length > 1))];
-	const replaceAccentMap = [...pipeSync(charactersWithAccents, opMapSync((forms) => new Set([...forms, ...forms.map((char) => stripAccents(char))])), opMapSync((forms) => [...forms].sort()), opFilterSync((forms) => forms.length > 1), opMapSync(joinLetters), opUniqueSync())].join("|");
+	const replaceAccentMap = [...pipeSync(charactersWithAccents, opMapSync((forms) => /* @__PURE__ */ new Set([...forms, ...forms.map((char) => stripAccents(char))])), opMapSync((forms) => [...forms].sort()), opFilterSync((forms) => forms.length > 1), opMapSync(joinLetters), opUniqueSync())].join("|");
 	const cost = costs.accentCosts;
 	const costToReplaceAccent = !replaceAccentMap ? [] : [{
 		map: replaceAccentMap,

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "Trie Data Structure to support cspell.",
   "type": "module",
   "sideEffects": false,
@@ -62,16 +62,16 @@
     "node": ">=22.18.0"
   },
   "peerDependencies": {
-    "@cspell/cspell-types": "10.0.0"
+    "@cspell/cspell-types": "10.1.0"
   },
   "devDependencies": {
-    "@cspell/cspell-performance-monitor": "10.0.0",
-    "@cspell/cspell-pipe": "10.0.0",
-    "@cspell/dict-cpp": "^7.0.2",
-    "@cspell/dict-en_us": "^4.4.33",
+    "@cspell/cspell-performance-monitor": "10.1.0",
+    "@cspell/cspell-pipe": "10.1.0",
+    "@cspell/dict-cpp": "^7.1.0",
+    "@cspell/dict-en_us": "^4.4.36",
     "@cspell/dict-es-es": "^3.0.8",
     "@cspell/dict-nl-nl": "^2.4.2",
     "gensequence": "^8.0.8"
   },
-  "gitHead": "6ddfd576b6bb554a7cb8dba1ab053a0b6ff8021f"
+  "gitHead": "401518c5e37c06fb406aedadb3fc7a1c27eca8e6"
 }