cspell 9.2.0 → 9.2.2

package/README.md

@@ -13,10 +13,13 @@ A Spell Checker for Code!
 <!--- @@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)
-- [![Patreon](https://img.shields.io/badge/-black?style=social&logo=patreon&label=Patreon%3A%20Street%20Side%20Software)](https://patreon.com/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)
 
+<!---
+- [![Patreon](https://img.shields.io/badge/-black?style=social&logo=patreon&label=Patreon%3A%20Street%20Side%20Software)](https://patreon.com/streetsidesoftware)
+  --->
+
 <!--- @@inject-end: ../../static/sponsor.md --->
 
 ## Features
@@ -437,7 +440,7 @@ const str = 'goedemorgen'; // <- will NOT be flagged as an error.
 
 ### Ignore
 
-_Ignore_ allows you the specify a list of words you want to ignore within the document.
+_Ignore_ allows you to specify a list of words you want to ignore within the document.
 
 ```javascript
 // cspell:ignore zaallano, wooorrdd
@@ -645,7 +648,7 @@ export default defineConfig({
   // Including "spanish" in the list of dictionaries means both Spanish and English
   // words will be considered correct.
   "dictionaries": ["spanish", "ruby", "corp-terms", "fonts"],
-  // Define each dictionary.  Relative paths are relative to the config file.
+  // Define each dictionary. Relative paths are relative to the config file.
   "dictionaryDefinitions": [
       { "name": "spanish", "path": "./spanish-words.txt"},
       { "name": "ruby", "path": "./ruby.txt"},
@@ -713,7 +716,7 @@ The spell checker includes a set of default dictionaries.
 - **useCompounds** - allow compound words
 
 ```javascript
-// Define each dictionary.  Relative paths are relative to the config file.
+// Define each dictionary. Relative paths are relative to the config file.
 "dictionaryDefinitions": [
     { "name": "spanish", "path": "./spanish-words.txt"},
     { "name": "ruby", "path": "./ruby.txt"},

package/dist/esm/app.d.ts

@@ -1,14 +1,14 @@
-import { LinterCliOptions } from "./options-ChaXtdFn.js";
+import { i as LinterCliOptions } from "./options-D_a-jMcz.js";
 import { Command } from "commander";
 
 //#region src/util/errors.d.ts
 declare class CheckFailed extends Error {
-  readonly exitCode: string;
+  readonly exitCode: number;
   constructor(message: string, exitCode?: number);
 }
 declare class ApplicationError extends Error {
-  readonly exitCode: string;
-  readonly cause?: number;
+  readonly exitCode: number;
+  readonly cause?: Error | undefined;
   constructor(message: string, exitCode?: number, cause?: Error | undefined);
 }
 //#endregion

package/dist/esm/app.js

@@ -1,4 +1,4 @@
-import { ApplicationError, CheckFailed, DEFAULT_CACHE_LOCATION, IncludeExcludeFlag, ReportChoicesAll, checkText, console, createInit, lint, listDictionaries, npmPackage, parseApplicationFeatureFlags, suggestions, trace } from "./application-_MFvh02K.js";
+import { a as parseApplicationFeatureFlags, c as listDictionaries, d as npmPackage, h as console, i as lint, l as ReportChoicesAll, m as CheckFailed, n as checkText, o as suggestions, p as ApplicationError, r as createInit, s as trace, t as IncludeExcludeFlag, u as DEFAULT_CACHE_LOCATION } from "./application-2V_0BiNj.js";
 import { Option, program } from "commander";
 import { satisfies } from "semver";
 import chalk from "chalk";
@@ -19,8 +19,7 @@ function commandCheck(prog) {
 			try {
 				const result = await checkText(filename, options);
 				for (const item of result.items) {
-					const fn = item.flagIE === IncludeExcludeFlag.EXCLUDE ? chalk.gray : item.isError ? chalk.red : chalk.whiteBright;
-					const t = fn(item.text);
+					const t = (item.flagIE === IncludeExcludeFlag.EXCLUDE ? chalk.gray : item.isError ? chalk.red : chalk.whiteBright)(item.text);
 					process.stdout.write(t);
 					issueCount += item.isError ? 1 : 0;
 				}
@@ -31,10 +30,7 @@ function commandCheck(prog) {
 			}
 			console.log();
 		}
-		if (issueCount) {
-			const exitCode = useExitCode ?? true ? 1 : 0;
-			throw new CheckFailed("Issues found", exitCode);
-		}
+		if (issueCount) throw new CheckFailed("Issues found", useExitCode ?? true ? 1 : 0);
 	});
 }
 
@@ -102,8 +98,7 @@ function pruneTextEnd(str, maxWidth$2, pad$1 = "…") {
 	if (!maxWidth$2 || maxWidth$2 <= 0) return str;
 	if (str.length <= maxWidth$2) return str;
 	if (isAnsiString(str)) return pruneAnsiTextEnd(str, maxWidth$2, pad$1);
-	const padWidth$1 = width(pad$1);
-	const maxWidthWithPad = maxWidth$2 - padWidth$1;
+	const maxWidthWithPad = maxWidth$2 - width(pad$1);
 	const letters = [...str];
 	let len = 0;
 	for (let i = 0; i < letters.length; i++) {
@@ -127,8 +122,7 @@ function pruneTextEnd(str, maxWidth$2, pad$1 = "…") {
 function pruneTextStart(str, maxWidth$2, pad$1 = "…") {
 	if (!maxWidth$2 || maxWidth$2 <= 0) return str;
 	if (str.length <= maxWidth$2) return str;
-	const padWidth$1 = width(pad$1);
-	const maxWidthWithPad = maxWidth$2 - padWidth$1;
+	const maxWidthWithPad = maxWidth$2 - width(pad$1);
 	const letters = [...str];
 	let len = 0;
 	for (let i = letters.length - 1; i >= 1; i--) {
@@ -176,8 +170,7 @@ function pruneAnsiTextEnd(str, maxWidth$2, pad$1 = "…") {
 	if (ansiWidth(str) <= maxWidth$2) return str;
 	const padWidth$1 = ansiWidth(pad$1);
 	const fragments = parseAnsiStr(str);
-	const maxWidthWithPad = maxWidth$2 - padWidth$1;
-	let remaining = maxWidthWithPad;
+	let remaining = maxWidth$2 - padWidth$1;
 	for (const frag of fragments) {
 		if (frag.type !== "text") continue;
 		if (remaining <= 0) {
@@ -207,8 +200,7 @@ function pruneAnsiTextStart(str, maxWidth$2, pad$1 = "…") {
 	if (ansiWidth(str) <= maxWidth$2) return str;
 	const padWidth$1 = ansiWidth(pad$1);
 	const fragments = parseAnsiStr(str);
-	const maxWidthWithPad = maxWidth$2 - padWidth$1;
-	let remaining = maxWidthWithPad;
+	let remaining = maxWidth$2 - padWidth$1;
 	for (const frag of fragments.reverse()) {
 		if (frag.type !== "text") continue;
 		if (remaining <= 0) {
@@ -242,8 +234,7 @@ function tableToLines(table, deliminator) {
 	function getCellFromRow(row, col) {
 		if (!row) return void 0;
 		if (Array.isArray(row)) return row[col];
-		const fieldName = columnFieldNames[col];
-		return row[fieldName];
+		return row[columnFieldNames[col]];
 	}
 	function rowToCells(row) {
 		if (Array.isArray(row)) return row;
@@ -368,14 +359,10 @@ function formatDictionaryLocation(dictSource, maxWidth$2, { cwd, dictionaryPathF
 	const idxNodeModule = relPath.lastIndexOf("node_modules");
 	const isNodeModule = idxNodeModule >= 0;
 	if (format$1 === "hide") return "";
-	if (format$1 === "short") {
-		const prefix = isNodeModule ? "[node_modules]/" : relPath.startsWith(".." + iPath$1.sep + "..") ? "…/" : relPath.startsWith(".." + iPath$1.sep) ? "../" : "";
-		return prefix + iPath$1.basename(dictSource);
-	}
+	if (format$1 === "short") return (isNodeModule ? "[node_modules]/" : relPath.startsWith(".." + iPath$1.sep + "..") ? "…/" : relPath.startsWith(".." + iPath$1.sep) ? "../" : "") + iPath$1.basename(dictSource);
 	if (format$1 === "full") return dictSource;
 	relPath = isNodeModule ? relPath.slice(idxNodeModule) : relPath;
-	const usePath = relPath.length < dictSource.length ? relPath : dictSource;
-	return trimMidPath(usePath, maxWidth$2, iPath$1.sep);
+	return trimMidPath(relPath.length < dictSource.length ? relPath : dictSource, maxWidth$2, iPath$1.sep);
 }
 
 //#endregion
@@ -394,20 +381,17 @@ function calcListDictsResultsReport(results, options) {
 	else if (options.color === false) chalk.level = 0;
 	const col = new Intl.Collator();
 	results.sort((a, b) => col.compare(a.name, b.name));
-	const header = calcHeaders(options);
-	const rows = results.map((r) => dictTableRowToTableRow(emitDictResult(r, options)));
-	const t = tableToLines({
-		header,
-		rows,
-		terminalWidth: options.lineWidth || process.stdout.columns || maxWidth$1,
-		deliminator: " ",
-		maxColumnWidths: {
-			locales: 12,
-			fileTypes: 40
-		}
-	});
 	return {
-		table: t.map((line) => line.trimEnd()).join("\n"),
+		table: tableToLines({
+			header: calcHeaders(options),
+			rows: results.map((r) => dictTableRowToTableRow(emitDictResult(r, options))),
+			terminalWidth: options.lineWidth || process.stdout.columns || maxWidth$1,
+			deliminator: " ",
+			maxColumnWidths: {
+				locales: 12,
+				fileTypes: 40
+			}
+		}).map((line) => line.trimEnd()).join("\n"),
 		errors: ""
 	};
 }
@@ -484,8 +468,7 @@ function commandDictionaries(prog) {
 	]).default("long", "Display most of the path.")).addOption(crOpt("--enabled", "Show only enabled dictionaries.").default(void 0)).addOption(crOpt("--no-enabled", "Do not show enabled dictionaries.")).option("--locale <locale>", "Set language locales. i.e. \"en,fr\" for English and French, or \"en-GB\" for British English.").option("--file-type <fileType>", "File type to use. i.e. \"html\", \"golang\", or \"javascript\".").option("--no-show-location", "Do not show the location of the dictionary.").option("--show-file-types", "Show the file types supported by the dictionary.", false).addOption(crOpt("--no-show-file-types", "Do not show the file types supported by the dictionary.").hideHelp()).option("--show-locales", "Show the language locales supported by the dictionary.", false).addOption(crOpt("--no-show-locales", "Do not show the locales supported by the dictionary.").hideHelp()).addOption(crOpt("--color", "Force color.").default(void 0)).addOption(crOpt("--no-color", "Turn off color.").default(void 0)).addOption(crOpt("--default-configuration", "Load the default configuration and dictionaries.").hideHelp()).addOption(crOpt("--no-default-configuration", "Do not load the default configuration and dictionaries.")).action(async (options) => {
 		const dictionaryPathFormat = isDictionaryPathFormat(options.pathFormat) ? options.pathFormat : "long";
 		const useColor = canUseColor(options.color);
-		const listResult = await listDictionaries(options);
-		emitListDictionariesResults(listResult, {
+		emitListDictionariesResults(await listDictionaries(options), {
 			cwd: process.cwd(),
 			dictionaryPathFormat,
 			color: useColor,
@@ -497,7 +480,7 @@ function commandDictionaries(prog) {
 //#endregion
 //#region src/commandInit.ts
 function commandInit(prog) {
-	const command = prog.command("init").description("Initialize a CSpell configuration file.").addOption(crOpt("-c, --config <path>", "Path to the CSpell configuration file. Conflicts with --output and --format.").conflicts(["output", "format"])).option("-o, --output <path>", "Define where to write file.").addOption(crOpt("--format <format>", "Define the format of the file.").choices([
+	return prog.command("init").description("Initialize a CSpell configuration file.").addOption(crOpt("-c, --config <path>", "Path to the CSpell configuration file. Conflicts with --output and --format.").conflicts(["output", "format"])).option("-o, --output <path>", "Define where to write file.").addOption(crOpt("--format <format>", "Define the format of the file.").choices([
 		"yaml",
 		"yml",
 		"json",
@@ -505,7 +488,6 @@ function commandInit(prog) {
 	]).default("yaml")).option("--import <path|package>", "Import a configuration file or dictionary package.", collect).option("--locale <locale>", "Define the locale to use when spell checking (e.g., en, en-US, de).").addOption(crOpt("--dictionary <dictionary>", "Enable a dictionary. Can be used multiple times.", collect).default(void 0)).addOption(crOpt("--comments", "Add comments to the config file.").default(void 0).hideHelp()).option("--no-comments", "Do not add comments to the config file.").addOption(crOpt("--remove-comments", "Remove all comments from the config file.").implies({ comments: false })).option("--no-schema", "Do not add the schema reference to the config file.").option("--stdout", "Write the configuration to stdout instead of a file.").action((options) => {
 		return createInit(options);
 	});
-	return command;
 }
 
 //#endregion
@@ -555,10 +537,7 @@ function addPathsToGlobalImportsResultToTable(results) {
 function commandLink(prog) {
 	const linkCommand = prog.command("link").description("Link dictionaries and other settings to the cspell global config.");
 	linkCommand.command("list", { isDefault: true }).alias("ls").description("List currently linked configurations.").action(async () => {
-		const imports = await listGlobalImports();
-		const table = listGlobalImportsResultToTable(imports.list);
-		tableToLines(table).forEach((line) => console.log(line));
-		return;
+		tableToLines(listGlobalImportsResultToTable((await listGlobalImports()).list)).forEach((line) => console.log(line));
 	});
 	linkCommand.command("add <dictionaries...>").alias("a").description("Add dictionaries any other settings to the cspell global config.").action(async (dictionaries) => {
 		const r = await addPathsToGlobalImports(dictionaries);
@@ -566,14 +545,12 @@ function commandLink(prog) {
 		console.log("Adding:");
 		tableToLines(table).forEach((line) => console.log(line));
 		if (r.error) throw new CheckFailed(r.error, 1);
-		return;
 	});
 	linkCommand.command("remove <paths...>").alias("r").description("Remove matching paths / packages from the global config.").action(async (dictionaries) => {
 		const r = await removePathsFromGlobalImports(dictionaries);
 		console.log("Removing:");
 		if (r.error) throw new CheckFailed(r.error, 1);
 		r.removed.map((f) => console.log(f));
-		return;
 	});
 	return linkCommand;
 }
@@ -699,11 +676,7 @@ function commandLint(prog) {
 			throw new CheckFailed("outputHelp", 1);
 		}
 		if (result.errors || mustFindFiles && !result.files) throw new CheckFailed("check failed", 1);
-		if (result.issues) {
-			const exitCode = useExitCode ? 1 : 0;
-			throw new CheckFailed("check failed", exitCode);
-		}
-		return;
+		if (result.issues) throw new CheckFailed("check failed", useExitCode ? 1 : 0);
 	});
 	return spellCheckCommand;
 }
@@ -788,8 +761,7 @@ function emitSuggestionResult(result, options) {
 			...s,
 			w: handleRtl(s.compoundWord || s.wordAdjustedToMatchCase || s.word)
 		}));
-		const sugWidths = mappedSugs.map((s) => width(s.w));
-		const maxWidth$2 = sugWidths.reduce((max, len) => Math.max(max, len), 0);
+		const maxWidth$2 = mappedSugs.map((s) => width(s.w)).reduce((max, len) => Math.max(max, len), 0);
 		for (const sug of mappedSugs) {
 			const { cost, dictionaries, w } = sug;
 			const padding = " ".repeat(padWidth(w, maxWidth$2));
@@ -880,16 +852,13 @@ function calcTraceResultsReport(word, found, results, options) {
 	const col = new Intl.Collator();
 	results.sort((a, b) => col.compare(a.dictName, b.dictName));
 	options.showWordFound && console.log(`${options.prefix || ""}${word}: ${found ? "Found" : "Not Found"}`);
-	const header = emitHeader(options.dictionaryPathFormat !== "hide");
-	const rows = results.map((r) => emitTraceResult(r, options));
-	const t = tableToLines({
-		header,
-		rows,
-		terminalWidth: options.lineWidth || process.stdout.columns || maxWidth,
-		deliminator: " "
-	});
 	return {
-		table: t.map((line) => line.trimEnd()).join("\n"),
+		table: tableToLines({
+			header: emitHeader(options.dictionaryPathFormat !== "hide"),
+			rows: results.map((r) => emitTraceResult(r, options)),
+			terminalWidth: options.lineWidth || process.stdout.columns || maxWidth,
+			deliminator: " "
+		}).map((line) => line.trimEnd()).join("\n"),
 		errors: emitErrors(results).join("\n")
 	};
 }
@@ -904,15 +873,13 @@ function emitHeader(location) {
 }
 function emitTraceResult(r, options) {
 	const errors = !!r.errors?.length;
-	const word = r.foundWord || r.word;
-	const cWord = word.replaceAll("+", chalk.yellow("+"));
+	const cWord = (r.foundWord || r.word).replaceAll("+", chalk.yellow("+"));
 	const sug = r.preferredSuggestions?.map((s) => chalk.yellowBright(s)).join(", ") || "";
 	const w = (r.forbidden ? chalk.red(cWord) : chalk.green(cWord)) + (sug ? `->(${sug})` : "");
 	const f = calcFoundChar(r);
 	const a = r.dictActive ? "*" : " ";
 	const dictName = r.dictName.slice(0, colWidthDictionaryName - 1) + a;
-	const dictColor = r.dictActive ? chalk.yellowBright : chalk.rgb(200, 128, 50);
-	const n = dictColor(dictName);
+	const n = (r.dictActive ? chalk.yellowBright : chalk.rgb(200, 128, 50))(dictName);
 	const c = colorize(errors ? chalk.red : chalk.white);
 	return [
 		w,
@@ -925,8 +892,7 @@ function emitTraceResult(r, options) {
 	];
 }
 function emitErrors(results) {
-	const errorResults = results.filter((r) => r.errors?.length);
-	return errorResults.map((r) => {
+	return results.filter((r) => r.errors?.length).map((r) => {
 		const errors = r.errors?.map((e) => e.message)?.join("\n	") || "";
 		return chalk.bold(r.dictName) + "\n	" + chalk.red(errors);
 	});
@@ -966,8 +932,7 @@ function commandTrace(prog) {
 		for await (const results of trace(words, options)) {
 			const byWord = groupBy(results, (r) => r.word);
 			for (const split of results.splits) {
-				const splitResults = byWord.get(split.word) || [];
-				const filtered = filterTraceResults(splitResults, options);
+				const filtered = filterTraceResults(byWord.get(split.word) || [], options);
 				emitTraceResults(split.word, split.found, filtered, {
 					cwd: process.cwd(),
 					dictionaryPathFormat,
@@ -977,8 +942,7 @@ function commandTrace(prog) {
 				});
 				prefix = "\n";
 				numFound += results.reduce((n, r) => n + (r.found ? 1 : 0), 0);
-				const numErrors = results.map((r) => r.errors?.length || 0).reduce((n, r) => n + r, 0);
-				if (numErrors) {
+				if (results.map((r) => r.errors?.length || 0).reduce((n, r) => n + r, 0)) {
 					console.error("Dictionary Errors.");
 					throw new CheckFailed("dictionary errors", 1);
 				}

package/dist/esm/{application-_MFvh02K.js → application-2V_0BiNj.js}

@@ -53,8 +53,7 @@ var Console = class {
 };
 const console = new Console();
 function getColorLevel(stream) {
-	const depth = stream.getColorDepth?.() || 0;
-	switch (depth) {
+	switch (stream.getColorDepth?.() || 0) {
 		case 1: return 1;
 		case 4: return 2;
 		case 24: return 3;
@@ -105,8 +104,7 @@ function isError(e) {
 function isErrorLike(e) {
 	if (e instanceof Error) return true;
 	if (!e || typeof e !== "object") return false;
-	const ex = e;
-	return typeof ex.message === "string";
+	return typeof e.message === "string";
 }
 function toApplicationError(e, message) {
 	if (e instanceof ApplicationError && !message) return e;
@@ -185,12 +183,9 @@ function reportProgress(io, p, cwdURL, options) {
 }
 function determineFilename(io, p, cwd) {
 	const fc = "" + p.fileCount;
-	const fn = (" ".repeat(fc.length) + p.fileNum).slice(-fc.length);
-	const idx = fn + "/" + fc;
-	const filename = io.chalk.gray(relativeUriFilename(p.filename, cwd));
 	return {
-		idx,
-		filename
+		idx: (" ".repeat(fc.length) + p.fileNum).slice(-fc.length) + "/" + fc,
+		filename: io.chalk.gray(relativeUriFilename(p.filename, cwd))
 	};
 }
 function reportProgressFileBegin(io, p, cwdURL) {
@@ -206,16 +201,14 @@ function reportProgressFileComplete(io, p, cwd, options) {
 	const time = reportTime(io, p.elapsedTimeMs, !!p.cached);
 	const skipped = p.processed === false ? " skipped" : "";
 	const hasErrors = p.numErrors ? io.chalk.red` X` : "";
-	const newLine = skipped && (verbose || debug) || hasErrors || isSlow(p.elapsedTimeMs) || io.getColorLevel() < 1 ? "\n" : "";
-	const msg = `${idx} ${filename} ${time}${skipped}${hasErrors}${newLine || "\r"}`;
+	const msg = `${idx} ${filename} ${time}${skipped}${hasErrors}${(skipped && (verbose || debug) || hasErrors || isSlow(p.elapsedTimeMs) || io.getColorLevel() < 1 ? "\n" : "") || "\r"}`;
 	io.write(msg);
 }
 function reportTime(io, elapsedTimeMs, cached) {
 	if (cached) return io.chalk.green("cached");
 	if (elapsedTimeMs === void 0) return "-";
 	const slow = isSlow(elapsedTimeMs);
-	const color = !slow ? io.chalk.white : slow === 1 ? io.chalk.yellow : io.chalk.redBright;
-	return color(elapsedTimeMs.toFixed(2) + "ms");
+	return (!slow ? io.chalk.white : slow === 1 ? io.chalk.yellow : io.chalk.redBright)(elapsedTimeMs.toFixed(2) + "ms");
 }
 function isSlow(elapsedTmeMs) {
 	if (!elapsedTmeMs || elapsedTmeMs < 1e3) return 0;
@@ -265,15 +258,13 @@ function getReporter(options, config) {
 		return (i) => {
 			const fullFilename = i.uri ? toFilePathOrHref(toFileURL(i.uri, rootURL)) : "";
 			const filename = i.uri ? fnFilename(i.uri) : "";
-			const r = {
+			fn({
 				...i,
 				filename,
 				fullFilename
-			};
-			fn(r);
+			});
 		};
 	}
-	const repeatIssues = false;
 	const issuesCollection = void 0;
 	const errorCollection = [];
 	function errorEmitter(message, error) {
@@ -297,9 +288,7 @@ function getReporter(options, config) {
 		}
 		const cachedFilesText = cachedFiles ? ` (${cachedFiles} from cache)` : "";
 		const withErrorsText = errors ? ` with ${errors} error${errors === 1 ? "" : "s"}` : "";
-		const numFilesWidthIssuesText = numFilesWithIssues === 1 ? "1 file" : `${numFilesWithIssues} files`;
-		const summaryMessage = `CSpell\u003A Files checked: ${files}${cachedFilesText}, Issues found: ${issues$1} in ${numFilesWidthIssuesText}${withErrorsText}.`;
-		consoleError(summaryMessage);
+		consoleError(`CSpell\u003A Files checked: ${files}${cachedFilesText}, Issues found: ${issues$1} in ${numFilesWithIssues === 1 ? "1 file" : `${numFilesWithIssues} files`}${withErrorsText}.`);
 		if (errorCollection?.length && issues$1 > 5) {
 			consoleError("-------------------------------------------");
 			consoleError("Errors:");
@@ -377,8 +366,7 @@ function formatIssue(io, templateStr, issue, maxIssueTextWidth) {
 		$messageColored: messageColored
 	};
 	const t = templateStr.replaceAll("$messageColored", messageColored);
-	const chalkTemplate = makeTemplate(io.chalk);
-	return substitute(chalkTemplate(t), substitutions).trimEnd();
+	return substitute(makeTemplate(io.chalk)(t), substitutions).trimEnd();
 }
 function formatSuggestions(io, issue) {
 	if (issue.suggestionsEx) return issue.suggestionsEx.map((sug) => sug.isPreferred ? io.chalk.italic(io.chalk.bold(sug.wordAdjustedToMatchCase || sug.word)) + "*" : sug.wordAdjustedToMatchCase || sug.word).join(", ");
@@ -389,8 +377,7 @@ function formatQuickFix(io, issue) {
 	if (!issue.suggestionsEx?.length) return "";
 	const preferred = issue.suggestionsEx.filter((sug) => sug.isPreferred).map((sug) => sug.wordAdjustedToMatchCase || sug.word);
 	if (!preferred.length) return "";
-	const fixes = preferred.map((w) => io.chalk.italic(io.chalk.yellow(w)));
-	return `fix: (${fixes.join(", ")})`;
+	return `fix: (${preferred.map((w) => io.chalk.italic(io.chalk.yellow(w))).join(", ")})`;
 }
 function substitute(text, substitutions) {
 	const subs = [];
@@ -416,16 +403,14 @@ function substitute(text, substitutions) {
 		i = b;
 		return prefix + t;
 	}
-	const parts = subs.map(sub);
-	return parts.join("") + text.slice(i);
+	return subs.map(sub).join("") + text.slice(i);
 }
 function assertCheckTemplate(template) {
 	const r = checkTemplate(template);
 	if (r instanceof Error) throw r;
 }
 function checkTemplate(template) {
-	const chalk$1 = new Chalk();
-	const chalkTemplate = makeTemplate(chalk$1);
+	const chalkTemplate = makeTemplate(new Chalk());
 	const substitutions = {
 		$col: "<col>",
 		$contextFull: "<contextFull>",
@@ -443,14 +428,11 @@ function checkTemplate(template) {
 		$messageColored: "<messageColored>"
 	};
 	try {
-		const t = chalkTemplate(template);
-		const result = substitute(t, substitutions);
-		const problems = [...result.matchAll(/\$[a-z]+/gi)].map((m) => m[0]);
+		const problems = [...substitute(chalkTemplate(template), substitutions).matchAll(/\$[a-z]+/gi)].map((m) => m[0]);
 		if (problems.length) throw new Error(`Unresolved template variable${problems.length > 1 ? "s" : ""}: ${problems.map((v) => `'${v}'`).join(", ")}`);
 		return true;
 	} catch (e) {
-		const msg = e instanceof Error ? e.message : `${e}`;
-		return new ApplicationError(msg);
+		return new ApplicationError(e instanceof Error ? e.message : `${e}`);
 	}
 }
 
@@ -459,11 +441,9 @@ function checkTemplate(template) {
 async function fileExists(url) {
 	if (url.protocol !== "file:") return false;
 	try {
-		const stats = await promises.stat(url);
-		return stats.isFile();
+		return (await promises.stat(url)).isFile();
 	} catch (e) {
-		const err = toError(e);
-		if (err.code === "ENOENT") return false;
+		if (toError(e).code === "ENOENT") return false;
 		throw e;
 	}
 }
@@ -552,8 +532,7 @@ function addDictionariesToConfigFile(configFile, dictionaries, comment) {
 		if (!found && comment) configFile.setComment("dictionaries", comment);
 		return;
 	}
-	const settings = configFile.settings;
-	const dicts = settings.dictionaries || [];
+	const dicts = configFile.settings.dictionaries || [];
 	const knownDicts = new Set(dicts);
 	for (const dict of dictionaries) if (!knownDicts.has(dict)) {
 		dicts.push(dict);
@@ -573,8 +552,7 @@ function applyValuesToConfigFile(config, settings, defaultValues, addComments) {
 		const oldValue = currentSettings[key];
 		const value = newValue ?? oldValue ?? defaultValue;
 		if (newValue === void 0 && oldValue !== void 0 || value === void 0) continue;
-		const useComment = addComments && oldValue === void 0 && comment || void 0;
-		setConfigFieldValue(config, key, value, useComment);
+		setConfigFieldValue(config, key, value, addComments && oldValue === void 0 && comment || void 0);
 	}
 	return config;
 }
@@ -675,8 +653,7 @@ const defaultConfigYaml = `
 `;
 async function configInit(options) {
 	const rw = createReaderWriter();
-	const url = determineFileNameURL(options);
-	const configFile = await createConfigFile(rw, url, options);
+	const configFile = await createConfigFile(rw, determineFileNameURL(options), options);
 	await applyOptionsToConfigFile(configFile, options);
 	await fs.mkdir(new URL("./", configFile.url), { recursive: true });
 	if (options.stdout) console.stdoutChannel.write(rw.serialize(configFile));
@@ -789,7 +766,7 @@ const pkgDir = _dirname;
 //#endregion
 //#region src/pkgInfo.ts
 const name = "cspell";
-const version$1 = "9.2.0";
+const version$1 = "9.2.2";
 const engines = { node: ">=20" };
 const npmPackage = {
 	name,
@@ -823,8 +800,7 @@ const defaultExcludeGlobs = ["node_modules/**"];
 */
 async function globP(pattern, options) {
 	const cwd = options?.root || options?.cwd || process.cwd();
-	const ignoreRaw = typeof options?.ignore === "string" ? [options.ignore] : options?.ignore;
-	const ignore = ignoreRaw?.filter((g) => !g.startsWith("../"));
+	const ignore = (typeof options?.ignore === "string" ? [options.ignore] : options?.ignore)?.filter((g) => !g.startsWith("../"));
 	const onlyFiles = options?.nodir;
 	const dot = options?.dot;
 	const patterns = typeof pattern === "string" ? [pattern] : pattern;
@@ -838,14 +814,11 @@ async function globP(pattern, options) {
 		expandDirectories: false
 	});
 	const compare$1 = new Intl.Collator("en").compare;
-	const absolutePaths = (await glob$1(patterns, useOptions)).sort(compare$1);
-	const relativePaths = absolutePaths.map((absFilename) => path$1.relative(cwd, absFilename));
-	return relativePaths;
+	return (await glob$1(patterns, useOptions)).sort(compare$1).map((absFilename) => path$1.relative(cwd, absFilename));
 }
 function calcGlobs(commandLineExclude) {
-	const globs = new Set((commandLineExclude || []).flatMap((glob$2) => glob$2.split(/(?<!\\)\s+/g)).map((g) => g.replaceAll("\\ ", " ")));
 	const commandLineExcludes = {
-		globs: [...globs],
+		globs: [...new Set((commandLineExclude || []).flatMap((glob$2) => glob$2.split(/(?<!\\)\s+/g)).map((g) => g.replaceAll("\\ ", " ")))],
 		source: "arguments"
 	};
 	const defaultExcludes = {
@@ -855,7 +828,7 @@ function calcGlobs(commandLineExclude) {
 	return commandLineExcludes.globs.length ? commandLineExcludes : defaultExcludes;
 }
 function extractPatterns(globs) {
-	const r = globs.reduce((info, g) => {
+	return globs.reduce((info, g) => {
 		const source = g.source;
 		const patterns = g.matcher.patternsNormalizedToRoot;
 		return [...info, ...patterns.map((glob$2) => ({
@@ -863,17 +836,15 @@ function extractPatterns(globs) {
 			source
 		}))];
 	}, []);
-	return r;
 }
 function calcExcludeGlobInfo(root, commandLineExclude) {
 	commandLineExclude = typeof commandLineExclude === "string" ? [commandLineExclude] : commandLineExclude;
 	const choice = calcGlobs(commandLineExclude);
-	const matcher = new GlobMatcher(choice.globs, {
-		root,
-		dot: true
-	});
 	return [{
-		matcher,
+		matcher: new GlobMatcher(choice.globs, {
+			root,
+			dot: true
+		}),
 		source: choice.source
 	}];
 }
@@ -883,14 +854,12 @@ function calcExcludeGlobInfo(root, commandLineExclude) {
 * @param root - directory to use as the root
 */
 function buildGlobMatcher(globs, root, isExclude) {
-	const withRoots = globs.map((g) => {
-		const source = typeof g === "string" ? "command line" : void 0;
+	return new GlobMatcher(globs.map((g) => {
 		return {
-			source,
+			source: typeof g === "string" ? "command line" : void 0,
 			...fileOrGlobToGlob(g, root)
 		};
-	});
-	return new GlobMatcher(withRoots, {
+	}), {
 		root,
 		mode: isExclude ? "exclude" : "include"
 	});
@@ -899,9 +868,7 @@ function extractGlobsFromMatcher(globMatcher) {
 	return globMatcher.patternsNormalizedToRoot.map((g) => g.glob);
 }
 function normalizeGlobsToRoot(globs, root, isExclude) {
-	const urls = globs.filter((g) => typeof g === "string" && isPossibleUrlRegExp.test(g));
-	const onlyGlobs = globs.filter((g) => typeof g !== "string" || !isPossibleUrlRegExp.test(g));
-	return [urls, extractGlobsFromMatcher(buildGlobMatcher(onlyGlobs, root, isExclude))].flat();
+	return [globs.filter((g) => typeof g === "string" && isPossibleUrlRegExp.test(g)), extractGlobsFromMatcher(buildGlobMatcher(globs.filter((g) => typeof g !== "string" || !isPossibleUrlRegExp.test(g)), root, isExclude))].flat();
 }
 const isPossibleGlobRegExp = /[()*?[{}]/;
 const isPossibleUrlRegExp = /^[\d_a-z-]{3,}:\/\//;
@@ -924,8 +891,7 @@ async function adjustPossibleDirectory(glob$2, root) {
 	if (isPossibleUrlRegExp.test(g.glob)) return glob$2;
 	const dirPath = path$1.resolve(g.root, g.glob);
 	try {
-		const stat$1 = await promises.stat(dirPath);
-		if (stat$1.isDirectory()) {
+		if ((await promises.stat(dirPath)).isDirectory()) {
 			const useGlob = posix.join(posixPath(g.glob), "**");
 			return typeof glob$2 === "string" ? useGlob : {
 				...glob$2,
@@ -941,8 +907,7 @@ function posixPath(p) {
 	return path$1.sep === "\\" ? p.replaceAll("\\", "/") : p;
 }
 async function normalizeFileOrGlobsToRoot(globs, root) {
-	const adjustedGlobs = await Promise.all(globs.map((g) => adjustPossibleDirectory(g, root)));
-	return normalizeGlobsToRoot(adjustedGlobs, root, false);
+	return normalizeGlobsToRoot(await Promise.all(globs.map((g) => adjustPossibleDirectory(g, root))), root, false);
 }
 function glob$1(patterns, options) {
 	patterns = typeof patterns === "string" ? workaroundPicomatchBug(patterns) : patterns.map((g) => workaroundPicomatchBug(g));
@@ -1018,8 +983,7 @@ function resolveFilename(filename, cwd) {
 }
 function readFileInfo(filename, encoding = UTF8, handleNotFound = false) {
 	filename = resolveFilename(filename);
-	const pText = filename.startsWith(STDINProtocol) ? streamConsumers.text(process.stdin) : readFileText(filename, encoding);
-	return pText.then((text) => ({
+	return (filename.startsWith(STDINProtocol) ? streamConsumers.text(process.stdin) : readFileText(filename, encoding)).then((text) => ({
 		text,
 		filename
 	}), (e) => {
@@ -1058,14 +1022,11 @@ const resolveFilenames = asyncMap(resolveFilename);
 */
 function readFileListFiles(listFiles) {
 	let useStdin = false;
-	const files = listFiles.filter((file) => {
+	return asyncPipe(mergeAsyncIterables(asyncPipe(listFiles.filter((file) => {
 		const isStdin$1 = file === "stdin";
 		useStdin = useStdin || isStdin$1;
 		return !isStdin$1;
-	});
-	const found = asyncPipe(files, asyncMap((file) => readFileListFile(file)), asyncAwait(), asyncFlatten());
-	const stdin = useStdin ? readStdin() : [];
-	return asyncPipe(mergeAsyncIterables(found, stdin), resolveFilenames);
+	}), asyncMap((file) => readFileListFile(file)), asyncAwait(), asyncFlatten()), useStdin ? readStdin() : []), resolveFilenames);
 }
 /**
 * Read a `listFile` and return the containing file paths resolved relative to the `listFile`.
@@ -1076,9 +1037,7 @@ function readFileListFiles(listFiles) {
 async function readFileListFile(listFile) {
 	try {
 		const relTo = path$1.resolve(path$1.dirname(listFile));
-		const content = await readFile(listFile);
-		const lines = content.split("\n").map((a) => a.trim()).filter((a) => !!a).map((file) => path$1.resolve(relTo, file));
-		return lines;
+		return (await readFile(listFile)).split("\n").map((a) => a.trim()).filter((a) => !!a).map((file) => path$1.resolve(relTo, file));
 	} catch (err) {
 		throw toApplicationError(err, `Error reading file list from: "${listFile}"`);
 	}
@@ -1089,16 +1048,14 @@ function isStdin(filename) {
 async function isFile(filename) {
 	if (isStdin(filename)) return true;
 	try {
-		const stat$1 = await promises.stat(filename);
-		return stat$1.isFile();
+		return (await promises.stat(filename)).isFile();
 	} catch {
 		return false;
 	}
 }
 async function isDir(filename) {
 	try {
-		const stat$1 = await promises.stat(filename);
-		return stat$1.isDirectory();
+		return (await promises.stat(filename)).isDirectory();
 	} catch {
 		return false;
 	}
@@ -1167,15 +1124,13 @@ var FlatCache = class {
 * @returns
 */
 function loadCacheFile(cachefile) {
-	const cache = new FlatCache(cachefile);
-	return cache.load();
+	return new FlatCache(cachefile).load();
 }
 
 //#endregion
 //#region src/util/cache/file-entry-cache/file-entry-cache.ts
 async function createFromFile$1(cacheFileUrl, useChecksum, currentWorkingDir) {
-	const cache = await loadCacheFile(cacheFileUrl);
-	const fec = new ImplFileEntryCache(cache, useChecksum ?? false, currentWorkingDir);
+	const fec = new ImplFileEntryCache(await loadCacheFile(cacheFileUrl), useChecksum ?? false, currentWorkingDir);
 	await fec.removeNotFoundFiles();
 	return fec;
 }
@@ -1318,7 +1273,7 @@ var ImplFileEntryCache = class {
 		} catch (error) {
 			if (!isNodeError(error) || error.code !== "ENOENT") throw error;
 		}
-		this.cache.save();
+		await this.cache.save();
 	}
 	resolveKeyToFile(entryKey) {
 		if (this.currentWorkingDir) return path.resolve(this.currentWorkingDir, entryKey);
@@ -1375,17 +1330,11 @@ var ShallowObjectCollection = class {
 
 //#endregion
 //#region src/util/cache/DiskCache.ts
-const cacheDataKeys = {
+const META_DATA_VERSION_SUFFIX = "-1-" + Object.keys({
 	v: "v",
 	r: "r",
 	d: "d"
-};
-/**
-* Meta Data Version is used to detect if the structure of the meta data has changed.
-* This is used in combination with the Suffix and the version of CSpell.
-*/
-const META_DATA_BASE_VERSION = "1";
-const META_DATA_VERSION_SUFFIX = "-" + META_DATA_BASE_VERSION + "-" + Object.keys(cacheDataKeys).join("|");
+}).join("|");
 /**
 * Caches cspell results on disk
 */
@@ -1412,7 +1361,7 @@ var DiskCache = class {
 		const data = meta?.data;
 		const result = data?.r;
 		const versionMatches = this.version === data?.v;
-		if (fileDescriptor.notFound || fileDescriptor.changed || !meta || !result || !versionMatches || !await this.checkDependencies(data.d)) return void 0;
+		if (fileDescriptor.notFound || fileDescriptor.changed || !meta || !result || !versionMatches || !await this.checkDependencies(data.d)) return;
 		const dd = { ...data };
 		if (dd.d) dd.d = setTreeEntry(this.dependencyCacheTree, dd.d);
 		dd.r = dd.r && this.normalizeResult(dd.r);
@@ -1431,12 +1380,11 @@ var DiskCache = class {
 		const fileDescriptor = await this.fileEntryCache.getFileDescriptor(fileInfo.filename);
 		const meta = fileDescriptor.meta;
 		if (fileDescriptor.notFound || !meta) return;
-		const data = this.objectCollection.get({
+		meta.data = this.objectCollection.get({
 			v: this.version,
 			r: this.normalizeResult(result),
 			d: await this.calcDependencyHashes(dependsUponFiles)
 		});
-		meta.data = data;
 	}
 	async reconcile() {
 		await this.fileEntryCache.reconcile();
@@ -1538,9 +1486,7 @@ async function getDependencyForUrl(remoteUrl) {
 	}
 }
 async function createDiskCache(cacheFileLocation, useCheckSum, cspellVersion, useUniversalCache) {
-	const fileEntryCache = await createFromFile(cacheFileLocation, useCheckSum, useUniversalCache);
-	const cache = new DiskCache(cacheFileLocation, useCheckSum, cspellVersion, useUniversalCache, fileEntryCache);
-	return cache;
+	return new DiskCache(cacheFileLocation, useCheckSum, cspellVersion, useUniversalCache, await createFromFile(cacheFileLocation, useCheckSum, useUniversalCache));
 }
 function getTreeEntry(tree, keys) {
 	let r = tree;
@@ -1634,8 +1580,7 @@ async function calcCacheSettings(config, cacheOptions, root) {
 }
 async function resolveCacheLocation(cacheLocation) {
 	try {
-		const s = await stat(cacheLocation);
-		if (s.isFile()) return cacheLocation;
+		if ((await stat(cacheLocation)).isFile()) return cacheLocation;
 		return path.join(cacheLocation, DEFAULT_CACHE_LOCATION);
 	} catch (err) {
 		if (isErrorLike(err) && err.code === "ENOENT") return cacheLocation;
@@ -1656,10 +1601,7 @@ function normalizeVersion(version$2) {
 //#region src/util/configFileHelper.ts
 async function readConfig(configFile, root, stopConfigSearchAt) {
 	configFile ??= getEnvironmentVariable(environmentKeys.CSPELL_CONFIG_PATH);
-	if (configFile) {
-		const cfgFile = typeof configFile === "string" ? await readConfigHandleError(configFile) : configFile;
-		return configFileToConfigInfo(cfgFile);
-	}
+	if (configFile) return configFileToConfigInfo(typeof configFile === "string" ? await readConfigHandleError(configFile) : configFile);
 	const config = await cspell.searchForConfig(root, { stopSearchAt: stopConfigSearchAt });
 	const defaultConfigFile = getEnvironmentVariable(environmentKeys.CSPELL_DEFAULT_CONFIG_PATH);
 	if (!config && defaultConfigFile) {
@@ -1673,9 +1615,8 @@ async function readConfig(configFile, root, stopConfigSearchAt) {
 }
 async function configFileToConfigInfo(cfgFile) {
 	const config = await cspell.resolveConfigFileImports(cfgFile);
-	const source = toFilePathOrHref(cfgFile.url);
 	return {
-		source,
+		source: toFilePathOrHref(cfgFile.url),
 		config
 	};
 }
@@ -1739,12 +1680,10 @@ function lineContext(lineText, start, end, contextRange) {
 	const t0 = lineText.slice(left, right);
 	const tLeft = t0.trimStart();
 	left = Math.min(left + t0.length - tLeft.length, start);
-	const text = tLeft.trimEnd();
-	const context = {
-		text,
+	return {
+		text: tLeft.trimEnd(),
 		offset: left
 	};
-	return context;
 }
 function extractContext(tdo, contextRange) {
 	const { line, offset, text } = tdo;
@@ -1806,13 +1745,12 @@ async function loadReporters(reporters, defaultReporter, config) {
 		}
 	}
 	reporters = !reporters || !reporters.length ? ["default"] : [...reporters];
-	const loadedReporters = await Promise.all(reporters.map(loadReporter));
-	return loadedReporters.filter((v) => v !== void 0);
+	return (await Promise.all(reporters.map(loadReporter))).filter((v) => v !== void 0);
 }
 function finalizeReporter(reporter) {
 	if (!reporter) return void 0;
 	if (reporterIsFinalized(reporter)) return reporter;
-	const final = {
+	return {
 		issue: (...params) => reporter.issue?.(...params),
 		info: (...params) => reporter.info?.(...params),
 		debug: (...params) => reporter.debug?.(...params),
@@ -1821,7 +1759,6 @@ function finalizeReporter(reporter) {
 		result: (...params) => reporter.result?.(...params),
 		features: reporter.features
 	};
-	return final;
 }
 function reporterIsFinalized(reporter) {
 	return !!reporter && reporter.features && typeof reporter.issue === "function" && typeof reporter.info === "function" && typeof reporter.debug === "function" && typeof reporter.error === "function" && typeof reporter.progress === "function" && typeof reporter.result === "function" || false;
@@ -1906,8 +1843,7 @@ var LintReporter = class {
 		});
 	}
 	emitProgressComplete(filename, fileNum, fileCount, result) {
-		const filteredIssues = result.issues.filter((issue) => filterFeatureIssues({}, issue, result.reportIssueOptions));
-		const numIssues = filteredIssues.length;
+		const numIssues = result.issues.filter((issue) => filterFeatureIssues({}, issue, result.reportIssueOptions)).length;
 		for (const reporter of this.#reporters) {
 			const progress = clean({
 				type: "ProgressFileComplete",
@@ -1940,14 +1876,12 @@ function getTimeMeasurer() {
 //#region src/util/writeFile.ts
 async function writeFileOrStream(filename, data) {
 	switch (filename) {
-		case "stdout": {
+		case "stdout":
 			await writeStream(process.stdout, data);
 			return;
-		}
-		case "stderr": {
+		case "stderr":
 			await writeStream(process.stderr, data);
 			return;
-		}
 		case "null": return;
 	}
 	return fs.writeFile(filename, data);
@@ -1989,25 +1923,21 @@ async function runLint(cfg) {
 			const cachedResult = await cache.getCachedLintResults(filename);
 			if (cachedResult) {
 				reporter.debug(`Filename: ${filename}, using cache`);
-				const fileResult = {
+				return { fileResult: {
 					...cachedResult,
 					elapsedTimeMs: getElapsedTimeMs()
-				};
-				return { fileResult };
+				} };
 			}
 			const uri = filenameToUri(filename, cfg.root).href;
-			const checkResult = await shouldCheckDocument({ uri }, {}, configInfo.config);
-			if (!checkResult.shouldCheck) return { skip: true };
-			const fileInfo = await readFileInfo(filename, void 0, true);
+			if (!(await shouldCheckDocument({ uri }, {}, configInfo.config)).shouldCheck) return { skip: true };
 			return {
-				fileInfo,
+				fileInfo: await readFileInfo(filename, void 0, true),
 				reportIssueOptions
 			};
 		}
-		const result = fetch$1();
 		return {
 			filename,
-			result
+			result: fetch$1()
 		};
 	}
 	async function processFile(filename, configInfo, cache, prefetch$1) {
@@ -2052,13 +1982,12 @@ async function runLint(cfg) {
 		try {
 			const { showSuggestions: generateSuggestions, validateDirectives, skipValidation } = cfg.options;
 			const numSuggestions = configInfo.config.numSuggestions ?? 5;
-			const validateOptions = clean({
+			const r = await spellCheckDocument(doc, clean({
 				generateSuggestions,
 				numSuggestions,
 				validateDirectives,
 				skipValidation
-			});
-			const r = await spellCheckDocument(doc, validateOptions, configInfo.config);
+			}), configInfo.config);
 			spellResult = r;
 			result.processed = r.checked;
 			result.perf = r.perf ? { ...r.perf } : void 0;
@@ -2135,11 +2064,10 @@ async function runLint(cfg) {
 					elapsedTimeMs: getElapsedTimeMs()
 				}
 			};
-			const result = await processFile(filename, configInfo, cache, fetchResult);
 			return {
 				filename,
 				fileNum: index,
-				result
+				result: await processFile(filename, configInfo, cache, fetchResult)
 			};
 		}
 		async function* loadAndProcessFiles() {
@@ -2180,8 +2108,7 @@ async function runLint(cfg) {
 			count += 1;
 			reporter.error("Configuration", ref.error);
 		});
-		const dictCollection = await getDictionary(config);
-		dictCollection.dictionaries.forEach((dict) => {
+		(await getDictionary(config)).dictionaries.forEach((dict) => {
 			const dictErrors = dict.getErrors?.() || [];
 			const msg = `Dictionary Error with (${dict.name})`;
 			dictErrors.forEach((error) => {
@@ -2228,8 +2155,7 @@ async function runLint(cfg) {
 				...cfg.options,
 				version
 			}, root);
-			const files = await determineFilesToCheck(configInfo, cfg, reporter, globInfo);
-			const result = await processFiles(files, configInfo, cacheSettings);
+			const result = await processFiles(await determineFilesToCheck(configInfo, cfg, reporter, globInfo), configInfo, cacheSettings);
 			if (configErrors$1 && cfg.options.exitCode !== false) result.errors ||= configErrors$1;
 			return result;
 		} catch (e) {
@@ -2263,19 +2189,14 @@ async function determineGlobs(configInfo, cfg) {
 	const cliGlobs = cfg.fileGlobs;
 	const allGlobs = cliGlobs.length && cliGlobs || cfg.options.filterFiles !== false && configInfo.config.files || [];
 	const combinedGlobs = await normalizeFileOrGlobsToRoot(allGlobs, cfg.root);
-	const cliExcludeGlobs = extractPatterns(cfg.excludes).map((p) => p.glob);
-	const normalizedExcludes = normalizeGlobsToRoot(cliExcludeGlobs, cfg.root, true);
-	const includeGlobs = combinedGlobs.filter((g) => !g.startsWith("!"));
-	const excludeGlobs = [...combinedGlobs.filter((g) => g.startsWith("!")).map((g) => g.slice(1)), ...normalizedExcludes];
-	const fileGlobs = includeGlobs;
-	const appGlobs = {
+	const normalizedExcludes = normalizeGlobsToRoot(extractPatterns(cfg.excludes).map((p) => p.glob), cfg.root, true);
+	return {
 		allGlobs,
 		gitIgnore,
-		fileGlobs,
-		excludeGlobs,
+		fileGlobs: combinedGlobs.filter((g) => !g.startsWith("!")),
+		excludeGlobs: [...combinedGlobs.filter((g) => g.startsWith("!")).map((g) => g.slice(1)), ...normalizedExcludes],
 		normalizedExcludes
 	};
-	return appGlobs;
 }
 async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
 	async function _determineFilesToCheck() {
@@ -2286,16 +2207,14 @@ async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
 		const globsToExcludeRaw = [...configInfo.config.ignorePaths || [], ...excludeGlobs];
 		const globsToExclude = globsToExcludeRaw.filter((g) => !globPattern(g).startsWith("!"));
 		if (globsToExclude.length !== globsToExcludeRaw.length) {
-			const globs = globsToExcludeRaw.map((g) => globPattern(g)).filter((g) => g.startsWith("!"));
-			const msg = `Negative glob exclusions are not supported: ${globs.join(", ")}`;
+			const msg = `Negative glob exclusions are not supported: ${globsToExcludeRaw.map((g) => globPattern(g)).filter((g) => g.startsWith("!")).join(", ")}`;
 			reporter.info(msg, MessageTypes.Warning);
 		}
 		const globMatcher = buildGlobMatcher(globsToExclude, root, true);
-		const ignoreGlobs = extractGlobsFromMatcher(globMatcher);
 		const globOptions = {
 			root,
 			cwd: root,
-			ignore: [...ignoreGlobs, ...normalizedExcludes],
+			ignore: [...extractGlobsFromMatcher(globMatcher), ...normalizedExcludes],
 			nodir: true
 		};
 		const enableGlobDot = cfg.enableGlobDot ?? configInfo.config.enableGlobDot;
@@ -2306,8 +2225,7 @@ async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
 		const cliFiles = cfg.options.mustFindFiles ? rawCliFiles : rawCliFiles && pipeAsync(rawCliFiles, opFilterAsync(isFile));
 		const foundFiles = hasFileLists ? concatAsyncIterables(cliFiles, await useFileLists(fileLists, includeFilter)) : cliFiles || await findFiles(fileGlobs, globOptions);
 		const filtered = gitIgnore ? await gitIgnore.filterOutIgnored(foundFiles) : foundFiles;
-		const files = isAsyncIterable(filtered) ? pipeAsync(filtered, opFilterExcludedFiles) : [...pipe(filtered, opFilterExcludedFiles)];
-		return files;
+		return isAsyncIterable(filtered) ? pipeAsync(filtered, opFilterExcludedFiles) : [...pipe(filtered, opFilterExcludedFiles)];
 	}
 	function isExcluded(filename, globMatcherExclude) {
 		if (isBinaryFile(toFileURL(filename))) return true;
@@ -2321,8 +2239,7 @@ async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
 		return r.matched;
 	}
 	function filterOutExcludedFilesFn(globMatcherExclude) {
-		const patterns = globMatcherExclude.patterns;
-		const excludeInfo = patterns.map(extractGlobSource).map(({ glob: glob$2, source }) => `Glob: ${glob$2} from ${source}`).filter(uniqueFn());
+		const excludeInfo = globMatcherExclude.patterns.map(extractGlobSource).map(({ glob: glob$2, source }) => `Glob: ${glob$2} from ${source}`).filter(uniqueFn());
 		reporter.info(`Exclusion Globs: \n    ${excludeInfo.join("\n    ")}\n`, MessageTypes.Info);
 		return (filename) => !isExcluded(filename, globMatcherExclude);
 	}
@@ -2355,12 +2272,11 @@ function getLoggerFromReporter(reporter) {
 	};
 	const error = (...params) => {
 		const msg = format(...params);
-		const err = {
+		reporter.error(msg, {
 			message: "",
 			name: "error",
 			toString: () => ""
-		};
-		reporter.error(msg, err);
+		});
 	};
 	const warn = (...params) => {
 		const msg = format(...params);
@@ -2382,8 +2298,7 @@ async function generateGitIgnore(roots) {
 	return new GitIgnore(root?.map((p) => path$1.resolve(p)));
 }
 async function useFileLists(fileListFiles, filterFiles) {
-	const files = readFileListFiles(fileListFiles);
-	return pipeAsync(files, opFilter(filterFiles), opFilterAsync(isNotDir));
+	return pipeAsync(readFileListFiles(fileListFiles), opFilter(filterFiles), opFilterAsync(isNotDir));
 }
 function createIncludeFileFilterFn(includeGlobPatterns, root, dot) {
 	if (!includeGlobPatterns?.length) return () => true;
@@ -2403,13 +2318,9 @@ async function* concatAsyncIterables(...iterables) {
 	}
 }
 async function writeDictionaryLog() {
-	const fieldsCsv = getEnvironmentVariable("CSPELL_ENABLE_DICTIONARY_LOG_FIELDS") || "time, word, value";
-	const fields = fieldsCsv.split(",").map((f) => f.trim());
-	const header = fields.join(", ") + "\n";
-	const lines = _debug.cacheDictionaryGetLog().filter((d) => d.method === "has").map((d) => fields.map((f) => f in d ? `${d[f]}` : "").join(", "));
-	const data = header + lines.join("\n") + "\n";
-	const filename = getEnvironmentVariable("CSPELL_ENABLE_DICTIONARY_LOG_FILE") || "cspell-dictionary-log.csv";
-	await writeFileOrStream(filename, data);
+	const fields = (getEnvironmentVariable("CSPELL_ENABLE_DICTIONARY_LOG_FIELDS") || "time, word, value").split(",").map((f) => f.trim());
+	const data = fields.join(", ") + "\n" + _debug.cacheDictionaryGetLog().filter((d) => d.method === "has").map((d) => fields.map((f) => f in d ? `${d[f]}` : "").join(", ")).join("\n") + "\n";
+	await writeFileOrStream(getEnvironmentVariable("CSPELL_ENABLE_DICTIONARY_LOG_FILE") || "cspell-dictionary-log.csv", data);
 }
 function globPattern(g) {
 	return typeof g === "string" ? g : g.glob;
@@ -2449,11 +2360,10 @@ var LintRequest = class {
 		this.fileLists = (options.fileList ?? options.fileLists) || [];
 		this.files = mergeFiles(options.file, options.files);
 		const noConfigSearch = options.configSearch === false ? true : options.configSearch === true ? false : void 0;
-		const dictionaries = [...(options.disableDictionary ?? []).map((d) => `!${d}`), ...(options.dictionary ?? []).map((d) => `!!${d}`)];
 		const languageSettings = [{
 			languageId: "*",
 			locale: "*",
-			dictionaries
+			dictionaries: [...(options.disableDictionary ?? []).map((d) => `!${d}`), ...(options.dictionary ?? []).map((d) => `!!${d}`)]
 		}];
 		this.cspellSettingsFromCliOptions = {
 			...noConfigSearch !== void 0 ? { noConfigSearch } : {},
@@ -2476,22 +2386,18 @@ function extractUnknownWordsConfig(options) {
 	const config = {};
 	if (!options.report) return config;
 	switch (options.report) {
-		case "all": {
+		case "all":
 			config.unknownWords = unknownWordsChoices.ReportAll;
 			break;
-		}
-		case "simple": {
+		case "simple":
 			config.unknownWords = unknownWordsChoices.ReportSimple;
 			break;
-		}
-		case "typos": {
+		case "typos":
 			config.unknownWords = unknownWordsChoices.ReportCommonTypos;
 			break;
-		}
-		case "flagged": {
+		case "flagged":
 			config.unknownWords = unknownWordsChoices.ReportFlagged;
 			break;
-		}
 	}
 	return config;
 }
@@ -2540,8 +2446,7 @@ var SimpleRepl = class {
 	}
 	_completer(line) {
 		if (this.completer) return this.completer(line);
-		const hist = this._history.filter((h) => h.startsWith(line));
-		return [hist, line];
+		return [this._history.filter((h) => h.startsWith(line)), line];
 	}
 	get history() {
 		return this._history;
@@ -2631,8 +2536,7 @@ function extractSpecialDictionaries(config) {
 }
 async function listDictionaries(options) {
 	const configFile = await readConfig(options.config, void 0);
-	const loadDefault = options.defaultConfiguration ?? configFile.config.loadDefaultConfiguration ?? true;
-	const configBase = mergeSettings(await getDefaultSettings(loadDefault), await getGlobalSettingsAsync(), configFile.config);
+	const configBase = mergeSettings(await getDefaultSettings(options.defaultConfiguration ?? configFile.config.loadDefaultConfiguration ?? true), await getGlobalSettingsAsync(), configFile.config);
 	const useFileType = options.fileType === "text" ? "plaintext" : options.fileType;
 	if (options.locale) configBase.language = options.locale;
 	const config = combineTextAndLanguageSettings(configBase, "", useFileType || configBase.languageId || "plaintext");
@@ -2656,8 +2560,7 @@ async function listDictionaries(options) {
 	}
 	const dictionaryDefinitions = (config.dictionaryDefinitions || []).filter(filterDicts);
 	dictionaryDefinitions.sort((a, b) => a.name.localeCompare(b.name));
-	const specialDicts = options.enabled !== false ? extractSpecialDictionaries(config) : [];
-	return [...specialDicts, ...dictionaryDefinitions.map(toListDictionariesResult)];
+	return [...options.enabled !== false ? extractSpecialDictionaries(config) : [], ...dictionaryDefinitions.map(toListDictionariesResult)];
 }
 
 //#endregion
@@ -2673,11 +2576,10 @@ function lint(fileGlobs, options, reporter) {
 		...useOptions,
 		console
 	};
-	const cfg = new LintRequest(fileGlobs, useOptions, finalizeReporter(reporter) ?? getReporter({
+	return runLint(new LintRequest(fileGlobs, useOptions, finalizeReporter(reporter) ?? getReporter({
 		...useOptions,
 		fileGlobs
-	}, reporterOptions));
-	return runLint(cfg);
+	}, reporterOptions)));
 }
 async function* trace(words, options) {
 	options = fixLegacy(options);
@@ -2687,8 +2589,7 @@ async function* trace(words, options) {
 	const loadDefault = options.defaultConfiguration ?? configFile.config.loadDefaultConfiguration ?? true;
 	const additionalSettings = {};
 	if (options.dictionary) additionalSettings.dictionaries = options.dictionary;
-	const config = mergeSettings(await getDefaultSettings(loadDefault), await getGlobalSettingsAsync(), configFile.config, additionalSettings);
-	yield* traceWordsAsync(iWords, config, clean({
+	yield* traceWordsAsync(iWords, mergeSettings(await getDefaultSettings(loadDefault), await getGlobalSettingsAsync(), configFile.config, additionalSettings), clean({
 		languageId,
 		locale,
 		ignoreCase,
@@ -2731,8 +2632,7 @@ async function* suggestions(words, options) {
 	}
 	const iWords = options.repl ? pipeAsync(toAsyncIterable(words, simpleRepl()), opTap(tapStart)) : options.useStdin ? pipeAsync(toAsyncIterable(words, readStdin()), opTap(tapStart)) : words.map(mapStart);
 	try {
-		const results = pipeAsync(suggestionsForWords(iWords, clean({ ...options }), configFile.config), opMap(mapEnd));
-		yield* results;
+		yield* pipeAsync(suggestionsForWords(iWords, clean({ ...options }), configFile.config), opMap(mapEnd));
 	} catch (e) {
 		if (!(e instanceof SuggestionError)) throw e;
 		console.error(e.message);
@@ -2744,18 +2644,16 @@ function createInit(options) {
 }
 function registerApplicationFeatureFlags() {
 	const ff = getFeatureFlags();
-	const flags = [{
+	[{
 		name: "timer",
 		description: "Display elapsed time for command."
-	}];
-	flags.forEach((flag) => ff.register(flag));
+	}].forEach((flag) => ff.register(flag));
 	return ff;
 }
 function parseApplicationFeatureFlags(flags) {
-	const ff = registerApplicationFeatureFlags();
-	return parseFeatureFlags(flags, ff);
+	return parseFeatureFlags(flags, registerApplicationFeatureFlags());
 }
 
 //#endregion
-export { ApplicationError, CheckFailed, DEFAULT_CACHE_LOCATION, IncludeExcludeFlag, ReportChoicesAll, checkText, console, createInit, getReporter, lint, listDictionaries, npmPackage, parseApplicationFeatureFlags, suggestions, trace };
-//# sourceMappingURL=application-_MFvh02K.js.map
+export { parseApplicationFeatureFlags as a, listDictionaries as c, npmPackage as d, getReporter as f, console as h, lint as i, ReportChoicesAll as l, CheckFailed as m, checkText as n, suggestions as o, ApplicationError as p, createInit as r, trace as s, IncludeExcludeFlag as t, DEFAULT_CACHE_LOCATION as u };
+//# sourceMappingURL=application-2V_0BiNj.js.map

package/dist/esm/{application-D8WjsMdV.d.ts → application-DDngbSV7.d.ts}

@@ -1,4 +1,4 @@
-import { BaseOptions, DictionariesOptions, LegacyOptions, LinterCliOptions, SuggestionOptions, TraceOptions } from "./options-ChaXtdFn.js";
+import { a as SuggestionOptions, i as LinterCliOptions, n as DictionariesOptions, o as TraceOptions, r as LegacyOptions, t as BaseOptions } from "./options-D_a-jMcz.js";
 import { CheckTextInfo, FeatureFlags, IncludeExcludeFlag, SuggestionsForWordResult, TraceResult, TraceWordResult } from "cspell-lib";
 import { CSpellReporter, RunResult } from "@cspell/cspell-types";
 
@@ -112,5 +112,5 @@ declare function suggestions(words: string[], options: SuggestionOptions): Async
 declare function createInit(options: InitOptions): Promise<void>;
 declare function parseApplicationFeatureFlags(flags: string[] | undefined): FeatureFlags;
 //#endregion
-export { AppError, CheckTextResult, IncludeExcludeFlag, type TraceResult, checkText, createInit, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace };
-//# sourceMappingURL=application-D8WjsMdV.d.ts.map
+export { checkText as a, parseApplicationFeatureFlags as c, listDictionaries as d, TraceResult as i, suggestions as l, CheckTextResult as n, createInit as o, IncludeExcludeFlag as r, lint as s, AppError as t, trace as u };
+//# sourceMappingURL=application-DDngbSV7.d.ts.map

package/dist/esm/application.d.ts

@@ -1,3 +1,3 @@
-import "./options-ChaXtdFn.js";
-import { AppError, CheckTextResult, IncludeExcludeFlag, TraceResult, checkText, createInit, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace } from "./application-D8WjsMdV.js";
+import "./options-D_a-jMcz.js";
+import { a as checkText, c as parseApplicationFeatureFlags, d as listDictionaries, i as TraceResult, l as suggestions, n as CheckTextResult, o as createInit, r as IncludeExcludeFlag, s as lint, t as AppError, u as trace } from "./application-DDngbSV7.js";
 export { AppError, CheckTextResult, IncludeExcludeFlag, TraceResult, checkText, createInit, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace };

package/dist/esm/application.js

@@ -1,3 +1,3 @@
-import { IncludeExcludeFlag, checkText, createInit, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace } from "./application-_MFvh02K.js";
+import { a as parseApplicationFeatureFlags, c as listDictionaries, i as lint, n as checkText, o as suggestions, r as createInit, s as trace, t as IncludeExcludeFlag } from "./application-2V_0BiNj.js";
 
 export { IncludeExcludeFlag, checkText, createInit, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace };

package/dist/esm/index.d.ts

@@ -1,5 +1,5 @@
-import { BaseOptions, LinterCliOptions, TraceOptions } from "./options-ChaXtdFn.js";
-import { AppError, CheckTextResult, IncludeExcludeFlag, TraceResult, checkText, createInit, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace } from "./application-D8WjsMdV.js";
+import { i as LinterCliOptions, o as TraceOptions, t as BaseOptions } from "./options-D_a-jMcz.js";
+import { a as checkText, c as parseApplicationFeatureFlags, d as listDictionaries, i as TraceResult, l as suggestions, n as CheckTextResult, o as createInit, r as IncludeExcludeFlag, s as lint, t as AppError, u as trace } from "./application-DDngbSV7.js";
 import "chalk";
 import { CSpellReporter, CSpellSettings, ReporterConfiguration, RunResult } from "@cspell/cspell-types";
 import { WriteStream } from "node:tty";
@@ -40,10 +40,6 @@ interface CSpellReporterModule {
 //#endregion
 //#region src/util/reporters.d.ts
 type FinalizedReporter = Required<CSpellReporter>;
-/**
-* Loads reporter modules configured in cspell config file
-*/
-
 //#endregion
 //#region src/cli-reporter.d.ts
 interface ReporterOptions extends Pick<LinterCliOptions, "color" | "debug" | "issues" | "issuesSummaryReport" | "legacy" | "progress" | "relative" | "root" | "showContext" | "showPerfSummary" | "showSuggestions" | "silent" | "summary" | "verbose" | "wordsOnly"> {

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { IncludeExcludeFlag, checkText, createInit, getReporter, lint, listDictionaries, parseApplicationFeatureFlags, suggestions, trace } from "./application-_MFvh02K.js";
+import { a as parseApplicationFeatureFlags, c as listDictionaries, f as getReporter, i as lint, n as checkText, o as suggestions, r as createInit, s as trace, t as IncludeExcludeFlag } from "./application-2V_0BiNj.js";
 
 export * from "@cspell/cspell-types"
 

package/dist/esm/{options-ChaXtdFn.d.ts → options-D_a-jMcz.d.ts}

@@ -383,5 +383,5 @@ interface CSpellConfigFile {
   settings: CSpellSettings;
 }
 //#endregion
-export { BaseOptions, DictionariesOptions, LegacyOptions, LinterCliOptions, SuggestionOptions, TraceOptions };
-//# sourceMappingURL=options-ChaXtdFn.d.ts.map
+export { SuggestionOptions as a, LinterCliOptions as i, DictionariesOptions as n, TraceOptions as o, LegacyOptions as r, BaseOptions as t };
+//# sourceMappingURL=options-D_a-jMcz.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "9.2.0",
+  "version": "9.2.2",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "bin": {
@@ -83,24 +83,24 @@
   },
   "homepage": "https://cspell.org/",
   "dependencies": {
-    "@cspell/cspell-json-reporter": "9.2.0",
-    "@cspell/cspell-pipe": "9.2.0",
-    "@cspell/cspell-types": "9.2.0",
-    "@cspell/dynamic-import": "9.2.0",
-    "@cspell/url": "9.2.0",
-    "chalk": "^5.4.1",
-    "chalk-template": "^1.1.0",
-    "commander": "^14.0.0",
-    "cspell-config-lib": "9.2.0",
-    "cspell-dictionary": "9.2.0",
-    "cspell-gitignore": "9.2.0",
-    "cspell-glob": "9.2.0",
-    "cspell-io": "9.2.0",
-    "cspell-lib": "9.2.0",
+    "@cspell/cspell-json-reporter": "9.2.2",
+    "@cspell/cspell-pipe": "9.2.2",
+    "@cspell/cspell-types": "9.2.2",
+    "@cspell/dynamic-import": "9.2.2",
+    "@cspell/url": "9.2.2",
+    "chalk": "^5.6.2",
+    "chalk-template": "^1.1.2",
+    "commander": "^14.0.1",
+    "cspell-config-lib": "9.2.2",
+    "cspell-dictionary": "9.2.2",
+    "cspell-gitignore": "9.2.2",
+    "cspell-glob": "9.2.2",
+    "cspell-io": "9.2.2",
+    "cspell-lib": "9.2.2",
     "fast-json-stable-stringify": "^2.1.0",
     "flatted": "^3.3.3",
-    "semver": "^7.7.2",
-    "tinyglobby": "^0.2.14"
+    "semver": "^7.7.3",
+    "tinyglobby": "^0.2.15"
   },
   "engines": {
     "node": ">=20"
@@ -108,9 +108,9 @@
   "devDependencies": {
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.9",
-    "@types/semver": "^7.7.0",
+    "@types/semver": "^7.7.1",
     "micromatch": "^4.0.8",
     "minimatch": "^9.0.5"
   },
-  "gitHead": "6004e6a19e11985bc61e6578846195be07365049"
+  "gitHead": "594a58399cb9dad07cbb1d9cef6f2adb87560dd7"
 }