cspell 9.1.0 → 9.1.2

package/dist/esm/emitters/dictionaryListEmitter.js

@@ -1,7 +1,7 @@
 import * as iPath from 'node:path';
 import chalk from 'chalk';
 import { console } from '../console.js';
-import { pruneTextEnd, pruneTextStart } from '../util/pad.js';
+import { pruneAnsiTextEnd, pruneAnsiTextStart } from '../util/pad.js';
 import { tableToLines } from '../util/table.js';
 import { formatDictionaryLocation } from './helpers.js';
 const maxWidth = 120;
@@ -52,10 +52,10 @@ function calcHeaders(options) {
 function emitDictResult(r, options) {
     const a = r.enabled ? '*' : ' ';
     const dictColor = r.enabled ? chalk.yellowBright : chalk.rgb(200, 128, 50);
-    const n = (width) => dictColor(pruneTextEnd(r.name, width && width - a.length) + a);
+    const n = (width) => dictColor(pruneAnsiTextEnd(r.name, width && width - a.length) + a);
     const c = colorize(chalk.white);
-    const locales = (width) => c(pruneTextEnd(r.locales?.join(',') || '', width));
-    const fileTypes = (width) => c(pruneTextEnd(r.fileTypes?.join(',') || '', width));
+    const locales = (width) => c(pruneAnsiTextEnd(r.locales?.join(',') || '', width));
+    const fileTypes = (width) => c(pruneAnsiTextEnd(r.fileTypes?.join(',') || '', width));
     if (!r.path) {
         return {
             name: n,
@@ -67,7 +67,7 @@ function emitDictResult(r, options) {
     return {
         name: n,
         location: (widthSrc) => c((r.path &&
-            pruneTextStart(formatDictionaryLocation(r.path, widthSrc ?? maxWidth, { iPath, ...options }), widthSrc ?? maxWidth)) ||
+            pruneAnsiTextStart(formatDictionaryLocation(r.path, widthSrc ?? maxWidth, { iPath, ...options }), widthSrc ?? maxWidth)) ||
             ''),
         locales,
         fileTypes,

package/dist/esm/pkgInfo.d.ts

@@ -1,6 +1,6 @@
 export { pkgDir } from './dirname.js';
 export declare const name = "cspell";
-export declare const version = "9.1.0";
+export declare const version = "9.1.2";
 export declare const engines: {
     node: string;
 };

package/dist/esm/pkgInfo.js

@@ -1,7 +1,7 @@
 // This file is generated by tools/patch-version.mjs
 export { pkgDir } from './dirname.js';
 export const name = 'cspell';
-export const version = '9.1.0';
+export const version = '9.1.2';
 export const engines = { node: '>=20' };
 export const npmPackage = { name, version, engines };
 //# sourceMappingURL=pkgInfo.js.map

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

@@ -1,6 +1,7 @@
 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 isAnsiString(s: string): boolean;
 export declare function width(s: string): number;
 export declare function ansiWidth(s: string): number;
 /**
@@ -19,4 +20,26 @@ export declare function pruneTextEnd(str: string, maxWidth: number | undefined,
  * @returns the pruned text
  */
 export declare function pruneTextStart(str: string, maxWidth: number | undefined, pad?: string): string;
+interface AnsiStrFragment {
+    type: 'text' | 'ansi';
+    text: string;
+}
+export declare function parseAnsiStr(str: string): AnsiStrFragment[];
+/**
+ * Prune the end of a string to fit within a specified width, adding an ellipsis if necessary.
+ * @param str - the text to prune - ANSI is supported
+ * @param maxWidth - the maximum width of the text
+ * @param pad - the string to use for padding, default is '…'
+ * @returns the pruned text
+ */
+export declare function pruneAnsiTextEnd(str: string, maxWidth: number | undefined, pad?: string): string;
+/**
+ * Prune the start of a string to fit within a specified width, adding an ellipsis if necessary.
+ * @param str - the text to prune - ANSI is supported
+ * @param maxWidth - the maximum width of the text
+ * @param pad - the string to use for padding, default is '…'
+ * @returns the pruned text
+ */
+export declare function pruneAnsiTextStart(str: string, maxWidth: number | undefined, pad?: string): string;
+export {};
 //# sourceMappingURL=pad.d.ts.map

package/dist/esm/util/pad.js

@@ -1,3 +1,4 @@
+import assert from 'node:assert';
 import { stripVTControlCharacters } from 'node:util';
 export function pad(s, w) {
     const p = padWidth(s, w);
@@ -15,8 +16,13 @@ export function padLeft(s, w) {
         return s;
     return s.padStart(p + s.length);
 }
+export function isAnsiString(s) {
+    // Check if the string contains ANSI control characters.
+    return s.includes('\u001B') || s.includes('\u009B');
+}
 export function width(s) {
     // Remove control codes and high surrogates to get the approximate width.
+    assert(!s.includes('\u001B'), 'String contains ANSI control characters');
     return (s
         // eslint-disable-next-line no-control-regex, no-misleading-character-class
         .replaceAll(/[\u0000-\u001F\u0300-\u036F]/g, '')
@@ -39,6 +45,8 @@ export function pruneTextEnd(str, maxWidth, pad = '…') {
         return str;
     if (str.length <= maxWidth)
         return str;
+    if (isAnsiString(str))
+        return pruneAnsiTextEnd(str, maxWidth, pad);
     const padWidth = width(pad);
     const maxWidthWithPad = maxWidth - padWidth;
     const letters = [...str];
@@ -85,4 +93,99 @@ export function pruneTextStart(str, maxWidth, pad = '…') {
     }
     return str;
 }
+// https://github.com/nodejs/node/blob/0ab50c2768453e932b5402eaea3df813e725e330/lib/internal/util/inspect.js#L283
+const ansi = new RegExp('[\\u001B\\u009B][[\\]()#;?]*' +
+    '(?:(?:(?:(?:;[-a-zA-Z\\d\\/\\#&.:=?%@~_]+)*' +
+    '|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/\\#&.:=?%@~_]*)*)?' +
+    '(?:\\u0007|\\u001B\\u005C|\\u009C))' +
+    '|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?' +
+    '[\\dA-PR-TZcf-nq-uy=><~]))', 'g');
+export function parseAnsiStr(str) {
+    const fragments = [];
+    let lastIndex = 0;
+    for (const match of str.matchAll(ansi)) {
+        if (match.index > lastIndex) {
+            fragments.push({ type: 'text', text: str.slice(lastIndex, match.index) });
+        }
+        fragments.push({ type: 'ansi', text: match[0] });
+        lastIndex = match.index + match[0].length;
+    }
+    if (lastIndex < str.length) {
+        fragments.push({ type: 'text', text: str.slice(lastIndex) });
+    }
+    return fragments;
+}
+/**
+ * Prune the end of a string to fit within a specified width, adding an ellipsis if necessary.
+ * @param str - the text to prune - ANSI is supported
+ * @param maxWidth - the maximum width of the text
+ * @param pad - the string to use for padding, default is '…'
+ * @returns the pruned text
+ */
+export function pruneAnsiTextEnd(str, maxWidth, pad = '…') {
+    if (!maxWidth || maxWidth <= 0)
+        return str;
+    if (str.length <= maxWidth)
+        return str;
+    if (ansiWidth(str) <= maxWidth)
+        return str;
+    const padWidth = ansiWidth(pad);
+    const fragments = parseAnsiStr(str);
+    const maxWidthWithPad = maxWidth - padWidth;
+    let remaining = maxWidthWithPad;
+    for (const frag of fragments) {
+        if (frag.type !== 'text')
+            continue;
+        if (remaining <= 0) {
+            frag.text = '';
+            continue;
+        }
+        const pruned = pruneTextEnd(frag.text, remaining, pad);
+        if (pruned !== frag.text) {
+            frag.text = pruned;
+            remaining = 0; // Stop processing further fragments
+            continue;
+        }
+        remaining -= width(frag.text);
+    }
+    return fragments.map((frag) => frag.text).join('');
+}
+/**
+ * Prune the start of a string to fit within a specified width, adding an ellipsis if necessary.
+ * @param str - the text to prune - ANSI is supported
+ * @param maxWidth - the maximum width of the text
+ * @param pad - the string to use for padding, default is '…'
+ * @returns the pruned text
+ */
+export function pruneAnsiTextStart(str, maxWidth, pad = '…') {
+    if (!maxWidth || maxWidth <= 0)
+        return str;
+    if (str.length <= maxWidth)
+        return str;
+    if (ansiWidth(str) <= maxWidth)
+        return str;
+    const padWidth = ansiWidth(pad);
+    const fragments = parseAnsiStr(str);
+    const maxWidthWithPad = maxWidth - padWidth;
+    let remaining = maxWidthWithPad;
+    for (const frag of fragments.reverse()) {
+        if (frag.type !== 'text')
+            continue;
+        if (remaining <= 0) {
+            frag.text = '';
+            continue;
+        }
+        const pruned = pruneTextStart(frag.text, remaining, pad);
+        if (pruned !== frag.text) {
+            frag.text = pruned;
+            remaining = 0; // Stop processing further fragments
+            continue;
+        }
+        remaining -= width(frag.text);
+    }
+    return fragments
+        .reverse()
+        .map((frag) => frag.text)
+        .join('');
+}
 //# sourceMappingURL=pad.js.map

package/dist/esm/util/stdinUrl.js

@@ -15,11 +15,12 @@ export function isStdinUrl(url) {
  */
 export function resolveStdinUrl(url, cwd) {
     assert(url.startsWith(STDINProtocol), `Expected url to start with ${STDINProtocol}`);
-    const path = url
+    const path = decodeURIComponent(url)
         .slice(STDINProtocol.length)
         .replace(/^\/\//, '')
         .replace(/^\/([a-z]:)/i, '$1');
     const fileUrl = toFileURL(path, cwd);
+    // If the path is empty,
     return fileUrl.toString().replace(/^file:/, STDINProtocol) + (path ? '' : '/');
 }
 //# sourceMappingURL=stdinUrl.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "bin": {
@@ -81,20 +81,20 @@
   },
   "homepage": "https://cspell.org/",
   "dependencies": {
-    "@cspell/cspell-json-reporter": "9.1.0",
-    "@cspell/cspell-pipe": "9.1.0",
-    "@cspell/cspell-types": "9.1.0",
-    "@cspell/dynamic-import": "9.1.0",
-    "@cspell/url": "9.1.0",
+    "@cspell/cspell-json-reporter": "9.1.2",
+    "@cspell/cspell-pipe": "9.1.2",
+    "@cspell/cspell-types": "9.1.2",
+    "@cspell/dynamic-import": "9.1.2",
+    "@cspell/url": "9.1.2",
     "chalk": "^5.4.1",
     "chalk-template": "^1.1.0",
     "commander": "^14.0.0",
-    "cspell-config-lib": "9.1.0",
-    "cspell-dictionary": "9.1.0",
-    "cspell-gitignore": "9.1.0",
-    "cspell-glob": "9.1.0",
-    "cspell-io": "9.1.0",
-    "cspell-lib": "9.1.0",
+    "cspell-config-lib": "9.1.2",
+    "cspell-dictionary": "9.1.2",
+    "cspell-gitignore": "9.1.2",
+    "cspell-glob": "9.1.2",
+    "cspell-io": "9.1.2",
+    "cspell-lib": "9.1.2",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^9.1.0",
     "semver": "^7.7.2",
@@ -111,5 +111,5 @@
     "micromatch": "^4.0.8",
     "minimatch": "^9.0.5"
   },
-  "gitHead": "a7ed42a31debbc86faa4a4ac2c686bdffe5b26b6"
+  "gitHead": "231a39f34c2c586ebb596ae7b2a832a996a80a1e"
 }