maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 191 additions and 7 deletions
Show stats 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);

38
tests/baselines/reference/requireOfJsonFileInJsFile.errors.txt Normal file
View file

@ -0,0 +1,38 @@
/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 (4 errors) ====
const json0 = require("./json.json");
json0.b; // Error (good)
~
!!! error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
/** @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");
json0.b; // Error (good)
~
!!! error TS2339: Property 'b' does not exist on type '{ "a": number; }'.
/** @type {{ b: number }} */
const js1 = require("./js.js"); // Error (good)
~~~
!!! error TS2322: Type '{ a: number; }' is not assignable to type '{ b: number; }'.
!!! error TS2322: Property 'b' is missing in type '{ a: number; }'.
js1.b;
==== /json.json (0 errors) ====
{ "a": 0 }
==== /js.js (0 errors) ====
module.exports = { a: 0 };

50
tests/baselines/reference/requireOfJsonFileInJsFile.symbols Normal file
View file

@ -0,0 +1,50 @@
=== /user.js ===
const json0 = require("./json.json");
>json0 : Symbol(json0, Decl(user.js, 0, 5))
>require : Symbol(require)
>"./json.json" : Symbol("/json", Decl(json.json, 0, 0))
json0.b; // Error (good)
>json0 : Symbol(json0, Decl(user.js, 0, 5))
/** @type {{ b: number }} */
const json1 = require("./json.json"); // No error (bad)
>json1 : Symbol(json1, Decl(user.js, 4, 5))
>require : Symbol(require)
>"./json.json" : Symbol("/json", Decl(json.json, 0, 0))
json1.b; // No error (OK since that's the type annotation)
>json1.b : Symbol(b, Decl(user.js, 3, 12))
>json1 : Symbol(json1, Decl(user.js, 4, 5))
>b : Symbol(b, Decl(user.js, 3, 12))
const js0 = require("./js.js");
>js0 : Symbol(js0, Decl(user.js, 7, 5))
>require : Symbol(require)
>"./js.js" : Symbol("/js", Decl(js.js, 0, 0))
json0.b; // Error (good)
>json0 : Symbol(json0, Decl(user.js, 0, 5))
/** @type {{ b: number }} */
const js1 = require("./js.js"); // Error (good)
>js1 : Symbol(js1, Decl(user.js, 11, 5))
>require : Symbol(require)
>"./js.js" : Symbol("/js", Decl(js.js, 0, 0))
js1.b;
>js1.b : Symbol(b, Decl(user.js, 10, 12))
>js1 : Symbol(js1, Decl(user.js, 11, 5))
>b : Symbol(b, Decl(user.js, 10, 12))
=== /json.json ===
{ "a": 0 }
>"a" : Symbol("a", Decl(json.json, 0, 1))
=== /js.js ===
module.exports = { a: 0 };
>module.exports : Symbol("/js", Decl(js.js, 0, 0))
>module : Symbol(export=, Decl(js.js, 0, 0))
>exports : Symbol(export=, Decl(js.js, 0, 0))
>a : Symbol(a, Decl(js.js, 0, 18))

63
tests/baselines/reference/requireOfJsonFileInJsFile.types Normal file
View file

@ -0,0 +1,63 @@
=== /user.js ===
const json0 = require("./json.json");
>json0 : { "a": number; }
>require("./json.json") : { "a": number; }
>require : any
>"./json.json" : "./json.json"
json0.b; // Error (good)
>json0.b : any
>json0 : { "a": number; }
>b : any
/** @type {{ b: number }} */
const json1 = require("./json.json"); // No error (bad)
>json1 : { b: number; }
>require("./json.json") : { "a": number; }
>require : any
>"./json.json" : "./json.json"
json1.b; // No error (OK since that's the type annotation)
>json1.b : number
>json1 : { b: number; }
>b : number
const js0 = require("./js.js");
>js0 : { a: number; }
>require("./js.js") : { a: number; }
>require : any
>"./js.js" : "./js.js"
json0.b; // Error (good)
>json0.b : any
>json0 : { "a": number; }
>b : any
/** @type {{ b: number }} */
const js1 = require("./js.js"); // Error (good)
>js1 : { b: number; }
>require("./js.js") : { a: number; }
>require : any
>"./js.js" : "./js.js"
js1.b;
>js1.b : number
>js1 : { b: number; }
>b : number
=== /json.json ===
{ "a": 0 }
>{ "a": 0 } : { "a": number; }
>"a" : number
>0 : 0
=== /js.js ===
module.exports = { a: 0 };
>module.exports = { a: 0 } : { a: number; }
>module.exports : { a: number; }
>module : { "/js": { a: number; }; }
>exports : { a: number; }
>{ a: 0 } : { a: number; }
>a : number
>0 : 0

12
tests/baselines/reference/requireOfJsonFileTypes.types
View file

@ -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

26
tests/cases/compiler/requireOfJsonFileInJsFile.ts Normal file
View file

@ -0,0 +1,26 @@
// @allowJs: true
// @checkJs: true
// @noEmit: true
// @strict: true
// @resolveJsonModule: true
// @Filename: /json.json
{ "a": 0 }
// @Filename: /js.js
module.exports = { a: 0 };
// @Filename: /user.js
const json0 = require("./json.json");
json0.b; // Error (good)
/** @type {{ b: number }} */
const json1 = require("./json.json"); // No error (bad)
json1.b; // No error (OK since that's the type annotation)
const js0 = require("./js.js");
json0.b; // Error (good)
/** @type {{ b: number }} */
const js1 = require("./js.js"); // Error (good)
js1.b;