Don't add export modifier to JSTypeAliasDeclaration from @callback (#2063)

Author: ahejlsberg

internal/parser/reparser.go

@@ -93,14 +93,8 @@ func (p *Parser) reparseUnhosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Nod
 		if callbackTag.TypeExpression == nil {
 			break
 		}
-
-		export := p.factory.NewModifier(ast.KindExportKeyword)
-		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, nil)
-
-		typeAlias := p.factory.NewJSTypeAliasDeclaration(modifiers, p.factory.DeepCloneReparse(callbackTag.FullName), nil, functionType)
+		typeAlias := p.factory.NewJSTypeAliasDeclaration(nil, p.factory.DeepCloneReparse(callbackTag.FullName), nil, functionType)
 		typeAlias.AsTypeAliasDeclaration().TypeParameters = p.gatherTypeParameters(jsDoc, tag)
 		p.finishReparsedNode(typeAlias, tag)
 		p.reparseList = append(p.reparseList, typeAlias)

testdata/baselines/reference/compiler/jsDocCallbackExport1.js

@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/jsDocCallbackExport1.ts] ////
+
+//// [x.js]
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+function f1() {}
+
+
+
+
+//// [x.d.ts]
+type Foo = (x: string) => number;
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+declare function f1(): void;

testdata/baselines/reference/compiler/jsDocCallbackExport1.symbols

@@ -0,0 +1,11 @@
+//// [tests/cases/compiler/jsDocCallbackExport1.ts] ////
+
+=== x.js ===
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+function f1() {}
+>f1 : Symbol(f1, Decl(x.js, 0, 0))
+

testdata/baselines/reference/compiler/jsDocCallbackExport1.types

@@ -0,0 +1,11 @@
+//// [tests/cases/compiler/jsDocCallbackExport1.ts] ////
+
+=== x.js ===
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+function f1() {}
+>f1 : () => void
+

testdata/baselines/reference/compiler/jsDocCallbackExport2.js

@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/jsDocCallbackExport2.ts] ////
+
+//// [x.js]
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+export function f1() {}
+
+
+
+
+//// [x.d.ts]
+export type Foo = (x: string) => number;
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+export declare function f1(): void;

testdata/baselines/reference/compiler/jsDocCallbackExport2.symbols

@@ -0,0 +1,11 @@
+//// [tests/cases/compiler/jsDocCallbackExport2.ts] ////
+
+=== x.js ===
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+export function f1() {}
+>f1 : Symbol(f1, Decl(x.js, 0, 0))
+

testdata/baselines/reference/compiler/jsDocCallbackExport2.types

@@ -0,0 +1,11 @@
+//// [tests/cases/compiler/jsDocCallbackExport2.ts] ////
+
+=== x.js ===
+/**
+ * @callback Foo
+ * @param {string} x
+ * @returns {number}
+ */
+export function f1() {}
+>f1 : () => void
+

testdata/baselines/reference/submodule/compiler/jsFileAlternativeUseOfOverloadTag.js

@@ -139,7 +139,7 @@ declare const example2: {
     constructor: () => void;
 };
 declare function evaluate(): any;
-export type callback = (error: any, result: any) ;
+type callback = (error: any, result: any) ;
 declare const example3: {
     /**
      * @overload evaluate(options = {}, [callback])
@@ -161,7 +161,7 @@ declare const example3: {
 //// [DtsFileErrors]
 
 
-dist/jsFileAlternativeUseOfOverloadTag.d.ts(34,50): error TS1005: '=>' expected.
+dist/jsFileAlternativeUseOfOverloadTag.d.ts(34,43): error TS1005: '=>' expected.
 
 
 ==== dist/jsFileAlternativeUseOfOverloadTag.d.ts (1 errors) ====
@@ -198,8 +198,8 @@ dist/jsFileAlternativeUseOfOverloadTag.d.ts(34,50): error TS1005: '=>' expected.
         constructor: () => void;
     };
     declare function evaluate(): any;
-    export type callback = (error: any, result: any) ;
-                                                     ~
+    type callback = (error: any, result: any) ;
+                                              ~
 !!! error TS1005: '=>' expected.
     declare const example3: {
         /**

testdata/baselines/reference/submodule/compiler/jsFileAlternativeUseOfOverloadTag.js.diff

@@ -82,7 +82,7 @@
 +    constructor: () => void;
 +};
 +declare function evaluate(): any;
-+export type callback = (error: any, result: any) ;
++type callback = (error: any, result: any) ;
 +declare const example3: {
      /**
       * @overload evaluate(options = {}, [callback])
@@ -105,7 +105,7 @@
 +//// [DtsFileErrors]
 +
 +
-+dist/jsFileAlternativeUseOfOverloadTag.d.ts(34,50): error TS1005: '=>' expected.
++dist/jsFileAlternativeUseOfOverloadTag.d.ts(34,43): error TS1005: '=>' expected.
 +
 +
 +==== dist/jsFileAlternativeUseOfOverloadTag.d.ts (1 errors) ====
@@ -142,8 +142,8 @@
 +        constructor: () => void;
 +    };
 +    declare function evaluate(): any;
-+    export type callback = (error: any, result: any) ;
-+                                                     ~
++    type callback = (error: any, result: any) ;
++                                              ~
 +!!! error TS1005: '=>' expected.
 +    declare const example3: {
 +        /**

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

@@ -29,7 +29,7 @@ function eachPerson(callback) {
  * @param {number} [person.age]
  * @returns {void}
  */
-export type WorksWithPeopleCallback = (person: {
+type WorksWithPeopleCallback = (person: {
     name: string;
     age?: number;
 }) => void;