cspell-lib 5.15.2 → 5.15.3

package/dist/Settings/CSpellSettingsServer.d.ts

@@ -29,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;
@@ -57,6 +61,7 @@ declare function validateRawConfigVersion(config: CSpellUserSettings | {
 }, fileRef: ImportFileRef): void;
 declare function validateRawConfigExports(config: CSpellUserSettings, fileRef: ImportFileRef): void;
 export declare const __testing__: {
+    mergeObjects: typeof mergeObjects;
     normalizeCacheSettings: typeof normalizeCacheSettings;
     normalizeSettings: typeof normalizeSettings;
     validateRawConfigExports: typeof validateRawConfigExports;

package/dist/Settings/CSpellSettingsServer.js

@@ -314,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),
@@ -380,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,
@@ -732,6 +740,7 @@ function validateRawConfig(config, fileRef) {
     validations.forEach((fn) => fn(config, fileRef));
 }
 exports.__testing__ = {
+    mergeObjects,
     normalizeCacheSettings,
     normalizeSettings,
     validateRawConfigExports,

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "5.15.2",
+  "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.15.2",
-    "@cspell/cspell-types": "^5.15.2",
+    "@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.15.2",
-    "cspell-io": "^5.15.2",
-    "cspell-trie-lib": "^5.15.2",
+    "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",
@@ -79,12 +79,12 @@
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.0",
-    "@types/node": "^17.0.8",
+    "@types/node": "^17.0.10",
     "cspell-dict-nl-nl": "^1.1.2",
     "jest": "^27.4.7",
     "lorem-ipsum": "^2.0.4",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.2"
+    "ts-jest": "^27.1.3"
   },
-  "gitHead": "b047b5458980010a8f3ab31c6dc9434e0e782d5e"
+  "gitHead": "8a7c55b7d0b340d3c4e964ba91390a405f2cda2d"
 }