Skip to content

Commit a073560

Browse files
DanielRosenwasserDanielRosenwasser
authored
Merge pull request microsoft#38372 from typescript-bot/pick/38368/release-3.9
🤖 Pick PR microsoft#38368 (Fix js missing type arguments on ex...) into release-3.9
2 parents 659677f + 623f78e commit a073560

30 files changed

+602
-32
lines changed

‎src/compiler/checker.ts

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5503,6 +5503,10 @@ namespace ts {
55035503
return symbol.declarations && find(symbol.declarations, s => !!getEffectiveTypeAnnotationNode(s) && (!enclosingDeclaration || !!findAncestor(s, n => n === enclosingDeclaration)));
55045504
}
55055505

5506+
function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing: TypeNode, type: Type) {
5507+
return !(getObjectFlags(type) & ObjectFlags.Reference) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount((type as TypeReference).target.typeParameters);
5508+
}
5509+
55065510
/**
55075511
* Unlike `typeToTypeNodeHelper`, this handles setting up the `AllowUniqueESSymbolType` flag
55085512
* so a `unique symbol` is returned when appropriate for the input symbol, rather than `typeof sym`
@@ -5513,7 +5517,7 @@ namespace ts {
55135517
if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation)) {
55145518
// try to reuse the existing annotation
55155519
const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation)!;
5516-
if (getTypeFromTypeNode(existing) === type) {
5520+
if (getTypeFromTypeNode(existing) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
55175521
const result = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
55185522
if (result) {
55195523
return result;
@@ -5534,7 +5538,7 @@ namespace ts {
55345538
function serializeReturnTypeForSignature(context: NodeBuilderContext, type: Type, signature: Signature, includePrivateSymbol?: (s: Symbol) => void, bundled?: boolean) {
55355539
if (type !== errorType && context.enclosingDeclaration) {
55365540
const annotation = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
5537-
if (!!findAncestor(annotation, n => n === context.enclosingDeclaration) && annotation && instantiateType(getTypeFromTypeNode(annotation), signature.mapper) === type) {
5541+
if (!!findAncestor(annotation, n => n === context.enclosingDeclaration) && annotation && instantiateType(getTypeFromTypeNode(annotation), signature.mapper) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
55385542
const result = serializeExistingTypeNode(context, annotation, includePrivateSymbol, bundled);
55395543
if (result) {
55405544
return result;
@@ -5575,6 +5579,21 @@ namespace ts {
55755579
if (isJSDocVariadicType(node)) {
55765580
return createArrayTypeNode(visitNode((node as JSDocVariadicType).type, visitExistingNodeTreeSymbols));
55775581
}
5582+
if (isJSDocTypeLiteral(node)) {
5583+
return createTypeLiteralNode(map(node.jsDocPropertyTags, t => {
5584+
const name = isIdentifier(t.name) ? t.name : t.name.right;
5585+
const typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode(node), name.escapedText);
5586+
const overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode(t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : undefined;
5587+
5588+
return createPropertySignature(
5589+
/*modifiers*/ undefined,
5590+
name,
5591+
t.typeExpression && isJSDocOptionalType(t.typeExpression.type) ? createToken(SyntaxKind.QuestionToken) : undefined,
5592+
overrideTypeNode || (t.typeExpression && visitNode(t.typeExpression.type, visitExistingNodeTreeSymbols)) || createKeywordTypeNode(SyntaxKind.AnyKeyword),
5593+
/*initializer*/ undefined
5594+
);
5595+
}));
5596+
}
55785597
if (isTypeReferenceNode(node) && isIdentifier(node.typeName) && node.typeName.escapedText === "") {
55795598
return setOriginalNode(createKeywordTypeNode(SyntaxKind.AnyKeyword), node);
55805599
}
@@ -5626,6 +5645,9 @@ namespace ts {
56265645
);
56275646
}
56285647
}
5648+
if (isTypeReferenceNode(node) && isInJSDoc(node) && (getIntendedTypeFromJSDocTypeReference(node) || unknownSymbol === resolveTypeReferenceName(getTypeReferenceName(node), SymbolFlags.Type, /*ignoreErrors*/ true))) {
5649+
return setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
5650+
}
56295651
if (isLiteralImportTypeNode(node)) {
56305652
return updateImportTypeNode(
56315653
node,

‎tests/baselines/reference/exportNestedNamespaces.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var classic = new s.Classic()
6868
/** @param {s.n.K} c
6969
@param {s.Classic} classic */
7070
function f(c, classic) {
71-
>f : (c: s.n.K, classic: s.Classic) => void
71+
>f : (c: K, classic: s.Classic) => void
7272
>c : K
7373
>classic : Classic
7474

‎tests/baselines/reference/jsDeclarationsClassStatic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ type HandlerOptions = {
7070
/**
7171
* Should be able to export a type alias at the same time.
7272
*/
73-
name: String;
73+
name: string;
7474
};

‎tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.js

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
//// [index.js]
2+
// these are recognized as TS concepts by the checker
3+
/** @type {String} */const a = "";
4+
/** @type {Number} */const b = 0;
5+
/** @type {Boolean} */const c = true;
6+
/** @type {Void} */const d = undefined;
7+
/** @type {Undefined} */const e = undefined;
8+
/** @type {Null} */const f = null;
9+
10+
/** @type {Function} */const g = () => void 0;
11+
/** @type {function} */const h = () => void 0;
12+
/** @type {array} */const i = [];
13+
/** @type {promise} */const j = Promise.resolve(0);
14+
/** @type {Object<string, string>} */const k = {x: "x"};
15+
16+
17+
// these are not recognized as anything and should just be lookup failures
18+
// ignore the errors to try to ensure they're emitted as `any` in declaration emit
19+
// @ts-ignore
20+
/** @type {class} */const l = true;
21+
// @ts-ignore
22+
/** @type {bool} */const m = true;
23+
// @ts-ignore
24+
/** @type {int} */const n = true;
25+
// @ts-ignore
26+
/** @type {float} */const o = true;
27+
// @ts-ignore
28+
/** @type {integer} */const p = true;
29+
30+
// or, in the case of `event` likely erroneously refers to the type of the global Event object
31+
/** @type {event} */const q = undefined;
32+
33+
//// [index.js]
34+
"use strict";
35+
// these are recognized as TS concepts by the checker
36+
/** @type {String} */ const a = "";
37+
/** @type {Number} */ const b = 0;
38+
/** @type {Boolean} */ const c = true;
39+
/** @type {Void} */ const d = undefined;
40+
/** @type {Undefined} */ const e = undefined;
41+
/** @type {Null} */ const f = null;
42+
/** @type {Function} */ const g = () => void 0;
43+
/** @type {function} */ const h = () => void 0;
44+
/** @type {array} */ const i = [];
45+
/** @type {promise} */ const j = Promise.resolve(0);
46+
/** @type {Object<string, string>} */ const k = { x: "x" };
47+
// these are not recognized as anything and should just be lookup failures
48+
// ignore the errors to try to ensure they're emitted as `any` in declaration emit
49+
// @ts-ignore
50+
/** @type {class} */ const l = true;
51+
// @ts-ignore
52+
/** @type {bool} */ const m = true;
53+
// @ts-ignore
54+
/** @type {int} */ const n = true;
55+
// @ts-ignore
56+
/** @type {float} */ const o = true;
57+
// @ts-ignore
58+
/** @type {integer} */ const p = true;
59+
// or, in the case of `event` likely erroneously refers to the type of the global Event object
60+
/** @type {event} */ const q = undefined;
61+
62+
63+
//// [index.d.ts]
64+
/** @type {String} */ declare const a: string;
65+
/** @type {Number} */ declare const b: number;
66+
/** @type {Boolean} */ declare const c: boolean;
67+
/** @type {Void} */ declare const d: void;
68+
/** @type {Undefined} */ declare const e: undefined;
69+
/** @type {Null} */ declare const f: null;
70+
/** @type {Function} */ declare const g: Function;
71+
/** @type {function} */ declare const h: Function;
72+
/** @type {array} */ declare const i: any[];
73+
/** @type {promise} */ declare const j: Promise<any>;
74+
/** @type {Object<string, string>} */ declare const k: {
75+
[x: string]: string;
76+
};
77+
/** @type {class} */ declare const l: any;
78+
/** @type {bool} */ declare const m: any;
79+
/** @type {int} */ declare const n: any;
80+
/** @type {float} */ declare const o: any;
81+
/** @type {integer} */ declare const p: any;
82+
/** @type {event} */ declare const q: Event | undefined;

‎tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.symbols

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
=== tests/cases/conformance/jsdoc/declarations/index.js ===
2+
// these are recognized as TS concepts by the checker
3+
/** @type {String} */const a = "";
4+
>a : Symbol(a, Decl(index.js, 1, 26))
5+
6+
/** @type {Number} */const b = 0;
7+
>b : Symbol(b, Decl(index.js, 2, 26))
8+
9+
/** @type {Boolean} */const c = true;
10+
>c : Symbol(c, Decl(index.js, 3, 27))
11+
12+
/** @type {Void} */const d = undefined;
13+
>d : Symbol(d, Decl(index.js, 4, 24))
14+
>undefined : Symbol(undefined)
15+
16+
/** @type {Undefined} */const e = undefined;
17+
>e : Symbol(e, Decl(index.js, 5, 29))
18+
>undefined : Symbol(undefined)
19+
20+
/** @type {Null} */const f = null;
21+
>f : Symbol(f, Decl(index.js, 6, 24))
22+
23+
/** @type {Function} */const g = () => void 0;
24+
>g : Symbol(g, Decl(index.js, 8, 28))
25+
26+
/** @type {function} */const h = () => void 0;
27+
>h : Symbol(h, Decl(index.js, 9, 28))
28+
29+
/** @type {array} */const i = [];
30+
>i : Symbol(i, Decl(index.js, 10, 25))
31+
32+
/** @type {promise} */const j = Promise.resolve(0);
33+
>j : Symbol(j, Decl(index.js, 11, 27))
34+
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
35+
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
36+
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
37+
38+
/** @type {Object<string, string>} */const k = {x: "x"};
39+
>k : Symbol(k, Decl(index.js, 12, 42))
40+
>x : Symbol(x, Decl(index.js, 12, 48))
41+
42+
43+
// these are not recognized as anything and should just be lookup failures
44+
// ignore the errors to try to ensure they're emitted as `any` in declaration emit
45+
// @ts-ignore
46+
/** @type {class} */const l = true;
47+
>l : Symbol(l, Decl(index.js, 18, 25))
48+
49+
// @ts-ignore
50+
/** @type {bool} */const m = true;
51+
>m : Symbol(m, Decl(index.js, 20, 24))
52+
53+
// @ts-ignore
54+
/** @type {int} */const n = true;
55+
>n : Symbol(n, Decl(index.js, 22, 23))
56+
57+
// @ts-ignore
58+
/** @type {float} */const o = true;
59+
>o : Symbol(o, Decl(index.js, 24, 25))
60+
61+
// @ts-ignore
62+
/** @type {integer} */const p = true;
63+
>p : Symbol(p, Decl(index.js, 26, 27))
64+
65+
// or, in the case of `event` likely erroneously refers to the type of the global Event object
66+
/** @type {event} */const q = undefined;
67+
>q : Symbol(q, Decl(index.js, 29, 25))
68+
>undefined : Symbol(undefined)
69+

‎tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.types

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
=== tests/cases/conformance/jsdoc/declarations/index.js ===
2+
// these are recognized as TS concepts by the checker
3+
/** @type {String} */const a = "";
4+
>a : string
5+
>"" : ""
6+
7+
/** @type {Number} */const b = 0;
8+
>b : number
9+
>0 : 0
10+
11+
/** @type {Boolean} */const c = true;
12+
>c : boolean
13+
>true : true
14+
15+
/** @type {Void} */const d = undefined;
16+
>d : void
17+
>undefined : undefined
18+
19+
/** @type {Undefined} */const e = undefined;
20+
>e : undefined
21+
>undefined : undefined
22+
23+
/** @type {Null} */const f = null;
24+
>f : null
25+
>null : null
26+
27+
/** @type {Function} */const g = () => void 0;
28+
>g : Function
29+
>() => void 0 : () => undefined
30+
>void 0 : undefined
31+
>0 : 0
32+
33+
/** @type {function} */const h = () => void 0;
34+
>h : Function
35+
>() => void 0 : () => undefined
36+
>void 0 : undefined
37+
>0 : 0
38+
39+
/** @type {array} */const i = [];
40+
>i : any[]
41+
>[] : never[]
42+
43+
/** @type {promise} */const j = Promise.resolve(0);
44+
>j : Promise<any>
45+
>Promise.resolve(0) : Promise<number>
46+
>Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
47+
>Promise : PromiseConstructor
48+
>resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
49+
>0 : 0
50+
51+
/** @type {Object<string, string>} */const k = {x: "x"};
52+
>k : { [x: string]: string; }
53+
>{x: "x"} : { x: string; }
54+
>x : string
55+
>"x" : "x"
56+
57+
58+
// these are not recognized as anything and should just be lookup failures
59+
// ignore the errors to try to ensure they're emitted as `any` in declaration emit
60+
// @ts-ignore
61+
/** @type {class} */const l = true;
62+
>l : error
63+
>true : true
64+
65+
// @ts-ignore
66+
/** @type {bool} */const m = true;
67+
>m : error
68+
>true : true
69+
70+
// @ts-ignore
71+
/** @type {int} */const n = true;
72+
>n : error
73+
>true : true
74+
75+
// @ts-ignore
76+
/** @type {float} */const o = true;
77+
>o : error
78+
>true : true
79+
80+
// @ts-ignore
81+
/** @type {integer} */const p = true;
82+
>p : error
83+
>true : true
84+
85+
// or, in the case of `event` likely erroneously refers to the type of the global Event object
86+
/** @type {event} */const q = undefined;
87+
>q : Event | undefined
88+
>undefined : undefined
89+

‎tests/baselines/reference/jsDeclarationsMissingGenerics.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
//// [file.js]
2+
/**
3+
* @param {Array} x
4+
*/
5+
function x(x) {}
6+
/**
7+
* @param {Promise} x
8+
*/
9+
function y(x) {}
10+
11+
//// [file.js]
12+
/**
13+
* @param {Array} x
14+
*/
15+
function x(x) { }
16+
/**
17+
* @param {Promise} x
18+
*/
19+
function y(x) { }
20+
21+
22+
//// [file.d.ts]
23+
/**
24+
* @param {Array} x
25+
*/
26+
declare function x(x: any[]): void;
27+
/**
28+
* @param {Promise} x
29+
*/
30+
declare function y(x: Promise<any>): void;

‎tests/baselines/reference/jsDeclarationsMissingGenerics.symbols

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
=== tests/cases/conformance/jsdoc/declarations/file.js ===
2+
/**
3+
* @param {Array} x
4+
*/
5+
function x(x) {}
6+
>x : Symbol(x, Decl(file.js, 0, 0))
7+
>x : Symbol(x, Decl(file.js, 3, 11))
8+
9+
/**
10+
* @param {Promise} x
11+
*/
12+
function y(x) {}
13+
>y : Symbol(y, Decl(file.js, 3, 16))
14+
>x : Symbol(x, Decl(file.js, 7, 11))
15+

‎tests/baselines/reference/jsDeclarationsMissingGenerics.types

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
=== tests/cases/conformance/jsdoc/declarations/file.js ===
2+
/**
3+
* @param {Array} x
4+
*/
5+
function x(x) {}
6+
>x : (x: any[]) => void
7+
>x : any[]
8+
9+
/**
10+
* @param {Promise} x
11+
*/
12+
function y(x) {}
13+
>y : (x: Promise<any>) => void
14+
>x : Promise<any>
15+

0 commit comments

Comments
 (0)