Skip to content

emit file as external module if separateCompilation flag is specified #2937

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

Merged
merged 2 commits into from
Apr 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion src/compiler/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5493,7 +5493,7 @@ if (typeof __param !== "function") __param = function (paramIndex, decorator) {
paramEmitted = true;
}

if (isExternalModule(node)) {
if (isExternalModule(node) || compilerOptions.separateCompilation) {
if (languageVersion >= ScriptTarget.ES6) {
emitES6Module(node, startIndex);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tests/cases/compiler/separateCompilationPlainFile-AMD.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.


==== tests/cases/compiler/separateCompilationPlainFile-AMD.ts (1 errors) ====

declare function run(a: number): void;
~~~~~~~
!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
run(1);

10 changes: 10 additions & 0 deletions tests/baselines/reference/separateCompilationPlainFile-AMD.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//// [separateCompilationPlainFile-AMD.ts]

declare function run(a: number): void;
run(1);


//// [separateCompilationPlainFile-AMD.js]
define(["require", "exports"], function (require, exports) {
run(1);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tests/cases/compiler/separateCompilationPlainFile-CommonJS.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.


==== tests/cases/compiler/separateCompilationPlainFile-CommonJS.ts (1 errors) ====

declare function run(a: number): void;
~~~~~~~
!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
run(1);

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//// [separateCompilationPlainFile-CommonJS.ts]

declare function run(a: number): void;
run(1);


//// [separateCompilationPlainFile-CommonJS.js]
run(1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tests/cases/compiler/separateCompilationPlainFile-ES6.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.


==== tests/cases/compiler/separateCompilationPlainFile-ES6.ts (1 errors) ====

declare function run(a: number): void;
~~~~~~~
!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
run(1);

8 changes: 8 additions & 0 deletions tests/baselines/reference/separateCompilationPlainFile-ES6.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//// [separateCompilationPlainFile-ES6.ts]

declare function run(a: number): void;
run(1);


//// [separateCompilationPlainFile-ES6.js]
run(1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tests/cases/compiler/separateCompilationPlainFile-System.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.


==== tests/cases/compiler/separateCompilationPlainFile-System.ts (1 errors) ====

declare function run(a: number): void;
~~~~~~~
!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
run(1);

15 changes: 15 additions & 0 deletions tests/baselines/reference/separateCompilationPlainFile-System.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//// [separateCompilationPlainFile-System.ts]

declare function run(a: number): void;
run(1);


//// [separateCompilationPlainFile-System.js]
System.register([], function(exports_1) {
return {
setters:[],
execute: function() {
run(1);
}
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tests/cases/compiler/separateCompilationPlainFile-UMD.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.


==== tests/cases/compiler/separateCompilationPlainFile-UMD.ts (1 errors) ====

declare function run(a: number): void;
~~~~~~~
!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
run(1);

17 changes: 17 additions & 0 deletions tests/baselines/reference/separateCompilationPlainFile-UMD.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//// [separateCompilationPlainFile-UMD.ts]

declare function run(a: number): void;
run(1);


//// [separateCompilationPlainFile-UMD.js]
(function (deps, factory) {
if (typeof module === 'object' && typeof module.exports === 'object') {
var v = factory(require, exports); if (v !== undefined) module.exports = v;
}
else if (typeof define === 'function' && define.amd) {
define(deps, factory);
}
})(["require", "exports"], function (require, exports) {
run(1);
});
6 changes: 6 additions & 0 deletions tests/cases/compiler/separateCompilationPlainFile-AMD.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @target: es5
// @module: amd
// @separateCompilation: true

declare function run(a: number): void;
run(1);
6 changes: 6 additions & 0 deletions tests/cases/compiler/separateCompilationPlainFile-CommonJS.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @target: es5
// @module: commonjs
// @separateCompilation: true

declare function run(a: number): void;
run(1);
5 changes: 5 additions & 0 deletions tests/cases/compiler/separateCompilationPlainFile-ES6.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @target: es6
// @separateCompilation: true

declare function run(a: number): void;
run(1);
6 changes: 6 additions & 0 deletions tests/cases/compiler/separateCompilationPlainFile-System.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @target: es5
// @module: system
// @separateCompilation: true

declare function run(a: number): void;
run(1);
6 changes: 6 additions & 0 deletions tests/cases/compiler/separateCompilationPlainFile-UMD.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @target: es5
// @module: umd
// @separateCompilation: true

declare function run(a: number): void;
run(1);