Ensuring in most cases (no --ignore-path option used) ignored folders are never even entered

Author: fabiospampinato

package-lock.json

@@ -50,7 +50,7 @@
     "specialist": "^1.4.0",
     "tiny-editorconfig": "^1.0.0",
     "tiny-jsonc": "^1.0.1",
-    "tiny-readdir-glob": "^1.22.24",
+    "tiny-readdir-glob-gitignore": "^1.0.2",
     "tiny-spinner": "^2.0.3",
     "worktank": "^2.6.1",
     "zeptomatch": "^2.0.0",

package.json

@@ -49,7 +49,8 @@ async function runGlobs(options: Options, pluginsOptions: PluginsOptions): Promi
 
   const rootPath = process.cwd();
   const projectPath = getProjectPath(rootPath);
-  const [filesPaths, filesNames, filesNamesToPaths, filesFoundPaths, foldersFoundPaths] = await getTargetsPaths(rootPath, options.globs, options.withNodeModules); // prettier-ignore
+  const ignoreFiles = options.ignorePath ? [] : [".gitignore", ".prettierignore"];
+  const [filesPaths, filesNames, filesNamesToPaths, filesFoundPaths, foldersFoundPaths] = await getTargetsPaths(rootPath, options.globs, ignoreFiles, options.withNodeModules); // prettier-ignore
   const filesPathsTargets = filesPaths.filter(negate(isBinaryPath)).sort();
   const [foldersPathsTargets, foldersExtraPaths] = getExpandedFoldersPaths(foldersFoundPaths, projectPath);
   const filesExtraPaths = await getFoldersChildrenPaths([rootPath, ...foldersExtraPaths]);
@@ -102,7 +103,7 @@ async function runGlobs(options: Options, pluginsOptions: PluginsOptions): Promi
   //TODO: Maybe do work in chunks here, as keeping too many formatted files in memory can be a problem
   const filesResults = await Promise.allSettled(
     filesPathsTargets.map(async (filePath) => {
-      const isIgnored = () => (ignoreManual ? ignoreManual(filePath) : getIgnoreResolved(filePath, ignoreNames));
+      const isIgnored = () => !ignoreFiles.length && (ignoreManual ? ignoreManual(filePath) : getIgnoreResolved(filePath, ignoreNames));
       const isCacheable = () => cache?.has(filePath, isIgnored);
       const ignored = cache ? !(await isCacheable()) : await isIgnored();
       if (ignored) return;

src/index.ts

@@ -10,7 +10,7 @@ import { text as stream2text } from "node:stream/consumers";
 import url from "node:url";
 import resolveTimeout from "promise-resolve-timeout";
 import { exit } from "specialist";
-import readdir from "tiny-readdir-glob";
+import readdir from "tiny-readdir-glob-gitignore";
 import zeptomatchEscape from "zeptomatch-escape";
 import zeptomatchIsStatic from "zeptomatch-is-static";
 import type { ContextOptions, FormatOptions, FunctionMaybe, Key, LogLevel, Options, PrettierConfigWithOverrides, PrettierPlugin } from "./types.js";
@@ -87,11 +87,13 @@ async function getFoldersChildrenPaths(foldersPaths: string[]): Promise<string[]
   return childrenPaths;
 }
 
-function getGlobPaths(rootPath: string, globs: string[], withNodeModules: boolean) {
+function getGlobPaths(rootPath: string, globs: string[], ignoreFiles: string[], withNodeModules: boolean) {
   return readdir(globs, {
     cwd: rootPath,
     followSymlinks: false,
     ignore: `**/{.git,.sl,.svn,.hg,.DS_Store,Thumbs.db${withNodeModules ? "" : ",node_modules"}}`,
+    ignoreFiles,
+    ignoreFilesFindAbove: false,
   });
 }
 
@@ -184,6 +186,7 @@ const getStdin = once(async (): Promise<string | undefined> => {
 async function getTargetsPaths(
   rootPath: string,
   globs: string[],
+  ignoreFiles: string[],
   withNodeModules: boolean,
 ): Promise<[string[], string[], Record<string, string[]>, string[], string[]]> {
   const targetFiles: string[] = [];
@@ -204,7 +207,7 @@ async function getTargetsPaths(
     }
   }
 
-  const result = await getGlobPaths(rootPath, targetGlobs, withNodeModules);
+  const result = await getGlobPaths(rootPath, targetGlobs, ignoreFiles, withNodeModules);
   const filesPaths = [...targetFiles, ...result.files];
   const filesNames = [...targetFilesNames, ...result.filesFoundNames];
   const filesNamesToPaths = result.filesFoundNamesToPaths;