add expandDirectories option

README.md

@@ -29,3 +29,4 @@ globSync({ patterns: ['src/*.ts', '!**/*.d.ts'] });
 - `ignore`: An array of glob patterns to ignore.
 - `cwd`: The current working directory in which to search. Defaults to `process.cwd()`.
 - `absolute`: Whether to return absolute paths. Defaults to `false`.
+- `expandDirectories`: Whether to expand directories. Disable to best match `fast-glob`. Defaults to `true`.

src/index.ts

@@ -1,22 +1,35 @@
 import { fdir } from 'fdir';
 import picomatch from 'picomatch';
 
-function processPatterns(patterns?: string[], ignore?: string[]) {
+export interface GlobOptions {
+  absolute?: boolean;
+  cwd?: string;
+  patterns?: string[];
+  ignore?: string[];
+  expandDirectories?: boolean;
+}
+
+// using a directory as entry should match all files inside it
+function expandDir(pattern: string) {
+  if (pattern.endsWith('/')) {
+    return `${pattern}**`;
+  }
+  if (pattern.endsWith('\\')) {
+    return `${pattern.slice(0, -1)}/**`;
+  }
+  return `${pattern}/**`;
+}
+
+function processPatterns({ patterns, ignore = [], expandDirectories = true }: GlobOptions) {
   if (!patterns) {
     return null;
   }
   const matchPatterns: string[] = [];
-  const ignorePatterns: string[] = ignore ?? [];
+  const ignorePatterns: string[] = ignore.map(p => (!p.endsWith('*') && expandDirectories ? expandDir(p) : p));
   for (let pattern of patterns) {
     // using a directory as entry should match all files inside it
-    if (!pattern.endsWith('*')) {
-      if (pattern.endsWith('/')) {
-        pattern += '**';
-      } else if (pattern.endsWith('\\')) {
-        pattern = `${pattern.slice(0, -1)}/**`;
-      } else {
-        pattern += '/**';
-      }
+    if (!pattern.endsWith('*') && expandDirectories) {
+      pattern = expandDir(pattern);
     }
     if (pattern.startsWith('!') && pattern[1] !== '(') {
       ignorePatterns.push(pattern.slice(1));
@@ -28,17 +41,10 @@ function processPatterns(patterns?: string[], ignore?: string[]) {
   return { match: matchPatterns, ignore: ignorePatterns };
 }
 
-export interface GlobOptions {
-  absolute?: boolean;
-  cwd?: string;
-  patterns?: string[];
-  ignore?: string[];
-}
-
-function getFdirBuilder({ absolute = false, ignore, patterns }: GlobOptions | undefined = {}) {
-  const processed = processPatterns(patterns, ignore);
+function getFdirBuilder(options: GlobOptions) {
+  const processed = processPatterns(options);
 
-  const options = processed
+  const fdirOptions = processed
     ? {
         filters: [
           picomatch(processed.match, {
@@ -50,7 +56,7 @@ function getFdirBuilder({ absolute = false, ignore, patterns }: GlobOptions | un
       }
     : undefined;
 
-  return absolute ? new fdir(options).withFullPaths() : new fdir(options).withRelativePaths();
+  return options.absolute ? new fdir(fdirOptions).withFullPaths() : new fdir(fdirOptions).withRelativePaths();
 }
 
 export async function glob(options: GlobOptions | undefined = {}): Promise<string[]> {

test/index.test.ts

@@ -3,11 +3,16 @@ import path from 'node:path';
 import { test } from 'node:test';
 import { glob, globSync } from '../src';
 
-test('path expansion', async () => {
+test('directory expansion', async () => {
   const files = await glob({ patterns: ['a'], cwd: path.join(__dirname, 'fixtures') });
   assert.deepEqual(files.sort(), [path.join('a', 'a.ts'), path.join('a', 'b.ts')]);
 });
 
+test('no directory expansion if expandDirectories is set to false', async () => {
+  const files = await glob({ patterns: ['a'], expandDirectories: false, cwd: path.join(__dirname, 'fixtures') });
+  assert.deepEqual(files.sort(), []);
+});
+
 test('negative patterns', async () => {
   const files = await glob({ patterns: ['**/a.ts', '!b/a.ts'], cwd: path.join(__dirname, 'fixtures') });
   assert.deepEqual(files.sort(), [path.join('a', 'a.ts')]);