fix(core): should get correct source file for node_modules types #OSP…

…-244
docgeni · Jan 24, 2022 · 1f84bcc · 1f84bcc
1 parent 9b795c5
commit 1f84bcc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/packages/ngdoc/src/ng-parser-host.ts b/packages/ngdoc/src/ng-parser-host.ts
@@ -105,9 +105,6 @@ export class DefaultNgParserHost implements NgParserHost {
 
     private getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, onError?: (message: string) => void) {
         this.readFiles.push(fileName);
-        if (this.rootDir && !fileName.startsWith(this.rootDir)) {
-            return undefined;
-        }
         const sourceText = ts.sys.readFile(fileName);
         return sourceText !== undefined ? ts.createSourceFile(fileName, sourceText, languageVersion) : undefined;
     }

diff --git a/packages/ngdoc/src/ng-parser.ts b/packages/ngdoc/src/ng-parser.ts
@@ -31,7 +31,7 @@ export interface ParserSourceFileContext {
 
 export class NgDocParser {
     static parse(pattern: string) {
-        return new NgDocParser({ fileGlobs: pattern }).parse(pattern);
+        return this.create({ fileGlobs: pattern }).parse(pattern);
     }
 
     static create(options: NgDocParserOptions) {
@@ -166,6 +166,7 @@ export class NgDocParser {
         });
         return properties;
     }
+
     private parseServiceProperties(context: ParserSourceFileContext, classDeclaration: ts.ClassDeclaration) {
         const properties: NgPropertyDoc[] = [];
         ts.forEachChild(classDeclaration, (node: ts.Node) => {
@@ -194,6 +195,7 @@ export class NgDocParser {
         });
         return properties;
     }
+
     private parseServiceMethods(context: ParserSourceFileContext, classDeclaration: ts.ClassDeclaration) {
         const properties: NgPropertyDoc[] = [];
         ts.forEachChild(classDeclaration, (node: ts.Node) => {

diff --git a/packages/ngdoc/test/fixtures/full/input/button.component.ts b/packages/ngdoc/test/fixtures/full/input/button.component.ts
@@ -30,7 +30,7 @@ export class ButtonComponent implements OnInit {
      * @deprecated
      * @default md
      */
-    @Input() thySize: LoadingComponent;
+    @Input() thySize: ButtonSize;
 
     @Input() set thyLoading(loading: boolean){
         this.loading = loading;

diff --git a/packages/ngdoc/test/fixtures/full/output.json b/packages/ngdoc/test/fixtures/full/output.json
@@ -39,8 +39,12 @@
         "name": "thySize",
         "aliasName": "",
         "type": {
-          "name": "any",
-          "options": null,
+          "name": "ButtonSize",
+          "options": [
+            "lg",
+            "md",
+            "sm"
+          ],
           "kindName": "TypeReference"
         },
         "description": "Button Size",
@@ -226,4 +230,4 @@
       }
     ]
   }
-]
+]
diff --git a/packages/template/src/styles/doc.scss b/packages/template/src/styles/doc.scss
@@ -249,7 +249,7 @@ $dg-service-color: #8e24aa;
     flex: 1;
     display: block;
     padding: 20px 0px;
-    font-size: $dg-font-size-md;
+    // font-size: $dg-font-size-md;
     // white-space: break-spaces;
     > :first-child {
         margin-top: 0;
@@ -319,6 +319,7 @@ $dg-service-color: #8e24aa;
         line-height: 26px;
         margin-top: 0;
         margin-bottom: 8px;
+        font-size: $dg-font-size-md;
 
         code {
             line-height: 24px;