Skip to content

Commit 17933ee

Browse files
TypeScript BotAndarist
TypeScript Bot
and
Andarist
authored
🤖 Pick PR #58810 (Fixed declaration emit issue relate...) into release-5.5 (#58842)
Co-authored-by: Mateusz BurzyÅ„ski <[email protected]>
1 parent 552b07e commit 17933ee

5 files changed

+170
-8
lines changed

Diff for: ‎src/compiler/checker.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -8684,7 +8684,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
86848684
}
86858685
if (isJSDocTypeLiteral(node)) {
86868686
return factory.createTypeLiteralNode(map(node.jsDocPropertyTags, t => {
8687-
const name = isIdentifier(t.name) ? t.name : t.name.right;
8687+
const name = visitNode(isIdentifier(t.name) ? t.name : t.name.right, visitExistingNodeTreeSymbols, isIdentifier)!;
86888688
const typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode(context, node), name.escapedText);
86898689
const overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode(context, t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : undefined;
86908690

@@ -8723,7 +8723,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
87238723
/*modifiers*/ undefined,
87248724
getEffectiveDotDotDotForParameter(p),
87258725
setTextRange(context, factory.createIdentifier(getNameForJSDocFunctionParameter(p, i)), p),
8726-
p.questionToken,
8726+
factory.cloneNode(p.questionToken),
87278727
visitNode(p.type, visitExistingNodeTreeSymbols, isTypeNode),
87288728
/*initializer*/ undefined,
87298729
)),
@@ -8738,7 +8738,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
87388738
/*modifiers*/ undefined,
87398739
getEffectiveDotDotDotForParameter(p),
87408740
setTextRange(context, factory.createIdentifier(getNameForJSDocFunctionParameter(p, i)), p),
8741-
p.questionToken,
8741+
factory.cloneNode(p.questionToken),
87428742
visitNode(p.type, visitExistingNodeTreeSymbols, isTypeNode),
87438743
/*initializer*/ undefined,
87448744
)),
@@ -8756,7 +8756,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
87568756
if (isTypeParameterDeclaration(node)) {
87578757
return factory.updateTypeParameterDeclaration(
87588758
node,
8759-
node.modifiers,
8759+
visitNodes(node.modifiers, visitExistingNodeTreeSymbols, isModifier),
87608760
setTextRange(context, typeParameterToName(getDeclaredTypeOfSymbol(getSymbolOfDeclaration(node)), context), node),
87618761
visitNode(node.constraint, visitExistingNodeTreeSymbols, isTypeNode),
87628762
visitNode(node.default, visitExistingNodeTreeSymbols, isTypeNode),
@@ -8797,8 +8797,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
87978797
return factory.updateImportTypeNode(
87988798
node,
87998799
factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier(node, node.argument.literal)),
8800-
node.attributes,
8801-
node.qualifier,
8800+
visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
8801+
visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
88028802
visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
88038803
node.isTypeOf,
88048804
);
@@ -8877,9 +8877,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
88778877
parameterName = result;
88788878
}
88798879
else {
8880-
parameterName = node.parameterName;
8880+
parameterName = factory.cloneNode(node.parameterName);
88818881
}
8882-
return factory.updateTypePredicateNode(node, node.assertsModifier, parameterName, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
8882+
return factory.updateTypePredicateNode(node, factory.cloneNode(node.assertsModifier), parameterName, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
88838883
}
88848884

88858885
if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {

Diff for: ‎tests/baselines/reference/declarationEmitTopLevelNodeFromCrossFile2.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
//// [tests/cases/compiler/declarationEmitTopLevelNodeFromCrossFile2.ts] ////
2+
3+
//// [a.ts]
4+
import { boxedBox } from "./boxedBox";
5+
6+
export const _ = boxedBox;
7+
8+
// At index 83
9+
/**
10+
* wat
11+
*/
12+
13+
//// [boxedBox.d.ts]
14+
export declare const boxedBox: import("./box").Box<{
15+
boxed: import("./box").Box<number>;
16+
}>; // ^This is index 83 in this file
17+
18+
//// [box.d.ts]
19+
export declare class Box<T> {
20+
value: T;
21+
constructor(value: T);
22+
}
23+
export declare function box<T>(value: T): Box<T>;
24+
25+
//// [a.js]
26+
"use strict";
27+
Object.defineProperty(exports, "__esModule", { value: true });
28+
exports._ = void 0;
29+
var boxedBox_1 = require("./boxedBox");
30+
exports._ = boxedBox_1.boxedBox;
31+
// At index 83
32+
/**
33+
* wat
34+
*/
35+
36+
37+
//// [a.d.ts]
38+
export declare const _: import("./box").Box<{
39+
boxed: import("./box").Box<number>;
40+
}>;
41+
/**
42+
* wat
43+
*/

Diff for: ‎tests/baselines/reference/declarationEmitTopLevelNodeFromCrossFile2.symbols

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
//// [tests/cases/compiler/declarationEmitTopLevelNodeFromCrossFile2.ts] ////
2+
3+
=== a.ts ===
4+
import { boxedBox } from "./boxedBox";
5+
>boxedBox : Symbol(boxedBox, Decl(a.ts, 0, 8))
6+
7+
export const _ = boxedBox;
8+
>_ : Symbol(_, Decl(a.ts, 2, 12))
9+
>boxedBox : Symbol(boxedBox, Decl(a.ts, 0, 8))
10+
11+
// At index 83
12+
/**
13+
* wat
14+
*/
15+
16+
=== boxedBox.d.ts ===
17+
export declare const boxedBox: import("./box").Box<{
18+
>boxedBox : Symbol(boxedBox, Decl(boxedBox.d.ts, 0, 20))
19+
>Box : Symbol(Box, Decl(box.d.ts, 0, 0))
20+
21+
boxed: import("./box").Box<number>;
22+
>boxed : Symbol(boxed, Decl(boxedBox.d.ts, 0, 52))
23+
>Box : Symbol(Box, Decl(box.d.ts, 0, 0))
24+
25+
}>; // ^This is index 83 in this file
26+
27+
=== box.d.ts ===
28+
export declare class Box<T> {
29+
>Box : Symbol(Box, Decl(box.d.ts, 0, 0))
30+
>T : Symbol(T, Decl(box.d.ts, 0, 25))
31+
32+
value: T;
33+
>value : Symbol(Box.value, Decl(box.d.ts, 0, 29))
34+
>T : Symbol(T, Decl(box.d.ts, 0, 25))
35+
36+
constructor(value: T);
37+
>value : Symbol(value, Decl(box.d.ts, 2, 16))
38+
>T : Symbol(T, Decl(box.d.ts, 0, 25))
39+
}
40+
export declare function box<T>(value: T): Box<T>;
41+
>box : Symbol(box, Decl(box.d.ts, 3, 1))
42+
>T : Symbol(T, Decl(box.d.ts, 4, 28))
43+
>value : Symbol(value, Decl(box.d.ts, 4, 31))
44+
>T : Symbol(T, Decl(box.d.ts, 4, 28))
45+
>Box : Symbol(Box, Decl(box.d.ts, 0, 0))
46+
>T : Symbol(T, Decl(box.d.ts, 4, 28))
47+

Diff for: ‎tests/baselines/reference/declarationEmitTopLevelNodeFromCrossFile2.types

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
//// [tests/cases/compiler/declarationEmitTopLevelNodeFromCrossFile2.ts] ////
2+
3+
=== a.ts ===
4+
import { boxedBox } from "./boxedBox";
5+
>boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
6+
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^
7+
8+
export const _ = boxedBox;
9+
>_ : import("box").Box<{ boxed: import("box").Box<number>; }>
10+
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^
11+
>boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
12+
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^
13+
14+
// At index 83
15+
/**
16+
* wat
17+
*/
18+
19+
=== boxedBox.d.ts ===
20+
export declare const boxedBox: import("./box").Box<{
21+
>boxedBox : import("box").Box<{ boxed: import("./box").Box<number>; }>
22+
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^
23+
24+
boxed: import("./box").Box<number>;
25+
>boxed : import("box").Box<number>
26+
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
27+
28+
}>; // ^This is index 83 in this file
29+
30+
=== box.d.ts ===
31+
export declare class Box<T> {
32+
>Box : Box<T>
33+
> : ^^^^^^
34+
35+
value: T;
36+
>value : T
37+
> : ^
38+
39+
constructor(value: T);
40+
>value : T
41+
> : ^
42+
}
43+
export declare function box<T>(value: T): Box<T>;
44+
>box : <T>(value: T) => Box<T>
45+
> : ^ ^^ ^^ ^^^^^
46+
>value : T
47+
> : ^
48+

Diff for: ‎tests/cases/compiler/declarationEmitTopLevelNodeFromCrossFile2.ts

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// @strict: true
2+
// @declaration: true
3+
4+
// @filename: a.ts
5+
import { boxedBox } from "./boxedBox";
6+
7+
export const _ = boxedBox;
8+
9+
// At index 83
10+
/**
11+
* wat
12+
*/
13+
14+
// @filename: boxedBox.d.ts
15+
export declare const boxedBox: import("./box").Box<{
16+
boxed: import("./box").Box<number>;
17+
}>; // ^This is index 83 in this file
18+
19+
// @filename: box.d.ts
20+
export declare class Box<T> {
21+
value: T;
22+
constructor(value: T);
23+
}
24+
export declare function box<T>(value: T): Box<T>;

0 commit comments

Comments
 (0)