Return '.' instead of '' when matching cwd

Fix: #519

Author: isaacs

src/walker.ts

@@ -214,7 +214,7 @@ export abstract class GlobUtil<O extends GlobWalkerOpts = GlobWalkerOpts> {
         this.opts.dotRelative && !rel.startsWith('..' + this.#sep)
           ? '.' + this.#sep
           : ''
-      this.matchEmit(!rel && mark ? '.' + mark : pre + rel + mark)
+      this.matchEmit(!rel ? '.' + mark : pre + rel + mark)
     }
   }
 

test/custom-fs.ts

@@ -16,7 +16,7 @@ const cwd = t.testdir({
 })
 
 t.same(
-  new Set(['a', 'b', 'c', '']),
+  new Set(['a', 'b', 'c', '.']),
   new Set(
     globSync('**', {
       fs: {

test/custom-ignore.ts

@@ -16,7 +16,9 @@ t.test('ignore files with long names', async t => {
   const syncRes = globSync('**', { cwd, ignore })
   const asyncRes = await glob('**', { cwd, ignore })
   const expect = j(
-    globSync('**', { cwd }).filter(p => basename(p).length === 1)
+    globSync('**', { cwd }).filter(p => {
+      return basename(p).length === 1 && basename(p) !== '.'
+    })
   )
   t.same(j(syncRes), expect)
   t.same(j(asyncRes), expect)

test/ignore.ts

@@ -58,7 +58,7 @@ const cases: Case[] = [
     '**',
     ['c/**', 'bc/**', 'symlink/**', 'abcdef/**'],
     j([
-      '',
+      '.',
       'abcfed',
       'abcfed/g',
       'abcfed/g/h',
@@ -80,7 +80,7 @@ const cases: Case[] = [
     '**',
     ['b'],
     j([
-      '',
+      '.',
       'abcdef',
       'abcdef/g',
       'abcdef/g/h',
@@ -112,7 +112,7 @@ const cases: Case[] = [
     '**',
     ['b', 'c'],
     j([
-      '',
+      '.',
       'abcdef',
       'abcdef/g',
       'abcdef/g/h',
@@ -143,7 +143,7 @@ const cases: Case[] = [
     '**',
     ['b**'],
     j([
-      '',
+      '.',
       'abcdef',
       'abcdef/g',
       'abcdef/g/h',
@@ -174,7 +174,7 @@ const cases: Case[] = [
     '**',
     ['b/**'],
     j([
-      '',
+      '.',
       'abcdef',
       'abcdef/g',
       'abcdef/g/h',
@@ -204,7 +204,7 @@ const cases: Case[] = [
     '**',
     ['b**/**'],
     j([
-      '',
+      '.',
       'abcdef',
       'abcdef/g',
       'abcdef/g/h',
@@ -231,7 +231,7 @@ const cases: Case[] = [
     '**',
     ['ab**ef/**'],
     j([
-      '',
+      '.',
       'abcfed',
       'abcfed/g',
       'abcfed/g/h',
@@ -261,7 +261,7 @@ const cases: Case[] = [
     '**',
     ['abc{def,fed}/**'],
     j([
-      '',
+      '.',
       'b',
       'b/c',
       'b/c/d',
@@ -288,7 +288,7 @@ const cases: Case[] = [
     '**',
     ['abc{def,fed}/*'],
     j([
-      '',
+      '.',
       'abcdef',
       'abcdef/g/h',
       'abcfed',

test/mark.ts

@@ -173,7 +173,7 @@ for (const mark of [true, false]) {
       if (mark) {
         t.equal(res, './')
       } else {
-        t.equal(res, '')
+        t.equal(res, '.')
       }
       t.equal(syncRes, res, 'sync should match async')
     })

test/max-depth.ts

@@ -31,11 +31,11 @@ t.test('set maxDepth', async t => {
   const expect = j(
     noMaxDepth
       .filter(p => p.depth() <= startDepth + maxDepth)
-      .map(p => p.relative())
+      .map(p => p.relative() || '.')
   )
 
-  const ssync = j(syncRes.map(p => p.relative()))
-  const sasync = j(asyncRes.map(p => p.relative()))
+  const ssync = j(syncRes.map(p => p.relative() || '.'))
+  const sasync = j(asyncRes.map(p => p.relative() || '.'))
   t.same(ssync, expect, 'got all results sync')
   t.same(sasync, expect, 'got all results async')
   for (const p of syncRes) {
@@ -87,12 +87,12 @@ t.test('set maxDepth', async t => {
 
   t.same(
     await glob(pattern, { cwd, maxDepth: 0, follow: true }),
-    [''],
+    ['.'],
     'async maxDepth 0'
   )
   t.same(
     globSync(pattern, { cwd, maxDepth: 0, follow: true }),
-    [''],
+    ['.'],
     'async maxDepth 0'
   )
 

test/slash-cwd.ts

@@ -5,7 +5,7 @@ import { glob } from '../'
 import type { GlobOptions } from '../src/index.js'
 
 const pattern = '../{*.md,test}/'
-const expect = ['']
+const expect = ['.']
 const cwd = __dirname
 const opt: GlobOptions = { cwd }
 process.chdir(__dirname + '/..')

test/stream.ts

@@ -11,7 +11,7 @@ import { glob, globSync } from '../dist/cjs'
 const cwd = resolve(__dirname, 'fixtures/a')
 const j = (a: string[]) => a.map(a => a.split('/').join(sep))
 const expect = j([
-  '',
+  '.',
   'z',
   'x',
   'cb',