cspell-lib 6.1.0 → 6.1.3-alpha.0

package/dist/LanguageIds.js

@@ -241,7 +241,6 @@ function doesSetContainAnyOf(setOfIds, languageId) {
 }
 function buildLanguageExtensionMapSet(defs) {
     return defs.reduce((map, def) => {
-        var _a;
         function getMapSet(value) {
             const found = map.get(value);
             if (found)
@@ -254,7 +253,7 @@ function buildLanguageExtensionMapSet(defs) {
             getMapSet(value).add(def.id);
         }
         def.extensions.forEach(addId);
-        (_a = def.filenames) === null || _a === void 0 ? void 0 : _a.forEach(addId);
+        def.filenames?.forEach(addId);
         return map;
     }, new Map());
 }

package/dist/Models/TextDocument.js

@@ -98,7 +98,7 @@ class TextDocumentImpl {
      * @returns this
      */
     update(edits, version) {
-        version = version !== null && version !== void 0 ? version : this.version + 1;
+        version = version ?? this.version + 1;
         for (const edit of edits) {
             const vsEdit = edit.range
                 ? {
@@ -112,9 +112,9 @@ class TextDocumentImpl {
     }
 }
 function createTextDocument({ uri, content, languageId, locale, version, }) {
-    version = version !== null && version !== void 0 ? version : 1;
+    version = version ?? 1;
     uri = Uri.toUri(uri);
-    languageId = languageId !== null && languageId !== void 0 ? languageId : (0, LanguageIds_1.getLanguagesForBasename)(Uri.basename(uri));
+    languageId = languageId ?? (0, LanguageIds_1.getLanguagesForBasename)(Uri.basename(uri));
     languageId = languageId.length === 0 ? 'text' : languageId;
     return new TextDocumentImpl(uri, content, languageId, locale, version);
 }

package/dist/Settings/CSpellSettingsServer.js

@@ -116,7 +116,7 @@ function merge(left, right) {
     const leftId = _left.id || _left.languageId || '';
     const rightId = _right.id || _right.languageId || '';
     const includeRegExpList = takeRightOtherwiseLeft(_left.includeRegExpList, _right.includeRegExpList);
-    const optionals = (includeRegExpList === null || includeRegExpList === void 0 ? void 0 : includeRegExpList.length) ? { includeRegExpList } : {};
+    const optionals = includeRegExpList?.length ? { includeRegExpList } : {};
     const version = max(_left.version, _right.version);
     const settings = (0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({
         ..._left,
@@ -146,6 +146,7 @@ function merge(left, right) {
         description: undefined,
         globRoot: undefined,
         import: undefined,
+        plugins: mergeList(_left.plugins, _right.plugins),
         __imports: mergeImportRefs(_left, _right),
         __importRef: undefined,
     });
@@ -176,8 +177,7 @@ function doesLeftHaveRightAncestor(left, right) {
     return hasAncestor(left, right, 1);
 }
 function hasAncestor(s, ancestor, side) {
-    var _a;
-    const sources = (_a = s.source) === null || _a === void 0 ? void 0 : _a.sources;
+    const sources = s.source?.sources;
     if (!sources)
         return false;
     // calc the first or last index of the source array.
@@ -194,7 +194,7 @@ function mergeInDocSettings(left, right) {
 }
 exports.mergeInDocSettings = mergeInDocSettings;
 function takeRightOtherwiseLeft(left, right) {
-    if (right === null || right === void 0 ? void 0 : right.length) {
+    if (right?.length) {
         return right;
     }
     return left || right;
@@ -230,13 +230,12 @@ function _finalizeSettings(settings) {
     return finalized;
 }
 function toInternalSettings(settings) {
-    var _a;
     if (settings === undefined)
         return undefined;
     if ((0, CSpellSettingsInternalDef_1.isCSpellSettingsInternal)(settings))
         return settings;
     const { dictionaryDefinitions: defs, ...rest } = settings;
-    const dictionaryDefinitions = (0, DictionarySettings_1.mapDictDefsToInternal)(defs, filenameToDirectory((_a = settings.source) === null || _a === void 0 ? void 0 : _a.filename) || resolveCwd());
+    const dictionaryDefinitions = (0, DictionarySettings_1.mapDictDefsToInternal)(defs, filenameToDirectory(settings.source?.filename) || resolveCwd());
     const setting = dictionaryDefinitions ? { ...rest, dictionaryDefinitions } : rest;
     return (0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)(setting);
 }
@@ -279,11 +278,10 @@ function getSources(settings) {
     const visited = new Set();
     const sources = [];
     function _walkSourcesTree(settings) {
-        var _a, _b;
         if (!settings || visited.has(settings))
             return;
         visited.add(settings);
-        if (!((_b = (_a = settings.source) === null || _a === void 0 ? void 0 : _a.sources) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!settings.source?.sources?.length) {
             sources.push(settings);
             return;
         }
@@ -294,7 +292,6 @@ function getSources(settings) {
 }
 exports.getSources = getSources;
 function mergeImportRefs(left, right = {}) {
-    var _a;
     const imports = new Map(left.__imports || []);
     if (left.__importRef) {
         imports.set(left.__importRef.filename, left.__importRef);
@@ -302,7 +299,7 @@ function mergeImportRefs(left, right = {}) {
     if (right.__importRef) {
         imports.set(right.__importRef.filename, right.__importRef);
     }
-    const rightImports = ((_a = right.__imports) === null || _a === void 0 ? void 0 : _a.values()) || [];
+    const rightImports = right.__imports?.values() || [];
     for (const ref of rightImports) {
         imports.set(ref.filename, ref);
     }

package/dist/Settings/DictionarySettings.js

@@ -59,7 +59,7 @@ function fixPath(def) {
     };
 }
 function mapDictDefsToInternal(defs, pathToSettingsFile) {
-    return defs === null || defs === void 0 ? void 0 : defs.map((def) => mapDictDefToInternal(def, pathToSettingsFile));
+    return defs?.map((def) => mapDictDefToInternal(def, pathToSettingsFile));
 }
 exports.mapDictDefsToInternal = mapDictDefsToInternal;
 function mapDictDefToInternal(def, pathToSettingsFile) {

package/dist/Settings/LanguageSettings.js

@@ -85,8 +85,7 @@ function calcSettingsForLanguage(languageSettings, languageId, locale) {
 exports.calcSettingsForLanguage = calcSettingsForLanguage;
 const cacheDoesLanguageSettingMatchLanguageId = new WeakMap();
 function doesLanguageSettingMatchLanguageId(s, languageId) {
-    var _a;
-    const r = (_a = cacheDoesLanguageSettingMatchLanguageId.get(s)) !== null && _a !== void 0 ? _a : new Map();
+    const r = cacheDoesLanguageSettingMatchLanguageId.get(s) ?? new Map();
     const f = r.get(languageId);
     if (f !== undefined) {
         return f;

package/dist/Settings/configLoader.js

@@ -105,7 +105,7 @@ function readConfig(fileRef) {
     const s = {};
     try {
         const r = cspellConfigExplorerSync.load(filename);
-        if (!(r === null || r === void 0 ? void 0 : r.config))
+        if (!r?.config)
             throw new Error(`not found: "${filename}"`);
         Object.assign(s, r.config);
         normalizeRawConfig(s);
@@ -190,7 +190,7 @@ function mergeSourceList(orig, append) {
     return [...collection.values()];
 }
 function importSettings(fileRef, defaultValues, pnpSettings) {
-    defaultValues = defaultValues !== null && defaultValues !== void 0 ? defaultValues : defaultSettings;
+    defaultValues = defaultValues ?? defaultSettings;
     let { filename } = fileRef;
     filename = path.resolve(filename);
     const importRef = { ...fileRef, filename };
@@ -230,10 +230,9 @@ async function normalizeSearchForConfigResultAsync(searchPath, searchResult, pnp
     return normalizeSearchForConfigResult(searchPath, result, pnpSettings);
 }
 function normalizeSearchForConfigResult(searchPath, searchResult, pnpSettings) {
-    var _a;
     const error = searchResult instanceof ImportError_1.ImportError ? searchResult : undefined;
     const result = searchResult instanceof ImportError_1.ImportError ? undefined : searchResult;
-    const filepath = result === null || result === void 0 ? void 0 : result.filepath;
+    const filepath = result?.filepath;
     if (filepath) {
         const cached = cachedFiles.get(filepath);
         if (cached) {
@@ -245,10 +244,10 @@ function normalizeSearchForConfigResult(searchPath, searchResult, pnpSettings) {
         }
     }
     const { config = (0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({}) } = result || {};
-    const filename = (_a = result === null || result === void 0 ? void 0 : result.filepath) !== null && _a !== void 0 ? _a : searchPath;
+    const filename = result?.filepath ?? searchPath;
     const importRef = { filename: filename, error };
     const id = [path.basename(path.dirname(filename)), path.basename(filename)].join('/');
-    const name = (result === null || result === void 0 ? void 0 : result.filepath) ? id : `Config not found: ${id}`;
+    const name = result?.filepath ? id : `Config not found: ${id}`;
     const finalizeSettings = (0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({ id, name, __importRef: importRef });
     const settings = { id, ...config };
     cachedFiles.set(filename, finalizeSettings); // add an empty entry to prevent circular references.
@@ -371,7 +370,6 @@ function clearCachedSettingsFiles() {
 }
 exports.clearCachedSettingsFiles = clearCachedSettingsFiles;
 function mergeImportRefs(left, right = {}) {
-    var _a;
     const imports = new Map(left.__imports || []);
     if (left.__importRef) {
         imports.set(left.__importRef.filename, left.__importRef);
@@ -379,7 +377,7 @@ function mergeImportRefs(left, right = {}) {
     if (right.__importRef) {
         imports.set(right.__importRef.filename, right.__importRef);
     }
-    const rightImports = ((_a = right.__imports) === null || _a === void 0 ? void 0 : _a.values()) || [];
+    const rightImports = right.__imports?.values() || [];
     for (const ref of rightImports) {
         imports.set(ref.filename, ref);
     }
@@ -394,17 +392,17 @@ function extractImportErrors(settings) {
 }
 exports.extractImportErrors = extractImportErrors;
 function resolveGlobRoot(settings, pathToSettingsFile) {
-    var _a;
     const settingsFileDirRaw = path.dirname(pathToSettingsFile);
     const isVSCode = path.basename(settingsFileDirRaw) === '.vscode';
     const settingsFileDir = isVSCode ? path.dirname(settingsFileDirRaw) : settingsFileDirRaw;
     const envGlobRoot = process.env[CSpellSettingsServer_1.ENV_CSPELL_GLOB_ROOT];
-    const defaultGlobRoot = envGlobRoot !== null && envGlobRoot !== void 0 ? envGlobRoot : '${cwd}';
-    const rawRoot = (_a = settings.globRoot) !== null && _a !== void 0 ? _a : (settings.version === CSpellSettingsServer_1.configSettingsFileVersion0_1 ||
-        (envGlobRoot && !settings.version) ||
-        (isVSCode && !settings.version)
-        ? defaultGlobRoot
-        : settingsFileDir);
+    const defaultGlobRoot = envGlobRoot ?? '${cwd}';
+    const rawRoot = settings.globRoot ??
+        (settings.version === CSpellSettingsServer_1.configSettingsFileVersion0_1 ||
+            (envGlobRoot && !settings.version) ||
+            (isVSCode && !settings.version)
+            ? defaultGlobRoot
+            : settingsFileDir);
     const globRoot = rawRoot.startsWith('${cwd}') ? rawRoot : path.resolve(settingsFileDir, rawRoot);
     return globRoot;
 }
@@ -431,9 +429,8 @@ function toGlobDef(g, root, source) {
     return g;
 }
 function normalizeDictionaryDefs(settings, pathToSettingsFile) {
-    var _a;
     const dictionaryDefinitions = (0, DictionarySettings_1.mapDictDefsToInternal)(settings.dictionaryDefinitions, pathToSettingsFile);
-    const languageSettings = (_a = settings.languageSettings) === null || _a === void 0 ? void 0 : _a.map((langSetting) => util.clean({
+    const languageSettings = settings.languageSettings?.map((langSetting) => util.clean({
         ...langSetting,
         dictionaryDefinitions: (0, DictionarySettings_1.mapDictDefsToInternal)(langSetting.dictionaryDefinitions, pathToSettingsFile),
     }));
@@ -443,9 +440,8 @@ function normalizeDictionaryDefs(settings, pathToSettingsFile) {
     });
 }
 function normalizeOverrides(settings, pathToSettingsFile) {
-    var _a;
     const { globRoot = path.dirname(pathToSettingsFile) } = settings;
-    const overrides = (_a = settings.overrides) === null || _a === void 0 ? void 0 : _a.map((override) => {
+    const overrides = settings.overrides?.map((override) => {
         const filename = toGlobDef(override.filename, globRoot, pathToSettingsFile);
         const { dictionaryDefinitions, languageSettings } = normalizeDictionaryDefs(override, pathToSettingsFile);
         return util.clean({

package/dist/Settings/link.js

@@ -72,7 +72,7 @@ function addPathsToGlobalImports(paths) {
     const error = (0, GlobalSettings_1.writeRawGlobalSettings)(globalSettings);
     return {
         success: !error,
-        error: error === null || error === void 0 ? void 0 : error.message,
+        error: error?.message,
         resolvedSettings,
     };
 }
@@ -88,7 +88,7 @@ function removePathsFromGlobalImports(paths) {
     const listResult = listGlobalImports();
     const toRemove = new Set();
     function matchPackage(pathToRemove) {
-        return ({ package: pkg, id }) => pathToRemove === (pkg === null || pkg === void 0 ? void 0 : pkg.name) || pathToRemove === id;
+        return ({ package: pkg, id }) => pathToRemove === pkg?.name || pathToRemove === id;
     }
     function compareFilenames(fullPath, partialPath) {
         if (fullPath === partialPath)
@@ -124,16 +124,15 @@ function removePathsFromGlobalImports(paths) {
     return {
         success: true,
         removed: [...toRemove],
-        error: error === null || error === void 0 ? void 0 : error.toString(),
+        error: error?.toString(),
     };
 }
 exports.removePathsFromGlobalImports = removePathsFromGlobalImports;
 function resolveSettings(filename) {
-    var _a;
     const settings = (0, configLoader_1.readRawSettings)(filename);
     const ref = settings.__importRef;
-    const resolvedToFilename = ref === null || ref === void 0 ? void 0 : ref.filename;
-    const error = ((_a = ref === null || ref === void 0 ? void 0 : ref.error) === null || _a === void 0 ? void 0 : _a.message) || (!resolvedToFilename && 'File not Found') || undefined;
+    const resolvedToFilename = ref?.filename;
+    const error = ref?.error?.message || (!resolvedToFilename && 'File not Found') || undefined;
     return (0, util_1.clean)({
         filename,
         resolvedToFilename,

package/dist/Settings/pnpLoader.js

@@ -40,10 +40,9 @@ class PnpLoader {
         return result;
     }
     async peek(uriDirectory) {
-        var _a;
         await lock;
         const cacheKey = this.calcKey(uriDirectory);
-        return (_a = cachedRequests.get(cacheKey)) !== null && _a !== void 0 ? _a : Promise.resolve(undefined);
+        return cachedRequests.get(cacheKey) ?? Promise.resolve(undefined);
     }
     /**
      * Request that the nearest .pnp file gets loaded

package/dist/SpellingDictionary/DictionaryLoader.js

@@ -89,7 +89,7 @@ function loadDictionary(def) {
 exports.loadDictionary = loadDictionary;
 function loadDictionarySync(def) {
     const { key, entry } = getCacheEntry(def);
-    if ((entry === null || entry === void 0 ? void 0 : entry.dictionary) && entry.loadingState === LoadingState.Loaded) {
+    if (entry?.dictionary && entry.loadingState === LoadingState.Loaded) {
         return entry.dictionary;
     }
     const loadedEntry = loadEntrySync(def.path, def);
@@ -101,7 +101,7 @@ const importantOptionKeys = ['name', 'noSuggest', 'useCompounds', 'type'];
 function calcKey(def) {
     const path = def.path;
     const loaderType = determineType(path, def);
-    const optValues = importantOptionKeys.map((k) => { var _a; return ((_a = def[k]) === null || _a === void 0 ? void 0 : _a.toString()) || ''; });
+    const optValues = importantOptionKeys.map((k) => def[k]?.toString() || '');
     const parts = [path, loaderType].concat(optValues);
     return parts.join('|');
 }

package/dist/SpellingDictionary/SpellingDictionaryCollection.js

@@ -82,7 +82,7 @@ class SpellingDictionaryCollection {
         this.dictionaries.forEach((dict) => dict.genSuggestions(collector, _suggestOptions));
     }
     getErrors() {
-        return this.dictionaries.reduce((errors, dict) => { var _a; return errors.concat(((_a = dict.getErrors) === null || _a === void 0 ? void 0 : _a.call(dict)) || []); }, []);
+        return this.dictionaries.reduce((errors, dict) => errors.concat(dict.getErrors?.() || []), []);
     }
 }
 exports.SpellingDictionaryCollection = SpellingDictionaryCollection;

package/dist/SpellingDictionary/SpellingDictionaryFromTrie.js

@@ -9,7 +9,6 @@ const util_1 = require("../util/util");
 const SpellingDictionaryMethods_1 = require("./SpellingDictionaryMethods");
 class SpellingDictionaryFromTrie {
     constructor(trie, name, options, source = 'from trie', size) {
-        var _a;
         this.trie = trie;
         this.name = name;
         this.options = options;
@@ -20,7 +19,7 @@ class SpellingDictionaryFromTrie {
         this.type = 'SpellingDictionaryFromTrie';
         this._find = (0, Memorizer_1.memorizer)((word, useCompounds, ignoreCase) => this.findAnyForm(word, useCompounds, ignoreCase), SpellingDictionaryFromTrie.cachedWordsLimit);
         this.mapWord = (0, repMap_1.createMapper)(options.repMap || []);
-        this.isDictionaryCaseSensitive = (_a = options.caseSensitive) !== null && _a !== void 0 ? _a : !trie.isLegacy;
+        this.isDictionaryCaseSensitive = options.caseSensitive ?? !trie.isLegacy;
         this.containsNoSuggestWords = options.noSuggest || false;
         this._size = size || 0;
         this.weightMap = options.weightMap || (0, SpellingDictionaryMethods_1.createWeightMapFromDictionaryInformation)(options.dictionaryInformation);
@@ -114,10 +113,10 @@ class SpellingDictionaryFromTrie {
         return collector.suggestions.map((r) => ({ ...r, word: r.word }));
     }
     genSuggestions(collector, suggestOptions) {
-        var _a;
         if (this.options.noSuggest)
             return;
-        const _compoundMethod = (_a = suggestOptions.compoundMethod) !== null && _a !== void 0 ? _a : (this.options.useCompounds ? cspell_trie_lib_1.CompoundWordsMethod.JOIN_WORDS : cspell_trie_lib_1.CompoundWordsMethod.NONE);
+        const _compoundMethod = suggestOptions.compoundMethod ??
+            (this.options.useCompounds ? cspell_trie_lib_1.CompoundWordsMethod.JOIN_WORDS : cspell_trie_lib_1.CompoundWordsMethod.NONE);
         (0, SpellingDictionaryMethods_1.wordSuggestFormsArray)(collector.word).forEach((w) => this.trie.genSuggestions((0, SpellingDictionaryMethods_1.impersonateCollector)(collector, w), _compoundMethod));
     }
     getErrors() {

package/dist/SpellingDictionary/createSpellingDictionary.js

@@ -45,7 +45,7 @@ function _createSpellingDictionary(params) {
 function createForbiddenWordsDictionary(wordList, name, source, options) {
     // console.log(`createSpellingDictionary ${name} ${source}`);
     const words = (0, cspell_trie_lib_1.parseDictionaryLines)(wordList.concat(wordList.map((a) => a.toLowerCase())), {
-        stripCaseAndAccents: !(options === null || options === void 0 ? void 0 : options.noSuggest),
+        stripCaseAndAccents: !options?.noSuggest,
     });
     const forbidWords = gensequence_1.operators.map((w) => '!' + w)(words);
     const trie = (0, cspell_trie_lib_1.buildTrieFast)(forbidWords);

package/dist/spellCheckFile.js

@@ -59,8 +59,8 @@ async function spellCheckDocument(document, options, settings) {
 }
 exports.spellCheckDocument = spellCheckDocument;
 async function spellCheckFullDocument(document, options, settings) {
-    const { uri, text: content } = document;
-    const doc = (0, TextDocument_1.createTextDocument)({ uri, content });
+    const { uri, text: content, languageId, locale } = document;
+    const doc = (0, TextDocument_1.createTextDocument)({ uri, content, languageId, locale });
     const docValOptions = options;
     const docValidator = new textValidation_1.DocumentValidator(doc, docValOptions, settings);
     await docValidator.prepare();
@@ -69,8 +69,8 @@ async function spellCheckFullDocument(document, options, settings) {
         return {
             document,
             options,
-            settingsUsed: (prep === null || prep === void 0 ? void 0 : prep.localConfig) || settings,
-            localConfigFilepath: prep === null || prep === void 0 ? void 0 : prep.localConfigFilepath,
+            settingsUsed: prep?.localConfig || settings,
+            localConfigFilepath: prep?.localConfigFilepath,
             issues: [],
             checked: false,
             errors: docValidator.errors,
@@ -81,7 +81,7 @@ async function spellCheckFullDocument(document, options, settings) {
         document,
         options,
         settingsUsed: docValidator.getFinalizedDocSettings(),
-        localConfigFilepath: prep === null || prep === void 0 ? void 0 : prep.localConfigFilepath,
+        localConfigFilepath: prep?.localConfigFilepath,
         issues,
         checked: docValidator.shouldCheckDocument(),
         errors: undefined,

package/dist/suggestions.js

@@ -35,21 +35,19 @@ async function* suggestionsForWords(words, options, settings = {}) {
 }
 exports.suggestionsForWords = suggestionsForWords;
 async function suggestionsForWord(word, options, settings = {}) {
-    var _a;
     const { languageId, locale: language, strict = true, numChanges = 4, numSuggestions = 8, includeTies = true, includeDefaultConfig = true, dictionaries, } = options || {};
     const ignoreCase = !strict;
     async function determineDictionaries(config) {
-        var _a, _b;
         const withLocale = (0, Settings_1.mergeSettings)(config, util.clean({
             language: language || config.language,
             // dictionaries: dictionaries?.length ? dictionaries : config.dictionaries,
         }));
-        const withLanguageId = (0, LanguageSettings_1.calcSettingsForLanguageId)(withLocale, (_a = languageId !== null && languageId !== void 0 ? languageId : withLocale.languageId) !== null && _a !== void 0 ? _a : 'plaintext');
+        const withLanguageId = (0, LanguageSettings_1.calcSettingsForLanguageId)(withLocale, languageId ?? withLocale.languageId ?? 'plaintext');
         const settings = (0, Settings_1.finalizeSettings)(withLanguageId);
-        settings.dictionaries = (dictionaries === null || dictionaries === void 0 ? void 0 : dictionaries.length) ? dictionaries : settings.dictionaries || [];
+        settings.dictionaries = dictionaries?.length ? dictionaries : settings.dictionaries || [];
         validateDictionaries(settings, dictionaries);
         const dictionaryCollection = await (0, SpellingDictionary_1.getDictionaryInternal)(settings);
-        settings.dictionaries = ((_b = settings.dictionaryDefinitions) === null || _b === void 0 ? void 0 : _b.map((def) => def.name)) || [];
+        settings.dictionaries = settings.dictionaryDefinitions?.map((def) => def.name) || [];
         const allDictionaryCollection = await (0, SpellingDictionary_1.getDictionaryInternal)(settings);
         return {
             dictionaryCollection,
@@ -58,7 +56,7 @@ async function suggestionsForWord(word, options, settings = {}) {
     }
     await (0, SpellingDictionary_1.refreshDictionaryCache)();
     const config = includeDefaultConfig
-        ? (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)((_a = settings.loadDefaultConfiguration) !== null && _a !== void 0 ? _a : true), (0, Settings_1.getGlobalSettings)(), settings)
+        ? (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)(settings.loadDefaultConfiguration ?? true), (0, Settings_1.getGlobalSettings)(), settings)
         : settings;
     const { dictionaryCollection, allDictionaryCollection } = await determineDictionaries(config);
     const opts = { ignoreCase, numChanges, numSuggestions, includeTies };
@@ -69,8 +67,8 @@ async function suggestionsForWord(word, options, settings = {}) {
         const found = allDictionaryCollection.find(sug.word, findOpts);
         return {
             ...sug,
-            forbidden: (found === null || found === void 0 ? void 0 : found.forbidden) || false,
-            noSuggest: (found === null || found === void 0 ? void 0 : found.noSuggest) || false,
+            forbidden: found?.forbidden || false,
+            noSuggest: found?.noSuggest || false,
         };
     });
     return {
@@ -92,8 +90,7 @@ function combine(suggestions) {
     return [...words.values()];
 }
 function limitResults(suggestions, numSuggestions, includeTies) {
-    var _a;
-    let cost = (_a = suggestions[0]) === null || _a === void 0 ? void 0 : _a.cost;
+    let cost = suggestions[0]?.cost;
     let i = 0;
     for (; i < suggestions.length; ++i) {
         if (i >= numSuggestions && (!includeTies || suggestions[i].cost > cost)) {
@@ -104,10 +101,9 @@ function limitResults(suggestions, numSuggestions, includeTies) {
     return suggestions.slice(0, i);
 }
 function validateDictionaries(settings, dictionaries) {
-    var _a;
-    if (!(dictionaries === null || dictionaries === void 0 ? void 0 : dictionaries.length))
+    if (!dictionaries?.length)
         return;
-    const knownDicts = new Set(((_a = settings.dictionaryDefinitions) === null || _a === void 0 ? void 0 : _a.map((def) => def.name)) || []);
+    const knownDicts = new Set(settings.dictionaryDefinitions?.map((def) => def.name) || []);
     for (const dict of dictionaries) {
         if (!knownDicts.has(dict)) {
             throw new SuggestionError(`Unknown dictionary: "${dict}"`, 'E_dictionary_unknown');

package/dist/textValidation/determineTextDocumentSettings.js

@@ -41,11 +41,10 @@ const TextDocumentSettings_1 = require("../Settings/TextDocumentSettings");
  * @param settings - The near final settings. Should already be the combination of all configuration files.
  */
 function determineTextDocumentSettings(doc, settings) {
-    var _a, _b;
     const filename = doc.uri.fsPath;
-    const settingsWithDefaults = (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)((_a = settings.loadDefaultConfiguration) !== null && _a !== void 0 ? _a : true), (0, Settings_1.getGlobalSettings)(), settings);
+    const settingsWithDefaults = (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)(settings.loadDefaultConfiguration ?? true), (0, Settings_1.getGlobalSettings)(), settings);
     const fileSettings = (0, Settings_1.calcOverrideSettings)(settingsWithDefaults, filename);
-    const languageIds = ((_b = fileSettings === null || fileSettings === void 0 ? void 0 : fileSettings.languageId) === null || _b === void 0 ? void 0 : _b.length)
+    const languageIds = fileSettings?.languageId?.length
         ? fileSettings.languageId
         : doc.languageId
             ? doc.languageId

package/dist/textValidation/docValidator.js

@@ -39,7 +39,6 @@ class DocumentValidator {
         return this._ready;
     }
     prepareSync() {
-        var _a, _b, _c;
         // @todo
         // Determine doc settings.
         // Calc include ranges
@@ -55,13 +54,13 @@ class DocumentValidator {
             : useSearchForConfig
                 ? this.errorCatcherWrapper(() => searchForDocumentConfigSync(this._document, settings, settings))
                 : undefined;
-        this.addPossibleError((_a = localConfig === null || localConfig === void 0 ? void 0 : localConfig.__importRef) === null || _a === void 0 ? void 0 : _a.error);
+        this.addPossibleError(localConfig?.__importRef?.error);
         const config = (0, Settings_1.mergeSettings)(settings, localConfig);
         const docSettings = (0, determineTextDocumentSettings_1.determineTextDocumentSettings)(this._document, config);
         const dict = (0, SpellingDictionary_1.getDictionaryInternalSync)(docSettings);
-        const matcher = new cspell_glob_1.GlobMatcher((localConfig === null || localConfig === void 0 ? void 0 : localConfig.ignorePaths) || [], { root: process.cwd(), dot: true });
+        const matcher = new cspell_glob_1.GlobMatcher(localConfig?.ignorePaths || [], { root: process.cwd(), dot: true });
         const uri = this._document.uri;
-        const shouldCheck = !matcher.match(uri.fsPath) && ((_b = docSettings.enabled) !== null && _b !== void 0 ? _b : true);
+        const shouldCheck = !matcher.match(uri.fsPath) && (docSettings.enabled ?? true);
         const finalSettings = (0, Settings_1.finalizeSettings)(docSettings);
         const validateOptions = (0, validator_1.settingsToValidateOptions)(finalSettings);
         const includeRanges = (0, textValidator_1.calcTextInclusionRanges)(this._document.text, validateOptions);
@@ -77,7 +76,7 @@ class DocumentValidator {
             segmenter,
             lineValidator,
             localConfig,
-            localConfigFilepath: (_c = localConfig === null || localConfig === void 0 ? void 0 : localConfig.__importRef) === null || _c === void 0 ? void 0 : _c.filename,
+            localConfigFilepath: localConfig?.__importRef?.filename,
         };
         this._ready = true;
         this._preparationTime = timer.elapsed();
@@ -92,7 +91,6 @@ class DocumentValidator {
         return this._prepared;
     }
     async _prepareAsync() {
-        var _a, _b, _c;
         (0, assert_1.default)(!this._ready);
         const timer = (0, timer_1.createTimer)();
         const { options, settings } = this;
@@ -103,13 +101,13 @@ class DocumentValidator {
                 ? this.catchError(searchForDocumentConfig(this._document, settings, settings))
                 : undefined;
         const localConfig = (await pLocalConfig) || {};
-        this.addPossibleError((_a = localConfig === null || localConfig === void 0 ? void 0 : localConfig.__importRef) === null || _a === void 0 ? void 0 : _a.error);
+        this.addPossibleError(localConfig?.__importRef?.error);
         const config = (0, Settings_1.mergeSettings)(settings, localConfig);
         const docSettings = (0, determineTextDocumentSettings_1.determineTextDocumentSettings)(this._document, config);
         const dict = await (0, SpellingDictionary_1.getDictionaryInternal)(docSettings);
-        const matcher = new cspell_glob_1.GlobMatcher((localConfig === null || localConfig === void 0 ? void 0 : localConfig.ignorePaths) || [], { root: process.cwd(), dot: true });
+        const matcher = new cspell_glob_1.GlobMatcher(localConfig?.ignorePaths || [], { root: process.cwd(), dot: true });
         const uri = this._document.uri;
-        const shouldCheck = !matcher.match(uri.fsPath) && ((_b = docSettings.enabled) !== null && _b !== void 0 ? _b : true);
+        const shouldCheck = !matcher.match(uri.fsPath) && (docSettings.enabled ?? true);
         const finalSettings = (0, Settings_1.finalizeSettings)(docSettings);
         const validateOptions = (0, validator_1.settingsToValidateOptions)(finalSettings);
         const includeRanges = (0, textValidator_1.calcTextInclusionRanges)(this._document.text, validateOptions);
@@ -125,19 +123,18 @@ class DocumentValidator {
             segmenter,
             lineValidator,
             localConfig,
-            localConfigFilepath: (_c = localConfig === null || localConfig === void 0 ? void 0 : localConfig.__importRef) === null || _c === void 0 ? void 0 : _c.filename,
+            localConfigFilepath: localConfig?.__importRef?.filename,
         };
         this._ready = true;
         this._preparationTime = timer.elapsed();
     }
     _updatePrep() {
-        var _a;
         (0, assert_1.default)(this._preparations, ERROR_NOT_PREPARED);
         const timer = (0, timer_1.createTimer)();
         const prep = this._preparations;
         const docSettings = (0, determineTextDocumentSettings_1.determineTextDocumentSettings)(this._document, prep.config);
         const dict = (0, SpellingDictionary_1.getDictionaryInternalSync)(docSettings);
-        const shouldCheck = (_a = docSettings.enabled) !== null && _a !== void 0 ? _a : true;
+        const shouldCheck = docSettings.enabled ?? true;
         const finalSettings = (0, Settings_1.finalizeSettings)(docSettings);
         const validateOptions = (0, validator_1.settingsToValidateOptions)(finalSettings);
         const includeRanges = (0, textValidator_1.calcTextInclusionRanges)(this._document.text, validateOptions);
@@ -251,7 +248,6 @@ class DocumentValidator {
         return this._suggestions.get(text);
     }
     genSuggestions(text) {
-        var _a;
         (0, assert_1.default)(this._preparations, ERROR_NOT_PREPARED);
         const settings = this._preparations.docSettings;
         const dict = this._preparations.dictionary;
@@ -259,7 +255,7 @@ class DocumentValidator {
             compoundMethod: 0,
             numSuggestions: this.options.numSuggestions,
             includeTies: false,
-            ignoreCase: !((_a = settings.caseSensitive) !== null && _a !== void 0 ? _a : false),
+            ignoreCase: !(settings.caseSensitive ?? false),
             timeout: settings.suggestionsTimeout,
             numChanges: settings.suggestionNumChanges,
         });

package/dist/textValidation/parsedText.js

@@ -12,11 +12,10 @@ function mapIssueBackToOriginalPos(parsedText, issue) {
 }
 exports.mapIssueBackToOriginalPos = mapIssueBackToOriginalPos;
 function mapTextOffsetBackToOriginalPos(parsedText, textOff) {
-    var _a;
     if (!parsedText.map || !parsedText.map.length)
         return textOff;
     const off = textOff.offset - parsedText.range[0];
-    const range = mapRangeBackToOriginalPos([off, off + ((_a = textOff.length) !== null && _a !== void 0 ? _a : textOff.text.length)], parsedText.map);
+    const range = mapRangeBackToOriginalPos([off, off + (textOff.length ?? textOff.text.length)], parsedText.map);
     return {
         text: textOff.text,
         offset: parsedText.range[0] + range[0],

package/dist/textValidation/textValidator.js

@@ -188,7 +188,7 @@ function mapLineSegmentAgainstRangesFactory(includeRanges) {
         const parts = [];
         const { segment, line } = lineSeg;
         const { text, offset, length } = segment;
-        const textEndPos = offset + (length !== null && length !== void 0 ? length : text.length);
+        const textEndPos = offset + (length ?? text.length);
         let textStartPos = offset;
         while (rangePos && (rangePos >= includeRanges.length || includeRanges[rangePos].startPos > textStartPos)) {
             rangePos -= 1;

package/dist/textValidation/validator.js

@@ -31,7 +31,6 @@ const util_1 = require("../util/util");
 const textValidator_1 = require("./textValidator");
 exports.diagSource = 'cSpell Checker';
 async function validateText(text, settings, options = {}) {
-    var _a;
     const finalSettings = Settings.finalizeSettings(settings);
     const dict = await (0, SpellingDictionary_1.getDictionaryInternal)(finalSettings);
     const issues = [...(0, textValidator_1.validateText)(text, dict, settingsToValidateOptions(finalSettings))];
@@ -42,7 +41,7 @@ async function validateText(text, settings, options = {}) {
         numSuggestions: options.numSuggestions,
         compoundMethod: SpellingDictionary_1.CompoundWordsMethod.NONE,
         includeTies: false,
-        ignoreCase: !((_a = settings.caseSensitive) !== null && _a !== void 0 ? _a : false),
+        ignoreCase: !(settings.caseSensitive ?? false),
         timeout: settings.suggestionsTimeout,
         numChanges: settings.suggestionNumChanges,
     });
@@ -56,10 +55,9 @@ async function validateText(text, settings, options = {}) {
 }
 exports.validateText = validateText;
 function settingsToValidateOptions(settings) {
-    var _a;
     const opt = {
         ...settings,
-        ignoreCase: !((_a = settings.caseSensitive) !== null && _a !== void 0 ? _a : false),
+        ignoreCase: !(settings.caseSensitive ?? false),
     };
     return opt;
 }

package/dist/trace.js

@@ -41,12 +41,11 @@ exports.traceWords = traceWords;
 async function* traceWordsAsync(words, settings, options) {
     const { languageId, locale: language, ignoreCase = true, allowCompoundWords } = options || {};
     async function finalize(config) {
-        var _a;
         const withLocale = (0, Settings_1.mergeSettings)(config, util.clean({
             language: language || config.language,
-            allowCompoundWords: allowCompoundWords !== null && allowCompoundWords !== void 0 ? allowCompoundWords : config.allowCompoundWords,
+            allowCompoundWords: allowCompoundWords ?? config.allowCompoundWords,
         }));
-        const withLanguageId = (0, LanguageSettings_1.calcSettingsForLanguageId)(withLocale, (_a = languageId !== null && languageId !== void 0 ? languageId : withLocale.languageId) !== null && _a !== void 0 ? _a : 'plaintext');
+        const withLanguageId = (0, LanguageSettings_1.calcSettingsForLanguageId)(withLocale, languageId ?? withLocale.languageId ?? 'plaintext');
         const settings = (0, Settings_1.finalizeSettings)(withLanguageId);
         const dictionaries = (settings.dictionaries || [])
             .concat((settings.dictionaryDefinitions || []).map((d) => d.name))
@@ -66,28 +65,25 @@ async function* traceWordsAsync(words, settings, options) {
     const setOfActiveDicts = new Set(activeDictionaries);
     const opts = util.clean({ ignoreCase, useCompounds: config.allowCompoundWords });
     function normalizeErrors(errors) {
-        if (!(errors === null || errors === void 0 ? void 0 : errors.length))
+        if (!errors?.length)
             return undefined;
         return errors;
     }
     function processWord(word) {
         return dicts.dictionaries
             .map((dict) => ({ dict, findResult: dict.find(word, opts) }))
-            .map(({ dict, findResult }) => {
-            var _a;
-            return ({
-                word,
-                found: !!(findResult === null || findResult === void 0 ? void 0 : findResult.found),
-                foundWord: (findResult === null || findResult === void 0 ? void 0 : findResult.found) || undefined,
-                forbidden: (findResult === null || findResult === void 0 ? void 0 : findResult.forbidden) || false,
-                noSuggest: (findResult === null || findResult === void 0 ? void 0 : findResult.noSuggest) || false,
-                dictName: dict.name,
-                dictSource: dict.source,
-                dictActive: setOfActiveDicts.has(dict.name),
-                configSource: config.name || '',
-                errors: normalizeErrors((_a = dict.getErrors) === null || _a === void 0 ? void 0 : _a.call(dict)),
-            });
-        });
+            .map(({ dict, findResult }) => ({
+            word,
+            found: !!findResult?.found,
+            foundWord: findResult?.found || undefined,
+            forbidden: findResult?.forbidden || false,
+            noSuggest: findResult?.noSuggest || false,
+            dictName: dict.name,
+            dictSource: dict.source,
+            dictActive: setOfActiveDicts.has(dict.name),
+            configSource: config.name || '',
+            errors: normalizeErrors(dict.getErrors?.()),
+        }));
     }
     for await (const word of words) {
         yield processWord(word);

package/dist/util/Memorizer.js

@@ -95,20 +95,18 @@ exports.callOnce = callOnce;
 function memorizerAll(fn) {
     const r = {};
     function find(p) {
-        var _a;
         let n = r;
         for (const k of p) {
             if (!n)
                 break;
-            n = (_a = n.c) === null || _a === void 0 ? void 0 : _a.get(k);
+            n = n.c?.get(k);
         }
         return n;
     }
     function set(p, v) {
-        var _a;
         let n = r;
         for (const k of p) {
-            const c = (_a = n.c) === null || _a === void 0 ? void 0 : _a.get(k);
+            const c = n.c?.get(k);
             if (c) {
                 n = c;
                 continue;

package/dist/util/PairingHeap.js

@@ -33,8 +33,7 @@ class PairingHeap {
         return { value };
     }
     peek() {
-        var _a;
-        return (_a = this._heap) === null || _a === void 0 ? void 0 : _a.v;
+        return this._heap?.v;
     }
     [Symbol.iterator]() {
         return this;

package/dist/util/memorizerWeak.js

@@ -5,20 +5,18 @@ exports.memorizerWeak = void 0;
 function memorizerWeak(fn) {
     const r = {};
     function find(p) {
-        var _a;
         let n = r;
         for (const k of p) {
             if (!n)
                 break;
-            n = (_a = n.c) === null || _a === void 0 ? void 0 : _a.get(k);
+            n = n.c?.get(k);
         }
         return n;
     }
     function set(p, v) {
-        var _a;
         let n = r;
         for (const k of p) {
-            const c = (_a = n.c) === null || _a === void 0 ? void 0 : _a.get(k);
+            const c = n.c?.get(k);
             if (c) {
                 n = c;
                 continue;

package/dist/util/search.js

@@ -6,8 +6,8 @@ exports.binarySearch = void 0;
  * The value returned is either the position of the item or where it should be inserted.
  */
 function binarySearch(arr, item, leftOffset, rightOffset) {
-    let left = Math.max(leftOffset !== null && leftOffset !== void 0 ? leftOffset : 0, 0);
-    let right = Math.min(rightOffset !== null && rightOffset !== void 0 ? rightOffset : arr.length, arr.length);
+    let left = Math.max(leftOffset ?? 0, 0);
+    let right = Math.min(rightOffset ?? arr.length, arr.length);
     while (left < right) {
         const pos = (left + right) >> 1;
         if (arr[pos] < item) {

package/dist/util/text.js

@@ -199,7 +199,7 @@ function calculateTextDocumentOffsets(uri, doc, wordOffsets) {
     function calcLine(row) {
         const last = lastLineRow === row ? lastLine : undefined;
         lastLineRow = row;
-        const r = last !== null && last !== void 0 ? last : extractLine(row);
+        const r = last ?? extractLine(row);
         lastLine = r;
         return r;
     }

package/dist/util/timer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLapRecorder = exports.polyHrTime = exports.toMilliseconds = exports.createTimer = void 0;
-const _hrTime = (process === null || process === void 0 ? void 0 : process.hrtime) || polyHrTime;
+const _hrTime = process?.hrtime || polyHrTime;
 function createTimer(hrTimeFn = _hrTime) {
     let start = hrTimeFn();
     let lastLap = 0;

package/dist/util/wordSplitter.js

@@ -186,7 +186,6 @@ function genSymbolBreaks(line) {
     ];
 }
 function splitIntoWords(lineSeg, breaks, has) {
-    var _a;
     const maxIndex = lineSeg.relEnd;
     const maxAttempts = 1000;
     const knownPathsByIndex = new Map();
@@ -242,11 +241,10 @@ function splitIntoWords(lineSeg, breaks, has) {
         return results;
     }
     function addToKnownPaths(candidate, path) {
-        var _a;
         for (let can = candidate; can !== undefined; can = can.p) {
             const t = can.text;
             const i = can.i;
-            const cost = (!t || t.isFound ? 0 : t.text.length) + ((_a = path === null || path === void 0 ? void 0 : path.c) !== null && _a !== void 0 ? _a : 0);
+            const cost = (!t || t.isFound ? 0 : t.text.length) + (path?.c ?? 0);
             const exitingPath = knownPathsByIndex.get(i);
             // Keep going only if this is a better candidate than the existing path
             if (exitingPath && exitingPath.c <= cost) {
@@ -307,7 +305,7 @@ function splitIntoWords(lineSeg, breaks, has) {
                 best.c += cost;
                 best.ec = best.c;
                 best.text = t;
-                const segText = t || ((_a = best.p) === null || _a === void 0 ? void 0 : _a.text) || toTextOffset('', best.i);
+                const segText = t || best.p?.text || toTextOffset('', best.i);
                 const can = t ? { ...best, text: segText } : { ...best, ...best.p, text: segText };
                 const f = addToKnownPaths(can, undefined);
                 bestPath = !bestPath || (f && f.c < bestPath.c) ? f : bestPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "6.1.0",
+  "version": "6.1.3-alpha.0",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -48,17 +48,17 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^6.1.0",
-    "@cspell/cspell-pipe": "^6.1.0",
-    "@cspell/cspell-types": "^6.1.0",
+    "@cspell/cspell-bundled-dicts": "^6.1.3-alpha.0",
+    "@cspell/cspell-pipe": "^6.1.3-alpha.0",
+    "@cspell/cspell-types": "^6.1.3-alpha.0",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.2",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^6.1.0",
-    "cspell-io": "^6.1.0",
-    "cspell-trie-lib": "^6.1.0",
-    "fast-equals": "^3.0.3",
+    "cspell-glob": "^6.1.3-alpha.0",
+    "cspell-io": "^6.1.3-alpha.0",
+    "cspell-trie-lib": "^6.1.3-alpha.0",
+    "fast-equals": "^4.0.1",
     "find-up": "^5.0.0",
     "fs-extra": "^10.1.0",
     "gensequence": "^3.1.1",
@@ -82,15 +82,15 @@
     "@cspell/dict-python": "^2.0.6",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.5.1",
-    "@types/node": "^17.0.36",
+    "@types/jest": "^28.1.1",
+    "@types/node": "^17.0.43",
     "cspell-dict-nl-nl": "^1.1.2",
-    "jest": "^28.1.0",
-    "lorem-ipsum": "^2.0.4",
+    "jest": "^28.1.1",
+    "lorem-ipsum": "^2.0.8",
     "rimraf": "^3.0.2",
-    "rollup": "^2.75.4",
+    "rollup": "^2.75.6",
     "rollup-plugin-dts": "^4.2.2",
-    "ts-jest": "^28.0.3"
+    "ts-jest": "^28.0.5"
   },
-  "gitHead": "eaf6991ced2c8eb2c60bd2914095e4c686a4266b"
+  "gitHead": "b3cde7e463fd8a6f2c03f990adc70b913239baeb"
 }