cspell 8.9.0 → 8.10.0

package/dist/esm/application.d.mts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { CSpellReporter, RunResult } from '@cspell/cspell-types';
 import type { CheckTextInfo, FeatureFlags, TraceWordResult } from 'cspell-lib';
 import type { TimedSuggestionsForWordResult } from './emitters/suggestionsEmitter.mjs';

package/dist/esm/application.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { CSpellReporter, RunResult } from '@cspell/cspell-types';
 import type { CheckTextInfo, FeatureFlags, TraceWordResult } from 'cspell-lib';
 import type { TimedSuggestionsForWordResult } from './emitters/suggestionsEmitter.js';

package/dist/esm/cli-reporter.js

@@ -12,6 +12,9 @@ const templateIssueWithContext = `{green $filename}:{yellow $row:$col} $padRowCo
 const templateIssueWithContextWithSuggestions = `{green $filename}:{yellow $row:$col} $padRowCol- $message ({red $text})$padContext -- {gray $contextLeft}{red {underline $text}}{gray $contextRight}\n\t Suggestions: {yellow [$suggestions]}`;
 const templateIssueLegacy = `${chalk.green('$filename')}[$row, $col]: $message: ${chalk.red('$text')}`;
 const templateIssueWordsOnly = '$text';
+function consoleError(...params) {
+    console.error(chalk.white('%s'), format(...params));
+}
 /**
  *
  * @param template - The template to use for the issue.
@@ -72,7 +75,7 @@ function reportProgressFileComplete(p) {
     const time = reportTime(p.elapsedTimeMs, !!p.cached);
     const skipped = p.processed === false ? ' skipped' : '';
     const hasErrors = p.numErrors ? chalk.red ` X` : '';
-    console.error(` ${time}${skipped}${hasErrors}`);
+    consoleError(` ${time}${skipped}${hasErrors}`);
 }
 function reportTime(elapsedTimeMs, cached) {
     if (cached)
@@ -133,7 +136,7 @@ export function getReporter(options, config) {
         }
         const errorText = format(chalk.red(message), error.toString());
         errorCollection?.push(errorText);
-        console.error(errorText);
+        consoleError(errorText);
     }
     const resultEmitter = (result) => {
         if (!fileGlobs.length && !result.files) {
@@ -142,30 +145,30 @@ export function getReporter(options, config) {
         const { files, issues, cachedFiles, filesWithIssues, errors } = result;
         const numFilesWithIssues = filesWithIssues.size;
         if (issuesCollection?.length || errorCollection?.length) {
-            console.error('-------------------------------------------');
+            consoleError('-------------------------------------------');
         }
         if (issuesCollection?.length) {
-            console.error('Issues found:');
-            issuesCollection.forEach((issue) => console.error(issue));
+            consoleError('Issues found:');
+            issuesCollection.forEach((issue) => consoleError(issue));
         }
         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} in ${numFilesWidthIssuesText}${withErrorsText}.`;
-        console.error(summaryMessage);
+        consoleError(summaryMessage);
         if (errorCollection?.length && issues > 5) {
-            console.error('-------------------------------------------');
-            console.error('Errors:');
-            errorCollection.forEach((error) => console.error(error));
+            consoleError('-------------------------------------------');
+            consoleError('Errors:');
+            errorCollection.forEach((error) => consoleError(error));
         }
         if (options.showPerfSummary) {
-            console.error('-------------------------------------------');
-            console.error('Performance Summary:');
-            console.error(`  Files Processed: ${perfStats.filesProcessed.toString().padStart(6)}`);
-            console.error(`  Files Skipped  : ${perfStats.filesSkipped.toString().padStart(6)}`);
-            console.error(`  Files Cached   : ${perfStats.filesCached.toString().padStart(6)}`);
-            console.error(`  Processing Time: ${perfStats.elapsedTimeMs.toFixed(2).padStart(9)}ms`);
-            console.error('Stats:');
+            consoleError('-------------------------------------------');
+            consoleError('Performance Summary:');
+            consoleError(`  Files Processed: ${perfStats.filesProcessed.toString().padStart(6)}`);
+            consoleError(`  Files Skipped  : ${perfStats.filesSkipped.toString().padStart(6)}`);
+            consoleError(`  Files Cached   : ${perfStats.filesCached.toString().padStart(6)}`);
+            consoleError(`  Processing Time: ${perfStats.elapsedTimeMs.toFixed(2).padStart(9)}ms`);
+            consoleError('Stats:');
             const stats = Object.entries(perfStats.perf)
                 .filter((p) => !!p[1])
                 .map(([key, value]) => [key, value.toFixed(2)]);
@@ -173,7 +176,7 @@ export function getReporter(options, config) {
             const padValue = Math.max(...stats.map((s) => s[1].length));
             stats.sort((a, b) => a[0].localeCompare(b[0]));
             for (const [key, value] of stats) {
-                value && console.error(`  ${key.padEnd(padName)}: ${value.padStart(padValue)}ms`);
+                value && consoleError(`  ${key.padEnd(padName)}: ${value.padStart(padValue)}ms`);
             }
         }
     };

package/dist/esm/cli-reporter.mjs

@@ -12,6 +12,9 @@ const templateIssueWithContext = `{green $filename}:{yellow $row:$col} $padRowCo
 const templateIssueWithContextWithSuggestions = `{green $filename}:{yellow $row:$col} $padRowCol- $message ({red $text})$padContext -- {gray $contextLeft}{red {underline $text}}{gray $contextRight}\n\t Suggestions: {yellow [$suggestions]}`;
 const templateIssueLegacy = `${chalk.green('$filename')}[$row, $col]: $message: ${chalk.red('$text')}`;
 const templateIssueWordsOnly = '$text';
+function consoleError(...params) {
+    console.error(chalk.white('%s'), format(...params));
+}
 /**
  *
  * @param template - The template to use for the issue.
@@ -72,7 +75,7 @@ function reportProgressFileComplete(p) {
     const time = reportTime(p.elapsedTimeMs, !!p.cached);
     const skipped = p.processed === false ? ' skipped' : '';
     const hasErrors = p.numErrors ? chalk.red ` X` : '';
-    console.error(` ${time}${skipped}${hasErrors}`);
+    consoleError(` ${time}${skipped}${hasErrors}`);
 }
 function reportTime(elapsedTimeMs, cached) {
     if (cached)
@@ -133,7 +136,7 @@ export function getReporter(options, config) {
         }
         const errorText = format(chalk.red(message), error.toString());
         errorCollection?.push(errorText);
-        console.error(errorText);
+        consoleError(errorText);
     }
     const resultEmitter = (result) => {
         if (!fileGlobs.length && !result.files) {
@@ -142,30 +145,30 @@ export function getReporter(options, config) {
         const { files, issues, cachedFiles, filesWithIssues, errors } = result;
         const numFilesWithIssues = filesWithIssues.size;
         if (issuesCollection?.length || errorCollection?.length) {
-            console.error('-------------------------------------------');
+            consoleError('-------------------------------------------');
         }
         if (issuesCollection?.length) {
-            console.error('Issues found:');
-            issuesCollection.forEach((issue) => console.error(issue));
+            consoleError('Issues found:');
+            issuesCollection.forEach((issue) => consoleError(issue));
         }
         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} in ${numFilesWidthIssuesText}${withErrorsText}.`;
-        console.error(summaryMessage);
+        consoleError(summaryMessage);
         if (errorCollection?.length && issues > 5) {
-            console.error('-------------------------------------------');
-            console.error('Errors:');
-            errorCollection.forEach((error) => console.error(error));
+            consoleError('-------------------------------------------');
+            consoleError('Errors:');
+            errorCollection.forEach((error) => consoleError(error));
         }
         if (options.showPerfSummary) {
-            console.error('-------------------------------------------');
-            console.error('Performance Summary:');
-            console.error(`  Files Processed: ${perfStats.filesProcessed.toString().padStart(6)}`);
-            console.error(`  Files Skipped  : ${perfStats.filesSkipped.toString().padStart(6)}`);
-            console.error(`  Files Cached   : ${perfStats.filesCached.toString().padStart(6)}`);
-            console.error(`  Processing Time: ${perfStats.elapsedTimeMs.toFixed(2).padStart(9)}ms`);
-            console.error('Stats:');
+            consoleError('-------------------------------------------');
+            consoleError('Performance Summary:');
+            consoleError(`  Files Processed: ${perfStats.filesProcessed.toString().padStart(6)}`);
+            consoleError(`  Files Skipped  : ${perfStats.filesSkipped.toString().padStart(6)}`);
+            consoleError(`  Files Cached   : ${perfStats.filesCached.toString().padStart(6)}`);
+            consoleError(`  Processing Time: ${perfStats.elapsedTimeMs.toFixed(2).padStart(9)}ms`);
+            consoleError('Stats:');
             const stats = Object.entries(perfStats.perf)
                 .filter((p) => !!p[1])
                 .map(([key, value]) => [key, value.toFixed(2)]);
@@ -173,7 +176,7 @@ export function getReporter(options, config) {
             const padValue = Math.max(...stats.map((s) => s[1].length));
             stats.sort((a, b) => a[0].localeCompare(b[0]));
             for (const [key, value] of stats) {
-                value && console.error(`  ${key.padEnd(padName)}: ${value.padStart(padValue)}ms`);
+                value && consoleError(`  ${key.padEnd(padName)}: ${value.padStart(padValue)}ms`);
             }
         }
     };

package/dist/esm/commandTrace.js

@@ -66,7 +66,11 @@ function filterTraceResults(results, options) {
     return results.filter((r) => filterTraceResult(r, options.onlyFound));
 }
 function filterTraceResult(result, onlyFound) {
-    return result.found || result.forbidden || result.noSuggest || (!onlyFound && result.dictActive);
+    return (result.found ||
+        result.forbidden ||
+        result.noSuggest ||
+        !!result.preferredSuggestions ||
+        (!onlyFound && result.dictActive));
 }
 function groupBy(items, key) {
     const map = new Map();

package/dist/esm/commandTrace.mjs

@@ -66,7 +66,11 @@ function filterTraceResults(results, options) {
     return results.filter((r) => filterTraceResult(r, options.onlyFound));
 }
 function filterTraceResult(result, onlyFound) {
-    return result.found || result.forbidden || result.noSuggest || (!onlyFound && result.dictActive);
+    return (result.found ||
+        result.forbidden ||
+        result.noSuggest ||
+        !!result.preferredSuggestions ||
+        (!onlyFound && result.dictActive));
 }
 function groupBy(items, key) {
     const map = new Map();

package/dist/esm/emitters/suggestionsEmitter.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { padLeft, padWidth, width } from '../util/util.js';
+import { padLeft, padWidth, width } from '../util/pad.js';
 // eslint-disable-next-line no-misleading-character-class
 const regExpRTL = /([ \u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]+)/g;
 function reverseRtlText(s) {

package/dist/esm/emitters/suggestionsEmitter.mjs

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { padLeft, padWidth, width } from '../util/util.mjs';
+import { padLeft, padWidth, width } from '../util/pad.mjs';
 // eslint-disable-next-line no-misleading-character-class
 const regExpRTL = /([ \u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]+)/g;
 function reverseRtlText(s) {

package/dist/esm/emitters/traceEmitter.d.mts

@@ -15,6 +15,10 @@ export interface EmitTraceOptions {
     showWordFound?: boolean;
 }
 export declare function emitTraceResults(word: string, found: boolean, results: TraceResult[], options: EmitTraceOptions): void;
+export declare function calcTraceResultsReport(word: string, found: boolean, results: TraceResult[], options: EmitTraceOptions): {
+    table: string;
+    errors: string;
+};
 declare function trimMidPath(s: string, w: number, sep: string): string;
 export declare const __testing__: {
     trimMidPath: typeof trimMidPath;

package/dist/esm/emitters/traceEmitter.d.ts

@@ -15,6 +15,10 @@ export interface EmitTraceOptions {
     showWordFound?: boolean;
 }
 export declare function emitTraceResults(word: string, found: boolean, results: TraceResult[], options: EmitTraceOptions): void;
+export declare function calcTraceResultsReport(word: string, found: boolean, results: TraceResult[], options: EmitTraceOptions): {
+    table: string;
+    errors: string;
+};
 declare function trimMidPath(s: string, w: number, sep: string): string;
 export declare const __testing__: {
     trimMidPath: typeof trimMidPath;

package/dist/esm/emitters/traceEmitter.js

@@ -1,57 +1,63 @@
 import * as iPath from 'node:path';
 import chalk from 'chalk';
-import strip from 'strip-ansi';
-import { pad, width } from '../util/util.js';
+import { tableToLines } from '../util/table.js';
+const maxWidth = 120;
 const colWidthDictionaryName = 20;
 export function emitTraceResults(word, found, results, options) {
-    const maxWordLength = results
-        .map((r) => r.foundWord || r.word)
-        .reduce((a, b) => Math.max(a, width(b)), 'Word'.length);
-    const maxDictNameLength = results
-        .map((r) => r.dictName.length)
-        .reduce((a, b) => Math.max(a, b), colWidthDictionaryName);
-    const cols = {
-        word: maxWordLength,
-        dictName: maxDictNameLength,
-        terminalWidth: options.lineWidth ?? (process.stdout.columns || 120),
-        location: options.dictionaryPathFormat === 'hide' ? 0 : 30,
-    };
+    const report = calcTraceResultsReport(word, found, results, options);
+    console.log(report.table);
+    if (report.errors) {
+        console.error('Errors:');
+        console.error(report.errors);
+    }
+}
+export 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'}`);
-    emitHeader(cols);
-    results.forEach((r) => emitTraceResult(r, cols, options));
+    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'),
+        errors: emitErrors(results).join('\n'),
+    };
 }
-function emitHeader(colWidths) {
-    const line = [
-        pad('Word', colWidths.word),
-        'F',
-        pad('Dictionary', colWidths.dictName),
-        colWidths.location ? pad('Dictionary Location', colWidths.location) : '',
-    ];
-    console.log(chalk.underline(line.join(' ').trim().slice(0, colWidths.terminalWidth)));
+function emitHeader(location) {
+    const headers = ['Word', 'F', 'Dictionary'];
+    location && headers.push('Dictionary Location');
+    return headers;
 }
-function emitTraceResult(r, colWidths, options) {
-    const { word: wordColWidth, terminalWidth, dictName: widthName } = colWidths;
-    const errors = r.errors?.map((e) => e.message)?.join('\n\t') || '';
-    const word = pad(r.foundWord || r.word, wordColWidth);
+function emitTraceResult(r, options) {
+    const errors = !!r.errors?.length;
+    const word = r.foundWord || r.word;
     const cWord = word.replaceAll('+', chalk.yellow('+'));
-    const w = r.forbidden ? chalk.red(cWord) : chalk.green(cWord);
+    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 = pad(r.dictName.slice(0, widthName - 1) + a, widthName);
+    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 info = [w, f, n].join(' ') + ' ';
-    const used = width(strip(info));
-    const widthSrc = terminalWidth - used;
     const c = colorize(errors ? chalk.red : chalk.white);
-    const s = c(formatDictionaryLocation(r.dictSource, widthSrc, { iPath, ...options }));
-    const line = info + s;
-    console.log(line.trim());
-    if (errors) {
-        console.error('\t' + chalk.red(errors));
-    }
+    return [
+        w,
+        f,
+        n,
+        (widthSrc) => c(formatDictionaryLocation(r.dictSource, widthSrc ?? maxWidth, { iPath, ...options })),
+    ];
+}
+function emitErrors(results) {
+    const errorResults = results.filter((r) => r.errors?.length);
+    return errorResults.map((r) => {
+        const errors = r.errors?.map((e) => e.message)?.join('\n\t') || '';
+        return chalk.bold(r.dictName) + '\n\t' + chalk.red(errors);
+    });
 }
 function trimMid(s, w) {
     s = s.trim();

package/dist/esm/emitters/traceEmitter.mjs

@@ -1,57 +1,63 @@
 import * as iPath from 'node:path';
 import chalk from 'chalk';
-import strip from 'strip-ansi';
-import { pad, width } from '../util/util.mjs';
+import { tableToLines } from '../util/table.mjs';
+const maxWidth = 120;
 const colWidthDictionaryName = 20;
 export function emitTraceResults(word, found, results, options) {
-    const maxWordLength = results
-        .map((r) => r.foundWord || r.word)
-        .reduce((a, b) => Math.max(a, width(b)), 'Word'.length);
-    const maxDictNameLength = results
-        .map((r) => r.dictName.length)
-        .reduce((a, b) => Math.max(a, b), colWidthDictionaryName);
-    const cols = {
-        word: maxWordLength,
-        dictName: maxDictNameLength,
-        terminalWidth: options.lineWidth ?? (process.stdout.columns || 120),
-        location: options.dictionaryPathFormat === 'hide' ? 0 : 30,
-    };
+    const report = calcTraceResultsReport(word, found, results, options);
+    console.log(report.table);
+    if (report.errors) {
+        console.error('Errors:');
+        console.error(report.errors);
+    }
+}
+export 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'}`);
-    emitHeader(cols);
-    results.forEach((r) => emitTraceResult(r, cols, options));
+    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'),
+        errors: emitErrors(results).join('\n'),
+    };
 }
-function emitHeader(colWidths) {
-    const line = [
-        pad('Word', colWidths.word),
-        'F',
-        pad('Dictionary', colWidths.dictName),
-        colWidths.location ? pad('Dictionary Location', colWidths.location) : '',
-    ];
-    console.log(chalk.underline(line.join(' ').trim().slice(0, colWidths.terminalWidth)));
+function emitHeader(location) {
+    const headers = ['Word', 'F', 'Dictionary'];
+    location && headers.push('Dictionary Location');
+    return headers;
 }
-function emitTraceResult(r, colWidths, options) {
-    const { word: wordColWidth, terminalWidth, dictName: widthName } = colWidths;
-    const errors = r.errors?.map((e) => e.message)?.join('\n\t') || '';
-    const word = pad(r.foundWord || r.word, wordColWidth);
+function emitTraceResult(r, options) {
+    const errors = !!r.errors?.length;
+    const word = r.foundWord || r.word;
     const cWord = word.replaceAll('+', chalk.yellow('+'));
-    const w = r.forbidden ? chalk.red(cWord) : chalk.green(cWord);
+    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 = pad(r.dictName.slice(0, widthName - 1) + a, widthName);
+    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 info = [w, f, n].join(' ') + ' ';
-    const used = width(strip(info));
-    const widthSrc = terminalWidth - used;
     const c = colorize(errors ? chalk.red : chalk.white);
-    const s = c(formatDictionaryLocation(r.dictSource, widthSrc, { iPath, ...options }));
-    const line = info + s;
-    console.log(line.trim());
-    if (errors) {
-        console.error('\t' + chalk.red(errors));
-    }
+    return [
+        w,
+        f,
+        n,
+        (widthSrc) => c(formatDictionaryLocation(r.dictSource, widthSrc ?? maxWidth, { iPath, ...options })),
+    ];
+}
+function emitErrors(results) {
+    const errorResults = results.filter((r) => r.errors?.length);
+    return errorResults.map((r) => {
+        const errors = r.errors?.map((e) => e.message)?.join('\n\t') || '';
+        return chalk.bold(r.dictName) + '\n\t' + chalk.red(errors);
+    });
 }
 function trimMid(s, w) {
     s = s.trim();

package/dist/esm/util/pad.d.mts

@@ -0,0 +1,6 @@
+export declare function pad(s: string, w: number): string;
+export declare function padWidth(s: string, target: number): number;
+export declare function padLeft(s: string, w: number): string;
+export declare function width(s: string): number;
+export declare function ansiWidth(s: string): number;
+//# sourceMappingURL=pad.d.mts.map

package/dist/esm/util/pad.d.ts

@@ -0,0 +1,6 @@
+export declare function pad(s: string, w: number): string;
+export declare function padWidth(s: string, target: number): number;
+export declare function padLeft(s: string, w: number): string;
+export declare function width(s: string): number;
+export declare function ansiWidth(s: string): number;
+//# sourceMappingURL=pad.d.ts.map

package/dist/esm/util/pad.js

@@ -0,0 +1,28 @@
+import strip from 'strip-ansi';
+export function pad(s, w) {
+    const p = padWidth(s, w);
+    if (!p)
+        return s;
+    return s.padEnd(p + s.length);
+}
+export function padWidth(s, target) {
+    const sWidth = ansiWidth(s);
+    return Math.max(target - sWidth, 0);
+}
+export function padLeft(s, w) {
+    const p = padWidth(s, w);
+    if (!p)
+        return s;
+    return s.padStart(p + s.length);
+}
+export function width(s) {
+    // Remove control codes and high surrogates to get the approximate width.
+    return (s
+        // eslint-disable-next-line no-control-regex, no-misleading-character-class
+        .replaceAll(/[\u0000-\u001F\u0300-\u036F]/g, '')
+        .replaceAll(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '.').length);
+}
+export function ansiWidth(s) {
+    return width(strip(s));
+}
+//# sourceMappingURL=pad.js.map

package/dist/esm/util/pad.mjs

@@ -0,0 +1,28 @@
+import strip from 'strip-ansi';
+export function pad(s, w) {
+    const p = padWidth(s, w);
+    if (!p)
+        return s;
+    return s.padEnd(p + s.length);
+}
+export function padWidth(s, target) {
+    const sWidth = ansiWidth(s);
+    return Math.max(target - sWidth, 0);
+}
+export function padLeft(s, w) {
+    const p = padWidth(s, w);
+    if (!p)
+        return s;
+    return s.padStart(p + s.length);
+}
+export function width(s) {
+    // Remove control codes and high surrogates to get the approximate width.
+    return (s
+        // eslint-disable-next-line no-control-regex, no-misleading-character-class
+        .replaceAll(/[\u0000-\u001F\u0300-\u036F]/g, '')
+        .replaceAll(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '.').length);
+}
+export function ansiWidth(s) {
+    return width(strip(s));
+}
+//# sourceMappingURL=pad.mjs.map

package/dist/esm/util/table.d.mts

@@ -1,6 +1,10 @@
+export type RowTextFn = (maxWidth: number | undefined) => string;
+export type TableCell = string | RowTextFn;
+export type TableRow = TableCell[];
 export interface Table {
     header: string[];
-    rows: string[][];
+    rows: TableRow[];
+    terminalWidth?: number;
     deliminator?: string;
 }
 export declare function tableToLines(table: Table, deliminator?: string): string[];

package/dist/esm/util/table.d.ts

@@ -1,6 +1,10 @@
+export type RowTextFn = (maxWidth: number | undefined) => string;
+export type TableCell = string | RowTextFn;
+export type TableRow = TableCell[];
 export interface Table {
     header: string[];
-    rows: string[][];
+    rows: TableRow[];
+    terminalWidth?: number;
     deliminator?: string;
 }
 export declare function tableToLines(table: Table, deliminator?: string): string[];

package/dist/esm/util/table.js

@@ -1,26 +1,49 @@
 import chalk from 'chalk';
-import strip from 'strip-ansi';
+import { ansiWidth, pad } from './pad.js';
 export function tableToLines(table, deliminator) {
-    deliminator = deliminator || table.deliminator || ' | ';
+    const del = deliminator || table.deliminator || ' | ';
     const columnWidths = [];
     const { header, rows } = table;
-    function recordWidths(row) {
-        row.forEach((col, idx) => {
-            columnWidths[idx] = Math.max(strip(col).length, columnWidths[idx] || 0);
+    function getText(col, maxWidth) {
+        return typeof col === 'string' ? col : col(maxWidth);
+    }
+    function getRCText(row, col, maxWidth) {
+        return getText(rows[row][col], maxWidth);
+    }
+    function recordHeaderWidths(header) {
+        header.forEach((col, idx) => {
+            columnWidths[idx] = Math.max(ansiWidth(col), columnWidths[idx] || 0);
+        });
+    }
+    function recordColWidths(row, rowIndex) {
+        row.forEach((_col, idx) => {
+            columnWidths[idx] = Math.max(ansiWidth(getRCText(rowIndex, idx, undefined)), columnWidths[idx] || 0);
         });
     }
     function justifyRow(c, i) {
-        return c + ' '.repeat(columnWidths[i] - strip(c).length);
+        return pad(c, columnWidths[i]);
     }
     function toLine(row) {
-        return decorateRowWith(row, justifyRow).join(deliminator);
+        return decorateRowWith(row.map((c, i) => getText(c, columnWidths[i])), justifyRow).join(del);
     }
     function* process() {
         yield toLine(decorateRowWith(header, headerDecorator));
         yield* rows.map(toLine);
     }
-    recordWidths(header);
-    rows.forEach(recordWidths);
+    function adjustColWidths() {
+        if (!table.terminalWidth)
+            return;
+        const dWidth = (columnWidths.length - 1) * ansiWidth(del);
+        let remainder = table.terminalWidth - dWidth;
+        for (let i = 0; i < columnWidths.length; i++) {
+            const colWidth = Math.min(columnWidths[i], remainder);
+            columnWidths[i] = colWidth;
+            remainder -= colWidth;
+        }
+    }
+    recordHeaderWidths(header);
+    rows.forEach(recordColWidths);
+    adjustColWidths();
     return [...process()];
 }
 function headerDecorator(t) {

package/dist/esm/util/table.mjs

@@ -1,26 +1,49 @@
 import chalk from 'chalk';
-import strip from 'strip-ansi';
+import { ansiWidth, pad } from './pad.mjs';
 export function tableToLines(table, deliminator) {
-    deliminator = deliminator || table.deliminator || ' | ';
+    const del = deliminator || table.deliminator || ' | ';
     const columnWidths = [];
     const { header, rows } = table;
-    function recordWidths(row) {
-        row.forEach((col, idx) => {
-            columnWidths[idx] = Math.max(strip(col).length, columnWidths[idx] || 0);
+    function getText(col, maxWidth) {
+        return typeof col === 'string' ? col : col(maxWidth);
+    }
+    function getRCText(row, col, maxWidth) {
+        return getText(rows[row][col], maxWidth);
+    }
+    function recordHeaderWidths(header) {
+        header.forEach((col, idx) => {
+            columnWidths[idx] = Math.max(ansiWidth(col), columnWidths[idx] || 0);
+        });
+    }
+    function recordColWidths(row, rowIndex) {
+        row.forEach((_col, idx) => {
+            columnWidths[idx] = Math.max(ansiWidth(getRCText(rowIndex, idx, undefined)), columnWidths[idx] || 0);
         });
     }
     function justifyRow(c, i) {
-        return c + ' '.repeat(columnWidths[i] - strip(c).length);
+        return pad(c, columnWidths[i]);
     }
     function toLine(row) {
-        return decorateRowWith(row, justifyRow).join(deliminator);
+        return decorateRowWith(row.map((c, i) => getText(c, columnWidths[i])), justifyRow).join(del);
     }
     function* process() {
         yield toLine(decorateRowWith(header, headerDecorator));
         yield* rows.map(toLine);
     }
-    recordWidths(header);
-    rows.forEach(recordWidths);
+    function adjustColWidths() {
+        if (!table.terminalWidth)
+            return;
+        const dWidth = (columnWidths.length - 1) * ansiWidth(del);
+        let remainder = table.terminalWidth - dWidth;
+        for (let i = 0; i < columnWidths.length; i++) {
+            const colWidth = Math.min(columnWidths[i], remainder);
+            columnWidths[i] = colWidth;
+            remainder -= colWidth;
+        }
+    }
+    recordHeaderWidths(header);
+    rows.forEach(recordColWidths);
+    adjustColWidths();
     return [...process()];
 }
 function headerDecorator(t) {

package/dist/esm/util/util.d.mts

@@ -5,9 +5,5 @@ export declare function uniqueFilterFnGenerator<T>(): FilterFn<T>;
 export declare function uniqueFilterFnGenerator<T, U>(extractFn: (v: T) => U): FilterFn<T>;
 export declare function unique<T>(src: T[]): T[];
 export declare function clean<T extends object>(src: T): RemoveUndefined<T>;
-export declare function padWidth(s: string, target: number): number;
-export declare function pad(s: string, w: number): string;
-export declare function padLeft(s: string, w: number): string;
-export declare function width(s: string): number;
 export {};
 //# sourceMappingURL=util.d.mts.map

package/dist/esm/util/util.d.ts

@@ -5,9 +5,5 @@ export declare function uniqueFilterFnGenerator<T>(): FilterFn<T>;
 export declare function uniqueFilterFnGenerator<T, U>(extractFn: (v: T) => U): FilterFn<T>;
 export declare function unique<T>(src: T[]): T[];
 export declare function clean<T extends object>(src: T): RemoveUndefined<T>;
-export declare function padWidth(s: string, target: number): number;
-export declare function pad(s: string, w: number): string;
-export declare function padLeft(s: string, w: number): string;
-export declare function width(s: string): number;
 export {};
 //# sourceMappingURL=util.d.ts.map

package/dist/esm/util/util.js

@@ -22,24 +22,4 @@ export function clean(src) {
     }
     return r;
 }
-export function padWidth(s, target) {
-    const sWidth = width(s);
-    return Math.max(target - sWidth, 0);
-}
-export function pad(s, w) {
-    const p = padWidth(s, w);
-    if (!p)
-        return s;
-    return s + ' '.repeat(p);
-}
-export function padLeft(s, w) {
-    const p = padWidth(s, w);
-    if (!p)
-        return s;
-    return ' '.repeat(p) + s;
-}
-export function width(s) {
-    // eslint-disable-next-line no-control-regex, no-misleading-character-class
-    return s.replaceAll(/[\u0000-\u001F\u0300-\u036F]/g, '').length;
-}
 //# sourceMappingURL=util.js.map

package/dist/esm/util/util.mjs

@@ -22,24 +22,4 @@ export function clean(src) {
     }
     return r;
 }
-export function padWidth(s, target) {
-    const sWidth = width(s);
-    return Math.max(target - sWidth, 0);
-}
-export function pad(s, w) {
-    const p = padWidth(s, w);
-    if (!p)
-        return s;
-    return s + ' '.repeat(p);
-}
-export function padLeft(s, w) {
-    const p = padWidth(s, w);
-    if (!p)
-        return s;
-    return ' '.repeat(p) + s;
-}
-export function width(s) {
-    // eslint-disable-next-line no-control-regex, no-misleading-character-class
-    return s.replaceAll(/[\u0000-\u001F\u0300-\u036F]/g, '').length;
-}
 //# sourceMappingURL=util.mjs.map

package/dist/lib/file-entry-cache.cjs

@@ -23,11 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFromFile = void 0;
+exports.createFromFile = createFromFile;
 /* This is to work around a bug in file-entry-cache that uses `this` */
 const fileEntryCache = __importStar(require("file-entry-cache"));
 function createFromFile(pathToCache, useChecksum) {
     return fileEntryCache.createFromFile(pathToCache, useChecksum);
 }
-exports.createFromFile = createFromFile;
 //# sourceMappingURL=file-entry-cache.cjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "8.9.0",
+  "version": "8.10.0",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "bin": {
@@ -82,17 +82,17 @@
   },
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "dependencies": {
-    "@cspell/cspell-json-reporter": "8.9.0",
-    "@cspell/cspell-pipe": "8.9.0",
-    "@cspell/cspell-types": "8.9.0",
-    "@cspell/dynamic-import": "8.9.0",
+    "@cspell/cspell-json-reporter": "8.10.0",
+    "@cspell/cspell-pipe": "8.10.0",
+    "@cspell/cspell-types": "8.10.0",
+    "@cspell/dynamic-import": "8.10.0",
     "chalk": "^5.3.0",
     "chalk-template": "^1.1.0",
     "commander": "^12.1.0",
-    "cspell-gitignore": "8.9.0",
-    "cspell-glob": "8.9.0",
-    "cspell-io": "8.9.0",
-    "cspell-lib": "8.9.0",
+    "cspell-gitignore": "8.10.0",
+    "cspell-glob": "8.10.0",
+    "cspell-io": "8.10.0",
+    "cspell-lib": "8.10.0",
     "fast-glob": "^3.3.2",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^8.0.0",
@@ -107,10 +107,10 @@
   "devDependencies": {
     "@types/file-entry-cache": "^5.0.4",
     "@types/glob": "^8.1.0",
-    "@types/micromatch": "^4.0.7",
+    "@types/micromatch": "^4.0.9",
     "@types/semver": "^7.5.8",
     "micromatch": "^4.0.7",
-    "minimatch": "^9.0.4"
+    "minimatch": "^9.0.5"
   },
-  "gitHead": "33c513cf848a61fb1ebcea1b9c67505a31447411"
+  "gitHead": "a5dde6ae7e2ac86ac956220d4b8c39a0e58e1bc6"
 }