fix(NgModule): dont link to files excluded via tsconfig

Closes compodoc#59
mattlewis92 · Jan 19, 2017 · 3063f10 · 3063f10
1 parent 93a40de
commit 3063f10
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 7 deletions.
diff --git a/dist/index-cli.js b/dist/index-cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/app/application.ts b/src/app/application.ts
@@ -160,7 +160,32 @@ export class Application {
 
     prepareModules() {
         logger.info('Prepare modules');
-        this.configuration.mainData.modules = $dependenciesEngine.getModules();
+        this.configuration.mainData.modules = $dependenciesEngine.getModules().map(ngModule => {
+            ['declarations', 'bootstrap', 'imports', 'exports'].forEach(metadataType => {
+                ngModule[metadataType] = ngModule[metadataType].filter(metaDataItem => {
+                    switch (metaDataItem.type) {
+                        case 'directive':
+                            return $dependenciesEngine.getDirectives().some(directive => directive.name === metaDataItem.name);
+
+                        case 'component':
+                            return $dependenciesEngine.getComponents().some(component => component.name === metaDataItem.name);
+
+                        case 'module':
+                            return $dependenciesEngine.getModules().some(module => module.name === metaDataItem.name);
+
+                        case 'pipe':
+                            return $dependenciesEngine.getPipes().some(pipe => pipe.name === metaDataItem.name);
+
+                        default:
+                            return true;
+                    }
+                });
+            });
+            ngModule.providers = ngModule.providers.filter(provider => {
+                return $dependenciesEngine.getInjectables().some(injectable => injectable.name === provider.name);
+            });
+            return ngModule;
+        });
         this.configuration.addPage({
             name: 'modules',
             context: 'modules'

diff --git a/test/src/cli.spec.ts b/test/src/cli.spec.ts
@@ -694,5 +694,32 @@ describe('CLI', () => {
 
     });
 
+    describe('when specific files are included in tsconfig', () => {
+
+        let stdoutString = null,
+          moduleFile = null;
+        before(function (done) {
+            tmp.create();
+            exec(tsNodePath + ' ./bin/index-cli.js -p ./test/src/sample-files/tsconfig.entry.json -d ' + tmp.name + '/', {env}, (error, stdout, stderr) => {
+                if (error) {
+                    console.error(`exec error: ${error}`);
+                    done('error');
+                    return;
+                }
+                stdoutString = stdout;
+                moduleFile = read(`${tmp.name}/modules/AppModule.html`);
+                done();
+            });
+        });
+        after(() => tmp.clean(tmp.name));
+
+        it('should only create links to files included via tsconfig', () => {
+            expect(moduleFile).to.contain('components/FooComponent.html');
+            expect(moduleFile).to.contain('modules/FooModule.html');
+            expect(moduleFile).not.to.contain('components/BarComponent.html');
+            expect(moduleFile).not.to.contain('injectables/FooService.html');
+            expect(moduleFile).not.to.contain('modules/BarModule.html');
+        });
+    });
 
 });
diff --git a/test/src/sample-files/app.module.ts b/test/src/sample-files/app.module.ts
@@ -9,7 +9,9 @@ import { FooModule } from './foo.module';
 
 @NgModule({
   declarations: [
-    FooDirective, FooComponent
+    FooDirective,
+    FooComponent,
+    BarComponent
   ],
   providers: [
     FooService

diff --git a/test/src/sample-files/tsconfig.entry.json b/test/src/sample-files/tsconfig.entry.json
@@ -3,6 +3,8 @@
     "module": "commonjs"
   },
   "files": [
-    "app.module.ts"
+    "app.module.ts",
+    "foo.component.ts",
+    "foo.module.ts"
   ]
 }