From 9eb0c9a88fa4f1cc5e83a314e6710079f67aa4ca Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 14 Aug 2018 13:24:39 -0700
Subject: [PATCH] Use widened type (just like importing using module.exports =
 in js file) Fixes #26429

---
 src/compiler/checker.ts                              |  9 ++++++++-
 .../reference/requireOfJsonFileInJsFile.errors.txt   |  7 ++++++-
 .../baselines/reference/requireOfJsonFileTypes.types | 12 ++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index da1af15dfa4..83cd2c1fe5c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5092,7 +5092,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);
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
index 39236816e57..dcc976a1b5b 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt
@@ -1,10 +1,12 @@
 /user.js(2,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
+/user.js(5,7): error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
+  Property 'b' is missing in type '{ "a": number; }'.
 /user.js(9,7): error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
 /user.js(12,7): error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
   Property 'b' is missing in type '{ a: number; }'.
 
 
-==== /user.js (3 errors) ====
+==== /user.js (4 errors) ====
     const json0 = require("./json.json");
     json0.b; // Error (good)
           ~
@@ -12,6 +14,9 @@
     
     /** @type {{ b: number }} */
     const json1 = require("./json.json"); // No error (bad)
+          ~~~~~
+!!! error TS2322: Type '{ "a": number; }' is not assignable to type '{ b: number; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ "a": number; }'.
     json1.b; // No error (OK since that's the type annotation)
     
     const js0 = require("./js.js");
diff --git a/tests/baselines/reference/requireOfJsonFileTypes.types b/tests/baselines/reference/requireOfJsonFileTypes.types
index d9cd38cd58f..d4587696fc7 100644
--- a/tests/baselines/reference/requireOfJsonFileTypes.types
+++ b/tests/baselines/reference/requireOfJsonFileTypes.types
@@ -6,10 +6,10 @@ import c = require('./c.json');
 >c : (string | null)[]
 
 import d = require('./d.json');
->d : "dConfig"
+>d : string
 
 import e = require('./e.json');
->e : -10
+>e : number
 
 import f = require('./f.json');
 >f : number[]
@@ -64,14 +64,14 @@ const stringOrNumberOrNull: string | number | null = c[0];
 >0 : 0
 
 stringLiteral = d;
->stringLiteral = d : "dConfig"
+>stringLiteral = d : string
 >stringLiteral : string
->d : "dConfig"
+>d : string
 
 numberLiteral = e;
->numberLiteral = e : -10
+>numberLiteral = e : number
 >numberLiteral : number
->e : -10
+>e : number
 
 numberLiteral = f[0];
 >numberLiteral = f[0] : number