Only apply filters on files from a directory, fixes #32

facebook · Aug 12, 2015 · 7532a65 · 7532a65
1 parent 462ea7f
commit 7532a65
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/bin/__tests__/jscodeshift-test.js b/bin/__tests__/jscodeshift-test.js
@@ -66,13 +66,13 @@ describe('jscodeshift CLI', () => {
     );
 
     return Promise.all([
-      run(['--no-extensions', '-t', transformA, sourceA, sourceB]).then(
+      run(['-t', transformA, sourceA, sourceB]).then(
         ([stdout, stderr]) => {
           expect(fs.readFileSync(sourceA).toString()).toBe('transforma');
           expect(fs.readFileSync(sourceB).toString()).toBe('transformb\n');
         }
       ),
-      run(['--no-extensions', '-t', transformB, sourceC]).then(
+      run(['-t', transformB, sourceC]).then(
         ([stdout, stderr]) => {
           expect(fs.readFileSync(sourceC).toString()).toBe(sourceC);
         }
@@ -100,7 +100,7 @@ describe('jscodeshift CLI', () => {
       '    typeof api.stats === "function"',
       '  );',
     ].join('\n'));
-    return run(['--no-extensions', '-t', transform, source]).then(
+    return run(['-t', transform, source]).then(
       ([stdout, stderr]) => {
         expect(fs.readFileSync(source).toString()).toBe('true');
       }
@@ -110,7 +110,7 @@ describe('jscodeshift CLI', () => {
   pit('passes options along to the transform', () => {
     var source = createTempFileWith('a');
     var transform = createTransformWith('return options.foo;');
-    return run(['--no-extensions', '-t', transform, '--foo=42', source]).then(
+    return run(['-t', transform, '--foo=42', source]).then(
       ([stdout, stderr]) => {
         expect(fs.readFileSync(source).toString()).toBe('42');
       }

diff --git a/src/Runner.js b/src/Runner.js
@@ -53,7 +53,7 @@ function showStats(stats) {
   names.forEach(name => console.log(name + ':', stats[name]));
 }
 
-function getAllFiles(paths) {
+function getAllFiles(paths, filter) {
   return Promise.all(
     paths.map(file => new Promise((resolve, reject) => {
       fs.lstat(file, (err, stat) => {
@@ -64,7 +64,10 @@ function getAllFiles(paths) {
         }
 
         if (stat.isDirectory()) {
-          dir.files(file, (err, list) => resolve(list));
+          dir.files(
+            file,
+            (err, list) => resolve(list ? list.filter(filter) : [])
+          );
         } else {
           resolve([file]);
         }
@@ -90,11 +93,10 @@ function run(transformFile, paths, options) {
     return;
   }
 
-  getAllFiles(paths)
-    .then(files => files.filter(
-      name => !extensions || extensions.indexOf(path.extname(name)) != -1
-    ))
-    .then(files => {
+  getAllFiles(
+    paths,
+    name => !extensions || extensions.indexOf(path.extname(name)) != -1
+  ).then(files => {
       if (files.length === 0) {
         console.log('No files selected, nothing to do.');
         return;