From d9710135fc9dab4ad9f432181b80e57d344ae2ae Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Thu, 25 Feb 2021 16:54:58 -0800 Subject: [PATCH] Cherry-pick PR #42971 into release-4.2 (#42972) Component commits: 9f9825a4f0 Fix: checkAliasSymbol crash when checking for @deprecated It's possible that we shouldn't be creating symbol with no declarations from non-homomorphic mapped types, but for 4.2, the right fix is to make the @deprecated-check in checkAliasSymbol ensure that target.declarations is defined. 75449de4be Add bug number and accept baselines Co-authored-by: Nathan Shively-Sanders --- src/compiler/checker.ts | 2 +- .../reference/importPropertyFromMappedType.js | 18 +++++++++++++++ .../importPropertyFromMappedType.symbols | 23 +++++++++++++++++++ .../importPropertyFromMappedType.types | 19 +++++++++++++++ .../compiler/importPropertyFromMappedType.ts | 11 +++++++++ 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/importPropertyFromMappedType.js create mode 100644 tests/baselines/reference/importPropertyFromMappedType.symbols create mode 100644 tests/baselines/reference/importPropertyFromMappedType.types create mode 100644 tests/cases/compiler/importPropertyFromMappedType.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6fc4b67bd7fa2..2dd94944b42a6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -36958,7 +36958,7 @@ namespace ts { error(node, Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type); } - if (isImportSpecifier(node) && every(target.declarations, d => !!(getCombinedNodeFlags(d) & NodeFlags.Deprecated))) { + if (isImportSpecifier(node) && target.declarations?.every(d => !!(getCombinedNodeFlags(d) & NodeFlags.Deprecated))) { addDeprecatedSuggestion(node.name, target.declarations, symbol.escapedName as string); } } diff --git a/tests/baselines/reference/importPropertyFromMappedType.js b/tests/baselines/reference/importPropertyFromMappedType.js new file mode 100644 index 0000000000000..37ff26b16304f --- /dev/null +++ b/tests/baselines/reference/importPropertyFromMappedType.js @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/importPropertyFromMappedType.ts] //// + +//// [errors.d.ts] +// #42957 + +export = createHttpError; +declare const createHttpError: createHttpError.NamedConstructors; +declare namespace createHttpError { + type NamedConstructors = { [P in 'NotFound']: unknown;} +} + +//// [main.ts] +import { NotFound } from './errors' + + +//// [main.js] +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/importPropertyFromMappedType.symbols b/tests/baselines/reference/importPropertyFromMappedType.symbols new file mode 100644 index 0000000000000..224ee8e4c6e77 --- /dev/null +++ b/tests/baselines/reference/importPropertyFromMappedType.symbols @@ -0,0 +1,23 @@ +=== tests/cases/compiler/errors.d.ts === +// #42957 + +export = createHttpError; +>createHttpError : Symbol(createHttpError, Decl(errors.d.ts, 3, 13), Decl(errors.d.ts, 3, 65)) + +declare const createHttpError: createHttpError.NamedConstructors; +>createHttpError : Symbol(createHttpError, Decl(errors.d.ts, 3, 13), Decl(errors.d.ts, 3, 65)) +>createHttpError : Symbol(createHttpError, Decl(errors.d.ts, 3, 13), Decl(errors.d.ts, 3, 65)) +>NamedConstructors : Symbol(createHttpError.NamedConstructors, Decl(errors.d.ts, 4, 35)) + +declare namespace createHttpError { +>createHttpError : Symbol(createHttpError, Decl(errors.d.ts, 3, 13), Decl(errors.d.ts, 3, 65)) + + type NamedConstructors = { [P in 'NotFound']: unknown;} +>NamedConstructors : Symbol(NamedConstructors, Decl(errors.d.ts, 4, 35)) +>P : Symbol(P, Decl(errors.d.ts, 5, 33)) +} + +=== tests/cases/compiler/main.ts === +import { NotFound } from './errors' +>NotFound : Symbol(NotFound, Decl(main.ts, 0, 8)) + diff --git a/tests/baselines/reference/importPropertyFromMappedType.types b/tests/baselines/reference/importPropertyFromMappedType.types new file mode 100644 index 0000000000000..efc06ad38e4a0 --- /dev/null +++ b/tests/baselines/reference/importPropertyFromMappedType.types @@ -0,0 +1,19 @@ +=== tests/cases/compiler/errors.d.ts === +// #42957 + +export = createHttpError; +>createHttpError : createHttpError.NamedConstructors + +declare const createHttpError: createHttpError.NamedConstructors; +>createHttpError : createHttpError.NamedConstructors +>createHttpError : any + +declare namespace createHttpError { + type NamedConstructors = { [P in 'NotFound']: unknown;} +>NamedConstructors : NamedConstructors +} + +=== tests/cases/compiler/main.ts === +import { NotFound } from './errors' +>NotFound : unknown + diff --git a/tests/cases/compiler/importPropertyFromMappedType.ts b/tests/cases/compiler/importPropertyFromMappedType.ts new file mode 100644 index 0000000000000..1c850b9a448bd --- /dev/null +++ b/tests/cases/compiler/importPropertyFromMappedType.ts @@ -0,0 +1,11 @@ +// #42957 + +// @filename: errors.d.ts +export = createHttpError; +declare const createHttpError: createHttpError.NamedConstructors; +declare namespace createHttpError { + type NamedConstructors = { [P in 'NotFound']: unknown;} +} + +// @filename: main.ts +import { NotFound } from './errors'