Support negations in directory excludes

TypeStrong · Jul 26, 2019 · 92f0f25 · 92f0f25
1 parent b328537
commit 92f0f25
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/lib/application.ts b/src/lib/application.ts
@@ -266,22 +266,27 @@ export class Application extends ChildableComponent<Application, AbstractCompone
         }
 
         const supportedFileRegex = this.options.getCompilerOptions().allowJs ? /\.[tj]sx?$/ : /\.tsx?$/;
-        function add(file: string) {
-            if (isExcluded(file.replace(/\\/g, '/'))) {
+        function add(file: string, entryPoint: boolean) {
+            const fileIsDir = FS.statSync(file).isDirectory();
+            if (fileIsDir && file.slice(-1) !== '/') {
+                file = `${file}/`;
+            }
+
+            if ((!fileIsDir || !entryPoint) && isExcluded(file.replace(/\\/g, '/'))) {
                 return;
             }
 
-            if (FS.statSync(file).isDirectory()) {
+            if (fileIsDir) {
                 FS.readdirSync(file).forEach(next => {
-                    add(Path.join(file, next));
+                    add(Path.join(file, next), false);
                 });
             } else if (supportedFileRegex.test(file)) {
                 files.push(file);
             }
         }
 
         inputFiles.forEach(file => {
-            add(Path.resolve(file));
+            add(Path.resolve(file), true);
         });
 
         return files;

diff --git a/src/test/typedoc.test.ts b/src/test/typedoc.test.ts
@@ -87,5 +87,15 @@ describe('TypeDoc', function() {
             Assert.strictEqual(expanded.includes(Path.join(inputFiles, 'access', 'access.ts')), false);
             Assert.strictEqual(expanded.includes(inputFiles), false);
         });
+
+        it('supports negations in directory excludes', function() {
+            const inputFiles = Path.join(__dirname, 'converter');
+            application.options.setValue('exclude', [ '**/!(access)/' ]);
+            const expanded = application.expandInputFiles([inputFiles]);
+
+            Assert.strictEqual(expanded.includes(Path.join(inputFiles, 'class', 'class.ts')), false);
+            Assert.strictEqual(expanded.includes(Path.join(inputFiles, 'access', 'access.ts')), true);
+            Assert.strictEqual(expanded.includes(inputFiles), false);
+        });
     });
 });