Honor the --exclude option on a list of files (#387)

TypeStrong · Feb 13, 2017 · 6ddb7f5 · aciccarello · Feb 15, 2017 · steveschmitt
1 parent e748236
commit 6ddb7f5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/lib/application.ts b/src/lib/application.ts
@@ -272,7 +272,7 @@ export class Application extends ChildableComponent<Application, AbstractCompone
             file = Path.resolve(file);
             if (FS.statSync(file).isDirectory()) {
                 add(file);
-            } else {
+            } else if (exclude && !exclude.match(file)) {
                 files.push(file);
             }
         });

diff --git a/test/typedoc.js b/test/typedoc.js
@@ -16,5 +16,22 @@ describe('TypeDoc', function() {
             Assert.notEqual(expanded.indexOf(Path.join(inputFiles, 'class.ts')), -1);
             Assert.equal(expanded.indexOf(inputFiles), -1);
         });
+        it('honors the exclude argument even on a fixed file list', function() {
+            var inputFiles = Path.join(__dirname, 'converter', 'class');
+            application.options.setValue('exclude', '**/class.ts');
+            var expanded = application.expandInputFiles([inputFiles]);
+
+            Assert.equal(expanded.indexOf(Path.join(inputFiles, 'class.ts')), -1);
+            Assert.equal(expanded.indexOf(inputFiles), -1);
+        });
+        it('supports multiple excludes', function() {
+            var inputFiles = Path.join(__dirname, 'converter');
+            application.options.setValue('exclude', '**/+(class|access).ts');
+            var expanded = application.expandInputFiles([inputFiles]);
+
+            Assert.equal(expanded.indexOf(Path.join(inputFiles, 'class', 'class.ts')), -1);
+            Assert.equal(expanded.indexOf(Path.join(inputFiles, 'access', 'access.ts')), -1);
+            Assert.equal(expanded.indexOf(inputFiles), -1);
+        });
     });
 });