Add support for following symlinks

.gitignore

@@ -3,3 +3,5 @@ test/a/
 node_modules/*
 v8.log
 profile.txt
+.idea
+.DS_Store

README.md

@@ -242,6 +242,8 @@ filesystem.
 * `symlinks` A cache of known symbolic links.  You may pass in a
   previously generated `symlinks` object to save `lstat` calls when
   resolving `**` matches.
+* `realpath` Set to true to follow all symlinks with `**` and `*` matchers.
+  By default symlinks are not followed by `*` or `**`.
 * `sync` Perform a synchronous glob search.
 * `nounique` In some cases, brace-expanded patterns can result in the
   same file showing up multiple times in the result set.  By default,

common.js

@@ -73,6 +73,7 @@ function setopts (self, pattern, options) {
   self.cache = options.cache || Object.create(null)
   self.statCache = options.statCache || Object.create(null)
   self.symlinks = options.symlinks || Object.create(null)
+  self.realpath = !!options.realpath
 
   self.changedCwd = false
   var cwd = process.cwd()

glob.js

@@ -411,7 +411,9 @@ Glob.prototype._readdirInGlobStar = function (abs, cb) {
 
     // If it's not a symlink or a dir, then it's definitely a regular file.
     // don't bother doing a readdir in that case.
-    if (!isSym && !lstat.isDirectory()) {
+    // If it's a symlink with followSymlinks toggled true and not a dir,
+    // treat as file
+    if ((!isSym || this.followSymlinks) && !lstat.isDirectory()) {
       self.cache[abs] = 'FILE'
       cb()
     } else
@@ -529,8 +531,9 @@ Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, i
   var isSym = this.symlinks[abs]
   var len = entries.length
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
+  // If it's a symlink, we're in a globstar,
+  // and we did not specify realpath, then stop
+  if (isSym && inGlobStar && !this.realpath)
     return cb()
 
   for (var i = 0; i < len; i++) {

sync.js

@@ -211,7 +211,9 @@ GlobSync.prototype._readdirInGlobStar = function (abs) {
 
   // If it's not a symlink or a dir, then it's definitely a regular file.
   // don't bother doing a readdir in that case.
-  if (!isSym && !lstat.isDirectory())
+  // If it's a symlink with followSymlinks toggled true and not a dir,
+  // treat as file
+  if ((!isSym || this.realpath) && !lstat.isDirectory())
     this.cache[abs] = 'FILE'
   else
     entries = this._readdir(abs, false)
@@ -306,8 +308,9 @@ GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index
   var len = entries.length
   var isSym = this.symlinks[abs]
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
+  // If it's a symlink, and we're in a globstar,
+  // and we did not specify realpath, then stop
+  if (isSym && inGlobStar && !this.realpath)
     return
 
   for (var i = 0; i < len; i++) {

test/bash-results.json

@@ -100,6 +100,7 @@
     "./test/error-callback.js",
     "./test/global-leakage.js",
     "./test/globstar-match.js",
+    "./test/globstar-symlink.js",
     "./test/has-magic.js",
     "./test/mark-sync.js",
     "./test/mark.js",

test/globstar-match.js

@@ -15,4 +15,4 @@ test('globstar should not have dupe matches', function(t) {
     t.same(matches, set, 'should have same set of matches')
     t.end()
   })
-})
+})

test/globstar-symlink.js

@@ -0,0 +1,31 @@
+require("./global-leakage.js")
+var Glob = require("../glob.js").Glob
+var GlobSync = require("../sync.js").GlobSync
+var test = require('tap').test
+var path = require('path')
+var fs = require('fs')
+var pattern = '**/g.js'
+var symlinkTo = path.join(__dirname, 'a/symlink2')
+var symlinkFrom = path.join(__dirname, '../examples')
+
+test('globstar should match symlinks', function(t) {
+  fs.symlinkSync(symlinkFrom, symlinkTo)
+  var g = new Glob(pattern, { cwd: __dirname, realpath: true })
+  var matches = []
+  g.on('match', function (m) {
+    matches.push(m)
+  })
+  g.on('end', function() {
+    fs.unlink(symlinkTo)
+    t.equal(matches.length, 1)
+    t.end()
+  })
+})
+
+test('sync globstar should match symlinks', function(t) {
+  fs.symlinkSync(symlinkFrom, symlinkTo)
+  var g = new GlobSync(pattern, { cwd: __dirname, realpath: true })
+  fs.unlink(symlinkTo)
+  t.equal(g.found.length, 1)
+  t.end()
+})