microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 07:45:18 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Dont follow aliases when looking for default exported symbol (#22995)

Browse Source
This commit is contained in:
Wesley Wigham 2018-03-29 12:46:31 -07:00 committed by GitHub
parent 51d44b6097
commit 3365272f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 134 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/checker.ts
View File

@ -1741,8 +1741,8 @@ namespace ts {
// Declaration files (and ambient modules)
if (!file || file.isDeclarationFile) {
// Definitely cannot have a synthetic default if they have a syntactic default member specified
const defaultExportSymbol = resolveExportByName(moduleSymbol, InternalSymbolName.Default, dontResolveAlias);
if (defaultExportSymbol && defaultExportSymbol.valueDeclaration && isSyntacticDefault(defaultExportSymbol.valueDeclaration)) {
const defaultExportSymbol = resolveExportByName(moduleSymbol, InternalSymbolName.Default, /*dontResolveAlias*/ true); // Dont resolve alias because we want the immediately exported symbol's declaration
if (defaultExportSymbol && some(defaultExportSymbol.declarations, isSyntacticDefault)) {
return false;
}
// It _might_ still be incorrect to assume there is no __esModule marker on the import at runtime, even if there is no `default` member

33
tests/baselines/reference/systemDefaultImportCallable.js Normal file
View File

@ -0,0 +1,33 @@
//// [tests/cases/compiler/systemDefaultImportCallable.ts] ////
//// [core-js.d.ts]
declare module core {
var String: {
repeat(text: string, count: number): string;
};
}
declare module "core-js/fn/string/repeat" {
var repeat: typeof core.String.repeat;
export default repeat;
}
//// [greeter.ts]
import repeat from "core-js/fn/string/repeat";
const _: string = repeat(new Date().toUTCString() + " ", 2);
//// [greeter.js]
System.register(["core-js/fn/string/repeat"], function (exports_1, context_1) {
"use strict";
var __moduleName = context_1 && context_1.id;
var repeat_1, _;
return {
setters: [
function (repeat_1_1) {
repeat_1 = repeat_1_1;
}
],
execute: function () {
_ = repeat_1["default"](new Date().toUTCString() + " ", 2);
}
};
});

39
tests/baselines/reference/systemDefaultImportCallable.symbols Normal file
View File

@ -0,0 +1,39 @@
=== tests/cases/compiler/core-js.d.ts ===
declare module core {
>core : Symbol(core, Decl(core-js.d.ts, 0, 0))
var String: {
>String : Symbol(String, Decl(core-js.d.ts, 1, 7))
repeat(text: string, count: number): string;
>repeat : Symbol(repeat, Decl(core-js.d.ts, 1, 17))
>text : Symbol(text, Decl(core-js.d.ts, 2, 15))
>count : Symbol(count, Decl(core-js.d.ts, 2, 28))
};
}
declare module "core-js/fn/string/repeat" {
>"core-js/fn/string/repeat" : Symbol("core-js/fn/string/repeat", Decl(core-js.d.ts, 4, 1))
var repeat: typeof core.String.repeat;
>repeat : Symbol(repeat, Decl(core-js.d.ts, 6, 7))
>core.String.repeat : Symbol(repeat, Decl(core-js.d.ts, 1, 17))
>core.String : Symbol(core.String, Decl(core-js.d.ts, 1, 7))
>core : Symbol(core, Decl(core-js.d.ts, 0, 0))
>String : Symbol(core.String, Decl(core-js.d.ts, 1, 7))
>repeat : Symbol(repeat, Decl(core-js.d.ts, 1, 17))
export default repeat;
>repeat : Symbol(repeat, Decl(core-js.d.ts, 6, 7))
}
=== tests/cases/compiler/greeter.ts ===
import repeat from "core-js/fn/string/repeat";
>repeat : Symbol(repeat, Decl(greeter.ts, 0, 6))
const _: string = repeat(new Date().toUTCString() + " ", 2);
>_ : Symbol(_, Decl(greeter.ts, 2, 5))
>repeat : Symbol(repeat, Decl(greeter.ts, 0, 6))
>new Date().toUTCString : Symbol(Date.toUTCString, Decl(lib.d.ts, --, --))
>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>toUTCString : Symbol(Date.toUTCString, Decl(lib.d.ts, --, --))

45
tests/baselines/reference/systemDefaultImportCallable.types Normal file
View File

@ -0,0 +1,45 @@
=== tests/cases/compiler/core-js.d.ts ===
declare module core {
>core : typeof core
var String: {
>String : { repeat(text: string, count: number): string; }
repeat(text: string, count: number): string;
>repeat : (text: string, count: number) => string
>text : string
>count : number
};
}
declare module "core-js/fn/string/repeat" {
>"core-js/fn/string/repeat" : typeof "core-js/fn/string/repeat"
var repeat: typeof core.String.repeat;
>repeat : (text: string, count: number) => string
>core.String.repeat : (text: string, count: number) => string
>core.String : { repeat(text: string, count: number): string; }
>core : typeof core
>String : { repeat(text: string, count: number): string; }
>repeat : (text: string, count: number) => string
export default repeat;
>repeat : (text: string, count: number) => string
}
=== tests/cases/compiler/greeter.ts ===
import repeat from "core-js/fn/string/repeat";
>repeat : (text: string, count: number) => string
const _: string = repeat(new Date().toUTCString() + " ", 2);
>_ : string
>repeat(new Date().toUTCString() + " ", 2) : string
>repeat : (text: string, count: number) => string
>new Date().toUTCString() + " " : string
>new Date().toUTCString() : string
>new Date().toUTCString : () => string
>new Date() : Date
>Date : DateConstructor
>toUTCString : () => string
>" " : " "
>2 : 2

15
tests/cases/compiler/systemDefaultImportCallable.ts Normal file
View File

@ -0,0 +1,15 @@
// @module: system
// @filename: core-js.d.ts
declare module core {
var String: {
repeat(text: string, count: number): string;
};
}
declare module "core-js/fn/string/repeat" {
var repeat: typeof core.String.repeat;
export default repeat;
}
// @filename: greeter.ts
import repeat from "core-js/fn/string/repeat";
const _: string = repeat(new Date().toUTCString() + " ", 2);