refactor: Removed FastTrieBlob part 1 (#8266)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: Jason3S

packages/cspell-trie-lib/api/api.d.ts

@@ -2,27 +2,19 @@ import { suite } from 'perf-insight';
 
 import { CharIndex } from '../src/lib/TrieBlob/CharIndex.ts';
 import { encodeTextToUtf8 } from '../src/lib/TrieBlob/Utf8.ts';
-import { readFastTrieBlobFromConfig, readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
+import { readTrieBlobFromConfig, readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
 
 // const measureTimeout = 100;
 
 const getTrie = memorize(_getTrie);
-const getFastTrieBlob = memorize(_getFastTrieBlob);
 const getWords = memorize(async () => [...(await getTrie()).words()]);
 
 suite('encode to sequence', async (test) => {
     const words = await getWords();
     const msgSuffix = ' - ' + words.length + ' words';
-    const fastTrieBlob = await getFastTrieBlob();
     const charIndex = CharIndex.fromIterable(words);
     const encoder = new TextEncoder();
 
-    test('fastTrieBlob.wordToNodeCharIndexSequence' + msgSuffix, () => {
-        for (const word of words) {
-            fastTrieBlob.wordToUtf8Seq(word);
-        }
-    });
-
     test('charIndex.wordToCharIndexSequence' + msgSuffix, () => {
         for (const word of words) {
             charIndex.wordToUtf8Seq(word);
@@ -116,7 +108,7 @@ function _getTrie() {
 }
 
 function _getFastTrieBlob() {
-    return readFastTrieBlobFromConfig('@cspell/dict-en_us/cspell-ext.json');
+    return readTrieBlobFromConfig('@cspell/dict-en_us/cspell-ext.json');
 }
 
 function memorize<T, P extends []>(fn: (...p: P) => T): (...p: P) => T {

packages/cspell-trie-lib/perf/charIndex.perf.ts

@@ -3,7 +3,7 @@ import { suite } from 'perf-insight';
 import { buildITrieFromWords } from '../src/lib/index.ts';
 import { createTrieBlobFromTrieRoot } from '../src/lib/TrieBlob/createTrieBlob.ts';
 import { FastTrieBlob } from '../src/lib/TrieBlob/FastTrieBlob.ts';
-import { FastTrieBlobBuilder } from '../src/lib/TrieBlob/FastTrieBlobBuilder.ts';
+import { TrieBlobBuilder } from '../src/lib/TrieBlob/TrieBlobBuilder.ts';
 import { createTrieRootFromList } from '../src/lib/TrieNode/trie-util.ts';
 import { readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
 
@@ -15,16 +15,15 @@ const getWords = memorize(async () => [...(await getTrie()).words()]);
 suite('trie create', async (test) => {
     const words = await getWords();
     const trie = createTrieRootFromList(words);
-    const fastTrie = FastTrieBlobBuilder.fromWordList(words);
+    const trieBlob = TrieBlobBuilder.fromWordList(words);
     console.error('Info: %o', {
         wordsSize: words.length,
-        fastTrieSize: fastTrie.size,
-        fastTrieSmallSize: FastTrieBlobBuilder.fromWordList(words.slice(-1000)).size,
+        TrieBlobSize: trieBlob.size,
+        fastTrieSmallSize: TrieBlobBuilder.fromWordList(words.slice(-1000)).size,
     });
-    const trieBlob = fastTrie.toTrieBlob();
 
     test('FastTrieBlobBuilder.insert.build', () => {
-        const builder = new FastTrieBlobBuilder();
+        const builder = new TrieBlobBuilder();
         builder.insert(words);
         builder.build();
     });
@@ -34,11 +33,11 @@ suite('trie create', async (test) => {
     });
 
     test('FastTrieBlobBuilder.fromWordList', () => {
-        FastTrieBlobBuilder.fromWordList(words);
+        TrieBlobBuilder.fromWordList(words);
     });
 
     test('FastTrieBlobBuilder.fromTrieRoot', () => {
-        FastTrieBlobBuilder.fromTrieRoot(trie);
+        TrieBlobBuilder.fromTrieRoot(trie);
     });
 
     test('FastTrieBlob.fromTrie', () => {
@@ -52,10 +51,6 @@ suite('trie create', async (test) => {
     test('TrieBlob createTrieBlobFromTrieRoot', () => {
         createTrieBlobFromTrieRoot(trie);
     });
-
-    test('TrieBlob fastTrie.toTrieBlob', () => {
-        fastTrie.toTrieBlob();
-    });
 });
 
 function _getTrie() {

packages/cspell-trie-lib/perf/create.perf.ts

@@ -3,20 +3,18 @@ import assert from 'node:assert';
 import { suite } from 'perf-insight';
 
 import { ITrieImpl } from '../src/lib/ITrie.ts';
-import { readFastTrieBlobFromConfig, readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
+import { readTrieBlobFromConfig, readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
 
 // const measureTimeout = 100;
 
 const getTrie = memorize(_getTrie);
-const getFastTrieBlob = memorize(_getFastTrieBlob);
+const getTrieBlob = memorize(_getTrieBlob);
 const getWords = memorize(async () => [...(await getTrie()).words()]);
 
 suite('trie has', async (test) => {
     const trie = await getTrie();
     const words = await getWords();
-    const fastTrieBlob = await getFastTrieBlob();
-    const trieBlob = fastTrieBlob.toTrieBlob();
-    const iTrieFast = new ITrieImpl(fastTrieBlob);
+    const trieBlob = await getTrieBlob();
     const iTrieBlob = new ITrieImpl(trieBlob);
     const setOfWords = new Set(words);
     console.log(`Number of words: ${words.length}`);
@@ -29,18 +27,10 @@ suite('trie has', async (test) => {
         trieHasWords(trie, words);
     });
 
-    test('fastTrieBlob has words', () => {
-        trieHasWords(fastTrieBlob, words);
-    });
-
     test('trieBlob has words', () => {
         trieHasWords(trieBlob, words);
     });
 
-    test('iTrieFast has words', () => {
-        trieHasWords(iTrieFast, words);
-    });
-
     test('iTrieBlob has words', () => {
         trieHasWords(iTrieBlob, words);
     });
@@ -50,8 +40,8 @@ function _getTrie() {
     return readTrieFromConfig('@cspell/dict-en_us/cspell-ext.json');
 }
 
-function _getFastTrieBlob() {
-    return readFastTrieBlobFromConfig('@cspell/dict-en_us/cspell-ext.json');
+function _getTrieBlob() {
+    return readTrieBlobFromConfig('@cspell/dict-en_us/cspell-ext.json');
 }
 
 function trieHasWords(trie: { has: (word: string) => boolean }, words: string[]): boolean {

packages/cspell-trie-lib/perf/has.perf.ts

@@ -3,13 +3,12 @@ import assert from 'node:assert';
 import { suite } from 'perf-insight';
 
 import type { Trie } from '../src/lib/index.ts';
-import type { FastTrieBlob } from '../src/lib/TrieBlob/FastTrieBlob.ts';
-import { FastTrieBlobBuilder } from '../src/lib/TrieBlob/FastTrieBlobBuilder.ts';
 import { TrieBlob } from '../src/lib/TrieBlob/TrieBlob.ts';
+import { TrieBlobBuilder } from '../src/lib/TrieBlob/TrieBlobBuilder.ts';
 import type { TrieData } from '../src/lib/TrieData.ts';
 import { TrieNodeTrie } from '../src/lib/TrieNode/TrieNodeTrie.ts';
 import { walkerWordsITrie } from '../src/lib/walker/walker.ts';
-import { readFastTrieBlobFromConfig, readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
+import { readTrieBlobFromConfig, readTrieFromConfig } from '../src/test/dictionaries.test.helper.ts';
 
 // const weightMapEn = getEnglishWeightMap();
 
@@ -29,16 +28,16 @@ class DI {
     }
 
     private _trieFast = lazy(() => {
-        return getFastTrieBlob();
+        return getTrieBlob();
     });
 
-    get trieFastNL() {
+    get trieBlobNL() {
         return this._trieFastNL();
     }
 
-    private _trieFastNL = lazy(() => getFastTrieBlobNL());
+    private _trieFastNL = lazy(() => getTrieBlobNL());
 
-    get trieFast() {
+    get trieBlob() {
         return this._trieFast();
     }
 
@@ -56,8 +55,8 @@ class DI {
 interface TestDependencies {
     trie: Trie;
     words: string[];
-    trieFast: FastTrieBlob;
-    trieFastNL: FastTrieBlob;
+    trieBlob: TrieBlob;
+    trieBlobNL: TrieBlob;
 }
 
 type DependenciesKeys = keyof TestDependencies;
@@ -67,22 +66,12 @@ const di = new DI();
 // const measureTimeout = 100;
 
 suite('blob.FastTrieBlobBuilder', async (test) => {
-    const { trie, words, trieFast } = await prepareDI(['trie', 'words', 'trieFast']);
-    const trieBlob = FastTrieBlobBuilder.fromTrieRoot(trie.root).toTrieBlob();
-    const trieBlobFromFast = trieFast.toTrieBlob();
-    assert(!words.some((w) => !trieFast.has(w)), 'Expect all words to be found in trieFast.');
-    assert(!words.some((w) => !trieBlobFromFast.has(w)), 'Expect all words to be found in trieBlobFromFast.');
+    const { trie, words, trieBlob } = await prepareDI(['trie', 'words', 'trieBlob']);
+    assert(!words.some((w) => !trieBlob.has(w)), 'Expect all words to be found in trieFast.');
     assert(!words.some((w) => !trie.has(w)), 'Expect all words to be found in trie.');
     assert(!words.some((w) => !trieBlob.has(w)), 'Expect all words to be found in trieBlob. p1');
 
-    test('FastTrieBlobBuilder.fromTrieRoot', () => FastTrieBlobBuilder.fromTrieRoot(trie.root));
-
-    test.prepare(() => FastTrieBlobBuilder.fromTrieRoot(trie.root)).test(
-        'blob.FastTrieBlobBuilder.fromTrieRoot',
-        (ft) => ft.toTrieBlob(),
-    );
-
-    test('blob.createTrieBlobFromITrieNodeRoot', () => FastTrieBlobBuilder.fromTrieRoot(trie.root).toTrieBlob());
+    test('TrieBlobBuilder.fromTrieRoot', () => TrieBlobBuilder.fromTrieRoot(trie.root));
 
     test('blob.TrieBlob.has', () => trieHasWords(trieBlob, words));
     test('blob.words', () => [...trieBlob.words()]);
@@ -118,12 +107,12 @@ function getTrie() {
     return readTrieFromConfig('@cspell/dict-en_us/cspell-ext.json');
 }
 
-function getFastTrieBlob() {
-    return readFastTrieBlobFromConfig('@cspell/dict-en_us/cspell-ext.json');
+function getTrieBlob() {
+    return readTrieBlobFromConfig('@cspell/dict-en_us/cspell-ext.json');
 }
 
-function getFastTrieBlobNL() {
-    return readFastTrieBlobFromConfig('@cspell/dict-nl-nl/cspell-ext.json');
+function getTrieBlobNL() {
+    return readTrieBlobFromConfig('@cspell/dict-nl-nl/cspell-ext.json');
 }
 
 function trieHasWords(trie: TrieData, words: string[]): boolean {

packages/cspell-trie-lib/perf/perfSuite.perf.ts

@@ -12,7 +12,7 @@ import type { CompoundWordsMethod, WalkerIterator } from './ITrieNode/walker/wal
 import type { SuggestionCollector, SuggestionResult } from './suggestCollector.ts';
 import { createSuggestionOptions, type SuggestionOptions } from './suggestions/genSuggestionsOptions.ts';
 import { genSuggestions, suggest } from './suggestions/suggestTrieData.ts';
-import { FastTrieBlobBuilder } from './TrieBlob/FastTrieBlobBuilder.ts';
+import { TrieBlobBuilder } from './TrieBlob/TrieBlobBuilder.ts';
 import type { TrieData } from './TrieData.ts';
 import { clean } from './utils/clean.ts';
 import { memorizeLastCall } from './utils/memorizeLastCall.ts';
@@ -427,7 +427,7 @@ export class ITrieImpl implements ITrie {
     }
 
     static create(words: Iterable<string> | IterableIterator<string>, info?: PartialTrieInfo): ITrie {
-        const builder = new FastTrieBlobBuilder(info);
+        const builder = new TrieBlobBuilder(info);
         builder.insert(words);
         const root = builder.build();
         return new ITrieImpl(root);

packages/cspell-trie-lib/src/lib/ITrie.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest';
 
 import { parseDictionaryLegacy } from '../SimpleDictionaryParser.ts';
-import { FastTrieBlobBuilder } from '../TrieBlob/FastTrieBlobBuilder.ts';
+import { TrieBlobBuilder } from '../TrieBlob/TrieBlobBuilder.ts';
 import type { TrieData } from '../TrieData.ts';
 import type { TrieRoot } from '../TrieNode/TrieNode.ts';
 import { TrieNodeTrie } from '../TrieNode/TrieNodeTrie.ts';
@@ -14,7 +14,7 @@ const findLegacyCompoundWord = __testing__.findLegacyCompoundWord;
 describe('Validate findWord', () => {
     const trie = dictionaryTrieNodeTrie().getRoot();
     const trieBlob = dictionaryTrieBlob().getRoot();
-    const trieFast = FastTrieBlobBuilder.fromTrieRoot(dictionaryTrieRoot()).getRoot();
+    const trieFast = TrieBlobBuilder.fromTrieRoot(dictionaryTrieRoot()).getRoot();
 
     const cModeC = { compoundMode: 'compound' };
     const mCaseT = { matchCase: true };
@@ -265,8 +265,7 @@ function dictionaryTrieNodeTrie(): TrieData {
 }
 
 function dictionaryTrieBlob(): TrieData {
-    const ft = FastTrieBlobBuilder.fromTrieRoot(dictionaryTrieRoot());
-    return ft.toTrieBlob();
+    return TrieBlobBuilder.fromTrieRoot(dictionaryTrieRoot());
 }
 
 const sampleWords = [

packages/cspell-trie-lib/src/lib/ITrieNode/find.test.ts

@@ -4,7 +4,7 @@ import { opSkip, opTake, pipe } from '@cspell/cspell-pipe/sync';
 import { describe, expect, test } from 'vitest';
 
 import { readTrieFromConfig } from '../../test/dictionaries.test.helper.ts';
-import { FastTrieBlobBuilder } from './FastTrieBlobBuilder.ts';
+import { TrieBlobBuilder } from './TrieBlobBuilder.ts';
 
 function getTrie() {
     return readTrieFromConfig('@cspell/dict-en_us/cspell-ext.json');
@@ -17,11 +17,11 @@ describe('Validate English FastTrieBlob', async () => {
     const pTrie = getTrie();
     const sampleTrie = await pTrie;
     const sampleWordsLarge = [...pipe(sampleTrie.words(), opSkip(1000), opTake(6000))];
-    const fastTrieBlob = FastTrieBlobBuilder.fromTrieRoot(sampleTrie.root);
+    const fastTrieBlob = TrieBlobBuilder.fromTrieRoot(sampleTrie.root);
 
     test('insert', () => {
         const words = sampleWordsLarge;
-        const ft = FastTrieBlobBuilder.fromWordList(words);
+        const ft = TrieBlobBuilder.fromWordList(words);
         const result = [...ft.words()];
         expect(result).toEqual(words.sort());
     });
@@ -35,7 +35,7 @@ describe('Validate English FastTrieBlob', async () => {
 
     test('words', async () => {
         const words = await sampleWords;
-        const ft = FastTrieBlobBuilder.fromWordList(words);
+        const ft = TrieBlobBuilder.fromWordList(words);
         const result = [...ft.words()].sort();
 
         const rSet = new Set(result);