Skip to content

Preserve return type nodes which resolve to errors in declaration emit #58522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weswigham merged 2 commits into from
May 13, 2024
Merged

Preserve return type nodes which resolve to errors in declaration emit #58522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d41691
Preserve return type nodes which resolve to errors in declaration emit
weswigham May 13, 2024
4fa7b59
Accept changed baselines
weswigham May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Preserve return type nodes which resolve to errors in declaration emit
  • Loading branch information
@weswigham
weswigham committed May 13, 2024
commit 3d41691b3baf77386e11fe227a18cddbfcba9ef4
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8233,7 +8233,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function serializeReturnTypeForSignatureWorker(context: NodeBuilderContext, signature: Signature) {
const typePredicate = getTypePredicateOfSignature(signature);
const type = getReturnTypeOfSignature(signature);
if (!isErrorType(type) && context.enclosingDeclaration) {
if (context.enclosingDeclaration && (!isErrorType(type) || (context.flags & NodeBuilderFlags.AllowUnresolvedNames))) {
const annotation = signature.declaration && getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
if (!!findAncestor(annotation, n => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
Expand Down
15 changes: 15 additions & 0 deletions tests/baselines/reference/transpile/declarationLocalAliasOfImportAlias.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//// [declarationLocalAliasOfImportAlias.ts] ////
import { Record } from "./a";
export type Foo<K extends string> = Record<K, number>;

export const obj = {
doThing<K extends string>(_k: K): Foo<K> {
return {} as any;
},
};
//// [declarationLocalAliasOfImportAlias.d.ts] ////
import { Record } from "./a";
export type Foo<K extends string> = Record<K, number>;
export declare const obj: {
doThing<K extends string>(_k: K): Foo<K>;
};
18 changes: 18 additions & 0 deletions tests/baselines/reference/transpile/declarationLocalAliasOfImportAlias.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//// [declarationLocalAliasOfImportAlias.ts] ////
import { Record } from "./a";
export type Foo<K extends string> = Record<K, number>;

export const obj = {
doThing<K extends string>(_k: K): Foo<K> {
return {} as any;
},
};
//// [declarationLocalAliasOfImportAlias.js] ////
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.obj = void 0;
exports.obj = {
doThing: function (_k) {
return {};
},
};
9 changes: 9 additions & 0 deletions tests/cases/transpile/declarationLocalAliasOfImportAlias.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// @declaration: true
import { Record } from "./a";
export type Foo<K extends string> = Record<K, number>;

export const obj = {
doThing<K extends string>(_k: K): Foo<K> {
return {} as any;
},
};