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

Merge pull request #26817 from Microsoft/resolvingJsonModuleLikeJsExportsEqual

Browse Source 
Use widened type and non fresh type when resolving json module
This commit is contained in:
Sheetal Nandi
2018-09-06 09:49:53 -07:00
committed by GitHub
parent 7fe0f9da9b 9eb0c9a88f
commit 8b30ff8393
6 changed files with 191 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/checker.ts
View File

@@ -5133,7 +5133,14 @@ namespace ts {
// Handle export default expressions
if (isSourceFile(declaration)) {
const jsonSourceFile = cast(declaration, isJsonSourceFile);
return jsonSourceFile.statements.length ? checkExpression(jsonSourceFile.statements[0].expression) : emptyObjectType;
if (!jsonSourceFile.statements.length) {
return emptyObjectType;
}
const type = getWidenedLiteralType(checkExpression(jsonSourceFile.statements[0].expression));
if (type.flags & TypeFlags.Object) {
return getRegularTypeOfObjectLiteral(type);
}
return type;
}
if (declaration.kind === SyntaxKind.ExportAssignment) {
return checkExpression((<ExportAssignment>declaration).expression);