cspell 5.18.0-alpha.0 → 5.18.3

package/dist/cli-reporter.js

@@ -66,9 +66,21 @@ function relativeUriFilename(uri, fsPathRoot) {
     return '.' + path.sep + rel;
 }
 function reportProgress(p) {
-    if (p.type !== 'ProgressFileComplete') {
-        return;
+    if (p.type === 'ProgressFileComplete') {
+        return reportProgressFileComplete(p);
     }
+    if (p.type === 'ProgressFileBegin') {
+        return reportProgressFileBegin(p);
+    }
+}
+function reportProgressFileBegin(p) {
+    const fc = '' + p.fileCount;
+    const fn = (' '.repeat(fc.length) + p.fileNum).slice(-fc.length);
+    const idx = fn + '/' + fc;
+    const filename = chalk.gray(relativeFilename(p.filename));
+    process.stderr.write(`\r${idx} ${filename} ...`);
+}
+function reportProgressFileComplete(p) {
     const fc = '' + p.fileCount;
     const fn = (' '.repeat(fc.length) + p.fileNum).slice(-fc.length);
     const idx = fn + '/' + fc;
@@ -76,7 +88,7 @@ function reportProgress(p) {
     const time = reportTime(p.elapsedTimeMs, !!p.cached);
     const skipped = p.processed === false ? ' skipped' : '';
     const hasErrors = p.numErrors ? chalk.red ` X` : '';
-    console.error(`${idx} ${filename} ${time}${skipped}${hasErrors}`);
+    console.error(`\r${idx} ${filename} ${time}${skipped}${hasErrors}`);
 }
 function reportTime(elapsedTimeMs, cached) {
     if (cached)
@@ -124,6 +136,10 @@ function getReporter(options) {
         if (!fileGlobs.length && !result.files) {
             return;
         }
+        if (result.cachedFiles) {
+            console.error('CSpell: Files checked: %d (%d from cache), Issues found: %d in %d files', result.files, result.cachedFiles, result.issues, result.filesWithIssues.size);
+            return;
+        }
         console.error('CSpell: Files checked: %d, Issues found: %d in %d files', result.files, result.issues, result.filesWithIssues.size);
     };
     return {

package/dist/emitters/suggestionsEmitter.js

@@ -6,21 +6,24 @@ const util_1 = require("../util/util");
 function emitSuggestionResult(result, options) {
     const { word, suggestions } = result;
     const { verbose, output = console } = options;
-    output.log(word ? chalk.green(word) : chalk.yellow('<empty>') + ':');
+    output.log(word ? chalk.yellow(word) : chalk.yellow('<empty>') + ':');
     if (!suggestions.length) {
         console.log(chalk.yellow(' <no suggestions>'));
         return;
     }
     if (verbose) {
-        const maxWidth = suggestions.map((r) => r.word.length).reduce((max, len) => Math.max(max, len), 0);
+        const maxWidth = suggestions
+            .map((r) => (0, util_1.width)(r.compoundWord || r.word))
+            .reduce((max, len) => Math.max(max, len), 0);
         for (const sug of suggestions) {
-            const { word, cost, dictionaries } = sug;
-            const padding = ' '.repeat(maxWidth - word.length);
+            const { word, cost, dictionaries, compoundWord } = sug;
+            const w = compoundWord || word;
+            const padding = ' '.repeat((0, util_1.padWidth)(w, maxWidth));
             const forbid = sug.forbidden ? chalk.red('X') : ' ';
             const ignore = sug.noSuggest ? chalk.yellow('N') : ' ';
             const strCost = (0, util_1.padLeft)(cost.toString(10), 4);
             const dicts = dictionaries.map((n) => chalk.gray(n)).join(', ');
-            output.log(` - ${formatWord(word, sug)}${padding} ${forbid}${ignore} - ${chalk.yellow(strCost)} ${dicts}`);
+            output.log(` - ${formatWord(w, sug)}${padding} ${forbid}${ignore} - ${chalk.yellow(strCost)} ${dicts}`);
         }
     }
     else {

package/dist/emitters/traceEmitter.js

@@ -32,7 +32,7 @@ function emitTraceResults(results, options) {
     var _a;
     const maxWordLength = results
         .map((r) => r.foundWord || r.word)
-        .reduce((a, b) => Math.max(a, b.length), 'Word'.length);
+        .reduce((a, b) => Math.max(a, (0, util_1.width)(b)), 'Word'.length);
     const cols = {
         word: maxWordLength,
         dictName: colWidthDictionaryName,
@@ -66,7 +66,7 @@ function emitTraceResult(r, colWidths, options) {
     const dictColor = r.dictActive ? chalk.yellowBright : chalk.rgb(200, 128, 50);
     const n = dictColor(dictName);
     const info = [w, f, n].join(' ') + ' ';
-    const used = (0, strip_ansi_1.default)(info).length;
+    const used = (0, util_1.width)((0, strip_ansi_1.default)(info));
     const widthSrc = terminalWidth - used;
     const c = errors ? chalk.red : chalk.white;
     const s = c(formatDictionaryLocation(r.dictSource, widthSrc, options.cwd));

package/dist/lint/lint.js

@@ -114,10 +114,16 @@ async function runLint(cfg) {
         const status = runResult();
         const cache = (0, cache_1.createCache)(cacheSettings);
         const failFast = (_b = (_a = cfg.options.failFast) !== null && _a !== void 0 ? _a : configInfo.config.failFast) !== null && _b !== void 0 ? _b : false;
-        const emitProgress = (filename, fileNum, result) => reporter.progress({
+        const emitProgressBegin = (filename, fileNum, fileCount) => reporter.progress({
+            type: 'ProgressFileBegin',
+            fileNum,
+            fileCount,
+            filename,
+        });
+        const emitProgressComplete = (filename, fileNum, fileCount, result) => reporter.progress({
             type: 'ProgressFileComplete',
             fileNum,
-            fileCount: fileCount !== null && fileCount !== void 0 ? fileCount : fileNum,
+            fileCount,
             filename,
             elapsedTimeMs: result === null || result === void 0 ? void 0 : result.elapsedTimeMs,
             processed: result === null || result === void 0 ? void 0 : result.processed,
@@ -128,6 +134,7 @@ async function runLint(cfg) {
             let i = 0;
             for await (const filename of files) {
                 ++i;
+                emitProgressBegin(filename, i, fileCount !== null && fileCount !== void 0 ? fileCount : i);
                 const result = await processFile(filename, configInfo, cache);
                 yield { filename, fileNum: i, result };
             }
@@ -136,7 +143,7 @@ async function runLint(cfg) {
             const { filename, fileNum, result } = await fileP;
             status.files += 1;
             status.cachedFiles = (status.cachedFiles || 0) + (result.cached ? 1 : 0);
-            emitProgress(filename, fileNum, result);
+            emitProgressComplete(filename, fileNum, fileCount !== null && fileCount !== void 0 ? fileCount : fileNum, result);
             // Show the spelling errors after emitting the progress.
             result.issues.filter(cfg.uniqueFilter).forEach((issue) => reporter.issue(issue));
             if (result.issues.length || result.errors) {

package/dist/util/InMemoryReporter.d.ts

@@ -1,4 +1,4 @@
-import type { CSpellReporter, Issue, ProgressFileComplete, RunResult } from '@cspell/cspell-types';
+import type { CSpellReporter, Issue, ProgressItem, RunResult } from '@cspell/cspell-types';
 export interface InMemoryResult {
     log: string[];
     issues: Issue[];
@@ -21,7 +21,7 @@ export declare class InMemoryReporter implements CSpellReporter, InMemoryResult
     error: (message: string, error: Error) => void;
     info: (message: string) => void;
     debug: (message: string) => void;
-    progress: (p: ProgressFileComplete) => void;
+    progress: (p: ProgressItem) => void;
     result: (r: RunResult) => void;
     dump: () => InMemoryResult;
 }

package/dist/util/util.d.ts

@@ -4,7 +4,9 @@ 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>(src: T): 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/util/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.padLeft = exports.pad = exports.clean = exports.unique = exports.uniqueFilterFnGenerator = exports.uniqueFn = void 0;
+exports.width = exports.padLeft = exports.pad = exports.padWidth = exports.clean = exports.unique = exports.uniqueFilterFnGenerator = exports.uniqueFn = void 0;
 // alias for uniqueFilterFnGenerator
 exports.uniqueFn = uniqueFilterFnGenerator;
 function uniqueFilterFnGenerator(extractFn) {
@@ -28,16 +28,28 @@ function clean(src) {
     return r;
 }
 exports.clean = clean;
+function padWidth(s, target) {
+    const sWidth = width(s);
+    return Math.max(target - sWidth, 0);
+}
+exports.padWidth = padWidth;
 function pad(s, w) {
-    if (s.length >= w)
+    const p = padWidth(s, w);
+    if (!p)
         return s;
-    return (s + ' '.repeat(w)).slice(0, w);
+    return s + ' '.repeat(p);
 }
 exports.pad = pad;
 function padLeft(s, w) {
-    if (s.length >= w)
+    const p = padWidth(s, w);
+    if (!p)
         return s;
-    return (' '.repeat(w) + s).slice(-w);
+    return ' '.repeat(p) + s;
 }
 exports.padLeft = padLeft;
+function width(s) {
+    // eslint-disable-next-line no-control-regex
+    return s.replace(/[\u0300-\u036f\x00-\x1f]/g, '').length;
+}
+exports.width = width;
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "5.18.0-alpha.0",
+  "version": "5.18.3",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "main": "dist/index.js",
@@ -70,13 +70,13 @@
   },
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "dependencies": {
-    "@cspell/cspell-pipe": "^5.18.0-alpha.0",
+    "@cspell/cspell-pipe": "^5.18.3",
     "chalk": "^4.1.2",
-    "commander": "^8.3.0",
-    "comment-json": "^4.1.1",
-    "cspell-gitignore": "^5.18.0-alpha.0",
-    "cspell-glob": "^5.18.0-alpha.0",
-    "cspell-lib": "^5.18.0-alpha.0",
+    "commander": "^9.0.0",
+    "comment-json": "^4.2.2",
+    "cspell-gitignore": "^5.18.3",
+    "cspell-glob": "^5.18.3",
+    "cspell-lib": "^5.18.3",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^6.0.1",
     "fs-extra": "^10.0.0",
@@ -91,8 +91,8 @@
     "node": ">=12.13.0"
   },
   "devDependencies": {
-    "@cspell/cspell-json-reporter": "^5.18.0-alpha.0",
-    "@cspell/cspell-types": "^5.18.0-alpha.0",
+    "@cspell/cspell-json-reporter": "^5.18.3",
+    "@cspell/cspell-types": "^5.18.3",
     "@types/file-entry-cache": "^5.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
@@ -104,8 +104,8 @@
     "micromatch": "^4.0.4",
     "minimatch": "^3.0.4",
     "rimraf": "^3.0.2",
-    "rollup": "^2.66.1",
+    "rollup": "^2.67.0",
     "rollup-plugin-dts": "^4.1.0"
   },
-  "gitHead": "d3c6f34444f19e9d8e375d1cbea6f99d0f270716"
+  "gitHead": "c650c8d0d58fc0398a6f745a0ad48d46f982332f"
 }