cspell-lib 9.4.0 → 9.6.1

package/README.md

@@ -6,13 +6,13 @@
 
 <!--- @@inject: ../../static/sponsor.md --->
 
-- [![GitHub Sponsors](https://img.shields.io/badge/-black?style=social&logo=githubsponsors&label=GitHub%20Sponsor%3A%20Street%20Side%20Software)](https://github.com/sponsors/streetsidesoftware)
-- [![PayPal](https://img.shields.io/badge/-black?style=social&logo=paypal&label=PayPal%20Donate%3A%20Street%20Side%20Software)](https://www.paypal.com/donate/?hosted_button_id=26LNBP2Q6MKCY)
-- [![Open Collective](https://img.shields.io/badge/-black?style=social&logo=opencollective&label=Open%20Collective%3A%20CSpell)](https://opencollective.com/cspell)
+[![GitHub Sponsors](https://img.shields.io/badge/-Street_Side_Software-black?style=for-the-badge&logo=githubsponsors&label=GitHub%20Sponsor%3A)](https://github.com/sponsors/streetsidesoftware)
 
-<!---
-- [![Patreon](https://img.shields.io/badge/-black?style=social&logo=patreon&label=Patreon%3A%20Street%20Side%20Software)](https://patreon.com/streetsidesoftware)
-  --->
+[![Open Collective](https://img.shields.io/badge/-CSpell-black?style=for-the-badge&logo=opencollective&label=Open%20Collective%3A)](https://opencollective.com/cspell)
+
+[![Street Side Software](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fstreetsidesoftware%2Fcspell%2Frefs%2Fheads%2Fmain%2Fstatic%2Fcspell-badge.json)](https://streetsidesoftware.com/sponsor/)
+
+[![PayPal](https://img.shields.io/badge/-Street_Side_Software-black?style=for-the-badge&logo=paypal&label=PayPal%20Donate%3A)](https://www.paypal.com/donate/?hosted_button_id=26LNBP2Q6MKCY)
 
 <!--- @@inject-end: ../../static/sponsor.md --->
 

package/dist/cspell-rpc/api.d.ts

@@ -0,0 +1,28 @@
+import type { spellCheckDocumentRPC } from './spellCheckFile.js';
+export interface CSpellRPCApi {
+    spellCheckDocument: typeof spellCheckDocumentRPC;
+    /**
+     * Sleeps for the given number of milliseconds.
+     *
+     * **Note:** This is primarily for testing purposes.
+     *
+     * @param ms - The number of milliseconds to sleep.
+     * @returns A promise that resolves with the number of milliseconds slept.
+     */
+    sleep: (ms: number) => Promise<number>;
+    /**
+     * Returns the given message.
+     *
+     * **Note:** This is primarily for testing purposes.
+     *
+     * @param msg - The message to echo.
+     * @returns A promise that resolves with the given message.
+     */
+    echo: (msg: string) => Promise<string>;
+}
+export type CSpellRPCApiMethodNames = keyof CSpellRPCApi;
+export type CSpellRPCApiEndpointNames = {
+    [K in CSpellRPCApiMethodNames]: K;
+};
+export declare const CSPELL_RPC_API_ENDPOINTS: CSpellRPCApiEndpointNames;
+//# sourceMappingURL=api.d.ts.map

package/dist/cspell-rpc/api.js

@@ -0,0 +1,6 @@
+export const CSPELL_RPC_API_ENDPOINTS = {
+    spellCheckDocument: 'spellCheckDocument',
+    sleep: 'sleep',
+    echo: 'echo',
+};
+//# sourceMappingURL=api.js.map

package/dist/cspell-rpc/client.d.ts

@@ -0,0 +1,17 @@
+import type { RPCClientConfiguration, RPCClientOptions, RPCProtocol } from '../rpc/index.js';
+import { RPCClient } from '../rpc/index.js';
+import type { CSpellRPCApi } from './api.js';
+export type { MessagePortLike } from '../rpc/index.js';
+export type CSpellRPCClientOptions = RPCClientOptions;
+export type CSpellRPCClientConfig = RPCClientConfiguration;
+export declare class CSpellRPCClient extends RPCClient<CSpellRPCApi> {
+    constructor(config: CSpellRPCClientConfig);
+    getApi(): RPCProtocol<CSpellRPCApi>;
+}
+/**
+ * Create a CSpell RPC Client.
+ * @param config - Client configuration
+ * @returns CSpellRPCClient
+ */
+export declare function createCSpellRPCClient(config: CSpellRPCClientConfig): CSpellRPCClient;
+//# sourceMappingURL=client.d.ts.map

package/dist/cspell-rpc/client.js

@@ -0,0 +1,20 @@
+import { randomUUID } from 'node:crypto';
+import { RPCClient } from '../rpc/index.js';
+import { CSPELL_RPC_API_ENDPOINTS } from './api.js';
+export class CSpellRPCClient extends RPCClient {
+    constructor(config) {
+        super({ randomUUID, ...config });
+    }
+    getApi() {
+        return super.getApi(Object.keys(CSPELL_RPC_API_ENDPOINTS));
+    }
+}
+/**
+ * Create a CSpell RPC Client.
+ * @param config - Client configuration
+ * @returns CSpellRPCClient
+ */
+export function createCSpellRPCClient(config) {
+    return new CSpellRPCClient(config);
+}
+//# sourceMappingURL=client.js.map

package/dist/cspell-rpc/index.d.ts

@@ -0,0 +1,7 @@
+export type { CSpellRPCApi } from './api.js';
+export { CSPELL_RPC_API_ENDPOINTS } from './api.js';
+export type { CSpellRPCClientOptions } from './client.js';
+export { createCSpellRPCClient, CSpellRPCClient } from './client.js';
+export type { CSpellRPCServerOptions, MessagePortLike } from './server.js';
+export { createCSpellRPCServer, CSpellRPCServer } from './server.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/cspell-rpc/index.js

@@ -0,0 +1,4 @@
+export { CSPELL_RPC_API_ENDPOINTS } from './api.js';
+export { createCSpellRPCClient, CSpellRPCClient } from './client.js';
+export { createCSpellRPCServer, CSpellRPCServer } from './server.js';
+//# sourceMappingURL=index.js.map

package/dist/cspell-rpc/server.d.ts

@@ -0,0 +1,16 @@
+import type { RPCServerConfiguration, RPCServerOptions } from '../rpc/index.js';
+import { RPCServer } from '../rpc/index.js';
+import type { CSpellRPCApi } from './api.js';
+export type { MessagePortLike } from '../rpc/index.js';
+export type CSpellRPCServerOptions = RPCServerOptions;
+export type CSpellRPCServerConfig = RPCServerConfiguration;
+export declare class CSpellRPCServer extends RPCServer<CSpellRPCApi> {
+    constructor(config: CSpellRPCServerConfig);
+}
+/**
+ * Create a CSpell RPC Server that listens on the given port.
+ * @param config - Server configuration.
+ * @returns The CSpell RPC Server.
+ */
+export declare function createCSpellRPCServer(config: CSpellRPCServerConfig): CSpellRPCServer;
+//# sourceMappingURL=server.d.ts.map

package/dist/cspell-rpc/server.js

@@ -0,0 +1,37 @@
+import { RPCServer } from '../rpc/index.js';
+import { spellCheckDocumentRPC } from './spellCheckFile.js';
+export class CSpellRPCServer extends RPCServer {
+    constructor(config) {
+        super(config, getCSpellRPCApi());
+    }
+}
+/**
+ * Create a CSpell RPC Server that listens on the given port.
+ * @param config - Server configuration.
+ * @returns The CSpell RPC Server.
+ */
+export function createCSpellRPCServer(config) {
+    return new CSpellRPCServer(config);
+}
+/**
+ * Get the CSpell RPC API.
+ *
+ * @returns the api implementation.
+ */
+function getCSpellRPCApi() {
+    return {
+        spellCheckDocument: spellCheckDocumentRPC,
+        sleep,
+        echo,
+    };
+}
+function echo(msg) {
+    return Promise.resolve(msg);
+}
+function sleep(ms) {
+    return new Promise((resolve) => {
+        const start = performance.now();
+        setTimeout(() => resolve(performance.now() - start), ms);
+    });
+}
+//# sourceMappingURL=server.js.map

package/dist/cspell-rpc/spellCheckFile.d.ts

@@ -0,0 +1,2 @@
+export { spellCheckDocumentRPC } from '../lib/spellCheckFile.js';
+//# sourceMappingURL=spellCheckFile.d.ts.map

package/dist/cspell-rpc/spellCheckFile.js

@@ -0,0 +1,2 @@
+export { spellCheckDocumentRPC } from '../lib/spellCheckFile.js';
+//# sourceMappingURL=spellCheckFile.js.map

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+export * from './lib/index.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -0,0 +1,2 @@
+export * from './lib/index.js';
+//# sourceMappingURL=index.js.map

package/dist/lib/Settings/CSpellSettingsServer.d.ts

@@ -1,6 +1,6 @@
-import type { AdvancedCSpellSettingsWithSourceTrace, ImportFileRef } from '@cspell/cspell-types';
-import type { CSpellSettingsInternal, CSpellSettingsInternalFinalized } from '../Models/CSpellSettingsInternalDef.js';
+import type { AdvancedCSpellSettingsWithSourceTrace, CSpellSettings, ImportFileRef } from '@cspell/cspell-types';
 import type { OptionalOrUndefined } from '../util/types.js';
+import type { CSpellSettingsInternal, CSpellSettingsInternalFinalized } from './internal/index.js';
 type CSpellSettingsWST = AdvancedCSpellSettingsWithSourceTrace;
 export type CSpellSettingsWSTO = OptionalOrUndefined<AdvancedCSpellSettingsWithSourceTrace>;
 export type CSpellSettingsI = CSpellSettingsInternal;
@@ -9,6 +9,8 @@ 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 toCSpellSettingsWithSourceTrace(settings: CSpellSettingsWSTO | CSpellSettingsI): CSpellSettingsWSTO;
+export declare function toCSpellSettingsWithOutSourceTrace(settings: CSpellSettingsWSTO | CSpellSettingsI): CSpellSettings;
 export declare function mergeSettings(left: CSpellSettingsWSTO | CSpellSettingsI, ...settings: (CSpellSettingsWSTO | CSpellSettingsI | undefined)[]): CSpellSettingsI;
 export declare function mergeInDocSettings(left: CSpellSettingsWSTO, ...rest: CSpellSettingsWSTO[]): CSpellSettingsWST;
 /**

package/dist/lib/Settings/CSpellSettingsServer.js

@@ -1,14 +1,15 @@
 import assert from 'node:assert';
 import { onClearCache } from '../events/index.js';
-import { cleanCSpellSettingsInternal as csi, isCSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef.js';
 import { autoResolveWeak, AutoResolveWeakCache } from '../util/AutoResolve.js';
 import { toFileUrl } from '../util/url.js';
 import * as util from '../util/util.js';
 import { configSettingsFileVersion0_1, ENV_CSPELL_GLOB_ROOT } from './constants.js';
-import { calcDictionaryDefsToLoad, mapDictDefsToInternal } from './DictionarySettings.js';
+import { calcDictionaryDefsToLoad, mapDictDefsToInternal } from './internal/index.js';
+import { cleanCSpellSettingsInternal as csi, isCSpellSettingsInternal } from './internal/index.js';
 import { mergeList, mergeListUnique } from './mergeList.js';
 import { resolvePatterns } from './patterns.js';
 import { CwdUrlResolver } from './resolveCwd.js';
+import { walkToJSONObj } from './util/settingsToJson.js';
 export { stats as getMergeStats } from './mergeList.js';
 const emptyWords = [];
 Object.freeze(emptyWords);
@@ -54,6 +55,13 @@ function replaceIfNotEmpty(left = [], right = []) {
     }
     return left;
 }
+export function toCSpellSettingsWithSourceTrace(settings) {
+    return walkToJSONObj(settings);
+}
+export function toCSpellSettingsWithOutSourceTrace(settings) {
+    const { __importRef, __imports, source: _source, ...rest } = toCSpellSettingsWithSourceTrace(settings);
+    return util.clean(rest);
+}
 export function mergeSettings(left, ...settings) {
     const rawSettings = settings.filter(util.isDefined).reduce(merge, toInternalSettings(left));
     return util.clean(rawSettings);

package/dist/lib/Settings/Controller/ImportError.js

@@ -2,6 +2,9 @@ import { isError } from '../../util/errors.js';
 export class ImportError extends Error {
     cause;
     constructor(msg, cause) {
+        if (isError(cause)) {
+            msg += `\n  ${cause.message}`;
+        }
         super(msg);
         this.cause = isError(cause) ? cause : undefined;
     }

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

@@ -1,11 +1,13 @@
 import type { CSpellSettings, CSpellUserSettings, ImportFileRef } from '@cspell/cspell-types';
-import { CSpellConfigFile, CSpellConfigFileReaderWriter, ICSpellConfigFile } from 'cspell-config-lib';
+import type { CSpellConfigFileReaderWriter, ICSpellConfigFile } from 'cspell-config-lib';
+import { CSpellConfigFile, CSpellConfigFileWithErrors } from 'cspell-config-lib';
 import type { VFileSystem } from '../../../fileSystem.js';
-import { AutoResolveCache, CacheStats } from '../../../util/AutoResolve.js';
+import type { CacheStats } from '../../../util/AutoResolve.js';
+import { AutoResolveCache } from '../../../util/AutoResolve.js';
 import { FileResolver } from '../../../util/resolveFile.js';
 import type { LoaderResult } from '../pnpLoader.js';
 import { ConfigSearch } from './configSearch.js';
-import { StopSearchAt } from './defaultConfigLoader.js';
+import type { StopSearchAt } from './defaultConfigLoader.js';
 import { normalizeCacheSettings } from './normalizeRawSettings.js';
 import type { PnPSettingsOptional } from './PnPSettings.js';
 import type { CSpellSettingsI, CSpellSettingsWST } from './types.js';
@@ -123,7 +125,7 @@ export declare class ConfigLoader implements IConfigLoader {
     readSettingsAsync(filename: string | URL, relativeTo?: string | URL, pnpSettings?: PnPSettingsOptional): Promise<CSpellSettingsI>;
     readConfigFile(filenameOrURL: string | URL, relativeTo?: string | URL): Promise<CSpellConfigFile | Error>;
     searchForConfigFileLocation(searchFrom: URL | string | undefined, stopSearchAt?: URL[] | undefined): Promise<URL | undefined>;
-    searchForConfigFile(searchFrom: URL | string | undefined, stopSearchAt?: URL[]): Promise<CSpellConfigFile | undefined>;
+    searchForConfigFile(searchFrom: URL | string | undefined, stopSearchAt?: URL[]): Promise<CSpellConfigFile | CSpellConfigFileWithErrors | undefined>;
     /**
      *
      * @param searchFrom the directory / file URL to start searching from.

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

@@ -1,13 +1,12 @@
 import assert from 'node:assert';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { CSpellConfigFile } from 'cspell-config-lib';
+import { CSpellConfigFile, CSpellConfigFileWithErrors } from 'cspell-config-lib';
 import { createReaderWriter } from 'cspell-config-lib';
 import { isUrlLike, toFileURL } from 'cspell-io';
 import { URI, Utils as UriUtils } from 'vscode-uri';
 import { onClearCache } from '../../../events/index.js';
 import { getVirtualFS } from '../../../fileSystem.js';
-import { createCSpellSettingsInternal as csi } from '../../../Models/CSpellSettingsInternalDef.js';
 import { srcDirectory } from '../../../pkg-info.mjs';
 import { autoResolve, AutoResolveCache, autoResolveWeak } from '../../../util/AutoResolve.js';
 import { logError, logWarning } from '../../../util/logger.js';
@@ -15,13 +14,14 @@ import { FileResolver } from '../../../util/resolveFile.js';
 import { envToTemplateVars } from '../../../util/templates.js';
 import { addTrailingSlash, cwdURL, resolveFileWithURL, toFileDirURL, toFilePathOrHref, toFileUrl, windowsDriveLetterToUpper, } from '../../../util/url.js';
 import { configSettingsFileVersion0_1, configSettingsFileVersion0_2, currentSettingsFileVersion, defaultConfigFileModuleRef, ENV_CSPELL_GLOB_ROOT, } from '../../constants.js';
-import { getMergeStats, mergeSettings } from '../../CSpellSettingsServer.js';
+import { getMergeStats, mergeSettings, toInternalSettings } from '../../CSpellSettingsServer.js';
 import { getGlobalConfig } from '../../GlobalSettings.js';
+import { createCSpellSettingsInternal as csi } from '../../internal/index.js';
 import { ImportError } from '../ImportError.js';
 import { pnpLoader } from '../pnpLoader.js';
 import { searchPlaces } from './configLocations.js';
 import { ConfigSearch } from './configSearch.js';
-import { configToRawSettings } from './configToRawSettings.js';
+import { configErrorToRawSettings, configToRawSettings } from './configToRawSettings.js';
 import { defaultSettings } from './defaultSettings.js';
 import { normalizeCacheSettings, normalizeDictionaryDefs, normalizeGitignoreRoot, normalizeImport, normalizeLanguageSettings, normalizeOverrides, normalizeReporters, normalizeSettingsGlobs, } from './normalizeRawSettings.js';
 import { defaultPnPSettings, normalizePnPSettings } from './PnPSettings.js';
@@ -31,7 +31,7 @@ export const sectionCSpell = 'cSpell';
 export const defaultFileName = 'cspell.json';
 let defaultConfigLoader = undefined;
 const defaultExtensions = ['.json', '.yaml', '.yml', '.jsonc', '.toml'];
-const defaultJsExtensions = ['.js', '.cjs', '.mjs', '.ts', '.mts'];
+const defaultJsExtensions = ['.js', '.cjs', '.mjs', '.ts', '.mts', '.cts'];
 export const defaultExtensionsAll = [...defaultExtensions, ...defaultJsExtensions];
 const trustedSearch = new Map([
     ['*', defaultExtensions],
@@ -110,7 +110,10 @@ export class ConfigLoader {
         if (!location)
             return undefined;
         const file = await this.readConfigFile(location);
-        return file instanceof Error ? undefined : file;
+        if (file instanceof Error) {
+            return new CSpellConfigFileWithErrors(location, configErrorToRawSettings(file, location), file);
+        }
+        return file;
     }
     /**
      *
@@ -123,6 +126,9 @@ export class ConfigLoader {
         const configFile = await this.searchForConfigFile(searchFrom, stopAt);
         if (!configFile)
             return undefined;
+        if (configFile instanceof CSpellConfigFileWithErrors) {
+            return toInternalSettings(configFile.settings);
+        }
         return this.mergeConfigFileWithImports(configFile, options);
     }
     getGlobalSettings() {

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

@@ -9,6 +9,7 @@ export const supportedExtensions = [
     '.toml',
     '.mts',
     '.ts',
+    '.cts',
 ];
 /**
  * Logic of the locations:

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

@@ -1,5 +1,5 @@
-import { createCSpellSettingsInternal as csi } from '../../../Models/CSpellSettingsInternalDef.js';
 import { currentSettingsFileVersion } from '../../constants.js';
+import { createCSpellSettingsInternal as csi } from '../../internal/index.js';
 export const defaultSettings = csi({
     id: 'default',
     name: 'default',

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

@@ -3,7 +3,7 @@ import { fileURLToPath } from 'node:url';
 import { resolveFile } from '../../../util/resolveFile.js';
 import { resolveFileWithURL, toFilePathOrHref } from '../../../util/url.js';
 import * as util from '../../../util/util.js';
-import { mapDictDefsToInternal } from '../../DictionarySettings.js';
+import { mapDictDefsToInternal } from '../../internal/index.js';
 import { toGlobDef } from './toGlobDef.js';
 export function normalizeRawConfig(config) {
     if (typeof config.version === 'number') {

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

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

package/dist/lib/Settings/DefaultSettings.d.ts

@@ -1,4 +1,4 @@
-import type { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef.js';
+import type { CSpellSettingsInternal } from './internal/index.js';
 export declare const _defaultSettingsBasis: Readonly<CSpellSettingsInternal>;
 export declare const _defaultSettings: Readonly<CSpellSettingsInternal>;
 declare class DefaultSettingsLoader {

package/dist/lib/Settings/DefaultSettings.js

@@ -1,11 +1,11 @@
 import { parsers } from 'cspell-grammar';
-import { createCSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef.js';
 import { PatternRegExp } from '../Models/PatternRegExp.js';
 import { srcDirectory } from '../pkg-info.mjs';
 import { resolveFile } from '../util/resolveFile.js';
 import { defaultConfigFileModuleRef } from './constants.js';
 import { readSettings } from './Controller/configLoader/index.js';
 import { mergeSettings } from './CSpellSettingsServer.js';
+import { createCSpellSettingsInternal } from './internal/index.js';
 import * as LanguageSettings from './LanguageSettings.js';
 import * as RegPat from './RegExpPatterns.js';
 // Do not use require.resolve because webpack will mess it up.

package/dist/lib/Settings/InDocSettings.d.ts

@@ -31,9 +31,6 @@ interface DirectiveMatchWithParser extends PossibleMatch {
     directive: Directive;
     fn: ReducerFn;
 }
-export declare const regExSpellingGuardBlock: RegExp;
-export declare const regExSpellingGuardNext: RegExp;
-export declare const regExSpellingGuardLine: RegExp;
 declare function parseCompoundWords(acc: CSpellUserSettings, match: string): CSpellUserSettings;
 declare function parseWords(acc: CSpellUserSettings, match: string): CSpellUserSettings;
 declare function parseIgnoreWords(acc: CSpellUserSettings, match: string): CSpellUserSettings;

package/dist/lib/Settings/InDocSettings.js

@@ -118,14 +118,12 @@ const settingParsers = [
     [/^dictionar(?:y|ies)\b(?!-)/i, parseDictionaries, 'Dictionaries'], // cspell:disable-line
     [/^LocalWords:/, (acc, m) => reduceWordList(acc, m.replaceAll(/^LocalWords:?/gi, ' '), 'words'), 'Words'],
 ];
-export const regExSpellingGuardBlock = /(\bc?spell(?:-?checker)?::?)\s*disable(?!-line|-next)\b[\s\S]*?((?:\1\s*enable\b)|$)/gi;
-export const regExSpellingGuardNext = /\bc?spell(?:-?checker)?::?\s*disable-next\b.*\s\s?.*/gi;
-export const regExSpellingGuardLine = /^.*\bc?spell(?:-?checker)?::?\s*disable-line\b.*/gim;
 const issueMessages = {
     unknownDirective: 'Unknown CSpell directive',
 };
 function parseSettingMatchValidation(possibleMatch) {
     const { fullDirective, offset } = possibleMatch;
+    regExCSpellDirectiveKey.lastIndex = 0;
     const directiveMatch = fullDirective.match(regExCSpellDirectiveKey);
     if (!directiveMatch)
         return undefined;
@@ -231,6 +229,7 @@ function parseFlagWords(acc, match) {
 }
 function parseRegEx(match) {
     const patterns = [match.replace(/^[^\s]+\s+/, '')].map((a) => {
+        regExMatchRegEx.lastIndex = 0;
         const m = a.match(regExMatchRegEx);
         if (m && m[0]) {
             return m[0];

package/dist/lib/Settings/LanguageSettings.js

@@ -16,11 +16,11 @@ function stringToList(sList) {
         .map((s) => s.trim())
         .filter((s) => !!s);
 }
-function memorizer(resolver) {
+function memoize(resolver) {
     const cache = createAutoResolveCache();
     return (k) => cache.get(k, resolver);
 }
-const _normalizeLanguageId = memorizer(__normalizeLanguageId);
+const _normalizeLanguageId = memoize(__normalizeLanguageId);
 function __normalizeLanguageId(langId) {
     const langIds = stringToList(langId);
     return new Set(langIds.map((a) => a.toLowerCase()));
@@ -28,7 +28,7 @@ function __normalizeLanguageId(langId) {
 export function normalizeLanguageId(langId) {
     return _normalizeLanguageId(typeof langId === 'string' ? langId : langId.join(','));
 }
-const _normalizeLocale = memorizer(__normalizeLocale);
+const _normalizeLocale = memoize(__normalizeLocale);
 function __normalizeLocale(locale) {
     const locales = localesToList(locale);
     return new Set(locales.map((locale) => locale.toLowerCase().replaceAll(/[^a-z]/g, '')));

package/dist/lib/Settings/RegExpPatterns.js

@@ -5,14 +5,14 @@ export const regExHRef = /\bhref\s*=\s*".*?"/gi;
 export const regExMatchCommonHexFormats = /(?:#[0-9a-f]{3,8})|(?:0x[0-9a-f]+)|(?:\\u[0-9a-f]{4})|(?:\\x\{[0-9a-f]{4}\})/gi;
 export const regExCommitHash = /\b(?![a-f]+\b)(?:0x)?[0-9a-f]{7,}\b/gi; // Match Commit Hashes that contain at least one digit.
 export const regExCommitHashLink = /\[[0-9a-f]{7,}\]/gi; // Match Commit Hash Markdown link: [abcdef0].
-export const regExCStyleHexValue = /\b0x[0-9a-f_]+\b/gi;
+export const regExCStyleHexValue = /\b0x[0-9a-f_]+n?\b/gi;
 export const regExCSSHexValue = /#[0-9a-f]{3,8}\b/gi;
 export const regExUUID = /\b[0-9a-fx]{8}-[0-9a-fx]{4}-[0-9a-fx]{4}-[0-9a-fx]{4}-[0-9a-fx]{12}\b/gi; // x - represents placeholder values
 export const regExUnicodeRef = /\bU\+[0-9a-f]{4,5}(?:-[0-9a-f]{4,5})?/gi;
 export const regExSpellingGuardBlock = /(\bc?spell(?:-?checker)?::?)\s*disable(?!-line|-next)\b(?!-)[\s\S]*?((?:\1\s*enable\b)|$)/gi;
 export const regExSpellingGuardNext = /\bc?spell(?:-?checker)?::?\s*disable-next\b.*\s\s?.*/gi;
 export const regExSpellingGuardLine = /^.*\bc?spell(?:-?checker)?::?\s*disable-line\b.*/gim;
-export const regExIgnoreSpellingDirectives = /\bc?spell(?:-?checker)?::?\s*ignoreRegExp.*/gim;
+export const regExIgnoreSpellingDirectives = /\bc?spell(?:-?checker)?::?\s*(ignoreRegExp|word|ignore).*/gim;
 export const regExPublicKey = /-{5}BEGIN\s+((?:RSA\s+)?PUBLIC\s+KEY)[\w=+\-/=\\\s]+?END\s+\1-{5}/g;
 export const regExCert = /-{5}BEGIN\s+(CERTIFICATE|(?:RSA\s+)?(?:PRIVATE|PUBLIC)\s+KEY)[\w=+\-/=\\\s]+?END\s+\1-{5}/g;
 export const regExSshRSA = /ssh-rsa\s+[a-z0-9/+]{28,}={0,3}(?![a-z0-9/+=])/gi;

package/dist/lib/Settings/TextDocumentSettings.d.ts

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

package/dist/lib/Settings/cfgStore.d.ts

@@ -1,4 +1,4 @@
-import { CSpellSettings } from '@cspell/cspell-types';
+import type { CSpellSettings } from '@cspell/cspell-types';
 export declare const legacyLocationDir: string | undefined;
 export declare const cspellGlobalLocationDir: string;
 export declare const defaultConfigFileName = "cspell.json";

package/dist/lib/Settings/index.d.ts

@@ -5,6 +5,8 @@ export type { CSpellConfigFile, ICSpellConfigFile } from './Controller/configLoa
 export { clearCachedSettingsFiles, createConfigLoader, defaultConfigFilenames, defaultFileName, extractImportErrors, getCachedFileSize, getDefaultConfigLoader, getGlobalSettings, getGlobalSettingsAsync, loadConfig, loadPnP, readConfigFile, readRawSettings, readSettings, readSettingsFiles, resolveConfigFileImports, resolveSettingsImports, searchForConfig, sectionCSpell, } from './Controller/configLoader/index.js';
 export { ImportError } from './Controller/ImportError.js';
 export type { ConfigurationDependencies, ImportFileRefWithError } from './CSpellSettingsServer.js';
-export { extractDependencies, finalizeSettings, getSources, mergeInDocSettings, mergeSettings, } from './CSpellSettingsServer.js';
+export { extractDependencies, finalizeSettings, getSources, mergeInDocSettings, mergeSettings, toCSpellSettingsWithOutSourceTrace, } from './CSpellSettingsServer.js';
 export { defaultSettingsLoader, getDefaultBundledSettingsAsync, getDefaultSettings } from './DefaultSettings.js';
+export type { CSpellSettingsInternal, CSpellSettingsInternalFinalized, DictionaryDefinitionInlineInternal, DictionaryDefinitionInternal, DictionaryDefinitionSimpleInternal, DictionaryFileDefinitionInternal, } from './internal/index.js';
+export { calcDictionaryDefsToLoad, createCSpellSettingsInternal, filterDictDefsToLoad, isDictionaryDefinitionInlineInternal, isDictionaryFileDefinitionInternal, mapDictDefToInternal, } from './internal/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/lib/Settings/index.js

@@ -3,6 +3,7 @@ export { checkFilenameMatchesGlob } from './checkFilenameMatchesGlob.js';
 export { currentSettingsFileVersion, ENV_CSPELL_GLOB_ROOT } from './constants.js';
 export { clearCachedSettingsFiles, createConfigLoader, defaultConfigFilenames, defaultFileName, extractImportErrors, getCachedFileSize, getDefaultConfigLoader, getGlobalSettings, getGlobalSettingsAsync, loadConfig, loadPnP, readConfigFile, readRawSettings, readSettings, readSettingsFiles, resolveConfigFileImports, resolveSettingsImports, searchForConfig, sectionCSpell, } from './Controller/configLoader/index.js';
 export { ImportError } from './Controller/ImportError.js';
-export { extractDependencies, finalizeSettings, getSources, mergeInDocSettings, mergeSettings, } from './CSpellSettingsServer.js';
+export { extractDependencies, finalizeSettings, getSources, mergeInDocSettings, mergeSettings, toCSpellSettingsWithOutSourceTrace, } from './CSpellSettingsServer.js';
 export { defaultSettingsLoader, getDefaultBundledSettingsAsync, getDefaultSettings } from './DefaultSettings.js';
+export { calcDictionaryDefsToLoad, createCSpellSettingsInternal, filterDictDefsToLoad, isDictionaryDefinitionInlineInternal, isDictionaryFileDefinitionInternal, mapDictDefToInternal, } from './internal/index.js';
 //# sourceMappingURL=index.js.map

package/dist/lib/Settings/internal/CSpellSettingsInternalDef.d.ts

@@ -0,0 +1,18 @@
+import type { AdvancedCSpellSettingsWithSourceTrace, CSpellSettingsWithSourceTrace, Parser } from '@cspell/cspell-types';
+import type { OptionalOrUndefined } from '../../util/types.js';
+import type { DictionaryDefinitionInternal } from './InternalDictionaryDef.js';
+export declare const SymbolCSpellSettingsInternal: unique symbol;
+export interface CSpellSettingsInternal extends Omit<AdvancedCSpellSettingsWithSourceTrace, 'dictionaryDefinitions'> {
+    [SymbolCSpellSettingsInternal]: true;
+    dictionaryDefinitions?: DictionaryDefinitionInternal[];
+}
+export interface CSpellSettingsInternalFinalized extends CSpellSettingsInternal {
+    parserFn: Parser | undefined;
+    finalized: true;
+    ignoreRegExpList: RegExp[];
+    includeRegExpList: RegExp[];
+}
+export declare function cleanCSpellSettingsInternal(parts?: OptionalOrUndefined<Partial<CSpellSettingsInternal>>): CSpellSettingsInternal;
+export declare function createCSpellSettingsInternal(parts?: OptionalOrUndefined<Partial<CSpellSettingsInternal>>): CSpellSettingsInternal;
+export declare function isCSpellSettingsInternal(cs: CSpellSettingsInternal | CSpellSettingsWithSourceTrace | OptionalOrUndefined<CSpellSettingsInternal | CSpellSettingsWithSourceTrace>): cs is CSpellSettingsInternal;
+//# sourceMappingURL=CSpellSettingsInternalDef.d.ts.map

package/dist/lib/{Models → Settings/internal}/CSpellSettingsInternalDef.js

@@ -1,4 +1,4 @@
-import { clean } from '../util/util.js';
+import { clean } from '../../util/util.js';
 export const SymbolCSpellSettingsInternal = Symbol('CSpellSettingsInternal');
 export function cleanCSpellSettingsInternal(parts) {
     return parts
@@ -11,13 +11,4 @@ export function createCSpellSettingsInternal(parts) {
 export function isCSpellSettingsInternal(cs) {
     return !!cs[SymbolCSpellSettingsInternal];
 }
-export function isDictionaryDefinitionInlineInternal(def) {
-    if (def.path)
-        return false;
-    const defInline = def;
-    return !!(defInline.words || defInline.flagWords || defInline.ignoreWords || defInline.suggestWords);
-}
-export function isDictionaryFileDefinitionInternal(def) {
-    return !!(def.path || def.file);
-}
 //# sourceMappingURL=CSpellSettingsInternalDef.js.map

package/dist/lib/Settings/{DictionarySettings.d.ts → internal/DictionarySettings.d.ts}

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