cspell 5.19.6 → 5.19.7

package/dist/lint/lint.js

@@ -43,6 +43,7 @@ const chalk = require("chalk");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const npmPackage = require('../../package.json');
 const version = npmPackage.version;
+const { opFilterAsync } = cspell_pipe_1.operators;
 async function runLint(cfg) {
     let { reporter } = cfg;
     cspell.setLogger(getLoggerFromReporter(reporter));
@@ -416,8 +417,8 @@ async function useFileLists(fileListFiles, includeGlobPatterns, root, dot) {
         options.dot = dot;
     }
     const globMatcher = new cspell_glob_1.GlobMatcher(includeGlobPatterns, options);
-    const files = await (0, fileHelper_1.readFileListFiles)(fileListFiles);
     const filterFiles = (file) => globMatcher.match(file);
-    return files instanceof Array ? files.filter(filterFiles) : (0, cspell_pipe_1.pipeAsync)(files, (0, cspell_pipe_1.opFilter)(filterFiles));
+    const files = (0, fileHelper_1.readFileListFiles)(fileListFiles);
+    return (0, cspell_pipe_1.pipeAsync)(files, (0, cspell_pipe_1.opFilter)(filterFiles), opFilterAsync(fileHelper_1.isNotDir));
 }
 //# sourceMappingURL=lint.js.map

package/dist/util/async.d.ts

@@ -1,2 +1,3 @@
-export { toAsyncIterable as mergeAsyncIterables, toArray as asyncIterableToArray, opMap as asyncMap, } from '@cspell/cspell-pipe';
+export { helpers as asyncHelpers, operators as asyncOperators, pipeAsync as asyncPipe, toArray as asyncIterableToArray, toAsyncIterable as mergeAsyncIterables, } from '@cspell/cspell-pipe';
+export declare const asyncMap: typeof import("@cspell/cspell-pipe/operators").opMapAsync, asyncFilter: typeof import("@cspell/cspell-pipe/operators").opFilterAsync, asyncAwait: typeof import("@cspell/cspell-pipe").opAwaitAsync, asyncFlatten: typeof import("@cspell/cspell-pipe/operators").opFlattenAsync;
 //# sourceMappingURL=async.d.ts.map

package/dist/util/async.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asyncMap = exports.asyncIterableToArray = exports.mergeAsyncIterables = void 0;
-var cspell_pipe_1 = require("@cspell/cspell-pipe");
-Object.defineProperty(exports, "mergeAsyncIterables", { enumerable: true, get: function () { return cspell_pipe_1.toAsyncIterable; } });
-Object.defineProperty(exports, "asyncIterableToArray", { enumerable: true, get: function () { return cspell_pipe_1.toArray; } });
-Object.defineProperty(exports, "asyncMap", { enumerable: true, get: function () { return cspell_pipe_1.opMap; } });
+exports.asyncFlatten = exports.asyncAwait = exports.asyncFilter = exports.asyncMap = exports.mergeAsyncIterables = exports.asyncIterableToArray = exports.asyncPipe = exports.asyncOperators = exports.asyncHelpers = void 0;
+const cspell_pipe_1 = require("@cspell/cspell-pipe");
+var cspell_pipe_2 = require("@cspell/cspell-pipe");
+Object.defineProperty(exports, "asyncHelpers", { enumerable: true, get: function () { return cspell_pipe_2.helpers; } });
+Object.defineProperty(exports, "asyncOperators", { enumerable: true, get: function () { return cspell_pipe_2.operators; } });
+Object.defineProperty(exports, "asyncPipe", { enumerable: true, get: function () { return cspell_pipe_2.pipeAsync; } });
+Object.defineProperty(exports, "asyncIterableToArray", { enumerable: true, get: function () { return cspell_pipe_2.toArray; } });
+Object.defineProperty(exports, "mergeAsyncIterables", { enumerable: true, get: function () { return cspell_pipe_2.toAsyncIterable; } });
+exports.asyncMap = cspell_pipe_1.operators.opMapAsync, exports.asyncFilter = cspell_pipe_1.operators.opFilterAsync, exports.asyncAwait = cspell_pipe_1.operators.opAwaitAsync, exports.asyncFlatten = cspell_pipe_1.operators.opFlattenAsync;
 //# sourceMappingURL=async.js.map

package/dist/util/fileHelper.d.ts

@@ -1,5 +1,6 @@
-import { GlobOptions } from './glob';
+/// <reference types="node" />
 import { CSpellUserSettings, Document, Issue } from 'cspell-lib';
+import { GlobOptions } from './glob';
 export interface ConfigInfo {
     source: string;
     config: CSpellUserSettings;
@@ -29,8 +30,8 @@ export declare function fileInfoToDocument(fileInfo: FileInfo, languageId: strin
 interface ReadFileInfoResult extends FileInfo {
     text: string;
 }
-export declare function readFileInfo(filename: string, encoding?: string, handleNotFound?: boolean): Promise<ReadFileInfoResult>;
-export declare function readFile(filename: string, encoding?: string): Promise<string>;
+export declare function readFileInfo(filename: string, encoding?: BufferEncoding, handleNotFound?: boolean): Promise<ReadFileInfoResult>;
+export declare function readFile(filename: string, encoding?: BufferEncoding): Promise<string>;
 /**
  * Looks for matching glob patterns or stdin
  * @param globPatterns patterns or stdin
@@ -43,7 +44,7 @@ export declare function calcFinalConfigInfo(configInfo: ConfigInfo, settingsFrom
  *   file will be resolved relative to the containing file.
  * @returns - a list of files to be processed.
  */
-export declare function readFileListFiles(listFiles: string[]): Promise<string[] | AsyncIterable<string>>;
+export declare function readFileListFiles(listFiles: string[]): AsyncIterable<string>;
 /**
  * Read a `listFile` and return the containing file paths resolved relative to the `listFile`.
  * @param listFiles - array of file paths to read that will contain a list of files. Paths contained in each
@@ -51,5 +52,8 @@ export declare function readFileListFiles(listFiles: string[]): Promise<string[]
  * @returns - a list of files to be processed.
  */
 export declare function readFileListFile(listFile: string): Promise<string[]>;
+export declare function isFile(filename: string): Promise<boolean>;
+export declare function isDir(filename: string): Promise<boolean>;
+export declare function isNotDir(filename: string): Promise<boolean>;
 export {};
 //# sourceMappingURL=fileHelper.d.ts.map

package/dist/util/fileHelper.js

@@ -26,15 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFileListFile = exports.readFileListFiles = exports.calcFinalConfigInfo = exports.findFiles = exports.readFile = exports.readFileInfo = exports.fileInfoToDocument = exports.readConfig = void 0;
+exports.isNotDir = exports.isDir = exports.isFile = exports.readFileListFile = exports.readFileListFiles = exports.calcFinalConfigInfo = exports.findFiles = exports.readFile = exports.readFileInfo = exports.fileInfoToDocument = exports.readConfig = void 0;
 const cspell = __importStar(require("cspell-lib"));
-const fsp = __importStar(require("fs-extra"));
+const cspell_lib_1 = require("cspell-lib");
+const fs_1 = require("fs");
 const get_stdin_1 = __importDefault(require("get-stdin"));
-const glob_1 = require("./glob");
 const path = __importStar(require("path"));
-const cspell_lib_1 = require("cspell-lib");
-const errors_1 = require("./errors");
 const async_1 = require("./async");
+const errors_1 = require("./errors");
+const glob_1 = require("./glob");
 const stdin_1 = require("./stdin");
 const UTF8 = 'utf8';
 const STDIN = 'stdin';
@@ -64,7 +64,7 @@ function fileInfoToDocument(fileInfo, languageId, locale) {
 }
 exports.fileInfoToDocument = fileInfoToDocument;
 function readFileInfo(filename, encoding = UTF8, handleNotFound = false) {
-    const pText = filename === STDIN ? (0, get_stdin_1.default)() : fsp.readFile(filename, encoding);
+    const pText = filename === STDIN ? (0, get_stdin_1.default)() : fs_1.promises.readFile(filename, encoding);
     return pText.then((text) => ({ text, filename }), (e) => {
         const error = (0, errors_1.toError)(e);
         return handleNotFound && error.code === 'EISDIR'
@@ -117,16 +117,17 @@ const resolveFilenames = (0, async_1.asyncMap)(resolveFilename);
  *   file will be resolved relative to the containing file.
  * @returns - a list of files to be processed.
  */
-async function readFileListFiles(listFiles) {
+function readFileListFiles(listFiles) {
     let useStdin = false;
     const files = listFiles.filter((file) => {
         const isStdin = file === 'stdin';
         useStdin = useStdin || isStdin;
         return !isStdin;
     });
-    const found = flatten(await Promise.all(files.map(readFileListFile)));
+    const found = (0, async_1.asyncPipe)(files, (0, async_1.asyncMap)((file) => readFileListFile(file)), (0, async_1.asyncAwait)(), (0, async_1.asyncFlatten)());
     // Move `stdin` to the end.
-    return useStdin ? resolveFilenames((0, async_1.mergeAsyncIterables)(found, (0, stdin_1.readStdin)())) : found;
+    const stdin = useStdin ? (0, stdin_1.readStdin)() : [];
+    return (0, async_1.asyncPipe)((0, async_1.mergeAsyncIterables)(found, stdin), resolveFilenames);
 }
 exports.readFileListFiles = readFileListFiles;
 /**
@@ -151,12 +152,28 @@ async function readFileListFile(listFile) {
     }
 }
 exports.readFileListFile = readFileListFile;
-function flatten(fileLists) {
-    function* f() {
-        for (const list of fileLists) {
-            yield* list;
-        }
+async function isFile(filename) {
+    try {
+        const stat = await fs_1.promises.stat(filename);
+        return stat.isFile();
     }
-    return [...f()];
+    catch (e) {
+        return false;
+    }
+}
+exports.isFile = isFile;
+async function isDir(filename) {
+    try {
+        const stat = await fs_1.promises.stat(filename);
+        return stat.isDirectory();
+    }
+    catch (e) {
+        return false;
+    }
+}
+exports.isDir = isDir;
+function isNotDir(filename) {
+    return isDir(filename).then((a) => !a);
 }
+exports.isNotDir = isNotDir;
 //# sourceMappingURL=fileHelper.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "5.19.6",
+  "version": "5.19.7",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "main": "dist/index.js",
@@ -70,12 +70,12 @@
   },
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "dependencies": {
-    "@cspell/cspell-pipe": "^5.19.6",
+    "@cspell/cspell-pipe": "^5.19.7",
     "chalk": "^4.1.2",
     "commander": "^9.1.0",
-    "cspell-gitignore": "^5.19.6",
-    "cspell-glob": "^5.19.6",
-    "cspell-lib": "^5.19.6",
+    "cspell-gitignore": "^5.19.7",
+    "cspell-glob": "^5.19.7",
+    "cspell-lib": "^5.19.7",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^6.0.1",
     "fs-extra": "^10.0.1",
@@ -90,8 +90,8 @@
     "node": ">=12.13.0"
   },
   "devDependencies": {
-    "@cspell/cspell-json-reporter": "^5.19.6",
-    "@cspell/cspell-types": "^5.19.6",
+    "@cspell/cspell-json-reporter": "^5.19.7",
+    "@cspell/cspell-types": "^5.19.7",
     "@types/file-entry-cache": "^5.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
@@ -104,7 +104,7 @@
     "minimatch": "^5.0.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.70.1",
-    "rollup-plugin-dts": "^4.2.0"
+    "rollup-plugin-dts": "^4.2.1"
   },
-  "gitHead": "288584aa11eb262dab45201824c90206d7db65c3"
+  "gitHead": "1d33cd1b61250f8c4c5c2c218ec43675614784ca"
 }