cspell-lib 5.14.0 → 5.15.3

package/dist/Settings/CSpellSettingsServer.d.ts

@@ -1,6 +1,7 @@
 import type { CSpellSettingsWithSourceTrace, CSpellUserSettings, Glob, ImportFileRef, PnPSettings } from '@cspell/cspell-types';
 import { URI } from 'vscode-uri';
 import { LoaderResult } from './pnpLoader';
+export declare const currentSettingsFileVersion = "0.2";
 export declare const sectionCSpell = "cSpell";
 export declare const defaultFileName = "cspell.json";
 export declare const ENV_CSPELL_GLOB_ROOT = "CSPELL_GLOB_ROOT";
@@ -28,6 +29,10 @@ export declare function readRawSettings(filename: string, relativeTo?: string):
  * @deprecated true
  */
 export declare function readSettingsFiles(filenames: string[]): CSpellSettings;
+declare function mergeObjects(left: undefined, right: undefined): undefined;
+declare function mergeObjects<T>(left: T, right: undefined): T;
+declare function mergeObjects<T>(left: T, right: T): T;
+declare function mergeObjects<T>(left: undefined, right: T): T;
 export declare function mergeSettings(left: CSpellSettings, ...settings: CSpellSettings[]): CSpellSettings;
 export declare function mergeInDocSettings(left: CSpellSettings, right: CSpellSettings): CSpellSettings;
 export declare function calcOverrideSettings(settings: CSpellSettings, filename: string): CSpellSettings;
@@ -45,14 +50,22 @@ export interface ImportFileRefWithError extends ImportFileRef {
     error: Error;
 }
 export declare function extractImportErrors(settings: CSpellSettings): ImportFileRefWithError[];
+export interface ConfigurationDependencies {
+    configFiles: string[];
+    dictionaryFiles: string[];
+}
+export declare function extractDependencies(settings: CSpellSettings): ConfigurationDependencies;
+declare function normalizeCacheSettings(settings: Pick<CSpellSettings, 'cache'>, pathToSettingsDir: string): Pick<CSpellSettings, 'cache'>;
 declare function validateRawConfigVersion(config: CSpellUserSettings | {
     version: unknown;
 }, fileRef: ImportFileRef): void;
 declare function validateRawConfigExports(config: CSpellUserSettings, fileRef: ImportFileRef): void;
 export declare const __testing__: {
+    mergeObjects: typeof mergeObjects;
+    normalizeCacheSettings: typeof normalizeCacheSettings;
     normalizeSettings: typeof normalizeSettings;
-    validateRawConfigVersion: typeof validateRawConfigVersion;
     validateRawConfigExports: typeof validateRawConfigExports;
+    validateRawConfigVersion: typeof validateRawConfigVersion;
 };
 export {};
 //# sourceMappingURL=CSpellSettingsServer.d.ts.map

package/dist/Settings/CSpellSettingsServer.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testing__ = exports.extractImportErrors = exports.getSources = exports.checkFilenameMatchesGlob = exports.clearCachedSettingsFiles = exports.getCachedFileSize = exports.getGlobalSettings = exports.finalizeSettings = exports.calcOverrideSettings = exports.mergeInDocSettings = exports.mergeSettings = exports.readSettingsFiles = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfig = exports.searchForConfig = exports.readSettings = exports.defaultConfigFilenames = exports.ENV_CSPELL_GLOB_ROOT = exports.defaultFileName = exports.sectionCSpell = void 0;
+exports.__testing__ = exports.extractDependencies = exports.extractImportErrors = exports.getSources = exports.checkFilenameMatchesGlob = exports.clearCachedSettingsFiles = exports.getCachedFileSize = exports.getGlobalSettings = exports.finalizeSettings = exports.calcOverrideSettings = exports.mergeInDocSettings = exports.mergeSettings = exports.readSettingsFiles = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfig = exports.searchForConfig = exports.readSettings = exports.defaultConfigFilenames = exports.ENV_CSPELL_GLOB_ROOT = exports.defaultFileName = exports.sectionCSpell = exports.currentSettingsFileVersion = void 0;
 const json = __importStar(require("comment-json"));
 const cosmiconfig_1 = require("cosmiconfig");
 const cspell_glob_1 = require("cspell-glob");
@@ -36,7 +36,7 @@ const pnpLoader_1 = require("./pnpLoader");
 const supportedCSpellConfigVersions = ['0.2'];
 const configSettingsFileVersion0_1 = '0.1';
 const configSettingsFileVersion0_2 = '0.2';
-const currentSettingsFileVersion = configSettingsFileVersion0_2;
+exports.currentSettingsFileVersion = configSettingsFileVersion0_2;
 const setOfSupportedConfigVersions = new Set(supportedCSpellConfigVersions);
 exports.sectionCSpell = 'cSpell';
 exports.defaultFileName = 'cspell.json';
@@ -90,7 +90,7 @@ const cspellConfigExplorerSync = (0, cosmiconfig_1.cosmiconfigSync)('cspell', cs
 const defaultSettings = {
     id: 'default',
     name: 'default',
-    version: currentSettingsFileVersion,
+    version: exports.currentSettingsFileVersion,
 };
 const defaultPnPSettings = {};
 let globalSettings;
@@ -137,6 +137,7 @@ function normalizeSettings(rawSettings, pathToSettingsFile, pnpSettings) {
     loadPnPSync(pnpSettingsToUse, vscode_uri_1.URI.file(pathToSettingsDir));
     // Fix up dictionaryDefinitions
     const settings = {
+        version: defaultSettings.version,
         ...rawSettings,
         id,
         name,
@@ -149,6 +150,7 @@ function normalizeSettings(rawSettings, pathToSettingsFile, pnpSettings) {
     const normalizedOverrides = normalizeOverrides(settings, pathToSettingsFile);
     const normalizedReporters = normalizeReporters(settings, pathToSettingsFile);
     const normalizedGitignoreRoot = normalizeGitignoreRoot(settings, pathToSettingsFile);
+    const normalizedCacheSettings = normalizeCacheSettings(settings, pathToSettingsDir);
     const imports = typeof settings.import === 'string' ? [settings.import] : settings.import || [];
     const source = settings.source || {
         name: settings.name,
@@ -162,6 +164,7 @@ function normalizeSettings(rawSettings, pathToSettingsFile, pnpSettings) {
         ...normalizedOverrides,
         ...normalizedReporters,
         ...normalizedGitignoreRoot,
+        ...normalizedCacheSettings,
     };
     if (!imports.length) {
         return fileSettings;
@@ -311,6 +314,13 @@ function mergeList(left, right) {
         return left;
     return left.concat(right);
 }
+function mergeObjects(left, right) {
+    if (left === undefined)
+        return right;
+    if (right === undefined)
+        return left;
+    return { ...left, ...right };
+}
 function tagLanguageSettings(tag, settings = []) {
     return settings.map((s) => ({
         id: tag + '.' + (s.id || s.locale || s.languageId),
@@ -377,6 +387,7 @@ function merge(left, right) {
         files: mergeListUnique(left.files, right.files),
         ignorePaths: versionBasedMergeList(left.ignorePaths, right.ignorePaths, version),
         overrides: versionBasedMergeList(left.overrides, right.overrides, version),
+        features: mergeObjects(left.features, right.features),
         source: mergeSources(left, right),
         globRoot: undefined,
         import: undefined,
@@ -534,7 +545,7 @@ function getSources(settings) {
     return sources;
 }
 exports.getSources = getSources;
-function mergeImportRefs(left, right) {
+function mergeImportRefs(left, right = {}) {
     var _a;
     const imports = new Map(left.__imports || []);
     if (left.__importRef) {
@@ -553,10 +564,19 @@ function isImportFileRefWithError(ref) {
     return !!ref.error;
 }
 function extractImportErrors(settings) {
-    const imports = mergeImportRefs(settings, {});
+    const imports = mergeImportRefs(settings);
     return !imports ? [] : [...imports.values()].filter(isImportFileRefWithError);
 }
 exports.extractImportErrors = extractImportErrors;
+function extractDependencies(settings) {
+    const configFiles = [...(mergeImportRefs(settings) || [])].map(([filename]) => filename);
+    const dictionaryFiles = (0, DictionarySettings_1.calcDictionaryDefsToLoad)(settings).map((dict) => dict.path);
+    return {
+        configFiles,
+        dictionaryFiles,
+    };
+}
+exports.extractDependencies = extractDependencies;
 function resolveGlobRoot(settings, pathToSettingsFile) {
     var _a;
     const settingsFileDirRaw = path.dirname(pathToSettingsFile);
@@ -573,6 +593,10 @@ function resolveGlobRoot(settings, pathToSettingsFile) {
     const globRoot = path.resolve(settingsFileDir, rawRoot.replace('${cwd}', cwd));
     return globRoot;
 }
+function resolveFilePath(filename, pathToSettingsFile) {
+    const cwd = process.cwd();
+    return path.resolve(pathToSettingsFile, filename.replace('${cwd}', cwd));
+}
 function toGlobDef(g, root, source) {
     if (g === undefined)
         return undefined;
@@ -670,6 +694,15 @@ function normalizeSettingsGlobs(settings, pathToSettingsFile) {
         ignorePaths,
     };
 }
+function normalizeCacheSettings(settings, pathToSettingsDir) {
+    const { cache } = settings;
+    if (cache === undefined)
+        return {};
+    const { cacheLocation } = cache;
+    if (cacheLocation === undefined)
+        return { cache };
+    return { cache: { ...cache, cacheLocation: resolveFilePath(cacheLocation, pathToSettingsDir) } };
+}
 function validationMessage(msg, fileRef) {
     return msg + `\n  File: "${fileRef.filename}"`;
 }
@@ -687,9 +720,9 @@ function validateRawConfigVersion(config, fileRef) {
         (0, logger_1.logError)(validationMessage(`Unsupported config file version: "${version}"`, fileRef));
         return;
     }
-    const msg = version > currentSettingsFileVersion
-        ? `Newer config file version found: "${version}". Supported version is "${currentSettingsFileVersion}"`
-        : `Legacy config file version found: "${version}", upgrade to "${currentSettingsFileVersion}"`;
+    const msg = version > exports.currentSettingsFileVersion
+        ? `Newer config file version found: "${version}". Supported version is "${exports.currentSettingsFileVersion}"`
+        : `Legacy config file version found: "${version}", upgrade to "${exports.currentSettingsFileVersion}"`;
     (0, logger_1.logWarning)(validationMessage(msg, fileRef));
 }
 function validateRawConfigExports(config, fileRef) {
@@ -707,8 +740,10 @@ function validateRawConfig(config, fileRef) {
     validations.forEach((fn) => fn(config, fileRef));
 }
 exports.__testing__ = {
+    mergeObjects,
+    normalizeCacheSettings,
     normalizeSettings,
-    validateRawConfigVersion,
     validateRawConfigExports,
+    validateRawConfigVersion,
 };
 //# sourceMappingURL=CSpellSettingsServer.js.map

package/dist/Settings/DefaultSettings.js

@@ -45,10 +45,14 @@ const predefinedPatterns = [
     { name: 'SpellCheckerDisable', pattern: regExpSpellCheckerDisable },
     { name: 'PublicKey', pattern: RegPat.regExPublicKey },
     { name: 'RsaCert', pattern: RegPat.regExCert },
+    { name: 'SshRsa', pattern: RegPat.regExSshRSA },
     { name: 'EscapeCharacters', pattern: RegPat.regExEscapeCharacters },
     { name: 'Base64', pattern: RegPat.regExBase64 },
+    { name: 'Base64SingleLine', pattern: RegPat.regExBase64SingleLine },
+    { name: 'Base64MultiLine', pattern: RegPat.regExBase64MultiLine },
     { name: 'Email', pattern: RegPat.regExEmail },
     { name: 'SHA', pattern: RegPat.regExSha },
+    { name: 'HashStrings', pattern: RegPat.regExHashStrings },
     { name: 'UnicodeRef', pattern: RegPat.regExUnicodeRef },
     { name: 'UUID', pattern: RegPat.regExUUID },
     { name: 'href', pattern: RegPat.regExHRef },
@@ -68,14 +72,16 @@ const definedDefaultRegExpExcludeList = [
     'SpellCheckerIgnoreInDocSetting',
     'Urls',
     'Email',
-    'PublicKey',
     'RsaCert',
-    'Base64',
+    'SshRsa',
+    'Base64MultiLine',
+    'Base64SingleLine',
     'CommitHash',
     'CommitHashLink',
     'CStyleHexValue',
     'CSSHexValue',
     'SHA',
+    'HashStrings',
     'UnicodeRef',
     'UUID',
 ];

package/dist/Settings/DictionarySettings.d.ts

@@ -1,4 +1,4 @@
-import type { DictionaryDefinition, DictionaryDefinitionPreferred, DictionaryReference } from '@cspell/cspell-types';
+import type { DictionaryDefinition, DictionaryDefinitionPreferred, DictionaryReference, CSpellSettingsWithSourceTrace } from '@cspell/cspell-types';
 export interface DictionaryDefinitionWithSource extends DictionaryDefinitionPreferred {
     /** The path to the config file that contains this dictionary definition */
     __source: string;
@@ -22,4 +22,5 @@ export declare function normalizePathForDictDefs(defs: DictionaryDefinition[], p
 export declare function normalizePathForDictDefs(defs: DictionaryDefinition[] | undefined, pathToSettingsFile: string): DictionaryDefinitionWithSource[] | undefined;
 export declare function normalizePathForDictDef(def: DictionaryDefinition, pathToSettingsFile: string): DictionaryDefinitionWithSource;
 export declare function isDictionaryDefinitionWithSource(d: DictionaryDefinition | DictionaryDefinitionWithSource): d is DictionaryDefinitionWithSource;
+export declare function calcDictionaryDefsToLoad(settings: CSpellSettingsWithSourceTrace): DictionaryDefinitionPreferred[];
 //# sourceMappingURL=DictionarySettings.d.ts.map

package/dist/Settings/DictionarySettings.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDictionaryDefinitionWithSource = exports.normalizePathForDictDef = exports.normalizePathForDictDefs = exports.filterDictDefsToLoad = void 0;
+exports.calcDictionaryDefsToLoad = exports.isDictionaryDefinitionWithSource = exports.normalizePathForDictDef = exports.normalizePathForDictDefs = exports.filterDictDefsToLoad = void 0;
 const path = __importStar(require("path"));
 const resolveFile_1 = require("../util/resolveFile");
 const DictionaryReferenceCollection_1 = require("./DictionaryReferenceCollection");
@@ -87,4 +87,17 @@ exports.isDictionaryDefinitionWithSource = isDictionaryDefinitionWithSource;
 function determineName(filename, options) {
     return options.name || path.basename(filename);
 }
+function calcDictionaryDefsToLoad(settings) {
+    const { dictionaries = [], dictionaryDefinitions = [], noSuggestDictionaries = [] } = settings;
+    const colNoSug = (0, DictionaryReferenceCollection_1.createDictionaryReferenceCollection)(noSuggestDictionaries);
+    const colDicts = (0, DictionaryReferenceCollection_1.createDictionaryReferenceCollection)(dictionaries.concat(colNoSug.enabled()));
+    const modDefs = dictionaryDefinitions.map((def) => {
+        const enabled = colNoSug.isEnabled(def.name);
+        if (enabled === undefined)
+            return def;
+        return { ...def, noSuggest: enabled };
+    });
+    return filterDictDefsToLoad(colDicts.enabled(), modDefs);
+}
+exports.calcDictionaryDefsToLoad = calcDictionaryDefsToLoad;
 //# sourceMappingURL=DictionarySettings.js.map

package/dist/Settings/RegExpPatterns.d.ts

@@ -13,8 +13,19 @@ export declare const regExSpellingGuardLine: RegExp;
 export declare const regExIgnoreSpellingDirectives: RegExp;
 export declare const regExPublicKey: RegExp;
 export declare const regExCert: RegExp;
+export declare const regExSshRSA: RegExp;
 export declare const regExEscapeCharacters: RegExp;
 export declare const regExBase64: RegExp;
+/**
+ * Detect a string of characters that look like a Base64 string.
+ *
+ * It must be:
+ * - at least 40 characters
+ * - contain at least 1 of [0-9+=]
+ * - end at the end of the line or with [,"'\]
+ */
+export declare const regExBase64SingleLine: RegExp;
+export declare const regExBase64MultiLine: RegExp;
 export declare const regExPhpHereDoc: RegExp;
 export declare const regExString: RegExp;
 export declare const regExCStyleComments: RegExp;
@@ -22,4 +33,14 @@ export declare const rexExPythonStyleComments: RegExp;
 export declare const regExEmail: RegExp;
 export declare const regExRepeatedChar: RegExp;
 export declare const regExSha: RegExp;
+/**
+ * Detect common hash strings like:
+ * - `sha1`, `sha256`, `sha512`
+ * - `md5`
+ * - `base64` - used in email
+ * - `crypt`, `bcrypt`, `script`
+ * - `token`
+ * - `assertion` - use with jwt
+ */
+export declare const regExHashStrings: RegExp;
 //# sourceMappingURL=RegExpPatterns.d.ts.map

package/dist/Settings/RegExpPatterns.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.regExSha = exports.regExRepeatedChar = exports.regExEmail = exports.rexExPythonStyleComments = exports.regExCStyleComments = exports.regExString = exports.regExPhpHereDoc = exports.regExBase64 = exports.regExEscapeCharacters = exports.regExCert = exports.regExPublicKey = exports.regExIgnoreSpellingDirectives = exports.regExSpellingGuardLine = exports.regExSpellingGuardNext = exports.regExSpellingGuardBlock = exports.regExUnicodeRef = exports.regExUUID = exports.regExCSSHexValue = exports.regExCStyleHexValue = exports.regExCommitHashLink = exports.regExCommitHash = exports.regExMatchCommonHexFormats = exports.regExHRef = exports.regExMatchUrls = void 0;
+exports.regExHashStrings = exports.regExSha = exports.regExRepeatedChar = exports.regExEmail = exports.rexExPythonStyleComments = exports.regExCStyleComments = exports.regExString = exports.regExPhpHereDoc = exports.regExBase64MultiLine = exports.regExBase64SingleLine = exports.regExBase64 = exports.regExEscapeCharacters = exports.regExSshRSA = exports.regExCert = exports.regExPublicKey = exports.regExIgnoreSpellingDirectives = exports.regExSpellingGuardLine = exports.regExSpellingGuardNext = exports.regExSpellingGuardBlock = exports.regExUnicodeRef = exports.regExUUID = exports.regExCSSHexValue = exports.regExCStyleHexValue = exports.regExCommitHashLink = exports.regExCommitHash = exports.regExMatchCommonHexFormats = exports.regExHRef = exports.regExMatchUrls = void 0;
 // Exclude Expressions
 // cSpell:ignore anrvtbf
 exports.regExMatchUrls = /(?:https?|ftp):\/\/[^\s"]+/gi;
@@ -16,10 +16,21 @@ exports.regExSpellingGuardBlock = /(\bc?spell(?:-?checker)?::?)\s*disable(?!-lin
 exports.regExSpellingGuardNext = /\bc?spell(?:-?checker)?::?\s*disable-next\b.*\s\s?.*/gi;
 exports.regExSpellingGuardLine = /^.*\bc?spell(?:-?checker)?::?\s*disable-line\b.*/gim;
 exports.regExIgnoreSpellingDirectives = /\bc?spell(?:-?checker)?::?\s*ignoreRegExp.*/gim;
-exports.regExPublicKey = /BEGIN\s+((?:RSA\s+)?PUBLIC)\s+KEY(?:[\w=+\-/]*\r?\n)+?-*END\s+\1/g;
-exports.regExCert = /BEGIN\s+(CERTIFICATE|RSA\s+(?:PRIVATE|PUBLIC)\s+KEY)(?:[\w=+\-/]*\r?\n)+?-*END\s+\1/g;
+exports.regExPublicKey = /-{5}BEGIN\s+((?:RSA\s+)?PUBLIC\s+KEY)[\w=+\-/=\\\s]+?END\s+\1-{5}/g;
+exports.regExCert = /-{5}BEGIN\s+(CERTIFICATE|(?:RSA\s+)?(?:PRIVATE|PUBLIC)\s+KEY)[\w=+\-/=\\\s]+?END\s+\1-{5}/g;
+exports.regExSshRSA = /ssh-rsa\s+[a-z0-9/+]{28,}={0,3}(?![a-z0-9/+=])/gi;
 exports.regExEscapeCharacters = /\\(?:[anrvtbf]|[xu][a-f0-9]+)/gi;
-exports.regExBase64 = /(?<![a-z0-9/+])(?:[a-z0-9/+]{40,})(?:\s^\s*[a-z0-9/+]{40,})*(?:\s^\s*[a-z0-9/+]+=*)?/gim;
+exports.regExBase64 = /(?<![A-Za-z0-9/+])(?:[A-Za-z0-9/+]{40,})(?:\s^\s*[A-Za-z0-9/+]{40,})*(?:\s^\s*[A-Za-z0-9/+]+=*)?(?![A-Za-z0-9/+=])/gm;
+/**
+ * Detect a string of characters that look like a Base64 string.
+ *
+ * It must be:
+ * - at least 40 characters
+ * - contain at least 1 of [0-9+=]
+ * - end at the end of the line or with [,"'\]
+ */
+exports.regExBase64SingleLine = /(?<![A-Za-z0-9/+])(?=[^/]|[/][A-Za-z0-9/+]+?[=+])(?![A-Za-z/]+(?![A-Za-z0-9/+=]))(?=[A-Za-z0-9/+=]*?(?:[A-Z]{2}|[0-9]{2}))(?:[A-Za-z0-9/+]{4}){10,}(?:[A-Za-z0-9/+]{3}={1}|[A-Za-z0-9/+]{2}={2}|[A-Za-z0-9/+]{1}={3})?(?![A-Za-z0-9/+=])(?=$|[:.,"'\\)])/gm;
+exports.regExBase64MultiLine = /(?<![A-Za-z0-9/+])["']?(?:[A-Za-z0-9/+]{40,})["']?(?:\s^\s*["']?[A-Za-z0-9/+]{40,}["']?)+(?:\s^\s*["']?[A-Za-z0-9/+]+={0,3}["']?)?(?![A-Za-z0-9/+=])/gm;
 // cspell:ignore aeiou
 // The following is an attempt at detecting random strings.
 // export const regExRandomString =
@@ -32,6 +43,15 @@ exports.regExCStyleComments = /(?<!\w:)(?:\/\/.*)|(?:\/\*[\s\S]*?\*\/)/g;
 exports.rexExPythonStyleComments = /#.*|(?:('''|""")[^\1]+?\1)/gm;
 exports.regExEmail = /<?\b[\w.\-+]{1,128}@\w{1,63}(\.\w{1,63}){1,4}\b>?/gi;
 exports.regExRepeatedChar = /^(\w)\1{3,}$/i;
-// cSpell:ignore bsha
-exports.regExSha = /\bsha\d+-[a-z0-9+/=]+/gi;
+exports.regExSha = /\bsha\d+-[a-z0-9+/]{25,}={0,3}/gi;
+/**
+ * Detect common hash strings like:
+ * - `sha1`, `sha256`, `sha512`
+ * - `md5`
+ * - `base64` - used in email
+ * - `crypt`, `bcrypt`, `script`
+ * - `token`
+ * - `assertion` - use with jwt
+ */
+exports.regExHashStrings = /(?:\b(?:sha\d+|md5|base64|crypt|bcrypt|scrypt|security-token|assertion)[-,:$=]|#code[/])[-\w/+%.]{25,}={0,3}(?:(['"])\s*\+?\s*\1?[-\w/+%.]+={0,3})*(?![-\w/+=%.])/gi;
 //# sourceMappingURL=RegExpPatterns.js.map

package/dist/SpellingDictionary/Dictionaries.d.ts

@@ -1,7 +1,7 @@
-import type { CSpellUserSettings, DictionaryDefinition, DictionaryReference } from '@cspell/cspell-types';
+import type { CSpellUserSettings, DictionaryDefinitionPreferred } from '@cspell/cspell-types';
 import { SpellingDictionaryCollection } from './index';
 import { SpellingDictionary } from './SpellingDictionary';
-export declare function loadDictionaries(dictIds: DictionaryReference[], defs: DictionaryDefinition[]): Promise<SpellingDictionary>[];
+export declare function loadDictionaryDefs(defsToLoad: DictionaryDefinitionPreferred[]): Promise<SpellingDictionary>[];
 export declare function refreshDictionaryCache(maxAge?: number): Promise<void>;
 export declare function getDictionary(settings: CSpellUserSettings): Promise<SpellingDictionaryCollection>;
 //# sourceMappingURL=Dictionaries.d.ts.map

package/dist/SpellingDictionary/Dictionaries.js

@@ -1,31 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDictionary = exports.refreshDictionaryCache = exports.loadDictionaries = void 0;
-const DictionaryReferenceCollection_1 = require("../Settings/DictionaryReferenceCollection");
+exports.getDictionary = exports.refreshDictionaryCache = exports.loadDictionaryDefs = void 0;
 const DictionarySettings_1 = require("../Settings/DictionarySettings");
 const createSpellingDictionary_1 = require("./createSpellingDictionary");
 const DictionaryLoader_1 = require("./DictionaryLoader");
 const SpellingDictionaryCollection_1 = require("./SpellingDictionaryCollection");
-function loadDictionaries(dictIds, defs) {
-    const defsToLoad = (0, DictionarySettings_1.filterDictDefsToLoad)(dictIds, defs);
+function loadDictionaryDefs(defsToLoad) {
     return defsToLoad.map((def) => (0, DictionaryLoader_1.loadDictionary)(def.path, def));
 }
-exports.loadDictionaries = loadDictionaries;
+exports.loadDictionaryDefs = loadDictionaryDefs;
 function refreshDictionaryCache(maxAge) {
     return (0, DictionaryLoader_1.refreshCacheEntries)(maxAge);
 }
 exports.refreshDictionaryCache = refreshDictionaryCache;
 function getDictionary(settings) {
-    const { words = [], userWords = [], dictionaries = [], dictionaryDefinitions = [], noSuggestDictionaries = [], flagWords = [], ignoreWords = [], } = settings;
-    const colNoSug = (0, DictionaryReferenceCollection_1.createDictionaryReferenceCollection)(noSuggestDictionaries);
-    const colDicts = (0, DictionaryReferenceCollection_1.createDictionaryReferenceCollection)(dictionaries.concat(colNoSug.enabled()));
-    const modDefs = dictionaryDefinitions.map((def) => {
-        const enabled = colNoSug.isEnabled(def.name);
-        if (enabled === undefined)
-            return def;
-        return { ...def, noSuggest: enabled };
-    });
-    const spellDictionaries = loadDictionaries(colDicts.enabled(), modDefs);
+    const { words = [], userWords = [], flagWords = [], ignoreWords = [] } = settings;
+    const spellDictionaries = loadDictionaryDefs((0, DictionarySettings_1.calcDictionaryDefsToLoad)(settings));
     const settingsDictionary = (0, createSpellingDictionary_1.createSpellingDictionary)(words.concat(userWords), '[words]', 'From Settings `words` and `userWords`', {
         caseSensitive: true,
     });

package/dist/SpellingDictionary/SpellingDictionary.d.ts

@@ -1,4 +1,4 @@
-import type { ReplaceMap } from '@cspell/cspell-types';
+import type { ReplaceMap, SuggestionCostsDefs } from '@cspell/cspell-types';
 import { CompoundWordsMethod, SuggestionCollector, SuggestionResult } from 'cspell-trie-lib';
 export { CompoundWordsMethod, SuggestionCollector, SuggestionResult } from 'cspell-trie-lib';
 export interface SearchOptions {
@@ -50,6 +50,7 @@ export interface SpellingDictionaryOptions {
     useCompounds?: boolean;
     caseSensitive?: boolean;
     noSuggest?: boolean;
+    suggestionDefs?: SuggestionCostsDefs | undefined;
 }
 export interface SpellingDictionary {
     readonly name: string;

package/dist/SpellingDictionary/SpellingDictionaryFromTrie.d.ts

@@ -1,5 +1,6 @@
-import { Trie, SuggestionCollector, SuggestionResult, CompoundWordsMethod } from 'cspell-trie-lib';
-import { SpellingDictionary, HasOptions, SuggestOptions, SpellingDictionaryOptions, FindResult } from './SpellingDictionary';
+import type { SuggestionCollector, SuggestionResult } from 'cspell-trie-lib';
+import { CompoundWordsMethod, Trie } from 'cspell-trie-lib';
+import { FindResult, HasOptions, SpellingDictionary, SpellingDictionaryOptions, SuggestOptions } from './SpellingDictionary';
 export declare class SpellingDictionaryFromTrie implements SpellingDictionary {
     readonly trie: Trie;
     readonly name: string;
@@ -13,6 +14,7 @@ export declare class SpellingDictionaryFromTrie implements SpellingDictionary {
     readonly type = "SpellingDictionaryFromTrie";
     readonly isDictionaryCaseSensitive: boolean;
     readonly containsNoSuggestWords: boolean;
+    private weightMap;
     constructor(trie: Trie, name: string, options: SpellingDictionaryOptions, source?: string, size?: number);
     get size(): number;
     has(word: string, hasOptions?: HasOptions): boolean;

package/dist/SpellingDictionary/SpellingDictionaryFromTrie.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSpellingDictionaryTrie = exports.SpellingDictionaryFromTrie = void 0;
 const cspell_trie_lib_1 = require("cspell-trie-lib");
-const repMap_1 = require("../util/repMap");
 const Settings_1 = require("../Settings");
 const Memorizer_1 = require("../util/Memorizer");
+const repMap_1 = require("../util/repMap");
 const SpellingDictionaryMethods_1 = require("./SpellingDictionaryMethods");
 class SpellingDictionaryFromTrie {
     constructor(trie, name, options, source = 'from trie', size) {
@@ -22,6 +22,7 @@ class SpellingDictionaryFromTrie {
         this.isDictionaryCaseSensitive = (_a = options.caseSensitive) !== null && _a !== void 0 ? _a : !trie.isLegacy;
         this.containsNoSuggestWords = options.noSuggest || false;
         this._size = size || 0;
+        this.weightMap = options.suggestionDefs ? (0, cspell_trie_lib_1.createWeightedMap)(options.suggestionDefs) : undefined;
     }
     get size() {
         if (!this._size) {
@@ -106,6 +107,7 @@ class SpellingDictionaryFromTrie {
             includeTies,
             ignoreCase,
             timeout,
+            weightMap: this.weightMap,
         });
         this.genSuggestions(collector, suggestOptions);
         return collector.suggestions.map((r) => ({ ...r, word: r.word }));

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export * from './Settings';
 export { defaultFileName as defaultSettingsFilename } from './Settings';
 export { combineTextAndLanguageSettings, combineTextAndLanguageSettings as constructSettingsForText, } from './Settings/TextDocumentSettings';
 export { determineFinalDocumentSettings, DetermineFinalDocumentSettingsResult, Document, fileToDocument, isBinaryFile, spellCheckDocument, spellCheckFile, SpellCheckFileOptions, SpellCheckFileResult, } from './spellCheckFile';
-export { CompoundWordsMethod, createSpellingDictionary, getDictionary, isSpellingDictionaryLoadError, refreshDictionaryCache, SpellingDictionary, SpellingDictionaryLoadError, SuggestionCollector, SuggestionResult, SpellingDictionaryCollection, } from './SpellingDictionary';
+export { CompoundWordsMethod, createSpellingDictionary, getDictionary, isSpellingDictionaryLoadError, refreshDictionaryCache, SpellingDictionary, SpellingDictionaryLoadError, SuggestionCollector, SuggestionResult, SpellingDictionaryCollection, SuggestOptions, } from './SpellingDictionary';
 export * from './trace';
 export { getLogger, Logger, setLogger } from './util/logger';
 export { resolveFile } from './util/resolveFile';

package/dist/textValidator.js

@@ -42,7 +42,7 @@ function validateText(text, dict, options) {
         const n = (mapOfProblems.get(word) || 0) + 1;
         mapOfProblems.set(word, n);
         // Filter out if there is too many
-        return n < maxDuplicateProblems;
+        return n <= maxDuplicateProblems;
     })
         .take(maxNumberOfProblems);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "5.14.0",
+  "version": "5.15.3",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -47,15 +47,15 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^5.14.0",
-    "@cspell/cspell-types": "^5.14.0",
+    "@cspell/cspell-bundled-dicts": "^5.15.3",
+    "@cspell/cspell-types": "^5.15.3",
     "clear-module": "^4.1.2",
     "comment-json": "^4.1.1",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^5.14.0",
-    "cspell-io": "^5.14.0",
-    "cspell-trie-lib": "^5.14.0",
+    "cspell-glob": "^5.15.3",
+    "cspell-io": "^5.15.3",
+    "cspell-trie-lib": "^5.15.3",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "gensequence": "^3.1.1",
@@ -78,13 +78,13 @@
     "@cspell/dict-python": "^2.0.5",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.0.3",
-    "@types/node": "^17.0.5",
+    "@types/jest": "^27.4.0",
+    "@types/node": "^17.0.10",
     "cspell-dict-nl-nl": "^1.1.2",
-    "jest": "^27.4.5",
+    "jest": "^27.4.7",
     "lorem-ipsum": "^2.0.4",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.2"
+    "ts-jest": "^27.1.3"
   },
-  "gitHead": "8c8dfb70479584839e8035094771762f77118667"
+  "gitHead": "8a7c55b7d0b340d3c4e964ba91390a405f2cda2d"
 }