cspell-lib 5.18.3 → 5.19.0

package/dist/LanguageIds.d.ts

@@ -29,5 +29,5 @@ export declare function isGeneratedFile(basename: string): boolean;
 export declare function isGenerated(languageId: LanguageId | LanguageId[] | Iterable<LanguageId>): boolean;
 export declare function buildLanguageExtensionMapSet(defs: LanguageDefinitions): ExtensionToLanguageIdMapSet;
 export declare function getLanguagesForExt(ext: string): string[];
-export declare function getLanguagesForFilename(basename: string): string[];
+export declare function getLanguagesForBasename(basename: string): string[];
 //# sourceMappingURL=LanguageIds.d.ts.map

package/dist/LanguageIds.js

@@ -7,7 +7,7 @@
  * ```
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLanguagesForFilename = exports.getLanguagesForExt = exports.buildLanguageExtensionMapSet = exports.isGenerated = exports.isGeneratedFile = exports.isGeneratedExt = exports.isBinary = exports.isBinaryFile = exports.isBinaryExt = exports.languageIds = exports.generatedFiles = exports.binaryLanguages = exports.languageExtensionDefinitions = void 0;
+exports.getLanguagesForBasename = exports.getLanguagesForExt = exports.buildLanguageExtensionMapSet = exports.isGenerated = exports.isGeneratedFile = exports.isGeneratedExt = exports.isBinary = exports.isBinaryFile = exports.isBinaryExt = exports.languageIds = exports.generatedFiles = exports.binaryLanguages = exports.languageExtensionDefinitions = void 0;
 exports.languageExtensionDefinitions = [
     { id: 'ada', extensions: ['.adb', '.ads'] },
     { id: 'apiblueprint', extensions: ['.apib', '.apiblueprint'] },
@@ -63,7 +63,7 @@ exports.languageExtensionDefinitions = [
     { id: 'powershell', extensions: ['.ps1', '.psm1', '.psd1', '.pssc', '.psrc'] },
     { id: 'purescript', extensions: ['.purs'] },
     { id: 'python', extensions: ['.py', '.rpy', '.pyw', '.cpy', '.gyp', '.gypi'] },
-    { id: 'r', extensions: ['.r', '.rhistory', '.rprofile', '.rt'] },
+    { id: 'r', extensions: ['.r', '.R', '.rhistory', '.rprofile', '.rt'] },
     { id: 'razor', extensions: ['.cshtml'] },
     { id: 'ruby', extensions: ['.rb', '.rbx', '.rjs', '.gemspec', '.rake', '.ru'] },
     { id: 'ruby', extensions: [], filenames: ['Gemfile'] },
@@ -167,6 +167,9 @@ exports.languageExtensionDefinitions = [
     { id: 'latex', extensions: ['.tex'] },
     { id: 'map', extensions: ['.map'] },
     { id: 'pdf', extensions: ['.pdf'] },
+    { id: 'rsa', extensions: ['.pub'], filenames: ['id_rsa', 'id_rsa.pub'] },
+    { id: 'pem', extensions: ['.private-key.pem', '.pem'] },
+    { id: 'pem-private-key', extensions: ['.private-key.pem'] },
     //
     // Special file types used to prevent spell checking.
     //
@@ -197,7 +200,7 @@ exports.languageExtensionDefinitions = [
     },
 ];
 exports.binaryLanguages = new Set(['binary', 'image', 'video', 'fonts']);
-exports.generatedFiles = new Set([...exports.binaryLanguages, 'map', 'lock', 'pdf', 'cache_files']);
+exports.generatedFiles = new Set([...exports.binaryLanguages, 'map', 'lock', 'pdf', 'cache_files', 'rsa', 'pem']);
 exports.languageIds = exports.languageExtensionDefinitions.map(({ id }) => id);
 const mapExtensionToSetOfLanguageIds = buildLanguageExtensionMapSet(exports.languageExtensionDefinitions);
 const mapExtensionToLanguageIds = buildExtensionToLanguageIdMap(mapExtensionToSetOfLanguageIds);
@@ -206,7 +209,7 @@ function isBinaryExt(ext) {
 }
 exports.isBinaryExt = isBinaryExt;
 function isBinaryFile(basename) {
-    return isBinary(getLanguagesForFilename(basename));
+    return isBinary(getLanguagesForBasename(basename));
 }
 exports.isBinaryFile = isBinaryFile;
 function isBinary(languageId) {
@@ -218,7 +221,7 @@ function isGeneratedExt(ext) {
 }
 exports.isGeneratedExt = isGeneratedExt;
 function isGeneratedFile(basename) {
-    return isGenerated(getLanguagesForFilename(basename));
+    return isGenerated(getLanguagesForBasename(basename));
 }
 exports.isGeneratedFile = isGeneratedFile;
 function isGenerated(languageId) {
@@ -263,14 +266,16 @@ function getLanguagesForExt(ext) {
     return mapExtensionToLanguageIds.get(ext) || mapExtensionToLanguageIds.get('.' + ext) || [];
 }
 exports.getLanguagesForExt = getLanguagesForExt;
-function getLanguagesForFilename(basename) {
+function getLanguagesForBasename(basename) {
     const found = mapExtensionToLanguageIds.get(basename);
     if (found)
         return found;
-    const pos = basename.lastIndexOf('.');
-    if (pos < 1)
-        return [];
-    return getLanguagesForExt(basename.slice(pos));
+    for (let pos = basename.indexOf('.'); pos >= 0; pos = basename.indexOf('.', pos + 1)) {
+        const ids = mapExtensionToLanguageIds.get(basename.slice(pos));
+        if (ids)
+            return ids;
+    }
+    return [];
 }
-exports.getLanguagesForFilename = getLanguagesForFilename;
+exports.getLanguagesForBasename = getLanguagesForBasename;
 //# sourceMappingURL=LanguageIds.js.map

package/dist/Models/CSpellSettingsInternalDef.d.ts

@@ -1,5 +1,6 @@
 import { CSpellSettingsWithSourceTrace, DictionaryDefinitionAugmented, DictionaryDefinitionCustom, DictionaryDefinitionPreferred } from '@cspell/cspell-types';
 import { WeightMap } from 'cspell-trie-lib';
+import { OptionalOrUndefined } from '../util/types';
 export declare const SymbolCSpellSettingsInternal: unique symbol;
 export interface CSpellSettingsInternal extends Omit<CSpellSettingsWithSourceTrace, 'dictionaryDefinitions'> {
     [SymbolCSpellSettingsInternal]: true;
@@ -17,7 +18,7 @@ export interface DictionaryDefinitionInternal extends Readonly<DictionaryDefinit
 export interface DictionaryDefinitionInternalWithSource extends DictionaryDefinitionInternal {
     readonly __source: string;
 }
-export declare function createCSpellSettingsInternal(parts?: Partial<CSpellSettingsInternal>): CSpellSettingsInternal;
-export declare function isCSpellSettingsInternal(cs: CSpellSettingsInternal | CSpellSettingsWithSourceTrace): cs is CSpellSettingsInternal;
+export declare function createCSpellSettingsInternal(parts?: OptionalOrUndefined<Partial<CSpellSettingsInternal>>): CSpellSettingsInternal;
+export declare function isCSpellSettingsInternal(cs: CSpellSettingsInternal | CSpellSettingsWithSourceTrace | OptionalOrUndefined<CSpellSettingsInternal | CSpellSettingsWithSourceTrace>): cs is CSpellSettingsInternal;
 export {};
 //# sourceMappingURL=CSpellSettingsInternalDef.d.ts.map

package/dist/Models/CSpellSettingsInternalDef.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCSpellSettingsInternal = exports.createCSpellSettingsInternal = exports.SymbolCSpellSettingsInternal = void 0;
+const util_1 = require("../util/util");
 exports.SymbolCSpellSettingsInternal = Symbol('CSpellSettingsInternal');
 function createCSpellSettingsInternal(parts = {}) {
-    return {
+    return (0, util_1.clean)({
         ...parts,
         [exports.SymbolCSpellSettingsInternal]: true,
-    };
+    });
 }
 exports.createCSpellSettingsInternal = createCSpellSettingsInternal;
 function isCSpellSettingsInternal(cs) {

package/dist/Models/TextDocument.d.ts

@@ -0,0 +1,52 @@
+import * as Uri from './Uri';
+export declare type DocumentUri = Uri.Uri;
+export interface Position {
+    line: number;
+    character: number;
+}
+export interface TextDocumentLine {
+    readonly text: string;
+    readonly offset: number;
+    readonly position: Position;
+}
+/**
+ * A simple text document. Not to be implemented. The document keeps the content
+ * as string.
+ */
+export interface TextDocument {
+    /**
+     * The associated URI for this document. Most documents have the __file__-scheme, indicating that they
+     * represent files on disk. However, some documents may have other schemes indicating that they are not
+     * available on disk.
+     */
+    readonly uri: DocumentUri;
+    /**
+     * The identifier of the language associated with this document.
+     */
+    readonly languageId: string | string[];
+    /**
+     * The version number of this document (it will increase after each
+     * change, including undo/redo).
+     */
+    readonly version: number;
+    /**
+     * the raw Document Text
+     */
+    readonly text: string;
+    /**
+     * The natural language locale.
+     */
+    readonly locale?: string | undefined;
+    positionAt(offset: number): Position;
+    offsetAt(position: Position): number;
+    lineAt(offset: number): TextDocumentLine;
+}
+export interface CreateTextDocumentParams {
+    uri: DocumentUri | string;
+    content: string;
+    languageId?: string | string[] | undefined;
+    locale?: string | undefined;
+    version?: number | undefined;
+}
+export declare function createTextDocument({ uri, content, languageId, locale, version, }: CreateTextDocumentParams): TextDocument;
+//# sourceMappingURL=TextDocument.d.ts.map

package/dist/Models/TextDocument.js

@@ -0,0 +1,73 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTextDocument = void 0;
+const LanguageIds_1 = require("../LanguageIds");
+const Uri = __importStar(require("./Uri"));
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+class TextDocumentImpl {
+    constructor(uri, text, languageId, locale, version) {
+        this.uri = uri;
+        this.text = text;
+        this.languageId = languageId;
+        this.locale = locale;
+        this.version = version;
+        const primaryLanguageId = typeof languageId === 'string' ? languageId : languageId[0] || 'plaintext';
+        this.vsTextDoc = vscode_languageserver_textdocument_1.TextDocument.create(uri.toString(), primaryLanguageId, version, text);
+    }
+    positionAt(offset) {
+        return this.vsTextDoc.positionAt(offset);
+    }
+    offsetAt(position) {
+        return this.vsTextDoc.offsetAt(position);
+    }
+    lineAt(offset) {
+        const position = this.vsTextDoc.positionAt(offset);
+        position.character = 0;
+        const lineOffset = this.vsTextDoc.offsetAt(position);
+        const range = {
+            start: position,
+            end: { line: position.line + 1, character: 0 },
+        };
+        let _text;
+        const getText = () => this.vsTextDoc.getText(range);
+        return {
+            get text() {
+                return _text !== null && _text !== void 0 ? _text : (_text = getText());
+            },
+            offset: lineOffset,
+            position,
+        };
+    }
+}
+function createTextDocument({ uri, content, languageId, locale, version, }) {
+    version = version !== null && version !== void 0 ? version : 1;
+    uri = Uri.toUri(uri);
+    languageId = languageId !== null && languageId !== void 0 ? languageId : (0, LanguageIds_1.getLanguagesForBasename)(Uri.basename(uri));
+    languageId = languageId.length === 0 ? 'text' : languageId;
+    return new TextDocumentImpl(uri, content, languageId, locale, version);
+}
+exports.createTextDocument = createTextDocument;
+//# sourceMappingURL=TextDocument.js.map

package/dist/Models/Uri.d.ts

@@ -0,0 +1,5 @@
+import { Utils, URI as Uri } from 'vscode-uri';
+export { URI as Uri } from 'vscode-uri';
+export declare const basename: typeof Utils.basename, dirname: typeof Utils.dirname, extname: typeof Utils.extname, joinPath: typeof Utils.joinPath, resolvePath: typeof Utils.resolvePath;
+export declare function toUri(uriOrFile: string | Uri): Uri;
+//# sourceMappingURL=Uri.d.ts.map

package/dist/Models/Uri.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toUri = exports.resolvePath = exports.joinPath = exports.extname = exports.dirname = exports.basename = exports.Uri = void 0;
+const vscode_uri_1 = require("vscode-uri");
+var vscode_uri_2 = require("vscode-uri");
+Object.defineProperty(exports, "Uri", { enumerable: true, get: function () { return vscode_uri_2.URI; } });
+exports.basename = vscode_uri_1.Utils.basename, exports.dirname = vscode_uri_1.Utils.dirname, exports.extname = vscode_uri_1.Utils.extname, exports.joinPath = vscode_uri_1.Utils.joinPath, exports.resolvePath = vscode_uri_1.Utils.resolvePath;
+const isFile = /^(?:[a-zA-Z]:|[/\\])/;
+const isPossibleUri = /\w:\/\//;
+function toUri(uriOrFile) {
+    if (uriOrFile instanceof vscode_uri_1.URI)
+        return uriOrFile;
+    return isFile.test(uriOrFile) && !isPossibleUri.test(uriOrFile) ? vscode_uri_1.URI.file(uriOrFile) : vscode_uri_1.URI.parse(uriOrFile);
+}
+exports.toUri = toUri;
+//# sourceMappingURL=Uri.js.map

package/dist/Settings/CSpellSettingsServer.d.ts

@@ -1,6 +1,8 @@
 import type { CSpellSettingsWithSourceTrace, Glob, ImportFileRef } from '@cspell/cspell-types';
 import { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
+import { OptionalOrUndefined } from '../util/types';
 declare type CSpellSettingsWST = CSpellSettingsWithSourceTrace;
+declare type CSpellSettingsWSTO = OptionalOrUndefined<CSpellSettingsWithSourceTrace>;
 declare type CSpellSettingsI = CSpellSettingsInternal;
 export declare const configSettingsFileVersion0_1 = "0.1";
 export declare const configSettingsFileVersion0_2 = "0.2";
@@ -10,18 +12,18 @@ 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: CSpellSettingsWST | CSpellSettingsI, ...settings: (CSpellSettingsWST | CSpellSettingsI)[]): CSpellSettingsI;
-export declare function mergeInDocSettings(left: CSpellSettingsWST, right: CSpellSettingsWST): CSpellSettingsWST;
-export declare function calcOverrideSettings(settings: CSpellSettingsWST, filename: string): CSpellSettingsI;
+export declare function mergeSettings(left: CSpellSettingsWSTO | CSpellSettingsI, ...settings: (CSpellSettingsWSTO | CSpellSettingsI)[]): CSpellSettingsI;
+export declare function mergeInDocSettings(left: CSpellSettingsWSTO, right: CSpellSettingsWSTO): CSpellSettingsWST;
+export declare function calcOverrideSettings(settings: CSpellSettingsWSTO, filename: string): CSpellSettingsI;
 /**
  *
  * @param settings - settings to finalize
  * @returns settings where all globs and file paths have been resolved.
  */
-export declare function finalizeSettings(settings: CSpellSettingsWST | CSpellSettingsI): CSpellSettingsI;
+export declare function finalizeSettings(settings: CSpellSettingsWSTO | CSpellSettingsI): CSpellSettingsI;
 export declare function toInternalSettings(settings: undefined): undefined;
-export declare function toInternalSettings(settings: CSpellSettingsI | CSpellSettingsWST): CSpellSettingsI;
-export declare function toInternalSettings(settings?: CSpellSettingsI | CSpellSettingsWST): CSpellSettingsI | undefined;
+export declare function toInternalSettings(settings: CSpellSettingsI | CSpellSettingsWSTO): CSpellSettingsI;
+export declare function toInternalSettings(settings?: CSpellSettingsI | CSpellSettingsWSTO): CSpellSettingsI | undefined;
 /**
  * @param filename - filename
  * @param globs - globs
@@ -34,7 +36,7 @@ export declare function checkFilenameMatchesGlob(filename: string, globs: Glob |
  * Return a list of Setting Sources used to create this Setting.
  * @param settings the settings to search
  */
-export declare function getSources(settings: CSpellSettingsWST): CSpellSettingsWST[];
+export declare function getSources(settings: CSpellSettingsWSTO): CSpellSettingsWSTO[];
 export interface ImportFileRefWithError extends ImportFileRef {
     error: Error;
 }
@@ -42,7 +44,7 @@ export interface ConfigurationDependencies {
     configFiles: string[];
     dictionaryFiles: string[];
 }
-export declare function extractDependencies(settings: CSpellSettingsWST | CSpellSettingsI): ConfigurationDependencies;
+export declare function extractDependencies(settings: CSpellSettingsWSTO | CSpellSettingsI): ConfigurationDependencies;
 export declare const __testing__: {
     mergeObjects: typeof mergeObjects;
 };

package/dist/Settings/CSpellSettingsServer.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -186,7 +190,7 @@ function mergeInDocSettings(left, right) {
         ...mergeSettings(left, right),
         includeRegExpList: mergeListUnique(left.includeRegExpList, right.includeRegExpList),
     };
-    return merged;
+    return util.clean(merged);
 }
 exports.mergeInDocSettings = mergeInDocSettings;
 function takeRightOtherwiseLeft(left, right) {

package/dist/Settings/DefaultSettings.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -139,7 +143,12 @@ const getSettings = (function () {
         if (!settings) {
             const jsonSettings = (0, configLoader_1.readSettings)(defaultConfigFile);
             settings = (0, index_1.mergeSettings)(exports._defaultSettings, jsonSettings);
-            settings.name = jsonSettings.name;
+            if (jsonSettings.name !== undefined) {
+                settings.name = jsonSettings.name;
+            }
+            else {
+                delete settings.name;
+            }
         }
         return settings;
     };

package/dist/Settings/DictionarySettings.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24,6 +28,7 @@ const path = __importStar(require("path"));
 const resolveFile_1 = require("../util/resolveFile");
 const DictionaryReferenceCollection_1 = require("./DictionaryReferenceCollection");
 const cspell_trie_lib_1 = require("cspell-trie-lib");
+const util_1 = require("../util/util");
 /**
  * Combines the list of desired dictionaries with the list of dictionary
  * definitions. Order does not matter, but the number of leading `!` does.
@@ -114,17 +119,10 @@ class _DictionaryDefinitionInternalWithSource {
             scope,
             useCompounds,
         };
+        Object.assign(this, (0, util_1.clean)(ddi));
         this.name = ddi.name;
         this.file = ddi.file;
         this.path = ddi.path;
-        this.addWords = ddi.addWords;
-        this.description = ddi.description;
-        this.dictionaryInformation = ddi.dictionaryInformation;
-        this.type = ddi.type;
-        this.repMap = ddi.repMap;
-        this.noSuggest = ddi.noSuggest;
-        this.scope = ddi.scope;
-        this.useCompounds = ddi.useCompounds;
         this._weightMap = this.dictionaryInformation
             ? (0, cspell_trie_lib_1.mapDictionaryInformationToWeightMap)(this.dictionaryInformation)
             : undefined;

package/dist/Settings/ImportError.d.ts

@@ -1,5 +1,5 @@
 export declare class ImportError extends Error {
-    readonly cause?: Error;
+    readonly cause: Error | undefined;
     constructor(msg: string, cause?: Error | unknown);
 }
 //# sourceMappingURL=ImportError.d.ts.map

package/dist/Settings/InDocSettings.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.internal = exports.getIgnoreRegExpFromDocument = exports.getIgnoreWordsFromDocument = exports.getInDocumentSettings = void 0;
 const gensequence_1 = require("gensequence");
 const Text = __importStar(require("../util/text"));
+const util_1 = require("../util/util");
 const CSpellSettingsServer_1 = require("./CSpellSettingsServer");
 // cspell:ignore gimuy
 const regExMatchRegEx = /\/.*\/[gimuy]*/;
@@ -77,7 +82,7 @@ function parseLocale(match) {
 }
 function parseIgnoreWords(match) {
     const wordsSetting = parseWords(match);
-    return { id: 'in-doc-ignore', ignoreWords: wordsSetting.words };
+    return (0, util_1.clean)({ id: 'in-doc-ignore', ignoreWords: wordsSetting.words });
 }
 function parseRegEx(match) {
     const patterns = [match.replace(/^[^\s]+\s+/, '')].map((a) => {

package/dist/Settings/LanguageSettings.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/Settings/TextDocumentSettings.d.ts

@@ -1,4 +1,5 @@
 import type { CSpellSettings, CSpellUserSettings } from '@cspell/cspell-types';
-export declare function combineTextAndLanguageSettings(settings: CSpellUserSettings, text: string, languageId: string | string[]): CSpellUserSettings;
+import { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
+export declare function combineTextAndLanguageSettings(settings: CSpellUserSettings, text: string, languageId: string | string[]): CSpellSettingsInternal;
 export declare function extractSettingsFromText(text: string): CSpellSettings;
 //# sourceMappingURL=TextDocumentSettings.d.ts.map

package/dist/Settings/TextDocumentSettings.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/Settings/configLoader.d.ts

@@ -1,9 +1,11 @@
-import type { CSpellSettingsWithSourceTrace, CSpellUserSettings, ImportFileRef, PnPSettings } from '@cspell/cspell-types';
+import type { CSpellSettingsWithSourceTrace, CSpellUserSettings, ImportFileRef, PnPSettings as PnPSettingsStrict } from '@cspell/cspell-types';
 import { URI } from 'vscode-uri';
 import { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
+import { OptionalOrUndefined } from '../util/types';
 import { LoaderResult } from './pnpLoader';
 declare type CSpellSettingsWST = CSpellSettingsWithSourceTrace;
 declare type CSpellSettingsI = CSpellSettingsInternal;
+declare type PnPSettings = OptionalOrUndefined<PnPSettingsStrict>;
 export declare const sectionCSpell = "cSpell";
 export declare const defaultFileName = "cspell.json";
 export declare const defaultConfigFilenames: readonly string[];
@@ -18,6 +20,7 @@ export declare function readSettings(filename: string, defaultValues: CSpellSett
 export declare function readSettings(filename: string, relativeTo: string): CSpellSettingsI;
 export declare function readSettings(filename: string, relativeTo: string, defaultValues: CSpellSettingsWST): CSpellSettingsI;
 export declare function searchForConfig(searchFrom: string | undefined, pnpSettings?: PnPSettings): Promise<CSpellSettingsI | undefined>;
+export declare function searchForConfigSync(searchFrom: string | undefined, pnpSettings?: PnPSettings): CSpellSettingsI | undefined;
 /**
  * Load a CSpell configuration files.
  * @param file - path or package reference to load.
@@ -25,6 +28,13 @@ export declare function searchForConfig(searchFrom: string | undefined, pnpSetti
  * @returns normalized CSpellSettings
  */
 export declare function loadConfig(file: string, pnpSettings?: PnPSettings): Promise<CSpellSettingsI>;
+/**
+ * Load a CSpell configuration files.
+ * @param filename - path or package reference to load.
+ * @param pnpSettings - PnP settings
+ * @returns normalized CSpellSettings
+ */
+export declare function loadConfigSync(filename: string, pnpSettings?: PnPSettings): CSpellSettingsI;
 export declare function loadPnP(pnpSettings: PnPSettings, searchFrom: URI): Promise<LoaderResult>;
 export declare function loadPnPSync(pnpSettings: PnPSettings, searchFrom: URI): LoaderResult;
 export declare function readRawSettings(filename: string, relativeTo?: string): CSpellSettingsWST;

package/dist/Settings/configLoader.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testing__ = exports.extractImportErrors = exports.clearCachedSettingsFiles = exports.getCachedFileSize = exports.getGlobalSettings = exports.readSettingsFiles = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfig = exports.searchForConfig = exports.readSettings = exports.defaultConfigFilenames = exports.defaultFileName = exports.sectionCSpell = void 0;
+exports.__testing__ = exports.extractImportErrors = exports.clearCachedSettingsFiles = exports.getCachedFileSize = exports.getGlobalSettings = exports.readSettingsFiles = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfigSync = exports.loadConfig = exports.searchForConfigSync = exports.searchForConfig = exports.readSettings = exports.defaultConfigFilenames = exports.defaultFileName = exports.sectionCSpell = void 0;
 const json = __importStar(require("comment-json"));
 const cosmiconfig_1 = require("cosmiconfig");
 const path = __importStar(require("path"));
@@ -215,16 +219,20 @@ function readSettings(filename, relativeToOrDefault, defaultValue) {
     return importSettings(ref, defaultValue, defaultValue || defaultPnPSettings);
 }
 exports.readSettings = readSettings;
-async function normalizeSearchForConfigResult(searchPath, searchResult, pnpSettings) {
-    var _a;
+async function normalizeSearchForConfigResultAsync(searchPath, searchResult, pnpSettings) {
     let result;
-    let error;
     try {
         result = (await searchResult) || undefined;
     }
     catch (cause) {
-        error = new ImportError_1.ImportError(`Failed to find config file at: "${searchPath}"`, cause);
+        result = new ImportError_1.ImportError(`Failed to find config file at: "${searchPath}"`, cause);
     }
+    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;
     if (filepath) {
         const cached = cachedFiles.get(filepath);
@@ -252,9 +260,20 @@ async function normalizeSearchForConfigResult(searchPath, searchResult, pnpSetti
     };
 }
 function searchForConfig(searchFrom, pnpSettings = defaultPnPSettings) {
-    return normalizeSearchForConfigResult(searchFrom || process.cwd(), cspellConfigExplorer.search(searchFrom), pnpSettings).then((r) => (r.filepath ? r.config : undefined));
+    return normalizeSearchForConfigResultAsync(searchFrom || process.cwd(), cspellConfigExplorer.search(searchFrom), pnpSettings).then((r) => (r.filepath ? r.config : undefined));
 }
 exports.searchForConfig = searchForConfig;
+function searchForConfigSync(searchFrom, pnpSettings = defaultPnPSettings) {
+    let searchResult;
+    try {
+        searchResult = cspellConfigExplorerSync.search(searchFrom) || undefined;
+    }
+    catch (err) {
+        searchResult = new ImportError_1.ImportError(`Failed to find config file from: "${searchFrom}"`, err);
+    }
+    return normalizeSearchForConfigResult(searchFrom || process.cwd(), searchResult, pnpSettings).config;
+}
+exports.searchForConfigSync = searchForConfigSync;
 /**
  * Load a CSpell configuration files.
  * @param file - path or package reference to load.
@@ -266,9 +285,30 @@ function loadConfig(file, pnpSettings = defaultPnPSettings) {
     if (cached) {
         return Promise.resolve(cached);
     }
-    return normalizeSearchForConfigResult(file, cspellConfigExplorer.load(file), pnpSettings).then((r) => r.config);
+    return normalizeSearchForConfigResultAsync(file, cspellConfigExplorer.load(file), pnpSettings).then((r) => r.config);
 }
 exports.loadConfig = loadConfig;
+/**
+ * Load a CSpell configuration files.
+ * @param filename - path or package reference to load.
+ * @param pnpSettings - PnP settings
+ * @returns normalized CSpellSettings
+ */
+function loadConfigSync(filename, pnpSettings = defaultPnPSettings) {
+    const cached = cachedFiles.get(path.resolve(filename));
+    if (cached) {
+        return cached;
+    }
+    let searchResult;
+    try {
+        searchResult = cspellConfigExplorerSync.load(filename) || undefined;
+    }
+    catch (err) {
+        searchResult = new ImportError_1.ImportError(`Failed to find config file at: "${filename}"`, err);
+    }
+    return normalizeSearchForConfigResult(filename, searchResult, pnpSettings).config;
+}
+exports.loadConfigSync = loadConfigSync;
 function loadPnP(pnpSettings, searchFrom) {
     if (!pnpSettings.usePnP) {
         return Promise.resolve(undefined);
@@ -379,10 +419,11 @@ function toGlobDef(g, root, source) {
         return g.map((g) => toGlobDef(g, root, source));
     }
     if (typeof g === 'string') {
-        return toGlobDef({
-            glob: g,
-            root,
-        }, root, source);
+        const glob = { glob: g };
+        if (root !== undefined) {
+            glob.root = root;
+        }
+        return toGlobDef(glob, root, source);
     }
     if (source) {
         return { ...g, source };
@@ -446,7 +487,7 @@ function normalizeLanguageSettings(languageSettings) {
         return undefined;
     function fixLocale(s) {
         const { local: locale, ...rest } = s;
-        return { locale, ...rest };
+        return util.clean({ locale, ...rest });
     }
     return languageSettings.map(fixLocale);
 }