feat: #530 - Add JSDocTypeExpression

Also added `JSDocPropertyLikeTag#getTypeExpression()`
dsherret · Feb 14, 2019 · ddc1dd3 · ddc1dd3
1 parent 1acc955
commit ddc1dd3
Show file tree

Hide file tree

Showing 16 changed files with 11,440 additions and 11,350 deletions.
diff --git a/lib/code-block-writer.d.ts b/lib/code-block-writer.d.ts
diff --git a/lib/ts-morph.d.ts b/lib/ts-morph.d.ts
diff --git a/src/codeBlockWriter/code-block-writer.ts b/src/codeBlockWriter/code-block-writer.ts
diff --git a/src/compiler/ast/CompilerNodeToWrappedType.ts b/src/compiler/ast/CompilerNodeToWrappedType.ts
@@ -10,6 +10,7 @@ export type CompilerNodeToWrappedType<T extends ts.Node> =
     T extends ts.AssignmentExpression<infer U> ? compiler.AssignmentExpression<ts.AssignmentExpression<U>> :
     T["kind"] extends keyof ImplementedKindToNodeMappings ? ImplementedKindToNodeMappings[T["kind"]] :
     T extends ts.SyntaxList ? compiler.SyntaxList :
+    T extends ts.JSDocTypeExpression ? compiler.JSDocTypeExpression :
     T extends ts.TypeNode ? compiler.TypeNode :
     T extends ts.TypeElement ? compiler.TypeElement :
     T extends ts.JSDocTag ? compiler.JSDocTag :

diff --git a/src/compiler/ast/doc/JSDocTag.ts b/src/compiler/ast/doc/JSDocTag.ts
@@ -1,4 +1,4 @@
-import { ts, SyntaxKind } from "../../../typescript";
+import { ts } from "../../../typescript";
 import { Identifier, Node } from "../common";
 
 /**

diff --git a/src/compiler/ast/doc/JSDocTypeExpression.ts b/src/compiler/ast/doc/JSDocTypeExpression.ts
@@ -0,0 +1,14 @@
+import { ts } from "../../../typescript";
+import { Node } from "..";
+
+/**
+ * JS doc type expression node.
+ */
+export class JSDocTypeExpression extends Node<ts.JSDocTypeExpression> {
+    /**
+     * Gets the type node of the JS doc type expression.
+     */
+    getTypeNode() {
+        return this._getNodeFromCompilerNode(this.compilerNode.type);
+    }
+}
diff --git a/src/compiler/ast/doc/base/JSDocPropertyLikeTag.ts b/src/compiler/ast/doc/base/JSDocPropertyLikeTag.ts
@@ -3,10 +3,13 @@ import { ts } from "../../../../typescript";
 import { EntityName } from "../../aliases";
 import { Node } from "../../common";
 import { JSDocTag } from "../JSDocTag";
+import { JSDocTypeExpression } from "../JSDocTypeExpression";
 
 export type JSDocPropertyLikeTagExtensionType = Node<ts.JSDocPropertyLikeTag> & JSDocTag;
 
 export interface JSDocPropertyLikeTag {
+    /** Gets the type expression node of the JS doc property like tag. */
+    getTypeExpression(): JSDocTypeExpression | undefined;
     /** Gets the name of the JS doc property like tag. */
     getName(): string;
     /** Gets the name node of the JS doc property like tag. */
@@ -18,6 +21,10 @@ export interface JSDocPropertyLikeTag {
 export function JSDocPropertyLikeTag<T extends Constructor<JSDocPropertyLikeTagExtensionType>>(Base: T): Constructor<JSDocPropertyLikeTag> & T {
     return class extends Base implements JSDocPropertyLikeTag {
         // todo: more methods
+        getTypeExpression() {
+            return this._getNodeFromCompilerNodeIfExists(this.compilerNode.typeExpression);
+        }
+
         getName() {
             return this.getNameNode().getText();
         }

diff --git a/src/compiler/ast/doc/index.ts b/src/compiler/ast/doc/index.ts
@@ -10,3 +10,4 @@ export * from "./JSDocTagInfo";
 export * from "./JSDocTypedefTag";
 export * from "./JSDocTypeTag";
 export * from "./JSDocUnknownTag";
+export * from "./JSDocTypeExpression";
diff --git a/src/compiler/ast/kindToNodeMappings.ts b/src/compiler/ast/kindToNodeMappings.ts