Add modifiers on reparsed signature from @overload (#1438)

Author: sandersn

internal/parser/reparser.go

@@ -104,7 +104,7 @@ func (p *Parser) reparseUnhosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Nod
 		export.Loc = tag.Loc
 		export.Flags = p.contextFlags | ast.NodeFlagsReparsed
 		modifiers := p.newModifierList(export.Loc, p.nodeSlicePool.NewSlice1(export))
-		functionType := p.reparseJSDocSignature(callbackTag.TypeExpression, tag, jsDoc, tag)
+		functionType := p.reparseJSDocSignature(callbackTag.TypeExpression, tag, jsDoc, tag, nil)
 
 		typeAlias := p.factory.NewJSTypeAliasDeclaration(modifiers, p.factory.DeepCloneReparse(callbackTag.FullName), nil, functionType)
 		typeAlias.AsTypeAliasDeclaration().TypeParameters = p.gatherTypeParameters(jsDoc, tag)
@@ -127,20 +127,21 @@ func (p *Parser) reparseUnhosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Nod
 		p.reparseList = append(p.reparseList, importDeclaration)
 	case ast.KindJSDocOverloadTag:
 		if fun, ok := getFunctionLikeHost(parent); ok {
-			p.reparseList = append(p.reparseList, p.reparseJSDocSignature(tag.AsJSDocOverloadTag().TypeExpression, fun, jsDoc, tag))
+			p.reparseList = append(p.reparseList, p.reparseJSDocSignature(tag.AsJSDocOverloadTag().TypeExpression, fun, jsDoc, tag, fun.Modifiers()))
 		}
 	}
 }
 
-func (p *Parser) reparseJSDocSignature(jsSignature *ast.Node, fun *ast.Node, jsDoc *ast.Node, tag *ast.Node) *ast.Node {
+func (p *Parser) reparseJSDocSignature(jsSignature *ast.Node, fun *ast.Node, jsDoc *ast.Node, tag *ast.Node, modifiers *ast.ModifierList) *ast.Node {
 	var signature *ast.Node
+	clonedModifiers := p.factory.DeepCloneReparseModifiers(modifiers)
 	switch fun.Kind {
 	case ast.KindFunctionDeclaration, ast.KindFunctionExpression, ast.KindArrowFunction:
-		signature = p.factory.NewFunctionDeclaration(nil, nil, p.factory.DeepCloneReparse(fun.Name()), nil, nil, nil, nil)
+		signature = p.factory.NewFunctionDeclaration(clonedModifiers, nil, p.factory.DeepCloneReparse(fun.Name()), nil, nil, nil, nil)
 	case ast.KindMethodDeclaration, ast.KindMethodSignature:
-		signature = p.factory.NewMethodDeclaration(nil, nil, p.factory.DeepCloneReparse(fun.Name()), nil, nil, nil, nil, nil)
+		signature = p.factory.NewMethodDeclaration(clonedModifiers, nil, p.factory.DeepCloneReparse(fun.Name()), nil, nil, nil, nil, nil)
 	case ast.KindConstructor:
-		signature = p.factory.NewConstructorDeclaration(nil, nil, nil, nil, nil)
+		signature = p.factory.NewConstructorDeclaration(clonedModifiers, nil, nil, nil, nil)
 	case ast.KindJSDocCallbackTag:
 		signature = p.factory.NewFunctionTypeNode(nil, nil, nil)
 	default:

testdata/baselines/reference/submodule/conformance/overloadTag1.errors.txt

@@ -1,14 +1,23 @@
-overloadTag1.js(26,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string | number'.
+overloadTag1.js(7,5): error TS2394: This overload signature is not compatible with its implementation signature.
+overloadTag1.js(25,29): error TS2769: No overload matches this call.
+  The last overload gave the following error.
+    Argument of type 'string' is not assignable to parameter of type 'boolean'.
+overloadTag1.js(43,29): error TS2769: No overload matches this call.
+  The last overload gave the following error.
+    Argument of type 'string' is not assignable to parameter of type 'boolean'.
 
 
-==== overloadTag1.js (1 errors) ====
+==== overloadTag1.js (3 errors) ====
     /**
      * @overload
      * @param {number} a 
      * @param {number} b
      * @returns {number} 
      *
      * @overload
+        ~~~~~~~~
+!!! error TS2394: This overload signature is not compatible with its implementation signature.
+!!! related TS2750 overloadTag1.js:16:17: The implementation signature is declared here.
      * @param {string} a
      * @param {boolean} b
      * @returns {string}
@@ -27,9 +36,13 @@ overloadTag1.js(26,25): error TS2345: Argument of type 'boolean' is not assignab
     }
     var o1 = overloaded(1,2)
     var o2 = overloaded("zero", "one")
+                                ~~~~~
+!!! error TS2769: No overload matches this call.
+!!! error TS2769:   The last overload gave the following error.
+!!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'boolean'.
+!!! related TS2771 overloadTag1.js:7:5: The last overload is declared here.
+!!! related TS2793 overloadTag1.js:16:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible.
     var o3 = overloaded("a",false)
-                            ~~~~~
-!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string | number'.
 
     /**
      * @overload
@@ -47,4 +60,10 @@ overloadTag1.js(26,25): error TS2345: Argument of type 'boolean' is not assignab
     }
     uncheckedInternally(1,2)
     uncheckedInternally("zero", "one")
+                                ~~~~~
+!!! error TS2769: No overload matches this call.
+!!! error TS2769:   The last overload gave the following error.
+!!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'boolean'.
+!!! related TS2771 overloadTag1.js:34:5: The last overload is declared here.
+!!! related TS2793 overloadTag1.js:39:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible.
 

testdata/baselines/reference/submodule/conformance/overloadTag1.js

@@ -97,31 +97,7 @@ uncheckedInternally("zero", "one");
 
 
 //// [overloadTag1.d.ts]
-/**
- * @overload
- * @param {number} a
- * @param {number} b
- * @returns {number}
- *
- * @overload
- * @param {string} a
- * @param {boolean} b
- * @returns {string}
- *
- * @param {string | number} a
- * @param {string | number} b
- * @returns {string | number}
- */
-export declare function overloaded(a: string | number, b: string | number): string | number;
-/**
- * @overload
- * @param {number} a
- * @param {number} b
- * @returns {number}
- *
- * @overload
- * @param {string} a
- * @param {boolean} b
- * @returns {string}
- */
-export declare function uncheckedInternally(a: any, b: any): any;
+export declare function overloaded(a: number, b: number): number;
+export declare function overloaded(a: string, b: boolean): string;
+export declare function uncheckedInternally(a: number, b: number): number;
+export declare function uncheckedInternally(a: string, b: boolean): string;

testdata/baselines/reference/submodule/conformance/overloadTag1.js.diff

@@ -1,9 +1,24 @@
 --- old.overloadTag1.js
 +++ new.overloadTag1.js
-@@= skipped -111, +111 lines =@@
-  * @param {string | number} b
-  * @returns {string | number}
-  */
+@@= skipped -96, +96 lines =@@
+
+
+ //// [overloadTag1.d.ts]
+-/**
+- * @overload
+- * @param {number} a
+- * @param {number} b
+- * @returns {number}
+- *
+- * @overload
+- * @param {string} a
+- * @param {boolean} b
+- * @returns {string}
+- *
+- * @param {string | number} a
+- * @param {string | number} b
+- * @returns {string | number}
+- */
 -export function overloaded(a: number, b: number): number;
 -/**
 - * @overload
@@ -45,16 +60,7 @@
 - * @returns {string}
 - */
 -export function uncheckedInternally(a: string, b: boolean): string;
-+export declare function overloaded(a: string | number, b: string | number): string | number;
-+/**
-+ * @overload
-+ * @param {number} a
-+ * @param {number} b
-+ * @returns {number}
-+ *
-+ * @overload
-+ * @param {string} a
-+ * @param {boolean} b
-+ * @returns {string}
-+ */
-+export declare function uncheckedInternally(a: any, b: any): any;
++export declare function overloaded(a: number, b: number): number;
++export declare function overloaded(a: string, b: boolean): string;
++export declare function uncheckedInternally(a: number, b: number): number;
++export declare function uncheckedInternally(a: string, b: boolean): string;

testdata/baselines/reference/submodule/conformance/overloadTag1.symbols

@@ -17,7 +17,7 @@
  * @returns {string | number}
  */
 export function overloaded(a,b) {
->overloaded : Symbol(overloaded, Decl(overloadTag1.js, 0, 0))
+>overloaded : Symbol(overloaded, Decl(overloadTag1.js, 1, 4), Decl(overloadTag1.js, 6, 4), Decl(overloadTag1.js, 0, 0))
 >a : Symbol(a, Decl(overloadTag1.js, 15, 27))
 >b : Symbol(b, Decl(overloadTag1.js, 15, 29))
 
@@ -64,7 +64,7 @@ var o3 = overloaded("a",false)
  * @returns {string}
  */
 export function uncheckedInternally(a, b) {
->uncheckedInternally : Symbol(uncheckedInternally, Decl(overloadTag1.js, 25, 30))
+>uncheckedInternally : Symbol(uncheckedInternally, Decl(overloadTag1.js, 28, 4), Decl(overloadTag1.js, 33, 4), Decl(overloadTag1.js, 25, 30))
 >a : Symbol(a, Decl(overloadTag1.js, 38, 36))
 >b : Symbol(b, Decl(overloadTag1.js, 38, 38))
 

testdata/baselines/reference/submodule/conformance/overloadTag1.symbols.diff

@@ -1,6 +1,15 @@
 --- old.overloadTag1.symbols
 +++ new.overloadTag1.symbols
-@@= skipped -41, +41 lines =@@
+@@= skipped -16, +16 lines =@@
+  * @returns {string | number}
+  */
+ export function overloaded(a,b) {
+->overloaded : Symbol(overloaded, Decl(overloadTag1.js, 0, 0))
++>overloaded : Symbol(overloaded, Decl(overloadTag1.js, 1, 4), Decl(overloadTag1.js, 6, 4), Decl(overloadTag1.js, 0, 0))
+ >a : Symbol(a, Decl(overloadTag1.js, 15, 27))
+ >b : Symbol(b, Decl(overloadTag1.js, 15, 29))
+
+@@= skipped -25, +25 lines =@@
  }
  var o1 = overloaded(1,2)
  >o1 : Symbol(o1, Decl(overloadTag1.js, 23, 3))
@@ -19,7 +28,16 @@
 
  /**
   * @overload
-@@= skipped -31, +31 lines =@@
+@@= skipped -22, +22 lines =@@
+  * @returns {string}
+  */
+ export function uncheckedInternally(a, b) {
+->uncheckedInternally : Symbol(uncheckedInternally, Decl(overloadTag1.js, 25, 30))
++>uncheckedInternally : Symbol(uncheckedInternally, Decl(overloadTag1.js, 28, 4), Decl(overloadTag1.js, 33, 4), Decl(overloadTag1.js, 25, 30))
+ >a : Symbol(a, Decl(overloadTag1.js, 38, 36))
+ >b : Symbol(b, Decl(overloadTag1.js, 38, 38))
+
+@@= skipped -9, +9 lines =@@
  >b : Symbol(b, Decl(overloadTag1.js, 38, 38))
  }
  uncheckedInternally(1,2)

testdata/baselines/reference/submodule/conformance/overloadTag1.types

@@ -17,7 +17,7 @@
  * @returns {string | number}
  */
 export function overloaded(a,b) {
->overloaded : (a: string | number, b: string | number) => string | number
+>overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >a : string | number
 >b : string | number
 
@@ -59,23 +59,23 @@ export function overloaded(a,b) {
 >"Invalid arguments" : "Invalid arguments"
 }
 var o1 = overloaded(1,2)
->o1 : string | number
->overloaded(1,2) : string | number
->overloaded : (a: string | number, b: string | number) => string | number
+>o1 : number
+>overloaded(1,2) : number
+>overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >1 : 1
 >2 : 2
 
 var o2 = overloaded("zero", "one")
->o2 : string | number
->overloaded("zero", "one") : string | number
->overloaded : (a: string | number, b: string | number) => string | number
+>o2 : never
+>overloaded("zero", "one") : never
+>overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >"zero" : "zero"
 >"one" : "one"
 
 var o3 = overloaded("a",false)
->o3 : string | number
->overloaded("a",false) : string | number
->overloaded : (a: string | number, b: string | number) => string | number
+>o3 : string
+>overloaded("a",false) : string
+>overloaded : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >"a" : "a"
 >false : false
 
@@ -91,7 +91,7 @@ var o3 = overloaded("a",false)
  * @returns {string}
  */
 export function uncheckedInternally(a, b) {
->uncheckedInternally : (a: any, b: any) => any
+>uncheckedInternally : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >a : any
 >b : any
 
@@ -101,14 +101,14 @@ export function uncheckedInternally(a, b) {
 >b : any
 }
 uncheckedInternally(1,2)
->uncheckedInternally(1,2) : any
->uncheckedInternally : (a: any, b: any) => any
+>uncheckedInternally(1,2) : number
+>uncheckedInternally : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >1 : 1
 >2 : 2
 
 uncheckedInternally("zero", "one")
->uncheckedInternally("zero", "one") : any
->uncheckedInternally : (a: any, b: any) => any
+>uncheckedInternally("zero", "one") : never
+>uncheckedInternally : { (a: number, b: number): number; (a: string, b: boolean): string; }
 >"zero" : "zero"
 >"one" : "one"
 

testdata/baselines/reference/submoduleAccepted/conformance/overloadTag1.errors.txt.diff

@@ -1,61 +1,52 @@
 --- old.overloadTag1.errors.txt
 +++ new.overloadTag1.errors.txt
 @@= skipped -0, +0 lines =@@
--overloadTag1.js(7,5): error TS2394: This overload signature is not compatible with its implementation signature.
+ overloadTag1.js(7,5): error TS2394: This overload signature is not compatible with its implementation signature.
 -overloadTag1.js(25,10): error TS2769: No overload matches this call.
 -  Overload 1 of 2, '(a: number, b: number): number', gave the following error.
 -    Argument of type 'string' is not assignable to parameter of type 'number'.
 -  Overload 2 of 2, '(a: string, b: boolean): string', gave the following error.
--    Argument of type 'string' is not assignable to parameter of type 'boolean'.
++overloadTag1.js(25,29): error TS2769: No overload matches this call.
++  The last overload gave the following error.
+     Argument of type 'string' is not assignable to parameter of type 'boolean'.
 -overloadTag1.js(43,1): error TS2769: No overload matches this call.
 -  Overload 1 of 2, '(a: number, b: number): number', gave the following error.
 -    Argument of type 'string' is not assignable to parameter of type 'number'.
 -  Overload 2 of 2, '(a: string, b: boolean): string', gave the following error.
--    Argument of type 'string' is not assignable to parameter of type 'boolean'.
--
--
--==== overloadTag1.js (3 errors) ====
-+overloadTag1.js(26,25): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string | number'.
-+
-+
-+==== overloadTag1.js (1 errors) ====
-     /**
-      * @overload
-      * @param {number} a 
-@@= skipped -18, +8 lines =@@
-      * @returns {number} 
-      *
-      * @overload
--        ~~~~~~~~
--!!! error TS2394: This overload signature is not compatible with its implementation signature.
--!!! related TS2750 overloadTag1.js:16:17: The implementation signature is declared here.
-      * @param {string} a
-      * @param {boolean} b
-      * @returns {string}
-@@= skipped -21, +18 lines =@@
++overloadTag1.js(43,29): error TS2769: No overload matches this call.
++  The last overload gave the following error.
+     Argument of type 'string' is not assignable to parameter of type 'boolean'.
+
+
+@@= skipped -39, +35 lines =@@
      }
      var o1 = overloaded(1,2)
      var o2 = overloaded("zero", "one")
 -             ~~~~~~~~~~
--!!! error TS2769: No overload matches this call.
++                                ~~~~~
+ !!! error TS2769: No overload matches this call.
 -!!! error TS2769:   Overload 1 of 2, '(a: number, b: number): number', gave the following error.
 -!!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'number'.
 -!!! error TS2769:   Overload 2 of 2, '(a: string, b: boolean): string', gave the following error.
--!!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'boolean'.
++!!! error TS2769:   The last overload gave the following error.
+ !!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'boolean'.
++!!! related TS2771 overloadTag1.js:7:5: The last overload is declared here.
++!!! related TS2793 overloadTag1.js:16:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible.
      var o3 = overloaded("a",false)
-+                            ~~~~~
-+!!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string | number'.
 
      /**
-      * @overload
-@@= skipped -24, +20 lines =@@
+@@= skipped -24, +24 lines =@@
      }
      uncheckedInternally(1,2)
      uncheckedInternally("zero", "one")
 -    ~~~~~~~~~~~~~~~~~~~
--!!! error TS2769: No overload matches this call.
++                                ~~~~~
+ !!! error TS2769: No overload matches this call.
 -!!! error TS2769:   Overload 1 of 2, '(a: number, b: number): number', gave the following error.
 -!!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'number'.
 -!!! error TS2769:   Overload 2 of 2, '(a: string, b: boolean): string', gave the following error.
--!!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'boolean'.
++!!! error TS2769:   The last overload gave the following error.
+ !!! error TS2769:     Argument of type 'string' is not assignable to parameter of type 'boolean'.
++!!! related TS2771 overloadTag1.js:34:5: The last overload is declared here.
++!!! related TS2793 overloadTag1.js:39:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible.