refactor: switch to fast-glob

README.md

@@ -854,16 +854,6 @@ rm -rf foo.txt bar.txt
 exec echo hello
 ```
 
-### config.globOptions
-
-Example:
-
-```javascript
-config.globOptions = {nodir: true};
-```
-
-Use this value for calls to `glob.sync()` instead of the default options.
-
 ### config.reset()
 
 Example:
@@ -882,7 +872,6 @@ Reset `shell.config` to the defaults:
 ```javascript
 {
   fatal: false,
-  globOptions: {},
   maxdepth: 255,
   noglob: false,
   silent: false,

package.json

@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "execa": "^1.0.0",
-    "glob": "^7.0.0",
+    "fast-glob": "^3.3.2",
     "interpret": "^1.0.0",
     "rechoir": "^0.6.2"
   },

shell.js

@@ -135,17 +135,6 @@ exports.config = common.config;
 //@ exec echo hello
 //@ ```
 
-//@
-//@ ### config.globOptions
-//@
-//@ Example:
-//@
-//@ ```javascript
-//@ config.globOptions = {nodir: true};
-//@ ```
-//@
-//@ Use this value for calls to `glob.sync()` instead of the default options.
-
 //@
 //@ ### config.reset()
 //@
@@ -165,7 +154,6 @@ exports.config = common.config;
 //@ ```javascript
 //@ {
 //@   fatal: false,
-//@   globOptions: {},
 //@   maxdepth: 255,
 //@   noglob: false,
 //@   silent: false,

src/common.js

@@ -6,7 +6,7 @@
 
 var os = require('os');
 var fs = require('fs');
-var glob = require('glob');
+var glob = require('fast-glob');
 var shell = require('..');
 
 var shellMethods = Object.create(shell);
@@ -19,7 +19,6 @@ var isElectron = Boolean(process.versions.electron);
 // Module globals (assume no execPath by default)
 var DEFAULT_CONFIG = {
   fatal: false,
-  globOptions: {},
   maxdepth: 255,
   noglob: false,
   silent: false,
@@ -263,7 +262,12 @@ function expand(list) {
     } else {
       var ret;
       try {
-        ret = glob.sync(listEl, config.globOptions);
+        ret = glob.sync(listEl, {
+          // These options are just to make fast-glob be compatible with POSIX
+          // (bash) wildcard behavior.
+          onlyFiles: false,
+          followSymbolicLinks: false,
+        });
         // if nothing matched, interpret the string literally
         ret = ret.length > 0 ? ret : [listEl];
       } catch (e) {

src/ls.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var fs = require('fs');
 var common = require('./common');
-var glob = require('glob');
+var glob = require('fast-glob');
 
 var globPatternRecursive = path.sep + '**';
 
@@ -105,13 +105,20 @@ function _ls(options, paths) {
     if (stat.isDirectory() && !options.directory) {
       if (options.recursive) {
         // use glob, because it's simple
-        glob.sync(p + globPatternRecursive, { dot: options.all, follow: options.link })
-          .forEach(function (item) {
-            // Glob pattern returns the directory itself and needs to be filtered out.
-            if (path.relative(p, item)) {
-              pushFile(item, path.relative(p, item));
-            }
-          });
+        glob.sync(p + globPatternRecursive, {
+          // These options are just to make fast-glob be compatible with POSIX
+          // (bash) wildcard behavior.
+          onlyFiles: false,
+
+          // These options depend on the cmdOptions provided to ls.
+          dot: options.all,
+          followSymbolicLinks: options.link,
+        }).forEach(function (item) {
+          // Glob pattern returns the directory itself and needs to be filtered out.
+          if (path.relative(p, item)) {
+            pushFile(item, path.relative(p, item));
+          }
+        });
       } else if (options.all) {
         // use fs.readdirSync, because it's fast
         fs.readdirSync(p).forEach(function (item) {

test/config.js

@@ -48,7 +48,7 @@ test.cb('config.fatal = true', t => {
 });
 
 //
-// config.globOptions
+// Default glob expansion behavior
 //
 
 test('Expands to directories by default', t => {
@@ -60,16 +60,3 @@ test('Expands to directories by default', t => {
   t.truthy(result.indexOf('test/resources/head') > -1);
   t.truthy(result.indexOf('test/resources/external') > -1);
 });
-
-test(
-  'Check to make sure options get passed through (nodir is an example)',
-  t => {
-    shell.config.globOptions = { nodir: true };
-    const result = common.expand(['test/resources/*a*']);
-    t.is(result.length, 2);
-    t.truthy(result.indexOf('test/resources/a.txt') > -1);
-    t.truthy(result.indexOf('test/resources/badlink') > -1);
-    t.truthy(result.indexOf('test/resources/cat') < 0);
-    t.truthy(result.indexOf('test/resources/external') < 0);
-  }
-);