diff --git a/tsc/internal/parser/parser_test.go b/tsc/internal/parser/parser_test.go index 200064160228b..45e3e8e0b9aed 100644 --- a/tsc/internal/parser/parser_test.go +++ b/tsc/internal/parser/parser_test.go @@ -308,6 +308,66 @@ function foo(options) {}` assert.Equal(t, scanner.GetTokenPosOfNode(typeNode, file, false /*includeJSDoc*/), strings.Index(sourceText, "{{")+1) } +func TestJSDocAugmentsTypeArgumentsReparse(t *testing.T) { + t.Parallel() + sourceText := `/** @template T */ +class A { + static extend() { + return this; + } +} + +/** @extends {A} */ +class B extends A.extend() {}` + opts := ast.SourceFileParseOptions{ + FileName: "/index.js", + Path: "/index.js", + } + + file := parser.ParseSourceFile(opts, sourceText, core.ScriptKindJS) + statements := file.Statements.Nodes + assert.Equal(t, len(statements), 2) + + classB := statements[1] + assert.Assert(t, ast.IsClassDeclaration(classB)) + + baseType := ast.GetClassExtendsHeritageElement(classB) + assert.Assert(t, baseType != nil) + + baseExpression := baseType.Expression() + assert.Assert(t, ast.IsAsExpression(baseExpression)) + + callExpression := baseExpression.Expression() + assert.Assert(t, ast.IsCallExpression(callExpression)) + assert.Equal(t, scanner.GetTextOfNode(callExpression), "A.extend()") + + typeQuery := baseExpression.Type() + assert.Equal(t, typeQuery.Kind, ast.KindTypeQuery) + assert.Assert(t, typeQuery.Flags&ast.NodeFlagsReparsed != 0) + + typeArguments := baseType.TypeArguments() + assert.Equal(t, len(typeArguments), 1) + + typeArgument := typeArguments[0] + assert.Equal(t, typeArgument.Kind, ast.KindStringKeyword) + assert.Assert(t, typeArgument.Flags&ast.NodeFlagsReparsed != 0) + + jsDocs := classB.JSDoc(file) + assert.Equal(t, len(jsDocs), 1) + + tags := jsDocs[0].AsJSDoc().Tags + assert.Assert(t, tags != nil) + assert.Equal(t, len(tags.Nodes), 1) + + tag := tags.Nodes[0] + assert.Assert(t, ast.IsJSDocAugmentsTag(tag)) + assert.Equal(t, ast.GetReparsedNodeForNode(tag.ClassName().Expression()), typeQuery.AsTypeQueryNode().ExprName) + + sourceTypeArguments := tag.ClassName().TypeArguments() + assert.Equal(t, len(sourceTypeArguments), 1) + assert.Equal(t, ast.GetReparsedNodeForNode(sourceTypeArguments[0]), typeArgument) +} + func TestSourceFilePositionMapWithNonASCIIStringLiteral(t *testing.T) { t.Parallel() sourceText := `const x = "─"; diff --git a/tsc/internal/parser/reparser.go b/tsc/internal/parser/reparser.go index 58a58cf974bd6..b78e9be7133ef 100644 --- a/tsc/internal/parser/reparser.go +++ b/tsc/internal/parser/reparser.go @@ -597,14 +597,14 @@ func (p *Parser) reparseHosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Node) }); extendsClause != nil && len(extendsClause.AsHeritageClause().Types.Nodes) == 1 { target := extendsClause.AsHeritageClause().Types.Nodes[0].AsExpressionWithTypeArguments() source := tag.ClassName().AsExpressionWithTypeArguments() - if ast.HasSamePropertyAccessName(target.Expression, source.Expression) { - if target.TypeArguments == nil && source.TypeArguments != nil { - newArguments := p.nodeSliceArena.NewSlice(len(source.TypeArguments.Nodes)) - for i, arg := range source.TypeArguments.Nodes { - newArguments[i] = p.addDeepCloneReparse(arg) - } - target.TypeArguments = p.newNodeList(source.TypeArguments.Loc, newArguments) - p.finishMutatedNode(target.AsNode()) + if target.TypeArguments == nil && source.TypeArguments != nil { + if ast.IsCallExpression(ast.SkipParentheses(target.Expression)) { + typeQuery := p.factory.NewTypeQueryNode(p.addDeepCloneReparse(source.Expression), nil) + p.finishReparsedNode(typeQuery, source.Expression) + target.Expression = p.makeNewCast(typeQuery, target.Expression, true /*isAssertion*/) + p.setReparsedTypeArguments(target, source.TypeArguments) + } else if ast.HasSamePropertyAccessName(target.Expression, source.Expression) { + p.setReparsedTypeArguments(target, source.TypeArguments) } } } @@ -612,6 +612,15 @@ func (p *Parser) reparseHosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Node) } } +func (p *Parser) setReparsedTypeArguments(target *ast.ExpressionWithTypeArguments, source *ast.NodeList) { + typeArguments := p.nodeSliceArena.NewSlice(len(source.Nodes)) + for i, typeArgument := range source.Nodes { + typeArguments[i] = p.addDeepCloneReparse(typeArgument) + } + target.TypeArguments = p.newNodeList(source.Loc, typeArguments) + p.finishMutatedNode(target.AsNode()) +} + func (p *Parser) makeQuestionIfOptional(parameter *ast.JSDocParameterOrPropertyTag) *ast.Node { var questionToken *ast.Node if parameter.IsBracketed || parameter.TypeExpression != nil && parameter.TypeExpression.Type().Kind == ast.KindJSDocOptionalType { diff --git a/tsc/testdata/baselines/reference/conformance/extendsTag7.symbols b/tsc/testdata/baselines/reference/conformance/extendsTag7.symbols new file mode 100644 index 0000000000000..20349b715c45d --- /dev/null +++ b/tsc/testdata/baselines/reference/conformance/extendsTag7.symbols @@ -0,0 +1,37 @@ +//// [tests/cases/conformance/jsdoc/extendsTag7.ts] //// + +=== a.js === +/** @template T */ +class A { +>A : Symbol(A, Decl(a.js, 0, 0)) + + /** @returns {T} */ + get value() { +>value : Symbol(A.value, Decl(a.js, 1, 9)) + + throw new Error(); +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) + } + + /** @returns {typeof A} */ + static extend() { +>extend : Symbol(A.extend, Decl(a.js, 5, 5)) + + return this; +>this : Symbol(A, Decl(a.js, 0, 0)) + } +} + +/** @extends {A} */ +class B extends A.extend() {} +>B : Symbol(B, Decl(a.js, 11, 1)) +>A.extend : Symbol(A.extend, Decl(a.js, 5, 5)) +>A : Symbol(A, Decl(a.js, 0, 0)) +>extend : Symbol(A.extend, Decl(a.js, 5, 5)) + +const value = new B().value; +>value : Symbol(value, Decl(a.js, 16, 5)) +>new B().value : Symbol(A.value, Decl(a.js, 1, 9)) +>B : Symbol(B, Decl(a.js, 11, 1)) +>value : Symbol(A.value, Decl(a.js, 1, 9)) + diff --git a/tsc/testdata/baselines/reference/conformance/extendsTag7.types b/tsc/testdata/baselines/reference/conformance/extendsTag7.types new file mode 100644 index 0000000000000..50b3b50060c01 --- /dev/null +++ b/tsc/testdata/baselines/reference/conformance/extendsTag7.types @@ -0,0 +1,40 @@ +//// [tests/cases/conformance/jsdoc/extendsTag7.ts] //// + +=== a.js === +/** @template T */ +class A { +>A : A + + /** @returns {T} */ + get value() { +>value : T + + throw new Error(); +>new Error() : Error +>Error : ErrorConstructor + } + + /** @returns {typeof A} */ + static extend() { +>extend : () => typeof A + + return this; +>this : typeof A + } +} + +/** @extends {A} */ +class B extends A.extend() {} +>B : B +>A.extend() : A +>A.extend : () => typeof A +>A : typeof A +>extend : () => typeof A + +const value = new B().value; +>value : string +>new B().value : string +>new B() : B +>B : typeof B +>value : string + diff --git a/tsc/testdata/baselines/reference/conformance/extendsTag8.errors.txt b/tsc/testdata/baselines/reference/conformance/extendsTag8.errors.txt new file mode 100644 index 0000000000000..1d1b5a53efbe2 --- /dev/null +++ b/tsc/testdata/baselines/reference/conformance/extendsTag8.errors.txt @@ -0,0 +1,20 @@ +a.js(13,17): error TS8026: Expected A type arguments; provide these with an '@extends' tag. + + +==== a.js (1 errors) ==== + /** @template T */ + class A { + /** @returns {typeof A} */ + static extend() { + return this; + } + } + + /** @template T */ + class C {} + + /** @extends {C} */ + class B extends A.extend() {} + ~~~~~~~~~~ +!!! error TS8026: Expected A type arguments; provide these with an '@extends' tag. + \ No newline at end of file diff --git a/tsc/testdata/baselines/reference/conformance/extendsTag8.symbols b/tsc/testdata/baselines/reference/conformance/extendsTag8.symbols new file mode 100644 index 0000000000000..8b10f3499d474 --- /dev/null +++ b/tsc/testdata/baselines/reference/conformance/extendsTag8.symbols @@ -0,0 +1,27 @@ +//// [tests/cases/conformance/jsdoc/extendsTag8.ts] //// + +=== a.js === +/** @template T */ +class A { +>A : Symbol(A, Decl(a.js, 0, 0)) + + /** @returns {typeof A} */ + static extend() { +>extend : Symbol(A.extend, Decl(a.js, 1, 9)) + + return this; +>this : Symbol(A, Decl(a.js, 0, 0)) + } +} + +/** @template T */ +class C {} +>C : Symbol(C, Decl(a.js, 6, 1)) + +/** @extends {C} */ +class B extends A.extend() {} +>B : Symbol(B, Decl(a.js, 9, 10)) +>A.extend : Symbol(A.extend, Decl(a.js, 1, 9)) +>A : Symbol(A, Decl(a.js, 0, 0)) +>extend : Symbol(A.extend, Decl(a.js, 1, 9)) + diff --git a/tsc/testdata/baselines/reference/conformance/extendsTag8.types b/tsc/testdata/baselines/reference/conformance/extendsTag8.types new file mode 100644 index 0000000000000..9c62961a7581e --- /dev/null +++ b/tsc/testdata/baselines/reference/conformance/extendsTag8.types @@ -0,0 +1,28 @@ +//// [tests/cases/conformance/jsdoc/extendsTag8.ts] //// + +=== a.js === +/** @template T */ +class A { +>A : A + + /** @returns {typeof A} */ + static extend() { +>extend : () => typeof A + + return this; +>this : typeof A + } +} + +/** @template T */ +class C {} +>C : C + +/** @extends {C} */ +class B extends A.extend() {} +>B : B +>A.extend() : A +>A.extend : () => typeof A +>A : typeof A +>extend : () => typeof A + diff --git a/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag7.ts b/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag7.ts new file mode 100644 index 0000000000000..ffa297ccc6d58 --- /dev/null +++ b/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag7.ts @@ -0,0 +1,23 @@ +// @target: es2015 +// @allowJs: true +// @checkJs: true +// @declaration: true + +// @filename: a.js +/** @template T */ +class A { + /** @returns {T} */ + get value() { + throw new Error(); + } + + /** @returns {typeof A} */ + static extend() { + return this; + } +} + +/** @extends {A} */ +class B extends A.extend() {} + +const value = new B().value; diff --git a/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag8.ts b/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag8.ts new file mode 100644 index 0000000000000..d63c39d8f257c --- /dev/null +++ b/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag8.ts @@ -0,0 +1,19 @@ +// @target: es2015 +// @allowJs: true +// @checkJs: true +// @noEmit: true + +// @filename: a.js +/** @template T */ +class A { + /** @returns {typeof A} */ + static extend() { + return this; + } +} + +/** @template T */ +class C {} + +/** @extends {C} */ +class B extends A.extend() {} diff --git a/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag9.ts b/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag9.ts new file mode 100644 index 0000000000000..a5fe80b7e5fde --- /dev/null +++ b/tsc/testdata/tests/cases/conformance/jsdoc/extendsTag9.ts @@ -0,0 +1,32 @@ +// @target: es2015 +// @allowJs: true +// @checkJs: true +// @noEmit: true + +// @filename: a.js +/** @template T */ +class A { + /** @returns {T} */ + get a() { + throw new Error(); + } + + /** @returns {typeof C} */ + static extend() { + return C; + } +} + +/** @template T */ +class C { + /** @returns {T} */ + get c() { + throw new Error(); + } +} + +/** @extends {A} */ +class B extends A.extend() {} + +const a = new B().a; +const c = new B().c;