cspell 7.3.9 → 8.1.0

package/dist/esm/application.js

@@ -1,5 +1,5 @@
 import { opMap, opTap, pipeAsync, toAsyncIterable } from '@cspell/cspell-pipe';
-import { checkTextDocument, getDefaultSettings, getGlobalSettings, mergeSettings, SuggestionError, suggestionsForWords, traceWordsAsync, } from 'cspell-lib';
+import { checkTextDocument, getDefaultSettings, getGlobalSettingsAsync, mergeSettings, SuggestionError, suggestionsForWords, traceWordsAsync, } from 'cspell-lib';
 import { getReporter } from './cli-reporter.js';
 import { getFeatureFlags, parseFeatureFlags } from './featureFlags/index.js';
 import { LintRequest, runLint } from './lint/index.js';
@@ -13,7 +13,7 @@ import * as util from './util/util.js';
 export { IncludeExcludeFlag } from 'cspell-lib';
 export function lint(fileGlobs, options, reporter) {
     options = fixLegacy(options);
-    const cfg = new LintRequest(fileGlobs, options, finalizeReporter(reporter) ?? getReporter({ ...options, fileGlobs }));
+    const cfg = new LintRequest(fileGlobs, options, finalizeReporter(reporter) ?? getReporter({ ...options, fileGlobs }, options));
     return runLint(cfg);
 }
 export async function* trace(words, options) {
@@ -22,7 +22,7 @@ export async function* trace(words, options) {
     const { languageId, locale, allowCompoundWords, ignoreCase } = options;
     const configFile = await readConfig(options.config, undefined);
     const loadDefault = options.defaultConfiguration ?? configFile.config.loadDefaultConfiguration ?? true;
-    const config = mergeSettings(getDefaultSettings(loadDefault), getGlobalSettings(), configFile.config);
+    const config = mergeSettings(await getDefaultSettings(loadDefault), await getGlobalSettingsAsync(), configFile.config);
     yield* traceWordsAsync(iWords, config, util.clean({ languageId, locale, ignoreCase, allowCompoundWords }));
 }
 export async function checkText(filename, options) {

package/dist/esm/application.mjs

@@ -1,5 +1,5 @@
 import { opMap, opTap, pipeAsync, toAsyncIterable } from '@cspell/cspell-pipe';
-import { checkTextDocument, getDefaultSettings, getGlobalSettings, mergeSettings, SuggestionError, suggestionsForWords, traceWordsAsync, } from 'cspell-lib';
+import { checkTextDocument, getDefaultSettings, getGlobalSettingsAsync, mergeSettings, SuggestionError, suggestionsForWords, traceWordsAsync, } from 'cspell-lib';
 import { getReporter } from './cli-reporter.mjs';
 import { getFeatureFlags, parseFeatureFlags } from './featureFlags/index.mjs';
 import { LintRequest, runLint } from './lint/index.mjs';
@@ -13,7 +13,7 @@ import * as util from './util/util.mjs';
 export { IncludeExcludeFlag } from 'cspell-lib';
 export function lint(fileGlobs, options, reporter) {
     options = fixLegacy(options);
-    const cfg = new LintRequest(fileGlobs, options, finalizeReporter(reporter) ?? getReporter({ ...options, fileGlobs }));
+    const cfg = new LintRequest(fileGlobs, options, finalizeReporter(reporter) ?? getReporter({ ...options, fileGlobs }, options));
     return runLint(cfg);
 }
 export async function* trace(words, options) {
@@ -22,7 +22,7 @@ export async function* trace(words, options) {
     const { languageId, locale, allowCompoundWords, ignoreCase } = options;
     const configFile = await readConfig(options.config, undefined);
     const loadDefault = options.defaultConfiguration ?? configFile.config.loadDefaultConfiguration ?? true;
-    const config = mergeSettings(getDefaultSettings(loadDefault), getGlobalSettings(), configFile.config);
+    const config = mergeSettings(await getDefaultSettings(loadDefault), await getGlobalSettingsAsync(), configFile.config);
     yield* traceWordsAsync(iWords, config, util.clean({ languageId, locale, ignoreCase, allowCompoundWords }));
 }
 export async function checkText(filename, options) {

package/dist/esm/cli-reporter.d.mts

@@ -1,4 +1,4 @@
-import type { Issue } from '@cspell/cspell-types';
+import type { Issue, ReporterConfiguration } from '@cspell/cspell-types';
 import type { LinterCliOptions } from './options.mjs';
 import type { FinalizedReporter } from './util/reporters.mjs';
 export interface ReporterIssue extends Issue {
@@ -7,7 +7,7 @@ export interface ReporterIssue extends Issue {
 export interface ReporterOptions extends Pick<LinterCliOptions, 'debug' | 'issues' | 'legacy' | 'progress' | 'relative' | 'root' | 'showContext' | 'showSuggestions' | 'silent' | 'summary' | 'verbose' | 'wordsOnly'> {
     fileGlobs: string[];
 }
-export declare function getReporter(options: ReporterOptions): FinalizedReporter;
+export declare function getReporter(options: ReporterOptions, config?: ReporterConfiguration): FinalizedReporter;
 declare function formatIssue(templateStr: string, issue: ReporterIssue, maxIssueTextWidth: number): string;
 export declare const __testing__: {
     formatIssue: typeof formatIssue;

package/dist/esm/cli-reporter.d.ts

@@ -1,4 +1,4 @@
-import type { Issue } from '@cspell/cspell-types';
+import type { Issue, ReporterConfiguration } from '@cspell/cspell-types';
 import type { LinterCliOptions } from './options.js';
 import type { FinalizedReporter } from './util/reporters.js';
 export interface ReporterIssue extends Issue {
@@ -7,7 +7,7 @@ export interface ReporterIssue extends Issue {
 export interface ReporterOptions extends Pick<LinterCliOptions, 'debug' | 'issues' | 'legacy' | 'progress' | 'relative' | 'root' | 'showContext' | 'showSuggestions' | 'silent' | 'summary' | 'verbose' | 'wordsOnly'> {
     fileGlobs: string[];
 }
-export declare function getReporter(options: ReporterOptions): FinalizedReporter;
+export declare function getReporter(options: ReporterOptions, config?: ReporterConfiguration): FinalizedReporter;
 declare function formatIssue(templateStr: string, issue: ReporterIssue, maxIssueTextWidth: number): string;
 export declare const __testing__: {
     formatIssue: typeof formatIssue;

package/dist/esm/cli-reporter.js

@@ -3,6 +3,7 @@ import chalkTemplate from 'chalk-template';
 import { isSpellingDictionaryLoadError } from 'cspell-lib';
 import * as path from 'path';
 import { URI } from 'vscode-uri';
+import { uniqueFilterFnGenerator } from './util/util.js';
 const templateIssue = `{green $filename}:{yellow $row:$col} - $message ({red $text}) $quickFix`;
 const templateIssueNoFix = `{green $filename}:{yellow $row:$col} - $message ({red $text})`;
 const templateIssueWithSuggestions = `{green $filename}:{yellow $row:$col} - $message ({red $text}) Suggestions: {yellow [$suggestions]}`;
@@ -10,11 +11,14 @@ 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 genIssueEmitter(template) {
+function genIssueEmitter(template, uniqueIssues) {
+    const uniqueFilter = uniqueIssues ? uniqueFilterFnGenerator((issue) => issue.text) : () => true;
     const defaultWidth = 10;
     let maxWidth = defaultWidth;
     let uri;
     return function issueEmitter(issue) {
+        if (!uniqueFilter(issue))
+            return;
         if (uri !== issue.uri) {
             maxWidth = defaultWidth;
             uri = issue.uri;
@@ -74,7 +78,8 @@ function reportTime(elapsedTimeMs, cached) {
     const color = elapsedTimeMs < 1000 ? chalk.white : elapsedTimeMs < 2000 ? chalk.yellow : chalk.redBright;
     return color(elapsedTimeMs.toFixed(2) + 'ms');
 }
-export function getReporter(options) {
+export function getReporter(options, config) {
+    const uniqueIssues = config?.unique || false;
     const issueTemplate = options.wordsOnly
         ? templateIssueWordsOnly
         : options.legacy
@@ -120,7 +125,7 @@ export function getReporter(options) {
         console.error('CSpell\x3a Files checked: %d, Issues found: %d in %d files', result.files, result.issues, result.filesWithIssues.size);
     };
     return {
-        issue: relativeIssue(silent || !issues ? nullEmitter : genIssueEmitter(issueTemplate)),
+        issue: relativeIssue(silent || !issues ? nullEmitter : genIssueEmitter(issueTemplate, uniqueIssues)),
         error: silent ? nullEmitter : errorEmitter,
         info: infoEmitter,
         debug: emitters.Debug,
@@ -185,6 +190,7 @@ function formatQuickFix(issue) {
     return `fix: (${fixes.join(', ')})`;
 }
 class TS extends Array {
+    raw;
     constructor(s) {
         super(s);
         this.raw = [s];

package/dist/esm/cli-reporter.mjs

@@ -3,6 +3,7 @@ import chalkTemplate from 'chalk-template';
 import { isSpellingDictionaryLoadError } from 'cspell-lib';
 import * as path from 'path';
 import { URI } from 'vscode-uri';
+import { uniqueFilterFnGenerator } from './util/util.mjs';
 const templateIssue = `{green $filename}:{yellow $row:$col} - $message ({red $text}) $quickFix`;
 const templateIssueNoFix = `{green $filename}:{yellow $row:$col} - $message ({red $text})`;
 const templateIssueWithSuggestions = `{green $filename}:{yellow $row:$col} - $message ({red $text}) Suggestions: {yellow [$suggestions]}`;
@@ -10,11 +11,14 @@ 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 genIssueEmitter(template) {
+function genIssueEmitter(template, uniqueIssues) {
+    const uniqueFilter = uniqueIssues ? uniqueFilterFnGenerator((issue) => issue.text) : () => true;
     const defaultWidth = 10;
     let maxWidth = defaultWidth;
     let uri;
     return function issueEmitter(issue) {
+        if (!uniqueFilter(issue))
+            return;
         if (uri !== issue.uri) {
             maxWidth = defaultWidth;
             uri = issue.uri;
@@ -74,7 +78,8 @@ function reportTime(elapsedTimeMs, cached) {
     const color = elapsedTimeMs < 1000 ? chalk.white : elapsedTimeMs < 2000 ? chalk.yellow : chalk.redBright;
     return color(elapsedTimeMs.toFixed(2) + 'ms');
 }
-export function getReporter(options) {
+export function getReporter(options, config) {
+    const uniqueIssues = config?.unique || false;
     const issueTemplate = options.wordsOnly
         ? templateIssueWordsOnly
         : options.legacy
@@ -120,7 +125,7 @@ export function getReporter(options) {
         console.error('CSpell\x3a Files checked: %d, Issues found: %d in %d files', result.files, result.issues, result.filesWithIssues.size);
     };
     return {
-        issue: relativeIssue(silent || !issues ? nullEmitter : genIssueEmitter(issueTemplate)),
+        issue: relativeIssue(silent || !issues ? nullEmitter : genIssueEmitter(issueTemplate, uniqueIssues)),
         error: silent ? nullEmitter : errorEmitter,
         info: infoEmitter,
         debug: emitters.Debug,
@@ -185,6 +190,7 @@ function formatQuickFix(issue) {
     return `fix: (${fixes.join(', ')})`;
 }
 class TS extends Array {
+    raw;
     constructor(s) {
         super(s);
         this.raw = [s];

package/dist/esm/commandLink.js

@@ -9,8 +9,8 @@ export function commandLink(prog) {
         .command('list', { isDefault: true })
         .alias('ls')
         .description('List currently linked configurations.')
-        .action(() => {
-        const imports = listGlobalImports();
+        .action(async () => {
+        const imports = await listGlobalImports();
         const table = listGlobalImportsResultToTable(imports.list);
         tableToLines(table).forEach((line) => console.log(line));
         return;
@@ -19,8 +19,8 @@ export function commandLink(prog) {
         .command('add <dictionaries...>')
         .alias('a')
         .description('Add dictionaries any other settings to the cspell global config.')
-        .action((dictionaries) => {
-        const r = addPathsToGlobalImports(dictionaries);
+        .action(async (dictionaries) => {
+        const r = await addPathsToGlobalImports(dictionaries);
         const table = addPathsToGlobalImportsResultToTable(r);
         console.log('Adding:');
         tableToLines(table).forEach((line) => console.log(line));
@@ -33,8 +33,8 @@ export function commandLink(prog) {
         .command('remove <paths...>')
         .alias('r')
         .description('Remove matching paths / packages from the global config.')
-        .action((dictionaries) => {
-        const r = removePathsFromGlobalImports(dictionaries);
+        .action(async (dictionaries) => {
+        const r = await removePathsFromGlobalImports(dictionaries);
         console.log('Removing:');
         if (r.error) {
             throw new CheckFailed(r.error, 1);

package/dist/esm/commandLink.mjs

@@ -9,8 +9,8 @@ export function commandLink(prog) {
         .command('list', { isDefault: true })
         .alias('ls')
         .description('List currently linked configurations.')
-        .action(() => {
-        const imports = listGlobalImports();
+        .action(async () => {
+        const imports = await listGlobalImports();
         const table = listGlobalImportsResultToTable(imports.list);
         tableToLines(table).forEach((line) => console.log(line));
         return;
@@ -19,8 +19,8 @@ export function commandLink(prog) {
         .command('add <dictionaries...>')
         .alias('a')
         .description('Add dictionaries any other settings to the cspell global config.')
-        .action((dictionaries) => {
-        const r = addPathsToGlobalImports(dictionaries);
+        .action(async (dictionaries) => {
+        const r = await addPathsToGlobalImports(dictionaries);
         const table = addPathsToGlobalImportsResultToTable(r);
         console.log('Adding:');
         tableToLines(table).forEach((line) => console.log(line));
@@ -33,8 +33,8 @@ export function commandLink(prog) {
         .command('remove <paths...>')
         .alias('r')
         .description('Remove matching paths / packages from the global config.')
-        .action((dictionaries) => {
-        const r = removePathsFromGlobalImports(dictionaries);
+        .action(async (dictionaries) => {
+        const r = await removePathsFromGlobalImports(dictionaries);
         console.log('Removing:');
         if (r.error) {
             throw new CheckFailed(r.error, 1);

package/dist/esm/commandLint.js

@@ -107,27 +107,33 @@ export function commandLint(prog) {
         .addOption(new CommanderOption('--no-default-configuration', 'Do not load the default configuration and dictionaries.'))
         .option('--debug', 'Output information useful for debugging cspell.json files.')
         .option('--reporter <module|path>', 'Specify one or more reporters to use.', collect)
+        .addOption(new CommanderOption('--skip-validation', 'Collect and process documents, but do not spell check.')
+        .implies({ cache: false })
+        .hideHelp())
+        .addOption(new CommanderOption('--issues-summary-report', 'Output a summary of issues found.').hideHelp())
         .usage(usage)
         .addHelpText('after', advanced)
         .arguments('[globs...]')
-        .action((fileGlobs, options) => {
+        .action(async (fileGlobs, options) => {
         const useExitCode = options.exitCode ?? true;
+        if (options.skipValidation) {
+            options.cache = false;
+        }
         App.parseApplicationFeatureFlags(options.flag);
         const { mustFindFiles, fileList } = options;
-        return App.lint(fileGlobs, options).then((result) => {
-            if (!fileGlobs.length && !result.files && !result.errors && !fileList) {
-                spellCheckCommand.outputHelp();
-                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;
-        });
+        const result = await App.lint(fileGlobs, options);
+        if (!fileGlobs.length && !result.files && !result.errors && !fileList) {
+            spellCheckCommand.outputHelp();
+            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;
     });
     return spellCheckCommand;
 }

package/dist/esm/commandLint.mjs

@@ -107,27 +107,33 @@ export function commandLint(prog) {
         .addOption(new CommanderOption('--no-default-configuration', 'Do not load the default configuration and dictionaries.'))
         .option('--debug', 'Output information useful for debugging cspell.json files.')
         .option('--reporter <module|path>', 'Specify one or more reporters to use.', collect)
+        .addOption(new CommanderOption('--skip-validation', 'Collect and process documents, but do not spell check.')
+        .implies({ cache: false })
+        .hideHelp())
+        .addOption(new CommanderOption('--issues-summary-report', 'Output a summary of issues found.').hideHelp())
         .usage(usage)
         .addHelpText('after', advanced)
         .arguments('[globs...]')
-        .action((fileGlobs, options) => {
+        .action(async (fileGlobs, options) => {
         const useExitCode = options.exitCode ?? true;
+        if (options.skipValidation) {
+            options.cache = false;
+        }
         App.parseApplicationFeatureFlags(options.flag);
         const { mustFindFiles, fileList } = options;
-        return App.lint(fileGlobs, options).then((result) => {
-            if (!fileGlobs.length && !result.files && !result.errors && !fileList) {
-                spellCheckCommand.outputHelp();
-                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;
-        });
+        const result = await App.lint(fileGlobs, options);
+        if (!fileGlobs.length && !result.files && !result.errors && !fileList) {
+            spellCheckCommand.outputHelp();
+            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;
     });
     return spellCheckCommand;
 }

package/dist/esm/lint/LintRequest.js

@@ -1,8 +1,18 @@
 import * as path from 'path';
 import { calcExcludeGlobInfo } from '../util/glob.js';
-import * as util from '../util/util.js';
 const defaultContextRange = 20;
 export class LintRequest {
+    fileGlobs;
+    options;
+    reporter;
+    uniqueFilter;
+    locale;
+    configFile;
+    excludes;
+    root;
+    showContext;
+    enableGlobDot;
+    fileLists;
     constructor(fileGlobs, options, reporter) {
         this.fileGlobs = fileGlobs;
         this.options = options;
@@ -12,7 +22,8 @@ export class LintRequest {
         this.excludes = calcExcludeGlobInfo(this.root, options.exclude);
         this.locale = options.locale || '';
         this.enableGlobDot = options.dot;
-        this.uniqueFilter = options.unique ? util.uniqueFilterFnGenerator((issue) => issue.text) : () => true;
+        // this.uniqueFilter = options.unique ? util.uniqueFilterFnGenerator((issue: Issue) => issue.text) : () => true;
+        this.uniqueFilter = () => true;
         this.showContext =
             options.showContext === true ? defaultContextRange : options.showContext ? options.showContext : 0;
         this.fileLists = (options.fileList ?? options.fileLists) || [];

package/dist/esm/lint/LintRequest.mjs

@@ -1,8 +1,18 @@
 import * as path from 'path';
 import { calcExcludeGlobInfo } from '../util/glob.mjs';
-import * as util from '../util/util.mjs';
 const defaultContextRange = 20;
 export class LintRequest {
+    fileGlobs;
+    options;
+    reporter;
+    uniqueFilter;
+    locale;
+    configFile;
+    excludes;
+    root;
+    showContext;
+    enableGlobDot;
+    fileLists;
     constructor(fileGlobs, options, reporter) {
         this.fileGlobs = fileGlobs;
         this.options = options;
@@ -12,7 +22,8 @@ export class LintRequest {
         this.excludes = calcExcludeGlobInfo(this.root, options.exclude);
         this.locale = options.locale || '';
         this.enableGlobDot = options.dot;
-        this.uniqueFilter = options.unique ? util.uniqueFilterFnGenerator((issue) => issue.text) : () => true;
+        // this.uniqueFilter = options.unique ? util.uniqueFilterFnGenerator((issue: Issue) => issue.text) : () => true;
+        this.uniqueFilter = () => true;
         this.showContext =
             options.showContext === true ? defaultContextRange : options.showContext ? options.showContext : 0;
         this.fileLists = (options.fileList ?? options.fileLists) || [];

package/dist/esm/lint/lint.js

@@ -4,7 +4,7 @@ import { MessageTypes } from '@cspell/cspell-types';
 import chalk from 'chalk';
 import { findRepoRoot, GitIgnore } from 'cspell-gitignore';
 import { GlobMatcher } from 'cspell-glob';
-import * as cspell from 'cspell-lib';
+import { ENV_CSPELL_GLOB_ROOT, extractDependencies, extractImportErrors, getDictionary, isBinaryFile as cspellIsBinaryFile, setLogger, shouldCheckDocument, spellCheckDocument, Text as cspellText, } from 'cspell-lib';
 import * as path from 'path';
 import { format } from 'util';
 import { URI } from 'vscode-uri';
@@ -23,7 +23,7 @@ const BATCH_SIZE = 8;
 const { opFilterAsync } = operators;
 export async function runLint(cfg) {
     let { reporter } = cfg;
-    cspell.setLogger(getLoggerFromReporter(reporter));
+    setLogger(getLoggerFromReporter(reporter));
     const configErrors = new Set();
     const timer = getTimeMeasurer();
     const lintResult = await run();
@@ -45,7 +45,7 @@ export async function runLint(cfg) {
                 return { fileResult };
             }
             const uri = filenameToUri(filename, cfg.root);
-            const checkResult = await cspell.shouldCheckDocument({ uri }, {}, configInfo.config);
+            const checkResult = await shouldCheckDocument({ uri }, {}, configInfo.config);
             if (!checkResult.shouldCheck)
                 return { skip: true };
             const fileInfo = await readFileInfo(filename, undefined, true);
@@ -88,13 +88,20 @@ export async function runLint(cfg) {
         let spellResult = {};
         reporter.info(`Checking: ${filename}, File type: ${doc.languageId ?? 'auto'}, Language: ${doc.locale ?? 'default'}`, MessageTypes.Info);
         try {
-            const { showSuggestions: generateSuggestions, validateDirectives } = cfg.options;
+            const { showSuggestions: generateSuggestions, validateDirectives, skipValidation } = cfg.options;
             const numSuggestions = configInfo.config.numSuggestions ?? 5;
-            const validateOptions = util.clean({ generateSuggestions, numSuggestions, validateDirectives });
-            const r = await cspell.spellCheckDocument(doc, validateOptions, configInfo.config);
+            const validateOptions = util.clean({
+                generateSuggestions,
+                numSuggestions,
+                validateDirectives,
+                skipValidation,
+            });
+            const r = await spellCheckDocument(doc, validateOptions, configInfo.config);
+            // console.warn('filename: %o %o', path.relative(process.cwd(), filename), r.perf);
             spellResult = r;
             result.processed = r.checked;
-            result.issues = cspell.Text.calculateTextDocumentOffsets(doc.uri, text, r.issues).map(mapIssue);
+            result.perf = r.perf ? { ...r.perf } : undefined;
+            result.issues = cspellText.calculateTextDocumentOffsets(doc.uri, text, r.issues).map(mapIssue);
         }
         catch (e) {
             reporter.error(`Failed to process "${filename}"`, toError(e));
@@ -103,9 +110,9 @@ export async function runLint(cfg) {
         result.elapsedTimeMs = getElapsedTimeMs();
         const config = spellResult.settingsUsed ?? {};
         result.configErrors += await reportConfigurationErrors(config);
-        const elapsed = result.elapsedTimeMs / 1000.0;
+        const elapsed = result.elapsedTimeMs;
         const dictionaries = config.dictionaries || [];
-        reporter.info(`Checked: ${filename}, File type: ${config.languageId}, Language: ${config.language} ... Issues: ${result.issues.length} ${elapsed}S`, MessageTypes.Info);
+        reporter.info(`Checked: ${filename}, File type: ${config.languageId}, Language: ${config.language} ... Issues: ${result.issues.length} ${elapsed.toFixed(2)}ms`, MessageTypes.Info);
         reporter.info(`Config file Used: ${spellResult.localConfigFilepath || configInfo.source}`, MessageTypes.Info);
         reporter.info(`Dictionaries Used: ${dictionaries.join(', ')}`, MessageTypes.Info);
         if (cfg.options.debug) {
@@ -193,8 +200,18 @@ export async function runLint(cfg) {
             else {
                 for (const pf of prefetchFiles(files)) {
                     await pf.result;
-                    yield await processPrefetchFileResult(pf, ++i);
+                    yield processPrefetchFileResult(pf, ++i);
                 }
+                // const iter = prefetchIterable(
+                //     pipe(
+                //         prefetchFiles(files),
+                //         opMap(async (pf) => {
+                //             return processPrefetchFileResult(pf, ++i);
+                //         }),
+                //     ),
+                //     BATCH_SIZE,
+                // );
+                // yield* iter;
             }
         }
         for await (const fileP of loadAndProcessFiles()) {
@@ -218,11 +235,11 @@ export async function runLint(cfg) {
         return status;
     }
     function calcDependencies(config) {
-        const { configFiles, dictionaryFiles } = cspell.extractDependencies(config);
+        const { configFiles, dictionaryFiles } = extractDependencies(config);
         return { files: configFiles.concat(dictionaryFiles) };
     }
     async function reportConfigurationErrors(config) {
-        const errors = cspell.extractImportErrors(config);
+        const errors = extractImportErrors(config);
         let count = 0;
         errors.forEach((ref) => {
             const key = ref.error.toString();
@@ -232,7 +249,7 @@ export async function runLint(cfg) {
             count += 1;
             reporter.error('Configuration', ref.error);
         });
-        const dictCollection = await cspell.getDictionary(config);
+        const dictCollection = await getDictionary(config);
         dictCollection.dictionaries.forEach((dict) => {
             const dictErrors = dict.getErrors?.() || [];
             const msg = `Dictionary Error with (${dict.name})`;
@@ -252,7 +269,7 @@ export async function runLint(cfg) {
     }
     async function run() {
         if (cfg.options.root) {
-            process.env[cspell.ENV_CSPELL_GLOB_ROOT] = cfg.root;
+            process.env[ENV_CSPELL_GLOB_ROOT] = cfg.root;
         }
         const configInfo = await readConfig(cfg.configFile, cfg.root);
         if (cfg.options.defaultConfiguration !== undefined) {
@@ -266,7 +283,7 @@ export async function runLint(cfg) {
         });
         const reporters = cfg.options.reporter ?? configInfo.config.reporters;
         reporter = mergeReporters(...(await loadReporters(reporters, cfg.reporter, reporterConfig)));
-        cspell.setLogger(getLoggerFromReporter(reporter));
+        setLogger(getLoggerFromReporter(reporter));
         const globInfo = await determineGlobs(configInfo, cfg);
         const { fileGlobs, excludeGlobs } = globInfo;
         const hasFileLists = !!cfg.fileLists.length;
@@ -361,7 +378,7 @@ async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
         return files;
     }
     function isExcluded(filename, globMatcherExclude) {
-        if (cspell.isBinaryFile(URI.file(filename))) {
+        if (cspellIsBinaryFile(URI.file(filename))) {
             return true;
         }
         const { root } = cfg;