feat: Add .getSignature() method to nodes that have a return type.

This is kind of lazily added on this mixin for now.
dsherret · Sep 30, 2018 · f65c529 · f65c529
1 parent bab0860
commit f65c529
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 15 deletions.
diff --git a/lib/ts-simple-ast.d.ts b/lib/ts-simple-ast.d.ts
@@ -2808,6 +2808,10 @@ export interface ReturnTypedNode {
      * Removes the return type.
      */
     removeReturnType(): this;
+    /**
+     * Gets the signature of the node from the type checker.
+     */
+    getSignature(): Signature;
 }
 
 declare type ReturnTypedNodeExtensionType = Node<ts.SignatureDeclaration>;

diff --git a/src/compiler/base/ReturnTypedNode.ts b/src/compiler/base/ReturnTypedNode.ts
@@ -5,7 +5,7 @@ import { Constructor, WriterFunction } from "../../types";
 import { SyntaxKind, ts } from "../../typescript";
 import { getTextFromStringOrWriter, StringUtils } from "../../utils";
 import { callBaseSet } from "../callBaseSet";
-import { Node } from "../common";
+import { Node, Signature } from "../common";
 import { Type } from "../type/Type";
 import { TypeNode } from "../type/TypeNode";
 import { callBaseGetStructure } from "../callBaseGetStructure";
@@ -34,15 +34,16 @@ export interface ReturnTypedNode {
      * Removes the return type.
      */
     removeReturnType(): this;
+    /**
+     * Gets the signature of the node from the type checker.
+     */
+    getSignature(): Signature;
 }
 
 export function ReturnTypedNode<T extends Constructor<ReturnTypedNodeExtensionType>>(Base: T): Constructor<ReturnTypedNode> & T {
     return class extends Base implements ReturnTypedNode {
         getReturnType() {
-            const signature = this.context.typeChecker.getSignatureFromNode(this);
-            if (signature == null)
-                throw new errors.NotImplementedError("Expected the index signature to have a type checker signature.");
-            return signature.getReturnType();
+            return this.getSignature().getReturnType();
         }
 
         getReturnTypeNode() {
@@ -81,6 +82,23 @@ export function ReturnTypedNode<T extends Constructor<ReturnTypedNodeExtensionTy
             }
         }
 
+        removeReturnType() {
+            const returnTypeNode = this.getReturnTypeNode();
+            if (returnTypeNode == null)
+                return this;
+
+            const colonToken = returnTypeNode.getPreviousSiblingIfKindOrThrow(SyntaxKind.ColonToken);
+            removeChildren({ children: [colonToken, returnTypeNode], removePrecedingSpaces: true });
+            return this;
+        }
+
+        getSignature() {
+            const signature = this.context.typeChecker.getSignatureFromNode(this);
+            if (signature == null)
+                throw new errors.NotImplementedError("Expected the node to have a signature.");
+            return signature;
+        }
+
         set(structure: Partial<ReturnTypedNodeStructure>) {
             callBaseSet(Base.prototype, this, structure);
 
@@ -92,16 +110,6 @@ export function ReturnTypedNode<T extends Constructor<ReturnTypedNodeExtensionTy
             return this;
         }
 
-        removeReturnType() {
-            const returnTypeNode = this.getReturnTypeNode();
-            if (returnTypeNode == null)
-                return this;
-
-            const colonToken = returnTypeNode.getPreviousSiblingIfKindOrThrow(SyntaxKind.ColonToken);
-            removeChildren({ children: [colonToken, returnTypeNode], removePrecedingSpaces: true });
-            return this;
-        }
-
         getStructure() {
             const returnTypeNode = this.getReturnTypeNode();
             return callBaseGetStructure<ReturnTypedNodeStructure>(Base.prototype, this, {