cspell 8.14.3 → 8.15.0

package/dist/esm/pkgInfo.d.ts

@@ -1,6 +1,6 @@
 export { pkgDir } from './dirname.js';
 export declare const name = "cspell";
-export declare const version = "8.14.3";
+export declare const version = "8.15.0";
 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 = '8.14.3';
+export const version = '8.15.0';
 export const engines = { node: '>=18' };
 export const npmPackage = { name, version, engines };
 //# sourceMappingURL=pkgInfo.js.map

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

@@ -1,5 +1,6 @@
 export declare const UTF8: "utf8";
 export declare const STDIN: "stdin";
-export declare const STDINProtocol: "stdin://";
-export declare const FileProtocol: "file://";
+export declare const STDINProtocol: "stdin:";
+export declare const STDINUrlPrefix: "stdin://";
+export declare const FileUrlPrefix: "file://";
 //# sourceMappingURL=constants.d.ts.map

package/dist/esm/util/constants.js

@@ -1,5 +1,6 @@
 export const UTF8 = 'utf8';
 export const STDIN = 'stdin';
-export const STDINProtocol = 'stdin://';
-export const FileProtocol = 'file://';
+export const STDINProtocol = 'stdin:';
+export const STDINUrlPrefix = 'stdin://';
+export const FileUrlPrefix = 'file://';
 //# sourceMappingURL=constants.js.map

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

@@ -30,7 +30,7 @@ export interface FileResult {
     cached?: boolean;
 }
 export declare function fileInfoToDocument(fileInfo: FileInfo, languageId: string | undefined, locale: string | undefined): Document;
-export declare function filenameToUrlString(filename: string, cwd?: string): URL;
+export declare function filenameToUrl(filename: string, cwd?: string): URL;
 export declare function filenameToUri(filename: string, cwd?: string): URL;
 export declare function isBinaryFile(filename: string, cwd?: string): boolean;
 export interface ReadFileInfoResult extends FileInfo {

package/dist/esm/util/fileHelper.js

@@ -7,10 +7,11 @@ import * as cspell from 'cspell-lib';
 import { fileToDocument, isBinaryFile as isUriBinaryFile } from 'cspell-lib';
 import getStdin from 'get-stdin';
 import { asyncAwait, asyncFlatten, asyncMap, asyncPipe, mergeAsyncIterables } from './async.js';
-import { FileProtocol, STDIN, STDINProtocol, UTF8 } from './constants.js';
+import { FileUrlPrefix, STDIN, STDINProtocol, STDINUrlPrefix, UTF8 } from './constants.js';
 import { IOError, toApplicationError, toError } from './errors.js';
 import { globP } from './glob.js';
 import { readStdin } from './stdin.js';
+import { isStdinUrl, resolveStdinUrl } from './stdinUrl.js';
 import { clean } from './util.js';
 export async function readConfig(configFile, root) {
     if (configFile) {
@@ -24,7 +25,7 @@ export function fileInfoToDocument(fileInfo, languageId, locale) {
     const { filename, text } = fileInfo;
     languageId = languageId || undefined;
     locale = locale || undefined;
-    const uri = filenameToUrlString(filename);
+    const uri = filenameToUrl(filename);
     if (uri.href.startsWith(STDINProtocol)) {
         return clean({
             uri: uri.href,
@@ -35,18 +36,17 @@ export function fileInfoToDocument(fileInfo, languageId, locale) {
     }
     return fileToDocument(uri.href, text, languageId, locale);
 }
-export function filenameToUrlString(filename, cwd = '.') {
+export function filenameToUrl(filename, cwd = '.') {
     const cwdURL = toFileDirURL(cwd);
     if (filename === STDIN)
         return new URL('stdin:///');
-    if (filename.startsWith(STDINProtocol)) {
-        const filePath = filename.slice(STDINProtocol.length);
-        return toFileURL(filePath, cwdURL);
+    if (isStdinUrl(filename)) {
+        return new URL(resolveStdinUrl(filename, cwd));
     }
     return toFileURL(filename, cwdURL);
 }
 export function filenameToUri(filename, cwd) {
-    return toURL(filenameToUrlString(filename, cwd));
+    return toURL(filenameToUrl(filename, cwd));
 }
 export function isBinaryFile(filename, cwd) {
     const uri = filenameToUri(filename, cwd);
@@ -57,14 +57,15 @@ export function isBinaryFile(filename, cwd) {
 export function resolveFilename(filename, cwd) {
     cwd = cwd || process.cwd();
     if (filename === STDIN)
-        return STDINProtocol;
-    if (filename.startsWith(FileProtocol)) {
-        const url = new URL(filename.slice(FileProtocol.length), pathToFileURL(cwd + path.sep));
+        return STDINUrlPrefix;
+    if (filename.startsWith(FileUrlPrefix)) {
+        const url = new URL(filename.slice(FileUrlPrefix.length), pathToFileURL(cwd + path.sep));
         return fileURLToPath(url);
     }
-    const scheme = filename.startsWith(STDINProtocol) ? STDINProtocol : '';
-    const pathname = filename.slice(scheme.length);
-    return scheme + path.resolve(cwd, pathname);
+    if (isStdinUrl(filename)) {
+        return resolveStdinUrl(filename, cwd);
+    }
+    return path.resolve(cwd, filename);
 }
 export function readFileInfo(filename, encoding = UTF8, handleNotFound = false) {
     filename = resolveFilename(filename);
@@ -87,9 +88,7 @@ export function readFile(filename, encoding = UTF8) {
  */
 export async function findFiles(globPatterns, options) {
     const stdin = [];
-    const globPats = globPatterns.filter((filename) => filename !== STDIN && !filename.startsWith(STDINProtocol) && !filename.startsWith(FileProtocol)
-        ? true
-        : (stdin.push(filename), false));
+    const globPats = globPatterns.filter((filename) => !isStdin(filename) && !filename.startsWith(FileUrlPrefix) ? true : (stdin.push(filename), false));
     const globResults = globPats.length ? await globP(globPats, options) : [];
     const cwd = options.cwd || process.cwd();
     return [...stdin, ...globResults].map((filename) => resolveFilename(filename, cwd));
@@ -134,7 +133,12 @@ export async function readFileListFile(listFile) {
         throw toApplicationError(err, `Error reading file list from: "${listFile}"`);
     }
 }
+function isStdin(filename) {
+    return filename === STDIN || isStdinUrl(filename);
+}
 export async function isFile(filename) {
+    if (isStdin(filename))
+        return true;
     try {
         const stat = await fsp.stat(filename);
         return stat.isFile();

package/dist/esm/util/glob.js

@@ -2,7 +2,7 @@ import { promises as fs } from 'node:fs';
 import * as path from 'node:path';
 import { posix } from 'node:path';
 import { fileOrGlobToGlob, GlobMatcher } from 'cspell-glob';
-import glob from 'fast-glob';
+import { glob } from 'tinyglobby';
 import { clean } from './util.js';
 const defaultExcludeGlobs = ['node_modules/**'];
 /**
@@ -23,6 +23,7 @@ export async function globP(pattern, options) {
         ignore,
         absolute: true,
         followSymbolicLinks: false,
+        expandDirectories: false,
     });
     const compare = new Intl.Collator('en').compare;
     const absolutePaths = (await glob(patterns, useOptions)).sort(compare);

package/dist/esm/util/pad.js

@@ -1,4 +1,4 @@
-import strip from 'strip-ansi';
+import { stripVTControlCharacters } from 'node:util';
 export function pad(s, w) {
     const p = padWidth(s, w);
     if (!p)
@@ -23,6 +23,6 @@ export function width(s) {
         .replaceAll(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '.').length);
 }
 export function ansiWidth(s) {
-    return width(strip(s));
+    return width(stripVTControlCharacters(s));
 }
 //# sourceMappingURL=pad.js.map

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

@@ -0,0 +1,9 @@
+export declare function isStdinUrl(url: string | URL): boolean;
+/**
+ * Normalize and resolve a stdin url.
+ * @param url - stdin url to resolve.
+ * @param cwd - file path to resolve relative paths against.
+ * @returns
+ */
+export declare function resolveStdinUrl(url: string, cwd: string): string;
+//# sourceMappingURL=stdinUrl.d.ts.map

package/dist/esm/util/stdinUrl.js

@@ -0,0 +1,26 @@
+import assert from 'node:assert';
+import Path from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { STDINProtocol } from './constants.js';
+export function isStdinUrl(url) {
+    if (url instanceof URL) {
+        return url.protocol === STDINProtocol;
+    }
+    return url.startsWith(STDINProtocol);
+}
+/**
+ * Normalize and resolve a stdin url.
+ * @param url - stdin url to resolve.
+ * @param cwd - file path to resolve relative paths against.
+ * @returns
+ */
+export function resolveStdinUrl(url, cwd) {
+    assert(url.startsWith(STDINProtocol), `Expected url to start with ${STDINProtocol}`);
+    const path = url
+        .slice(STDINProtocol.length)
+        .replace(/^\/\//, '')
+        .replace(/^\/([a-z]:)/i, '$1');
+    const fileUrl = pathToFileURL(Path.resolve(cwd, path));
+    return fileUrl.toString().replace(/^file:/, STDINProtocol) + (path ? '' : '/');
+}
+//# sourceMappingURL=stdinUrl.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "8.14.3",
+  "version": "8.15.0",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "bin": {
@@ -43,7 +43,6 @@
     "build": "tsc -p . && pnpm run build:api",
     "build:api": "rollup -c rollup.config.mjs",
     "build:esm": "tsc -p .",
-    "build:lib": "tsc -b src/lib/tsconfig.json -f",
     "build:readme": "pnpm build:readme:help",
     "build:readme:help": "pnpm build:readme:help:lint && pnpm build:readme:help:trace && inject-markdown README.md && prettier -w README.md",
     "build:readme:help:lint": "./bin.mjs lint --help > static/help-lint.txt",
@@ -52,8 +51,8 @@
     "coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "test": "vitest run",
-    "watch": "tsc -b . -w -f",
-    "compile": "tsc -b . -f",
+    "watch": "tsc -p . -w",
+    "compile": "tsc -p .",
     "test-watch": "vitest",
     "version": "node ./tools/patch-version.mjs && git add .",
     "prepublishOnly": "pnpm run clean-build",
@@ -82,25 +81,24 @@
   },
   "homepage": "https://cspell.org/",
   "dependencies": {
-    "@cspell/cspell-json-reporter": "8.14.3",
-    "@cspell/cspell-pipe": "8.14.3",
-    "@cspell/cspell-types": "8.14.3",
-    "@cspell/dynamic-import": "8.14.3",
-    "@cspell/url": "8.14.3",
+    "@cspell/cspell-json-reporter": "8.15.0",
+    "@cspell/cspell-pipe": "8.15.0",
+    "@cspell/cspell-types": "8.15.0",
+    "@cspell/dynamic-import": "8.15.0",
+    "@cspell/url": "8.15.0",
     "chalk": "^5.3.0",
     "chalk-template": "^1.1.0",
     "commander": "^12.1.0",
-    "cspell-dictionary": "8.14.3",
-    "cspell-gitignore": "8.14.3",
-    "cspell-glob": "8.14.3",
-    "cspell-io": "8.14.3",
-    "cspell-lib": "8.14.3",
-    "fast-glob": "^3.3.2",
+    "cspell-dictionary": "8.15.0",
+    "cspell-gitignore": "8.15.0",
+    "cspell-glob": "8.15.0",
+    "cspell-io": "8.15.0",
+    "cspell-lib": "8.15.0",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^9.1.0",
     "get-stdin": "^9.0.0",
     "semver": "^7.6.3",
-    "strip-ansi": "^7.1.0"
+    "tinyglobby": "^0.2.9"
   },
   "engines": {
     "node": ">=18"
@@ -113,5 +111,5 @@
     "micromatch": "^4.0.8",
     "minimatch": "^9.0.5"
   },
-  "gitHead": "ce996377857f5d7c3e70f27fc512afbe605562f8"
+  "gitHead": "60b04562dfa023eede01929d86fa944163c07256"
 }