cspell-lib 6.1.2 → 6.1.3

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

@@ -22,8 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__testing__ = exports.extractDependencies = exports.getSources = exports.checkFilenameMatchesGlob = exports.toInternalSettings = exports.finalizeSettings = exports.calcOverrideSettings = exports.mergeInDocSettings = exports.mergeSettings = exports.ENV_CSPELL_GLOB_ROOT = exports.currentSettingsFileVersion = exports.configSettingsFileVersion0_2 = exports.configSettingsFileVersion0_1 = void 0;
+const assert_1 = __importDefault(require("assert"));
 const cspell_glob_1 = require("cspell-glob");
 const path = __importStar(require("path"));
 const CSpellSettingsInternalDef_1 = require("../Models/CSpellSettingsInternalDef");
@@ -116,7 +120,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 +150,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 +181,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 +198,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;
@@ -224,19 +228,19 @@ function _finalizeSettings(settings) {
         finalized: true,
         ignoreRegExpList: (0, patterns_1.resolvePatterns)(settings.ignoreRegExpList, settings.patterns),
         includeRegExpList: (0, patterns_1.resolvePatterns)(settings.includeRegExpList, settings.patterns),
+        parser: resolveParser(settings),
     };
     finalized.name = 'Finalized ' + (finalized.name || '');
     finalized.source = { name: settings.name || 'src', sources: [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 +283,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 +297,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 +304,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);
     }
@@ -323,6 +325,39 @@ function resolveCwd() {
     const cwd = envGlobRoot || process.cwd();
     return cwd;
 }
+function resolveParser(settings) {
+    if (!settings.parser)
+        return undefined;
+    if (typeof settings.parser === 'function')
+        return settings.parser;
+    const parserName = settings.parser;
+    (0, assert_1.default)(typeof parserName === 'string');
+    const parsers = extractParsers(settings.plugins);
+    const parser = parsers.get(parserName);
+    (0, assert_1.default)(parser, `Parser "${parserName}" not found.`);
+    return parser;
+}
+const parserCache = new WeakMap();
+const emptyParserMap = new Map();
+function extractParsers(plugins) {
+    if (!plugins || !plugins.length)
+        return emptyParserMap;
+    const found = parserCache.get(plugins);
+    if (found)
+        return found;
+    function* parsers(plugins) {
+        for (const plugin of plugins) {
+            if (!plugin.parsers)
+                continue;
+            for (const parser of plugin.parsers) {
+                yield [parser.name, parser];
+            }
+        }
+    }
+    const map = new Map(parsers(plugins));
+    parserCache.set(plugins, map);
+    return map;
+}
 exports.__testing__ = {
     mergeObjects,
 };

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/SpellingDictionary.d.ts

@@ -2,8 +2,8 @@ import type { ReplaceMap, DictionaryInformation } from '@cspell/cspell-types';
 import { CompoundWordsMethod, SuggestionCollector, SuggestionResult, WeightMap } from 'cspell-trie-lib';
 export { CompoundWordsMethod, SuggestionCollector, SuggestionResult } from 'cspell-trie-lib';
 export interface SearchOptions {
-    useCompounds?: boolean | number;
-    ignoreCase?: boolean;
+    useCompounds?: boolean | number | undefined;
+    ignoreCase?: boolean | undefined;
 }
 export interface SuggestOptions {
     /**

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/SpellingDictionaryMethods.d.ts

@@ -5,7 +5,7 @@ export { impersonateCollector, suggestionCollector } from 'cspell-trie-lib';
 export declare type FilterSuggestionsPredicate = (word: SuggestionResult) => boolean;
 export declare type SuggestArgs = Parameters<SpellingDictionary['suggest']> | Parameters<(word: string, numSuggestions?: number, compoundMethod?: CompoundWordsMethod, numChanges?: number, ignoreCase?: boolean) => SuggestionResult[]>;
 export declare const defaultNumSuggestions = 10;
-export declare function wordSearchFormsArray(word: string, isDictionaryCaseSensitive: boolean, ignoreCase: boolean): string[];
+declare function wordSearchFormsArray(word: string, isDictionaryCaseSensitive: boolean, ignoreCase: boolean): string[];
 export declare function wordSearchForms(word: string, isDictionaryCaseSensitive: boolean, ignoreCase: boolean): Set<string>;
 export declare function wordSuggestFormsArray(word: string): string[];
 export declare function wordSuggestForms(word: string): Set<string>;
@@ -20,7 +20,7 @@ export declare function suggestArgsToSuggestOptions(args: SuggestArgs): SuggestO
 export declare function createWeightMapFromDictionaryInformation(di: undefined): undefined;
 export declare function createWeightMapFromDictionaryInformation(di: DictionaryInformation): WeightMap;
 export declare function createWeightMapFromDictionaryInformation(di: DictionaryInformation | undefined): WeightMap | undefined;
-export declare const __testMethods: {
+export declare const __testMethods__: {
     wordSearchForms: typeof wordSearchForms;
     wordSearchFormsArray: typeof wordSearchFormsArray;
     wordDictionaryForms: typeof wordDictionaryForms;

package/dist/SpellingDictionary/SpellingDictionaryMethods.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testMethods = exports.createWeightMapFromDictionaryInformation = exports.suggestArgsToSuggestOptions = exports.hasOptionToSearchOption = exports.wordDictionaryFormsCollector = exports.wordSuggestForms = exports.wordSuggestFormsArray = exports.wordSearchForms = exports.wordSearchFormsArray = exports.defaultNumSuggestions = exports.suggestionCollector = exports.impersonateCollector = void 0;
+exports.__testMethods__ = exports.createWeightMapFromDictionaryInformation = exports.suggestArgsToSuggestOptions = exports.hasOptionToSearchOption = exports.wordDictionaryFormsCollector = exports.wordSuggestForms = exports.wordSuggestFormsArray = exports.wordSearchForms = exports.defaultNumSuggestions = exports.suggestionCollector = exports.impersonateCollector = void 0;
 const cspell_trie_lib_1 = require("cspell-trie-lib");
 const trie_util_1 = require("cspell-trie-lib/dist/lib/trie-util");
 const gensequence_1 = require("gensequence");
@@ -12,7 +12,6 @@ exports.defaultNumSuggestions = 10;
 function wordSearchFormsArray(word, isDictionaryCaseSensitive, ignoreCase) {
     return [...wordSearchForms(word, isDictionaryCaseSensitive, ignoreCase)];
 }
-exports.wordSearchFormsArray = wordSearchFormsArray;
 function wordSearchForms(word, isDictionaryCaseSensitive, ignoreCase) {
     const forms = new Set();
     word = word.normalize('NFC');
@@ -82,8 +81,9 @@ function wordDictionaryFormsCollector(prefixNoCase) {
     };
 }
 exports.wordDictionaryFormsCollector = wordDictionaryFormsCollector;
+const DEFAULT_HAS_OPTIONS = Object.freeze({});
 function hasOptionToSearchOption(opt) {
-    return !opt ? {} : opt;
+    return !opt ? DEFAULT_HAS_OPTIONS : opt;
 }
 exports.hasOptionToSearchOption = hasOptionToSearchOption;
 function suggestArgsToSuggestOptions(args) {
@@ -105,7 +105,7 @@ function createWeightMapFromDictionaryInformation(di) {
     return di ? (0, cspell_trie_lib_1.mapDictionaryInformationToWeightMap)(di) : undefined;
 }
 exports.createWeightMapFromDictionaryInformation = createWeightMapFromDictionaryInformation;
-exports.__testMethods = {
+exports.__testMethods__ = {
     wordSearchForms,
     wordSearchFormsArray,
     wordDictionaryForms,

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

@@ -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/ValidationTypes.d.ts

@@ -0,0 +1,41 @@
+import { MappedText, TextOffset as TextOffsetRW } from '@cspell/cspell-types';
+export declare type TextOffsetRO = Readonly<TextOffsetRW>;
+export interface ValidationOptions extends IncludeExcludeOptions {
+    maxNumberOfProblems?: number;
+    maxDuplicateProblems?: number;
+    minWordLength?: number;
+    flagWords?: string[];
+    allowCompoundWords?: boolean;
+    /** ignore case when checking words against dictionary or ignore words list */
+    ignoreCase: boolean;
+}
+export interface CheckOptions extends ValidationOptions {
+    allowCompoundWords: boolean;
+    ignoreCase: boolean;
+}
+export interface IncludeExcludeOptions {
+    ignoreRegExpList?: RegExp[];
+    includeRegExpList?: RegExp[];
+}
+export interface WordRangeAcc {
+    textOffset: TextOffsetRO;
+    isIncluded: boolean;
+    rangePos: number;
+}
+export interface ValidationResult extends TextOffsetRW {
+    line: TextOffsetRW;
+    isFlagged?: boolean | undefined;
+    isFound?: boolean | undefined;
+}
+export declare type ValidationResultRO = Readonly<ValidationResult>;
+export declare type LineValidator = (line: LineSegment) => Iterable<ValidationResult>;
+export interface LineSegment {
+    line: TextOffsetRO;
+    segment: TextOffsetRO;
+}
+export interface MappedTextValidationResult extends MappedText {
+    isFlagged?: boolean | undefined;
+    isFound?: boolean | undefined;
+}
+export declare type TextValidator = (text: MappedText) => Iterable<MappedTextValidationResult>;
+//# sourceMappingURL=ValidationTypes.d.ts.map

package/dist/textValidation/ValidationTypes.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ValidationTypes.js.map

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