fix: Remove sources from hidden signatures

TypeStrong · Jan 14, 2020 · 411a900 · 411a900
1 parent 1c89283
commit 411a900
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/src/lib/converter/plugins/CommentPlugin.ts b/src/lib/converter/plugins/CommentPlugin.ts
@@ -13,6 +13,8 @@ import { Component, ConverterComponent } from '../components';
 import { parseComment, getRawComment } from '../factories/comment';
 import { Converter } from '../converter';
 import { Context } from '../context';
+import { partition, uniq } from 'lodash';
+import { SourceReference } from '../../models';
 
 /**
  * Structure used by [[ContainerCommentHandler]] to store discovered module comments.
@@ -226,12 +228,15 @@ export class CommentPlugin extends ConverterComponent {
         hidden.forEach(reflection => project.removeReflection(reflection, true));
 
         // remove functions with empty signatures after their signatures have been removed
-        const hiddenMethods = hidden.map(reflection => reflection.parent!)
-            .filter(method =>
-                method.kindOf(ReflectionKind.FunctionOrMethod)
-                && method instanceof DeclarationReflection
-                && method.signatures?.length === 0);
-        hiddenMethods.forEach(reflection => project.removeReflection(reflection, true));
+        const [ allRemoved, someRemoved ] = partition(
+            hidden.map(reflection => reflection.parent!)
+                .filter(method => method.kindOf(ReflectionKind.FunctionOrMethod)) as DeclarationReflection[],
+            method => method.signatures?.length === 0
+        );
+        allRemoved.forEach(reflection => project.removeReflection(reflection, true));
+        someRemoved.forEach(reflection => {
+            reflection.sources = uniq(reflection.signatures!.reduce<SourceReference[]>((c, s) => c.concat(s.sources || []), []));
+        });
     }
 
     /**

diff --git a/src/test/converter/comment/specs.json b/src/test/converter/comment/specs.json
@@ -118,20 +118,10 @@
                 }
               ],
               "sources": [
-                {
-                  "fileName": "comment.ts",
-                  "line": 70,
-                  "character": 13
-                },
                 {
                   "fileName": "comment.ts",
                   "line": 74,
                   "character": 13
-                },
-                {
-                  "fileName": "comment.ts",
-                  "line": 75,
-                  "character": 13
                 }
               ]
             }
@@ -339,4 +329,4 @@
       ]
     }
   ]
-}
+}