Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port9607 #9614

Merged
merged 7 commits into from
Jul 11, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated test with relative import
(cherry picked from commit db54bda)
  • Loading branch information
billti committed Jul 11, 2016
commit ab45a56eda597aea72d0f3ec92b6d812e2cf714f
Original file line number Diff line number Diff line change
@@ -2,5 +2,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
"use strict";
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
m1.rel = 42; // Error: Should be boolean
m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
});
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
maxDepthExceeded/root.ts(4,1): error TS2322: Type 'number' is not assignable to type 'boolean'.


==== entry.js (0 errors) ====
@@ -10,8 +11,12 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
"person": m3.person
};

==== relative.js (0 errors) ====
exports.relativeProp = true;

==== index.js (0 errors) ====
var m2 = require('m2');
var rel = require('./relative');

/**
* @param {string} p1 The first param
@@ -22,11 +27,17 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to

exports.f2 = m2;

==== maxDepthExceeded/root.ts (1 errors) ====
exports.rel = rel.relativeProp;

==== maxDepthExceeded/root.ts (2 errors) ====
import * as m1 from "m1";
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
~~~~~~~
!!! error TS2322: Type 'string' is not assignable to type 'number'.
m1.rel = 42; // Error: Should be boolean
~~~~~~
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.

m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".

Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
"resolvedInputFiles": [
"lib.d.ts",
"maxDepthExceeded/node_modules/m2/entry.js",
"maxDepthExceeded/node_modules/m1/relative.js",
"maxDepthExceeded/node_modules/m1/index.js",
"maxDepthExceeded/root.ts"
],
Original file line number Diff line number Diff line change
@@ -2,4 +2,5 @@
var m1 = require("m1");
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
m1.rel = 42; // Error: Should be boolean
m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
maxDepthExceeded/root.ts(4,1): error TS2322: Type 'number' is not assignable to type 'boolean'.


==== entry.js (0 errors) ====
@@ -10,8 +11,12 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
"person": m3.person
};

==== relative.js (0 errors) ====
exports.relativeProp = true;

==== index.js (0 errors) ====
var m2 = require('m2');
var rel = require('./relative');

/**
* @param {string} p1 The first param
@@ -22,11 +27,17 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to

exports.f2 = m2;

==== maxDepthExceeded/root.ts (1 errors) ====
exports.rel = rel.relativeProp;

==== maxDepthExceeded/root.ts (2 errors) ====
import * as m1 from "m1";
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
~~~~~~~
!!! error TS2322: Type 'string' is not assignable to type 'number'.
m1.rel = 42; // Error: Should be boolean
~~~~~~
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.

m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".

Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
"resolvedInputFiles": [
"lib.d.ts",
"maxDepthExceeded/node_modules/m2/entry.js",
"maxDepthExceeded/node_modules/m1/relative.js",
"maxDepthExceeded/node_modules/m1/index.js",
"maxDepthExceeded/root.ts"
],

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import * as m1 from "m1";
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
m1.rel = 42; // Error: Should be boolean

m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".