Skip to content

Commit d0de238

Browse files
weswighamweswigham
committed
Merge pull request microsoft#5765 from weswigham/emit-module-in-strict-mode
Emit modules in strict mode
2 parents 2a21558 + 27149f3 commit d0de238

1,454 files changed

Lines changed: 17438 additions & 15720 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/compiler/emitter.ts‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7383,7 +7383,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
73837383
write(`], function(${exportFunctionForFile}) {`);
73847384
writeLine();
73857385
increaseIndent();
7386-
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
7386+
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
73877387
emitEmitHelpers(node);
73887388
emitCaptureThisForNodeIfNecessary(node);
73897389
emitSystemModuleBody(node, dependencyGroups, startIndex);
@@ -7493,7 +7493,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
74937493
writeModuleName(node, emitRelativePathAsModuleName);
74947494
emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
74957495
increaseIndent();
7496-
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
7496+
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
74977497
emitExportStarHelper();
74987498
emitCaptureThisForNodeIfNecessary(node);
74997499
emitLinesStartingAt(node.statements, startIndex);
@@ -7505,7 +7505,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
75057505
}
75067506

75077507
function emitCommonJSModule(node: SourceFile) {
7508-
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
7508+
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ true);
75097509
emitEmitHelpers(node);
75107510
collectExternalModuleInfo(node);
75117511
emitExportStarHelper();
@@ -7534,7 +7534,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
75347534
})(`);
75357535
emitAMDFactoryHeader(dependencyNames);
75367536
increaseIndent();
7537-
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);
7537+
const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
75387538
emitExportStarHelper();
75397539
emitCaptureThisForNodeIfNecessary(node);
75407540
emitLinesStartingAt(node.statements, startIndex);
@@ -7676,19 +7676,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
76767676
}
76777677
}
76787678

7679-
function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean): number {
7679+
function isUseStrictPrologue(node: ExpressionStatement): boolean {
7680+
return !!(node.expression as StringLiteral).text.match(/use strict/);
7681+
}
7682+
7683+
function ensureUseStrictPrologue(startWithNewLine: boolean, writeUseStrict: boolean) {
7684+
if (writeUseStrict) {
7685+
if (startWithNewLine) {
7686+
writeLine();
7687+
}
7688+
write("\"use strict\";");
7689+
}
7690+
}
7691+
7692+
function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean, ensureUseStrict?: boolean): number {
7693+
let foundUseStrict = false;
76807694
for (let i = 0; i < statements.length; ++i) {
76817695
if (isPrologueDirective(statements[i])) {
7696+
if (isUseStrictPrologue(statements[i] as ExpressionStatement)) {
7697+
foundUseStrict = true;
7698+
}
76827699
if (startWithNewLine || i > 0) {
76837700
writeLine();
76847701
}
76857702
emit(statements[i]);
76867703
}
76877704
else {
7705+
ensureUseStrictPrologue(startWithNewLine || i > 0, !foundUseStrict && ensureUseStrict);
76887706
// return index of the first non prologue directive
76897707
return i;
76907708
}
76917709
}
7710+
ensureUseStrictPrologue(startWithNewLine, !foundUseStrict && ensureUseStrict);
76927711
return statements.length;
76937712
}
76947713

‎tests/baselines/reference/APISample_compile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ compile(process.argv.slice(2), {
4040
at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-minimal-compiler
4141
* Please log a "breaking change" issue for any API breaking change affecting this issue
4242
*/
43+
"use strict";
4344
var ts = require("typescript");
4445
function compile(fileNames, options) {
4546
var program = ts.createProgram(fileNames, options);

‎tests/baselines/reference/APISample_linter.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ fileNames.forEach(fileName => {
7070
at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#traversing-the-ast-with-a-little-linter
7171
* Please log a "breaking change" issue for any API breaking change affecting this issue
7272
*/
73+
"use strict";
7374
var ts = require("typescript");
7475
function delint(sourceFile) {
7576
delintNode(sourceFile);

‎tests/baselines/reference/APISample_transform.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ console.log(JSON.stringify(result));
2222
at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-simple-transform-function
2323
* Please log a "breaking change" issue for any API breaking change affecting this issue
2424
*/
25+
"use strict";
2526
var ts = require("typescript");
2627
var source = "let x: string = 'string'";
2728
var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });

‎tests/baselines/reference/APISample_watcher.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
109109
at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#incremental-build-support-using-the-language-services
110110
* Please log a "breaking change" issue for any API breaking change affecting this issue
111111
*/
112+
"use strict";
112113
var ts = require("typescript");
113114
function watch(rootFileNames, options) {
114115
var files = {};

‎tests/baselines/reference/ExportAssignment7.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export class C {
55
export = B;
66

77
//// [ExportAssignment7.js]
8+
"use strict";
89
var C = (function () {
910
function C() {
1011
}

‎tests/baselines/reference/ExportAssignment8.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export class C {
55
}
66

77
//// [ExportAssignment8.js]
8+
"use strict";
89
var C = (function () {
910
function C() {
1011
}

‎tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export module A {
3030

3131

3232
//// [part1.js]
33+
"use strict";
3334
var A;
3435
(function (A) {
3536
var Utils;
@@ -42,6 +43,7 @@ var A;
4243
A.Origin = { x: 0, y: 0 };
4344
})(A = exports.A || (exports.A = {}));
4445
//// [part2.js]
46+
"use strict";
4547
var A;
4648
(function (A) {
4749
// collision with 'Origin' var in other part of merged module

‎tests/baselines/reference/aliasAssignments.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ y = moduleA; // should be error
1414

1515

1616
//// [aliasAssignments_moduleA.js]
17+
"use strict";
1718
var someClass = (function () {
1819
function someClass() {
1920
}
2021
return someClass;
2122
})();
2223
exports.someClass = someClass;
2324
//// [aliasAssignments_1.js]
25+
"use strict";
2426
var moduleA = require("./aliasAssignments_moduleA");
2527
var x = moduleA;
2628
x = 1; // Should be error

‎tests/baselines/reference/aliasOnMergedModuleInterface.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
2323

2424
//// [aliasOnMergedModuleInterface_0.js]
2525
//// [aliasOnMergedModuleInterface_1.js]
26+
"use strict";
2627
var z;
2728
z.bar("hello"); // This should be ok
2829
var x = foo.bar("hello"); // foo.A should be ok but foo.bar should be error

0 commit comments

Comments
 (0)