cspell-lib 7.0.0-alpha.2 → 7.0.0

package/dist/esm/SpellingDictionary/DictionaryController/DictionaryLoader.d.mts

@@ -8,7 +8,6 @@ export declare class DictionaryLoader {
     private inlineDictionaryCache;
     private dictionaryCacheByDef;
     private reader;
-    private readerSync;
     constructor(cspellIO: CSpellIO);
     loadDictionary(def: DictionaryDefinitionInternal): Promise<SpellingDictionary>;
     loadDictionarySync(def: DictionaryDefinitionInternal): SpellingDictionary;

package/dist/esm/SpellingDictionary/DictionaryController/DictionaryLoader.mjs

@@ -32,7 +32,6 @@ export class DictionaryLoader {
         this.inlineDictionaryCache = new AutoResolveWeakCache();
         this.dictionaryCacheByDef = new StrongWeakMap();
         this.reader = toReader(cspellIO);
-        this.readerSync = toReaderSync(cspellIO);
     }
     loadDictionary(def) {
         if (isDictionaryDefinitionInlineInternal(def)) {
@@ -132,7 +131,7 @@ export class DictionaryLoader {
         const stat = this.getStatSync(uri);
         const sig = now + Math.random();
         try {
-            const dictionary = loadSync(this.readerSync, uri, options);
+            const dictionary = loadSync(this.reader, uri, options);
             const pending = Promise.resolve([dictionary, stat]);
             return {
                 uri,
@@ -190,15 +189,11 @@ export class DictionaryLoader {
     }
 }
 function toReader(cspellIO) {
-    return async function (filename) {
-        const res = await cspellIO.readFile(filename);
-        return res.content.split(/\n|\r\n|\r/);
-    };
-}
-function toReaderSync(cspellIO) {
-    return function (filename) {
-        const res = cspellIO.readFileSync(filename);
-        return res.content.split(/\n|\r\n|\r/);
+    return {
+        read: async (filename) => (await cspellIO.readFile(filename)).content,
+        readLines: async (filename) => toLines((await cspellIO.readFile(filename)).content),
+        readSync: (filename) => cspellIO.readFileSync(filename).content,
+        readLinesSync: (filename) => toLines(cspellIO.readFileSync(filename).content),
     };
 }
 const importantOptionKeys = ['name', 'noSuggest', 'useCompounds', 'type'];
@@ -230,12 +225,12 @@ function loadSync(reader, uri, options) {
     const loader = loadersSync[type] || loaders.default;
     return loader(reader, uri, options);
 }
-async function legacyWordList(readLines, filename, options) {
-    const lines = await readLines(filename);
+async function legacyWordList(reader, filename, options) {
+    const lines = await reader.readLines(filename);
     return _legacyWordListSync(lines, filename, options);
 }
-function legacyWordListSync(readLinesSync, filename, options) {
-    const lines = readLinesSync(filename);
+function legacyWordListSync(reader, filename, options) {
+    const lines = reader.readLinesSync(filename);
     return _legacyWordListSync(lines, filename, options);
 }
 function _legacyWordListSync(lines, filename, options) {
@@ -246,12 +241,12 @@ function _legacyWordListSync(lines, filename, options) {
     opConcatMap((line) => line.split(/[^\w\p{L}\p{M}'’]+/gu)), opFilter((word) => !!word));
     return createSpellingDictionary(words, options.name, filename, options);
 }
-async function wordsPerLineWordList(readLines, filename, options) {
-    const lines = await readLines(filename);
+async function wordsPerLineWordList(reader, filename, options) {
+    const lines = await reader.readLines(filename);
     return _wordsPerLineWordList(lines, filename, options);
 }
-function wordsPerLineWordListSync(readLinesSync, filename, options) {
-    const lines = readLinesSync(filename);
+function wordsPerLineWordListSync(reader, filename, options) {
+    const lines = reader.readLinesSync(filename);
     return _wordsPerLineWordList(lines, filename, options);
 }
 function _wordsPerLineWordList(lines, filename, options) {
@@ -263,18 +258,21 @@ function _wordsPerLineWordList(lines, filename, options) {
     return createSpellingDictionary(words, options.name, filename, options);
 }
 async function loadSimpleWordList(reader, filename, options) {
-    const lines = await reader(filename);
+    const lines = await reader.readLines(filename);
     return createSpellingDictionary(lines, options.name, filename, options);
 }
-function loadSimpleWordListSync(readLinesSync, filename, options) {
-    const lines = readLinesSync(filename);
+function loadSimpleWordListSync(reader, filename, options) {
+    const lines = reader.readLinesSync(filename);
     return createSpellingDictionary(lines, options.name, filename, options);
 }
-async function loadTrie(readLines, filename, options) {
-    const lines = await readLines(filename);
-    return createSpellingDictionaryFromTrieFile(lines, options.name, filename, options);
+async function loadTrie(reader, filename, options) {
+    const content = await reader.read(filename);
+    return createSpellingDictionaryFromTrieFile(content, options.name, filename, options);
+}
+function loadTrieSync(reader, filename, options) {
+    const content = reader.readSync(filename);
+    return createSpellingDictionaryFromTrieFile(content, options.name, filename, options);
 }
-function loadTrieSync(readLinesSync, filename, options) {
-    const lines = readLinesSync(filename);
-    return createSpellingDictionaryFromTrieFile(lines, options.name, filename, options);
+function toLines(content) {
+    return content.split(/\n|\r\n|\r/);
 }

package/dist/esm/index.d.mts

@@ -22,7 +22,7 @@ export { getLogger, Logger, setLogger } from './util/logger.mjs';
 export { resolveFile } from './util/resolveFile.mjs';
 export { checkText, checkTextDocument, CheckTextInfo, IncludeExcludeFlag, IncludeExcludeOptions, TextInfoItem, validateText, ValidationIssue, } from './validator.mjs';
 export * from '@cspell/cspell-types';
-export { asyncIterableToArray, readFile, readFileSync, writeToFile, writeToFileIterable, writeToFileIterableP, } from 'cspell-io';
+export { asyncIterableToArray, readFileText as readFile, readFileTextSync as readFileSync, writeToFile, writeToFileIterable, writeToFileIterableP, } from 'cspell-io';
 export { Link, Text };
 export { ExclusionHelper };
 export { clearCachedFiles } from './clearCachedFiles.mjs';

package/dist/esm/index.mjs

@@ -17,7 +17,7 @@ export { getLogger, setLogger } from './util/logger.mjs';
 export { resolveFile } from './util/resolveFile.mjs';
 export { checkText, checkTextDocument, IncludeExcludeFlag, validateText, } from './validator.mjs';
 export * from '@cspell/cspell-types';
-export { asyncIterableToArray, readFile, readFileSync, writeToFile, writeToFileIterable, writeToFileIterableP, } from 'cspell-io';
+export { asyncIterableToArray, readFileText as readFile, readFileTextSync as readFileSync, writeToFile, writeToFileIterable, writeToFileIterableP, } from 'cspell-io';
 export { Link, Text };
 export { ExclusionHelper };
 export { clearCachedFiles } from './clearCachedFiles.mjs';

package/dist/esm/util/fileReader.mjs

@@ -1,8 +1,8 @@
-import { readFile, readFileSync } from 'cspell-io';
+import { readFileText, readFileTextSync } from 'cspell-io';
 import { toIterableIterator } from './iterableIteratorLib.mjs';
 export async function readLines(filename, encoding = 'utf8') {
     try {
-        const content = await readFile(filename, encoding);
+        const content = await readFileText(filename, encoding);
         return toIterableIterator(content.split(/\r?\n/g));
     }
     catch (e) {
@@ -10,6 +10,6 @@ export async function readLines(filename, encoding = 'utf8') {
     }
 }
 export function readLinesSync(filename, encoding = 'utf8') {
-    const content = readFileSync(filename, encoding);
+    const content = readFileTextSync(filename, encoding);
     return content.split(/\r?\n/g);
 }

package/dist/esm/wordListHelper.mjs

@@ -15,7 +15,7 @@ export function splitLine(line) {
     return [...Text.extractWordsFromText(line)].map(({ text }) => text);
 }
 export function splitCodeWords(words) {
-    return words.map(Text.splitCamelCaseWord).reduce((a, b) => a.concat(b), []);
+    return words.map(Text.splitCamelCaseWord).flatMap((a) => a);
 }
 export function splitLineIntoCodeWords(line) {
     const asMultiWord = regExpWordsWithSpaces.test(line) ? [line] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "types": "dist/api/api.d.ts",
@@ -60,19 +60,19 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "7.0.0-alpha.2",
-    "@cspell/cspell-pipe": "7.0.0-alpha.2",
-    "@cspell/cspell-types": "7.0.0-alpha.2",
-    "@cspell/strong-weak-map": "7.0.0-alpha.2",
+    "@cspell/cspell-bundled-dicts": "7.0.0",
+    "@cspell/cspell-pipe": "7.0.0",
+    "@cspell/cspell-types": "7.0.0",
+    "@cspell/strong-weak-map": "7.0.0",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.3",
     "configstore": "^6.0.0",
     "cosmiconfig": "8.0.0",
-    "cspell-dictionary": "7.0.0-alpha.2",
-    "cspell-glob": "7.0.0-alpha.2",
-    "cspell-grammar": "7.0.0-alpha.2",
-    "cspell-io": "7.0.0-alpha.2",
-    "cspell-trie-lib": "7.0.0-alpha.2",
+    "cspell-dictionary": "7.0.0",
+    "cspell-glob": "7.0.0",
+    "cspell-grammar": "7.0.0",
+    "cspell-io": "7.0.0",
+    "cspell-trie-lib": "7.0.0",
     "fast-equals": "^5.0.1",
     "find-up": "^6.3.0",
     "gensequence": "^5.0.2",
@@ -88,15 +88,15 @@
   "devDependencies": {
     "@cspell/dict-cpp": "^4.0.3",
     "@cspell/dict-csharp": "^4.0.2",
-    "@cspell/dict-css": "^3.0.0",
+    "@cspell/dict-css": "^4.0.6",
     "@cspell/dict-fa-ir": "^2.0.0",
-    "@cspell/dict-fr-fr": "^2.2.1",
+    "@cspell/dict-fr-fr": "^2.2.2",
     "@cspell/dict-html": "^4.0.3",
-    "@cspell/dict-nl-nl": "^2.2.8",
-    "@cspell/dict-python": "^4.0.4",
+    "@cspell/dict-nl-nl": "^2.2.9",
+    "@cspell/dict-python": "^4.1.5",
     "@types/configstore": "^6.0.0",
     "cspell-dict-nl-nl": "^1.1.2",
     "lorem-ipsum": "^2.0.8"
   },
-  "gitHead": "a1b7c5daeef5afdb14d6444318f450b9fd9c035a"
+  "gitHead": "52960d5ed75655978f9b633f44fd106937a63cd7"
 }