Merge branch 'tresorit-directive_handling' into release-0.54.0

src/ast/nodes/ExpressionStatement.ts

@@ -1,7 +1,31 @@
 import MagicString from 'magic-string';
 import { StatementBase } from './shared/Statement';
+import Scope from '../scopes/Scope';
 
 export default class ExpressionStatement extends StatementBase {
+	directive?: string;
+
+	initialiseNode(_parentScope: Scope){
+		if (this.directive && this.directive !== 'use strict' && this.parent.type === "Program") {
+			this.module.warn( // This is necessary, because either way (deleting or not) can lead to errors.
+				{
+					code: 'MODULE_LEVEL_DIRECTIVE',
+					message: `Module level directives cause errors when bundled, '${this.directive}' was ignored.`
+				},
+				this.start
+			);
+		}
+
+		return super.initialiseNode(_parentScope);
+	}
+
+	shouldBeIncluded() {
+		if (this.directive && this.directive !== 'use strict')
+			return this.parent.type !== "Program";
+
+		return super.shouldBeIncluded();
+	}
+
 	render (code: MagicString, es: boolean) {
 		super.render(code, es);
 		if (this.included) this.insertSemicolon(code);

test/function/samples/function-asm-directive/_config.js

@@ -0,0 +1,8 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'shouldn\'t delete use asm from the start of a function body',
+	code: function ( code ) {
+		assert.notEqual( code.indexOf('use asm'), -1 );
+	},
+};

test/function/samples/function-asm-directive/main.js

@@ -0,0 +1,5 @@
+export function a() {
+    "use asm";
+
+    return 1;
+}

test/function/samples/function-directive-not-first/_config.js

@@ -0,0 +1,9 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'should delete use asm from function body if it\'s not first expression',
+	code: function ( code ) {
+		console.log(code);
+		assert.equal( code.indexOf('use asm'), -1 );
+	},
+};

test/function/samples/function-directive-not-first/main.js

@@ -0,0 +1,5 @@
+export function a() {
+    const x = 1;
+    "use asm";
+    return x;
+}

test/function/samples/function-use-strict-directive-removed/_config.js

@@ -0,0 +1,9 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'should delete use strict from function body',
+	code: function ( code ) {
+		assert.equal( code.lastIndexOf('use strict'), 1 );
+	},
+	show: true,
+};

test/function/samples/function-use-strict-directive-removed/main.js

@@ -0,0 +1,5 @@
+export function a() {
+    "use strict";
+    const x = 1;
+    return x;
+}

test/function/samples/module-level-directive/_config.js

@@ -0,0 +1,22 @@
+var assert = require( 'assert' );
+var path = require( 'path' );
+
+module.exports = {
+	description: 'module level directives should produce warnings',
+	warnings: [
+		{
+			code: 'MODULE_LEVEL_DIRECTIVE',
+			message: 'Module level directives cause errors when bundled, \'use asm\' was ignored.',
+			pos: 0,
+			id: path.resolve( __dirname, 'main.js' ),
+			loc: {
+				file: path.resolve( __dirname, 'main.js' ),
+				line: 1,
+				column: 0
+			},
+			frame: `
+			1: \"use asm\";\n   ^\n2:\n3: export default 1;
+			`
+		}
+	]
+};

test/function/samples/module-level-directive/main.js

@@ -0,0 +1,3 @@
+"use asm";
+
+export default 1;