cspell-lib 6.18.1 → 6.19.0

package/dist/Document/Document.d.ts

@@ -0,0 +1,11 @@
+export interface Document {
+    uri: UriString;
+    text?: string;
+    languageId?: string;
+    locale?: string;
+}
+export type UriString = string;
+export interface DocumentWithText extends Document {
+    text: string;
+}
+//# sourceMappingURL=Document.d.ts.map

package/dist/Document/Document.js

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

package/dist/Document/index.d.ts

@@ -0,0 +1,4 @@
+export type { Document, DocumentWithText, UriString } from './Document';
+export { isBinaryFile } from './isBinaryDoc';
+export { fileToDocument, fileToTextDocument } from './resolveDocument';
+//# sourceMappingURL=index.d.ts.map

package/dist/Document/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fileToTextDocument = exports.fileToDocument = exports.isBinaryFile = void 0;
+var isBinaryDoc_1 = require("./isBinaryDoc");
+Object.defineProperty(exports, "isBinaryFile", { enumerable: true, get: function () { return isBinaryDoc_1.isBinaryFile; } });
+var resolveDocument_1 = require("./resolveDocument");
+Object.defineProperty(exports, "fileToDocument", { enumerable: true, get: function () { return resolveDocument_1.fileToDocument; } });
+Object.defineProperty(exports, "fileToTextDocument", { enumerable: true, get: function () { return resolveDocument_1.fileToTextDocument; } });
+//# sourceMappingURL=index.js.map

package/dist/Document/isBinaryDoc.d.ts

@@ -0,0 +1,5 @@
+import { URI } from 'vscode-uri';
+import type { Document } from './Document';
+export declare function isBinaryDoc(document: Document): boolean;
+export declare function isBinaryFile(filenameUri: URI, languageId?: string | string[]): boolean;
+//# sourceMappingURL=isBinaryDoc.d.ts.map

package/dist/Document/isBinaryDoc.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBinaryFile = exports.isBinaryDoc = void 0;
+const vscode_uri_1 = require("vscode-uri");
+const LanguageIds_1 = require("../LanguageIds");
+const normalizeLanguageIds_1 = require("./normalizeLanguageIds");
+function isBinaryDoc(document) {
+    return isBinaryFile(vscode_uri_1.URI.parse(document.uri), document.languageId);
+}
+exports.isBinaryDoc = isBinaryDoc;
+function isBinaryFile(filenameUri, languageId) {
+    if (languageId) {
+        const ids = (0, normalizeLanguageIds_1.normalizeLanguageIds)(languageId);
+        if (ids.length)
+            return (0, LanguageIds_1.isGenerated)(ids);
+    }
+    const filename = vscode_uri_1.Utils.basename(filenameUri);
+    return (0, LanguageIds_1.isGeneratedFile)(filename);
+}
+exports.isBinaryFile = isBinaryFile;
+//# sourceMappingURL=isBinaryDoc.js.map

package/dist/Document/normalizeLanguageIds.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeLanguageIds(languageId: string | string[]): string[];
+//# sourceMappingURL=normalizeLanguageIds.d.ts.map

package/dist/Document/normalizeLanguageIds.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeLanguageIds = void 0;
+function normalizeLanguageIds(languageId) {
+    return (Array.isArray(languageId) ? languageId.join(',') : languageId).split(',').map((s) => s.trim());
+}
+exports.normalizeLanguageIds = normalizeLanguageIds;
+//# sourceMappingURL=normalizeLanguageIds.js.map

package/dist/Document/resolveDocument.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+import type { TextDocument } from '../Models/TextDocument';
+import type { Document, DocumentWithText } from './Document';
+export declare function fileToDocument(file: string): Document;
+export declare function fileToDocument(file: string, text: string, languageId?: string, locale?: string): DocumentWithText;
+export declare function fileToDocument(file: string, text?: string, languageId?: string, locale?: string): Document | DocumentWithText;
+export declare function fileToTextDocument(file: string): Promise<TextDocument>;
+export declare function documentToTextDocument(document: DocumentWithText): TextDocument;
+export declare function resolveDocumentToTextDocument(doc: Document): Promise<TextDocument>;
+export declare function resolveDocument(document: DocumentWithText | Document, encoding?: BufferEncoding): Promise<DocumentWithText>;
+//# sourceMappingURL=resolveDocument.d.ts.map

package/dist/Document/resolveDocument.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDocument = exports.resolveDocumentToTextDocument = exports.documentToTextDocument = exports.fileToTextDocument = exports.fileToDocument = void 0;
+const promises_1 = require("fs/promises");
+const vscode_uri_1 = require("vscode-uri");
+const TextDocument_1 = require("../Models/TextDocument");
+const util_1 = require("../util/util");
+const defaultEncoding = 'utf8';
+function fileToDocument(file, text, languageId, locale) {
+    return (0, util_1.clean)({
+        uri: vscode_uri_1.URI.file(file).toString(),
+        text,
+        languageId,
+        locale,
+    });
+}
+exports.fileToDocument = fileToDocument;
+async function fileToTextDocument(file) {
+    return documentToTextDocument(await resolveDocument(fileToDocument(file)));
+}
+exports.fileToTextDocument = fileToTextDocument;
+function documentToTextDocument(document) {
+    const { uri, text: content, languageId, locale } = document;
+    return (0, TextDocument_1.createTextDocument)({ uri, content, languageId, locale });
+}
+exports.documentToTextDocument = documentToTextDocument;
+async function resolveDocumentToTextDocument(doc) {
+    return documentToTextDocument(await resolveDocument(doc));
+}
+exports.resolveDocumentToTextDocument = resolveDocumentToTextDocument;
+async function readDocument(filename, encoding = defaultEncoding) {
+    const text = await (0, promises_1.readFile)(filename, encoding);
+    const uri = vscode_uri_1.URI.file(filename).toString();
+    return {
+        uri,
+        text,
+    };
+}
+function resolveDocument(document, encoding) {
+    if (isDocumentWithText(document))
+        return Promise.resolve(document);
+    const uri = vscode_uri_1.URI.parse(document.uri);
+    if (uri.scheme !== 'file') {
+        throw new Error(`Unsupported schema: "${uri.scheme}", open "${uri.toString()}"`);
+    }
+    return readDocument(uri.fsPath, encoding);
+}
+exports.resolveDocument = resolveDocument;
+function isDocumentWithText(doc) {
+    return doc.text !== undefined;
+}
+//# sourceMappingURL=resolveDocument.js.map

package/dist/LanguageIds.d.ts

@@ -11,6 +11,10 @@ export interface LanguageExtensionDefinition {
     extensions: string[];
     /** Filenames that do not have an extension or have a different type than their implied extension */
     filenames?: string[];
+    /** Indicates that it is a Text or Binary file type. */
+    format?: 'Text' | 'Binary';
+    /** Optional Description */
+    description?: string;
 }
 export type LanguageDefinition = LanguageExtensionDefinition;
 export type LanguageDefinitions = LanguageDefinition[];

package/dist/LanguageIds.js

@@ -37,7 +37,7 @@ exports.languageExtensionDefinitions = [
         id: 'html',
         extensions: ['.html', '.htm', '.shtml', '.xhtml', '.mdoc', '.jsp', '.asp', '.aspx', '.jshtm', '.volt', '.vue'],
     },
-    { id: 'ini', extensions: ['.ini'] },
+    { id: 'ini', extensions: ['.ini', '.conf'] },
     { id: 'properties', extensions: ['.properties', '.gitconfig', '.cfg', '.conf'] },
     { id: 'jade', extensions: ['.jade', '.pug'] },
     { id: 'java', extensions: ['.java', '.jav'] },
@@ -70,7 +70,7 @@ exports.languageExtensionDefinitions = [
     { id: 'ruby', extensions: ['.rb', '.rbx', '.rjs', '.gemspec', '.rake', '.ru'] },
     { id: 'ruby', extensions: [], filenames: ['Gemfile'] },
     { id: 'rust', extensions: ['.rs'] },
-    { id: 'scala', extensions: ['.scala', '.sc'] },
+    { id: 'scala', extensions: ['.scala', '.sc', '.sbt'] },
     { id: 'scss', extensions: ['.scss'] },
     { id: 'shaderlab', extensions: ['.shader', '.cginc'] },
     {
@@ -165,6 +165,7 @@ exports.languageExtensionDefinitions = [
             '.xul',
         ],
     },
+    { id: 'wheel', extensions: ['.whl'], format: 'Binary' },
     { id: 'xsl', extensions: ['.xsl', '.xslt'] },
     { id: 'yaml', extensions: ['.eyaml', '.eyml', '.yaml', '.yml'] },
     { id: 'latex', extensions: ['.tex'] },
@@ -178,20 +179,41 @@ exports.languageExtensionDefinitions = [
     //
     {
         id: 'image',
-        extensions: ['.jpg', '.png', '.jpeg', '.tiff', '.bmp', '.gif', '.ico'],
+        extensions: [
+            '.bmp',
+            '.exr',
+            '.gif',
+            '.ico',
+            '.jpeg',
+            '.jpg',
+            '.pbm',
+            '.pgm',
+            '.png',
+            '.ppm',
+            '.ras',
+            '.sgi',
+            '.tiff',
+            '.webp',
+            '.xbm',
+        ],
+        format: 'Binary',
+        description: 'Some image extensions',
     },
     // cspell:ignore woff
     {
         id: 'binary',
         extensions: ['.gz', '.exe', '.dll', '.lib', '.obj', '.o', '.eot', '.cur', '.zip'],
+        format: 'Binary',
     },
     {
         id: 'fonts',
         extensions: ['.ttf', '.woff', '.woff2'],
+        format: 'Binary',
     },
     {
         id: 'video',
         extensions: ['.mov', '.mpg'],
+        format: 'Binary',
     },
     {
         id: 'lock',
@@ -204,8 +226,15 @@ exports.languageExtensionDefinitions = [
         // cspell:ignore eslintcache
         filenames: ['.cspellcache', '.DS_Store', '.eslintcache'],
     },
+    { id: 'dll', extensions: ['.dll'], format: 'Binary' },
+    { id: 'exe', extensions: ['.exe'], format: 'Binary' },
+    { id: 'object-file', extensions: ['.o', '.obj'], format: 'Binary' },
+    { id: 'jar', extensions: ['.jar'], format: 'Binary' },
+    { id: 'spv', extensions: ['.spv'], format: 'Binary', description: 'SPSS Output Document' },
+    { id: 'mdb', extensions: ['.mdb'], format: 'Binary', description: 'Microsoft Access DB' },
 ];
-exports.binaryLanguages = new Set(['binary', 'image', 'video', 'fonts']);
+const binaryFormatIds = exports.languageExtensionDefinitions.filter((d) => d.format === 'Binary').map((d) => d.id);
+exports.binaryLanguages = new Set(['binary', 'image', 'video', 'fonts'].concat(binaryFormatIds));
 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);

package/dist/Models/CSpellSettingsInternalDef.d.ts

@@ -1,6 +1,6 @@
-import { AdvancedCSpellSettingsWithSourceTrace, CSpellSettingsWithSourceTrace, DictionaryDefinitionAugmented, DictionaryDefinitionCustom, DictionaryDefinitionPreferred, Parser } from '@cspell/cspell-types';
-import { WeightMap } from 'cspell-trie-lib';
-import { OptionalOrUndefined } from '../util/types';
+import type { AdvancedCSpellSettingsWithSourceTrace, CSpellSettingsWithSourceTrace, DictionaryDefinitionAugmented, DictionaryDefinitionCustom, DictionaryDefinitionPreferred, Parser } from '@cspell/cspell-types';
+import type { WeightMap } from 'cspell-trie-lib';
+import type { OptionalOrUndefined } from '../util/types';
 export declare const SymbolCSpellSettingsInternal: unique symbol;
 export interface CSpellSettingsInternal extends Omit<AdvancedCSpellSettingsWithSourceTrace, 'dictionaryDefinitions'> {
     [SymbolCSpellSettingsInternal]: true;

package/dist/Models/TextDocument.js

@@ -27,11 +27,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTextDocument = exports.loadTextDocument = exports.updateTextDocument = exports.createTextDocument = void 0;
-const LanguageIds_1 = require("../LanguageIds");
-const Uri = __importStar(require("./Uri"));
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const LanguageIds_1 = require("../LanguageIds");
+const Uri = __importStar(require("./Uri"));
 class TextDocumentImpl {
     constructor(uri, text, languageId, locale, version) {
         this.uri = uri;

package/dist/Models/Uri.d.ts

@@ -1,4 +1,4 @@
-import { Utils, URI as Uri } from 'vscode-uri';
+import { URI as Uri, Utils } 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;

package/dist/Models/ValidationResult.d.ts

@@ -1,4 +1,4 @@
-import { TextOffset as TextOffsetRW, Issue } from '@cspell/cspell-types';
+import type { Issue, TextOffset as TextOffsetRW } from '@cspell/cspell-types';
 export interface ValidationResult extends TextOffsetRW, Pick<Issue, 'message' | 'issueType'> {
     line: TextOffsetRW;
     isFlagged?: boolean | undefined;

package/dist/Settings/CSpellSettingsServer.d.ts

@@ -1,6 +1,6 @@
 import type { AdvancedCSpellSettingsWithSourceTrace, Glob, ImportFileRef } from '@cspell/cspell-types';
-import { CSpellSettingsInternal, CSpellSettingsInternalFinalized } from '../Models/CSpellSettingsInternalDef';
-import { OptionalOrUndefined } from '../util/types';
+import type { CSpellSettingsInternal, CSpellSettingsInternalFinalized } from '../Models/CSpellSettingsInternalDef';
+import type { OptionalOrUndefined } from '../util/types';
 type CSpellSettingsWST = AdvancedCSpellSettingsWithSourceTrace;
 type CSpellSettingsWSTO = OptionalOrUndefined<AdvancedCSpellSettingsWithSourceTrace>;
 type CSpellSettingsI = CSpellSettingsInternal;

package/dist/Settings/Controller/SettingsController.d.ts

@@ -1,4 +1,4 @@
-import { CSpellIO } from 'cspell-io';
+import type { CSpellIO } from 'cspell-io';
 /**
  * The settings controller manages requests to resolve configuration settings and files.
  */

package/dist/Settings/Controller/configLoader/configLoader.d.ts

@@ -1,12 +1,10 @@
-import type { CSpellSettingsWithSourceTrace, CSpellUserSettings, ImportFileRef, PnPSettings as PnPSettingsStrict } from '@cspell/cspell-types';
-import { CSpellIO } from 'cspell-io';
+import type { CSpellUserSettings, ImportFileRef, PnPSettings as PnPSettingsStrict } from '@cspell/cspell-types';
+import type { CSpellIO } from 'cspell-io';
 import { URI } from 'vscode-uri';
-import { CSpellSettingsInternal } from '../../../Models/CSpellSettingsInternalDef';
-import { OptionalOrUndefined } from '../../../util/types';
-import { LoaderResult } from '../pnpLoader';
+import type { OptionalOrUndefined } from '../../../util/types';
+import type { LoaderResult } from '../pnpLoader';
 import { normalizeCacheSettings } from './normalizeRawSettings';
-export type CSpellSettingsWST = CSpellSettingsWithSourceTrace;
-export type CSpellSettingsI = CSpellSettingsInternal;
+import type { CSpellSettingsI, CSpellSettingsWST } from './types';
 type PnPSettings = OptionalOrUndefined<PnPSettingsStrict>;
 export declare const sectionCSpell = "cSpell";
 export declare const defaultFileName = "cspell.json";
@@ -18,7 +16,7 @@ export declare class ConfigLoader {
      * @param cspellIO - CSpellIO interface for reading files.
      */
     protected constructor(cspellIO: CSpellIO);
-    protected cachedFiles: Map<string, CSpellSettingsInternal>;
+    protected cachedFiles: Map<string, import("../../../Models/CSpellSettingsInternalDef").CSpellSettingsInternal>;
     protected cspellConfigExplorer: {
         readonly search: (searchFrom?: string | undefined) => Promise<import("cosmiconfig/dist/types").CosmiconfigResult>;
         readonly load: (filepath: string) => Promise<import("cosmiconfig/dist/types").CosmiconfigResult>;
@@ -73,7 +71,7 @@ export declare class ConfigLoader {
 }
 declare class ConfigLoaderInternal extends ConfigLoader {
     constructor(cspellIO: CSpellIO);
-    get _cachedFiles(): Map<string, CSpellSettingsInternal>;
+    get _cachedFiles(): Map<string, import("../../../Models/CSpellSettingsInternalDef").CSpellSettingsInternal>;
     get _cspellConfigExplorer(): {
         readonly search: (searchFrom?: string | undefined) => Promise<import("cosmiconfig/dist/types").CosmiconfigResult>;
         readonly load: (filepath: string) => Promise<import("cosmiconfig/dist/types").CosmiconfigResult>;
@@ -88,8 +86,8 @@ declare class ConfigLoaderInternal extends ConfigLoader {
         readonly clearSearchCache: () => void;
         readonly clearCaches: () => void;
     };
-    readonly _readConfig: (fileRef: ImportFileRef) => CSpellSettingsWithSourceTrace;
-    readonly _normalizeSettings: (rawSettings: CSpellSettingsWithSourceTrace, pathToSettingsFile: string, pnpSettings: OptionalOrUndefined<PnPSettingsStrict>) => CSpellSettingsInternal;
+    readonly _readConfig: (fileRef: ImportFileRef) => import("@cspell/cspell-types").CSpellSettingsWithSourceTrace;
+    readonly _normalizeSettings: (rawSettings: import("@cspell/cspell-types").CSpellSettingsWithSourceTrace, pathToSettingsFile: string, pnpSettings: OptionalOrUndefined<PnPSettingsStrict>) => import("../../../Models/CSpellSettingsInternalDef").CSpellSettingsInternal;
 }
 export declare function searchForConfig(searchFrom: string | undefined, pnpSettings?: PnPSettings): Promise<CSpellSettingsI | undefined>;
 export declare function searchForConfigSync(searchFrom: string | undefined, pnpSettings?: PnPSettings): CSpellSettingsI | undefined;
@@ -110,13 +108,6 @@ export declare function loadConfigSync(filename: string, pnpSettings?: PnPSettin
 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;
-/**
- *
- * @param filenames - settings files to read
- * @returns combined configuration
- * @deprecated true
- */
-export declare function readSettingsFiles(filenames: string[]): CSpellSettingsI;
 export declare function getGlobalSettings(): CSpellSettingsI;
 export declare function getCachedFileSize(): number;
 export declare function clearCachedSettingsFiles(): void;

package/dist/Settings/Controller/configLoader/configLoader.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testing__ = exports.getDefaultConfigLoader = exports.createConfigLoader = exports.clearCachedSettingsFiles = exports.getCachedFileSize = exports.getGlobalSettings = exports.readSettingsFiles = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfigSync = exports.loadConfig = exports.searchForConfigSync = exports.searchForConfig = exports.ConfigLoader = exports.defaultConfigFilenames = exports.defaultFileName = exports.sectionCSpell = void 0;
+exports.__testing__ = exports.getDefaultConfigLoader = exports.createConfigLoader = exports.clearCachedSettingsFiles = exports.getCachedFileSize = exports.getGlobalSettings = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfigSync = exports.loadConfig = exports.searchForConfigSync = exports.searchForConfig = exports.ConfigLoader = exports.defaultConfigFilenames = exports.defaultFileName = exports.sectionCSpell = void 0;
 const json = __importStar(require("comment-json"));
 const cosmiconfig_1 = require("cosmiconfig");
 const cspell_io_1 = require("cspell-io");
@@ -37,8 +37,8 @@ const CSpellSettingsServer_1 = require("../../CSpellSettingsServer");
 const GlobalSettings_1 = require("../../GlobalSettings");
 const ImportError_1 = require("../ImportError");
 const pnpLoader_1 = require("../pnpLoader");
+const defaultSettings_1 = require("./defaultSettings");
 const normalizeRawSettings_1 = require("./normalizeRawSettings");
-const readSettings_1 = require("./readSettings");
 const supportedCSpellConfigVersions = [constants_1.configSettingsFileVersion0_2];
 const setOfSupportedConfigVersions = Object.freeze(new Set(supportedCSpellConfigVersions));
 exports.sectionCSpell = 'cSpell';
@@ -87,11 +87,6 @@ function parseJson(_filename, content) {
     return json.parse(content);
 }
 exports.defaultConfigFilenames = Object.freeze(searchPlaces.concat());
-const defaultSettings = (0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({
-    id: 'default',
-    name: 'default',
-    version: constants_1.currentSettingsFileVersion,
-});
 const defaultPnPSettings = {};
 let defaultConfigLoader = undefined;
 class ConfigLoader {
@@ -158,7 +153,7 @@ class ConfigLoader {
         return s;
     }
     importSettings(fileRef, defaultValues, pnpSettings) {
-        defaultValues = defaultValues ?? defaultSettings;
+        defaultValues = defaultValues ?? defaultSettings_1.defaultSettings;
         const { filename } = fileRef;
         const importRef = { ...fileRef };
         const cached = this.cachedFiles.get(filename);
@@ -198,7 +193,7 @@ class ConfigLoader {
         loadPnPSync(pnpSettingsToUse, vscode_uri_1.URI.file(pathToSettingsDir));
         // Fix up dictionaryDefinitions
         const settings = {
-            version: defaultSettings.version,
+            version: defaultSettings_1.defaultSettings.version,
             ...rawSettings,
             id,
             name,
@@ -379,16 +374,6 @@ function readRawSettings(filename, relativeTo) {
     return gcl()._readConfig(ref);
 }
 exports.readRawSettings = readRawSettings;
-/**
- *
- * @param filenames - settings files to read
- * @returns combined configuration
- * @deprecated true
- */
-function readSettingsFiles(filenames) {
-    return filenames.map((filename) => (0, readSettings_1.readSettings)(filename)).reduce((a, b) => (0, CSpellSettingsServer_1.mergeSettings)(a, b), defaultSettings);
-}
-exports.readSettingsFiles = readSettingsFiles;
 function resolveFilename(filename, relativeTo) {
     const r = (0, resolveFile_1.resolveFile)(filename, relativeTo);
     return {

package/dist/Settings/Controller/configLoader/defaultSettings.d.ts

@@ -0,0 +1,3 @@
+import type { CSpellSettingsI } from './types';
+export declare const defaultSettings: CSpellSettingsI;
+//# sourceMappingURL=defaultSettings.d.ts.map

package/dist/Settings/Controller/configLoader/defaultSettings.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultSettings = void 0;
+const CSpellSettingsInternalDef_1 = require("../../../Models/CSpellSettingsInternalDef");
+const constants_1 = require("../../constants");
+exports.defaultSettings = (0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({
+    id: 'default',
+    name: 'default',
+    version: constants_1.currentSettingsFileVersion,
+});
+//# sourceMappingURL=defaultSettings.js.map

package/dist/Settings/Controller/configLoader/extractImportErrors.d.ts

@@ -1,5 +1,5 @@
-import { ImportFileRef } from '@cspell/cspell-types';
-import { CSpellSettingsWST } from './configLoader';
+import type { ImportFileRef } from '@cspell/cspell-types';
+import type { CSpellSettingsWST } from './types';
 export declare function extractImportErrors(settings: CSpellSettingsWST): ImportFileRefWithError[];
 export interface ImportFileRefWithError extends ImportFileRef {
     error: Error;

package/dist/Settings/Controller/configLoader/index.d.ts

@@ -1,4 +1,5 @@
-export { clearCachedSettingsFiles, ConfigLoader, createConfigLoader, defaultConfigFilenames, defaultFileName, getCachedFileSize, getGlobalSettings, loadConfig, loadConfigSync, loadPnP, loadPnPSync, readRawSettings, readSettingsFiles, searchForConfig, searchForConfigSync, sectionCSpell, __testing__, } from './configLoader';
+export { __testing__, clearCachedSettingsFiles, ConfigLoader, createConfigLoader, defaultConfigFilenames, defaultFileName, getCachedFileSize, getGlobalSettings, loadConfig, loadConfigSync, loadPnP, loadPnPSync, readRawSettings, searchForConfig, searchForConfigSync, sectionCSpell, } from './configLoader';
 export { extractImportErrors, ImportFileRefWithError } from './extractImportErrors';
 export { readSettings } from './readSettings';
+export { readSettingsFiles } from './readSettingsFiles';
 //# sourceMappingURL=index.d.ts.map

package/dist/Settings/Controller/configLoader/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readSettings = exports.extractImportErrors = exports.__testing__ = exports.sectionCSpell = exports.searchForConfigSync = exports.searchForConfig = exports.readSettingsFiles = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfigSync = exports.loadConfig = exports.getGlobalSettings = exports.getCachedFileSize = exports.defaultFileName = exports.defaultConfigFilenames = exports.createConfigLoader = exports.ConfigLoader = exports.clearCachedSettingsFiles = void 0;
+exports.readSettingsFiles = exports.readSettings = exports.extractImportErrors = exports.sectionCSpell = exports.searchForConfigSync = exports.searchForConfig = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfigSync = exports.loadConfig = exports.getGlobalSettings = exports.getCachedFileSize = exports.defaultFileName = exports.defaultConfigFilenames = exports.createConfigLoader = exports.ConfigLoader = exports.clearCachedSettingsFiles = exports.__testing__ = void 0;
 var configLoader_1 = require("./configLoader");
+Object.defineProperty(exports, "__testing__", { enumerable: true, get: function () { return configLoader_1.__testing__; } });
 Object.defineProperty(exports, "clearCachedSettingsFiles", { enumerable: true, get: function () { return configLoader_1.clearCachedSettingsFiles; } });
 Object.defineProperty(exports, "ConfigLoader", { enumerable: true, get: function () { return configLoader_1.ConfigLoader; } });
 Object.defineProperty(exports, "createConfigLoader", { enumerable: true, get: function () { return configLoader_1.createConfigLoader; } });
@@ -14,13 +15,13 @@ Object.defineProperty(exports, "loadConfigSync", { enumerable: true, get: functi
 Object.defineProperty(exports, "loadPnP", { enumerable: true, get: function () { return configLoader_1.loadPnP; } });
 Object.defineProperty(exports, "loadPnPSync", { enumerable: true, get: function () { return configLoader_1.loadPnPSync; } });
 Object.defineProperty(exports, "readRawSettings", { enumerable: true, get: function () { return configLoader_1.readRawSettings; } });
-Object.defineProperty(exports, "readSettingsFiles", { enumerable: true, get: function () { return configLoader_1.readSettingsFiles; } });
 Object.defineProperty(exports, "searchForConfig", { enumerable: true, get: function () { return configLoader_1.searchForConfig; } });
 Object.defineProperty(exports, "searchForConfigSync", { enumerable: true, get: function () { return configLoader_1.searchForConfigSync; } });
 Object.defineProperty(exports, "sectionCSpell", { enumerable: true, get: function () { return configLoader_1.sectionCSpell; } });
-Object.defineProperty(exports, "__testing__", { enumerable: true, get: function () { return configLoader_1.__testing__; } });
 var extractImportErrors_1 = require("./extractImportErrors");
 Object.defineProperty(exports, "extractImportErrors", { enumerable: true, get: function () { return extractImportErrors_1.extractImportErrors; } });
 var readSettings_1 = require("./readSettings");
 Object.defineProperty(exports, "readSettings", { enumerable: true, get: function () { return readSettings_1.readSettings; } });
+var readSettingsFiles_1 = require("./readSettingsFiles");
+Object.defineProperty(exports, "readSettingsFiles", { enumerable: true, get: function () { return readSettingsFiles_1.readSettingsFiles; } });
 //# sourceMappingURL=index.js.map

package/dist/Settings/Controller/configLoader/normalizeRawSettings.d.ts

@@ -1,5 +1,5 @@
-import { CSpellUserSettings, GlobDef, LanguageSetting } from '@cspell/cspell-types';
-import { OptionalOrUndefined } from '../../../util/types';
+import type { CSpellUserSettings, GlobDef, LanguageSetting } from '@cspell/cspell-types';
+import type { OptionalOrUndefined } from '../../../util/types';
 interface NormalizableFields {
     version?: string | number;
 }

package/dist/Settings/Controller/configLoader/readSettings.d.ts

@@ -1,4 +1,4 @@
-import { CSpellSettingsI, CSpellSettingsWST } from './configLoader';
+import type { CSpellSettingsI, CSpellSettingsWST } from './types';
 /**
  * Read / import a cspell configuration file.
  * @param filename - the path to the file.

package/dist/Settings/Controller/configLoader/readSettingsFiles.d.ts

@@ -0,0 +1,9 @@
+import type { CSpellSettingsI } from './types';
+/**
+ *
+ * @param filenames - settings files to read
+ * @returns combined configuration
+ * @deprecated true
+ */
+export declare function readSettingsFiles(filenames: string[]): CSpellSettingsI;
+//# sourceMappingURL=readSettingsFiles.d.ts.map

package/dist/Settings/Controller/configLoader/readSettingsFiles.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readSettingsFiles = void 0;
+const CSpellSettingsServer_1 = require("../../CSpellSettingsServer");
+const defaultSettings_1 = require("./defaultSettings");
+const readSettings_1 = require("./readSettings");
+/**
+ *
+ * @param filenames - settings files to read
+ * @returns combined configuration
+ * @deprecated true
+ */
+function readSettingsFiles(filenames) {
+    return filenames.map((filename) => (0, readSettings_1.readSettings)(filename)).reduce((a, b) => (0, CSpellSettingsServer_1.mergeSettings)(a, b), defaultSettings_1.defaultSettings);
+}
+exports.readSettingsFiles = readSettingsFiles;
+//# sourceMappingURL=readSettingsFiles.js.map

package/dist/Settings/Controller/configLoader/toGlobDef.d.ts

@@ -1,4 +1,4 @@
-import { Glob, GlobDef } from '@cspell/cspell-types';
+import type { Glob, GlobDef } from '@cspell/cspell-types';
 export declare function toGlobDef(g: undefined, root: string | undefined, source: string | undefined): undefined;
 export declare function toGlobDef(g: Glob, root: string | undefined, source: string | undefined): GlobDef;
 export declare function toGlobDef(g: Glob[], root: string | undefined, source: string | undefined): GlobDef[];

package/dist/Settings/Controller/configLoader/types.d.ts

@@ -0,0 +1,5 @@
+import type { CSpellSettingsWithSourceTrace } from '@cspell/cspell-types';
+import type { CSpellSettingsInternal } from '../../../Models/CSpellSettingsInternalDef';
+export type CSpellSettingsWST = CSpellSettingsWithSourceTrace;
+export type CSpellSettingsI = CSpellSettingsInternal;
+//# sourceMappingURL=types.d.ts.map

package/dist/Settings/Controller/configLoader/types.js

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

package/dist/Settings/Controller/pnpLoader.d.ts

@@ -1,6 +1,3 @@
-/**
- * Handles loading of `.pnp.js` and `.pnp.js` files.
- */
 import { URI } from 'vscode-uri';
 export type LoaderResult = URI | undefined;
 export declare class PnpLoader {

package/dist/Settings/Controller/pnpLoader.js

@@ -7,10 +7,10 @@ exports.clearPnPGlobalCache = exports.pnpLoader = exports.PnpLoader = void 0;
 /**
  * Handles loading of `.pnp.js` and `.pnp.js` files.
  */
-const vscode_uri_1 = require("vscode-uri");
-const import_fresh_1 = __importDefault(require("import-fresh"));
-const find_up_1 = __importDefault(require("find-up"));
 const clear_module_1 = __importDefault(require("clear-module"));
+const find_up_1 = __importDefault(require("find-up"));
+const import_fresh_1 = __importDefault(require("import-fresh"));
+const vscode_uri_1 = require("vscode-uri");
 const ImportError_1 = require("./ImportError");
 const defaultPnpFiles = ['.pnp.cjs', '.pnp.js'];
 const supportedSchemas = new Set(['file']);

package/dist/Settings/DefaultSettings.d.ts

@@ -1,4 +1,4 @@
-import { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
+import type { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
 export declare const _defaultSettingsBasis: Readonly<CSpellSettingsInternal>;
 export declare const _defaultSettings: Readonly<CSpellSettingsInternal>;
 export declare function getDefaultSettings(useDefaultDictionaries?: boolean): CSpellSettingsInternal;

package/dist/Settings/DefaultSettings.js

@@ -29,7 +29,7 @@ const CSpellSettingsInternalDef_1 = require("../Models/CSpellSettingsInternalDef
 const PatternRegExp_1 = require("../Models/PatternRegExp");
 const resolveFile_1 = require("../util/resolveFile");
 const configLoader_1 = require("./Controller/configLoader");
-const index_1 = require("./index");
+const CSpellSettingsServer_1 = require("./CSpellSettingsServer");
 const LanguageSettings = __importStar(require("./LanguageSettings"));
 const RegPat = __importStar(require("./RegExpPatterns"));
 const defaultConfigFileModuleRef = '@cspell/cspell-bundled-dicts/cspell-default.json';
@@ -154,7 +154,7 @@ const getSettings = (function () {
         }
         if (!settings) {
             const jsonSettings = (0, configLoader_1.readSettings)(defaultConfigFile);
-            settings = (0, index_1.mergeSettings)(exports._defaultSettings, jsonSettings);
+            settings = (0, CSpellSettingsServer_1.mergeSettings)(exports._defaultSettings, jsonSettings);
             if (jsonSettings.name !== undefined) {
                 settings.name = jsonSettings.name;
             }

package/dist/Settings/DictionarySettings.d.ts

@@ -1,6 +1,6 @@
 import type { DictionaryDefinition } from '@cspell/cspell-types';
-import { CSpellSettingsInternal, DictionaryDefinitionInternal, DictionaryDefinitionInternalWithSource } from '../Models/CSpellSettingsInternalDef';
-import { DictionaryReferenceCollection } from './DictionaryReferenceCollection';
+import type { CSpellSettingsInternal, DictionaryDefinitionInternal, DictionaryDefinitionInternalWithSource } from '../Models/CSpellSettingsInternalDef';
+import type { DictionaryReferenceCollection } from './DictionaryReferenceCollection';
 export type DefMapArrayItem = [string, DictionaryDefinitionInternal];
 /**
  * Combines the list of desired dictionaries with the list of dictionary