Remove exports before calling closure compiler (#68)

kristoferbaxter · web-flow · commit 60698835f7a1 · 2018-09-19T16:20:32.000-07:00
* Remove exports before calling closure compiler
* Tests for export transpilation
* Added an ES5 test for every scenario
diff --git a/src/transformers/exports.ts b/src/transformers/exports.ts
@@ -99,8 +99,12 @@ export default class ExportTransform extends Transform implements TransformInter
       );
     } else if (isESMFormat(this.outputOptions.format)) {
       const source = new MagicString(code);
-      // Window scoped references for each key are required to ensure Closure Compilre retains the code.
       Object.keys(this.originalExports).forEach(key => {
+        // Remove export statements before Closure Compiler sees the code
+        // This prevents CC from transpiling `export` statements when the language_out is set to a value
+        // where exports were not part of the language.
+        source.remove(this.originalExports[key].range[0], this.originalExports[key].range[1]);
+        // Window scoped references for each key are required to ensure Closure Compilre retains the code.
         source.append(`\nwindow['${key}'] = ${key}`);
       });
 
diff --git a/src/transformers/parsing-utilities.ts b/src/transformers/parsing-utilities.ts
@@ -76,13 +76,21 @@ export function NamedDeclaration(
       [functionName]: {
         alias: null,
         type: ExportClosureMapping.NAMED_FUNCTION,
+        range: [
+          declaration.range ? declaration.range[0] : 0,
+          declaration.range ? declaration.range[1] : 0,
+        ],
       },
     };
   } else if (className !== null) {
     return {
       [className]: {
         alias: null,
         type: ExportClosureMapping.NAMED_CLASS,
+        range: [
+          declaration.range ? declaration.range[0] : 0,
+          declaration.range ? declaration.range[1] : 0,
+        ],
       },
     };
   } else if (declaration.declaration && declaration.declaration.type === 'VariableDeclaration') {
@@ -94,6 +102,10 @@ export function NamedDeclaration(
         exportMap[variableDeclarator.id.name] = {
           alias: null,
           type: ExportClosureMapping.NAMED_CONSTANT,
+          range: [
+            declaration.range ? declaration.range[0] : 0,
+            declaration.range ? declaration.range[1] : 0,
+          ],
         };
       }
     });
@@ -107,6 +119,10 @@ export function NamedDeclaration(
         exportMap[exportSpecifier.local.name] = {
           alias: null,
           type: ExportClosureMapping.DEFAULT,
+          range: [
+            declaration.range ? declaration.range[0] : 0,
+            declaration.range ? declaration.range[1] : 0,
+          ],
         };
       } else {
         exportMap[exportSpecifier.local.name] = {
@@ -115,6 +131,10 @@ export function NamedDeclaration(
               ? exportSpecifier.exported.name
               : null,
           type: ExportClosureMapping.NAMED_CONSTANT,
+          range: [
+            declaration.range ? declaration.range[0] : 0,
+            declaration.range ? declaration.range[1] : 0,
+          ],
         };
       }
     });
@@ -137,6 +157,10 @@ export function DefaultDeclaration(
             [functionName]: {
               alias: null,
               type: ExportClosureMapping.NAMED_DEFAULT_FUNCTION,
+              range: [
+                declaration.range ? declaration.range[0] : 0,
+                declaration.range ? declaration.range[1] : 0,
+              ],
             },
           };
         }
@@ -148,6 +172,10 @@ export function DefaultDeclaration(
             [className]: {
               alias: null,
               type: ExportClosureMapping.NAMED_DEFAULT_CLASS,
+              range: [
+                declaration.range ? declaration.range[0] : 0,
+                declaration.range ? declaration.range[1] : 0,
+              ],
             },
           };
         }
@@ -158,6 +186,10 @@ export function DefaultDeclaration(
             [declaration.declaration.name]: {
               alias: null,
               type: ExportClosureMapping.NAMED_DEFAULT_FUNCTION,
+              range: [
+                declaration.range ? declaration.range[0] : 0,
+                declaration.range ? declaration.range[1] : 0,
+              ],
             },
           };
         }
@@ -168,6 +200,10 @@ export function DefaultDeclaration(
             [declaration.declaration.name]: {
               alias: null,
               type: ExportClosureMapping.NAMED_DEFAULT_FUNCTION,
+              range: [
+                declaration.range ? declaration.range[0] : 0,
+                declaration.range ? declaration.range[1] : 0,
+              ],
             },
           };
         }
diff --git a/src/types.ts b/src/types.ts
@@ -58,6 +58,7 @@ export interface ExportNameToClosureMapping {
   [key: string]: {
     alias: string | null;
     type: ExportClosureMapping;
+    range: [number, number];
   };
 }
 
diff --git a/test/error-reporting/fixtures/warnings.esm.es5.js b/test/error-reporting/fixtures/warnings.esm.es5.js
@@ -0,0 +1 @@
+console.log(document.getElementById(1));
diff --git a/test/export-all/fixtures/all.esm.es5.js b/test/export-all/fixtures/all.esm.es5.js
@@ -0,0 +1 @@
+var export1=1;var export2=function(){return 2};export{export1,export2};
diff --git a/test/export-default/fixtures/array.esm.es5.js b/test/export-default/fixtures/array.esm.es5.js
@@ -0,0 +1 @@
+export default [];
diff --git a/test/export-default/fixtures/class.esm.es5.js b/test/export-default/fixtures/class.esm.es5.js
@@ -0,0 +1 @@
+function a(b){this.name_=b}a.prototype.console=function(){console.log(this.name_)};export default a;
diff --git a/test/export-default/fixtures/function.esm.es5.js b/test/export-default/fixtures/function.esm.es5.js
@@ -0,0 +1 @@
+export default function(a){console.log(a);console.log(1)};
diff --git a/test/export-default/fixtures/identifier.esm.es5.js b/test/export-default/fixtures/identifier.esm.es5.js
@@ -0,0 +1 @@
+export default 1;
diff --git a/test/export-default/fixtures/named-class.esm.es5.js b/test/export-default/fixtures/named-class.esm.es5.js
@@ -0,0 +1 @@
+function a(b){this.name_=b}a.prototype.console=function(){console.log(this.name_)};export default a;
diff --git a/test/export-default/fixtures/named-function.esm.es5.js b/test/export-default/fixtures/named-function.esm.es5.js
@@ -0,0 +1 @@
+export default function(a){console.log(a);console.log(1)};
diff --git a/test/export-default/fixtures/number.esm.es5.js b/test/export-default/fixtures/number.esm.es5.js
@@ -0,0 +1 @@
+export default 42;
diff --git a/test/export-default/fixtures/object.esm.es5.js b/test/export-default/fixtures/object.esm.es5.js
@@ -0,0 +1 @@
+export default {key:"value"};
diff --git a/test/export-named/fixtures/identifier-alias.esm.es5.js b/test/export-named/fixtures/identifier-alias.esm.es5.js
@@ -0,0 +1 @@
+var a=1;export{a as bar};
diff --git a/test/export-named/fixtures/identifier-default.esm.es5.js b/test/export-named/fixtures/identifier-default.esm.es5.js
@@ -0,0 +1 @@
+export default 1;
diff --git a/test/export-named/fixtures/identifier.esm.es5.js b/test/export-named/fixtures/identifier.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;export{foo};
diff --git a/test/export-named/fixtures/multiple.esm.es5.js b/test/export-named/fixtures/multiple.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;var bar=function(){console.log(1)};export{foo,bar};
diff --git a/test/export-transpilation/fixtures/named-constant.esm.advanced.js b/test/export-transpilation/fixtures/named-constant.esm.advanced.js
@@ -0,0 +1 @@
+var b=Symbol.for("smth");var isSmth=(a)=>a&&!!a[b];export{isSmth};
diff --git a/test/export-transpilation/fixtures/named-constant.esm.default.js b/test/export-transpilation/fixtures/named-constant.esm.default.js
@@ -0,0 +1 @@
+var b=Symbol.for("smth");var isSmth=(a)=>a&&!!a[b];export{isSmth};
diff --git a/test/export-transpilation/fixtures/named-constant.esm.es5.js b/test/export-transpilation/fixtures/named-constant.esm.es5.js
diff --git a/test/export-transpilation/fixtures/named-constant.js b/test/export-transpilation/fixtures/named-constant.js
@@ -0,0 +1,7 @@
+var SMTH = Symbol.for('smth');
+
+const isSmth = (smth) => {
+  return smth && !!smth[SMTH]
+};
+
+export { isSmth };
diff --git a/test/export-transpilation/fixtures/named-function.esm.advanced.js b/test/export-transpilation/fixtures/named-function.esm.advanced.js
@@ -0,0 +1 @@
+var b=Symbol.for("smth");var isSmth=function(a){return a&&!!a[b]};export{isSmth};
diff --git a/test/export-transpilation/fixtures/named-function.esm.default.js b/test/export-transpilation/fixtures/named-function.esm.default.js
@@ -0,0 +1 @@
+var b=Symbol.for("smth");var isSmth=function(a){return a&&!!a[b]};export{isSmth};
diff --git a/test/export-transpilation/fixtures/named-function.esm.es5.js b/test/export-transpilation/fixtures/named-function.esm.es5.js
@@ -0,0 +1 @@
+var b=Symbol.for("smth");var isSmth=function(a){return a&&!!a[b]};export{isSmth};
diff --git a/test/export-transpilation/fixtures/named-function.js b/test/export-transpilation/fixtures/named-function.js
@@ -0,0 +1,7 @@
+var SMTH = Symbol.for('smth');
+
+function isSmth(smth) {
+  return smth && !!smth[SMTH]
+}
+
+export { isSmth };
diff --git a/test/export-transpilation/named-constant.js b/test/export-transpilation/named-constant.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {generator} from '../generator';
+
+generator('export-transpilation', 'named-constant');
diff --git a/test/export-transpilation/named-function.js b/test/export-transpilation/named-function.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {generator} from '../generator';
+
+generator('export-transpilation', 'named-function');
diff --git a/test/export-variables/fixtures/class.esm.es5.js b/test/export-variables/fixtures/class.esm.es5.js
@@ -0,0 +1 @@
+function a(b){this.name_=b}a.prototype.console=function(){console.log(this.name_)};var Exported=a;export{Exported};
diff --git a/test/export-variables/fixtures/const-function.esm.es5.js b/test/export-variables/fixtures/const-function.esm.es5.js
@@ -0,0 +1 @@
+var foo=function(a){console.log(a)};export{foo};
diff --git a/test/export-variables/fixtures/const-number.esm.es5.js b/test/export-variables/fixtures/const-number.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;export{foo};
diff --git a/test/export-variables/fixtures/function.esm.es5.js b/test/export-variables/fixtures/function.esm.es5.js
@@ -0,0 +1 @@
+var foo=function(a){console.log(a)};export{foo};
diff --git a/test/export-variables/fixtures/let-function.esm.es5.js b/test/export-variables/fixtures/let-function.esm.es5.js
@@ -0,0 +1 @@
+var foo=function(a){console.log(a)};export{foo};
diff --git a/test/export-variables/fixtures/let-identifier.esm.es5.js b/test/export-variables/fixtures/let-identifier.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;export{foo};
diff --git a/test/export-variables/fixtures/let-number.esm.es5.js b/test/export-variables/fixtures/let-number.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;export{foo};
diff --git a/test/export-variables/fixtures/var-function.esm.es5.js b/test/export-variables/fixtures/var-function.esm.es5.js
@@ -0,0 +1 @@
+var foo=function(a){console.log(a)};export{foo};
diff --git a/test/export-variables/fixtures/var-identifier.esm.es5.js b/test/export-variables/fixtures/var-identifier.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;export{foo};
diff --git a/test/export-variables/fixtures/var-number.esm.es5.js b/test/export-variables/fixtures/var-number.esm.es5.js
@@ -0,0 +1 @@
+var foo=1;export{foo};
diff --git a/test/generator.js b/test/generator.js
@@ -30,9 +30,15 @@ const ADVANCED_CLOSURE_OPTIONS = {
     language_out: 'ECMASCRIPT_2015',
   },
 };
+const ES5_STRICT_CLOSURE_OPTIONS = { 
+  es5: {
+    language_out: 'ECMASCRIPT5_STRICT',
+  },
+};
 const defaultClosureFlags = {
   ...DEFAULT_CLOSURE_OPTIONS,
   ...ADVANCED_CLOSURE_OPTIONS,
+  ...ES5_STRICT_CLOSURE_OPTIONS,
 };
 
 const ES_OUTPUT = 'es';
diff --git a/test/iife/fixtures/iife.es5.minified.js b/test/iife/fixtures/iife.es5.minified.js
@@ -0,0 +1 @@
+'use strict';var wrapper=function(a){a.greeting=function(a){document.body.innerHTML="hello "+a};return a}({});
diff --git a/test/iife/iife-wrapped-safely.js b/test/iife/iife-wrapped-safely.js
@@ -31,6 +31,9 @@ const closureFlags = {
     compilation_level: 'ADVANCED_OPTIMIZATIONS',
     language_out: 'ECMASCRIPT_2015',
   },
+  es5: {
+    language_out: 'ECMASCRIPT5_STRICT',
+  }
 };
 
 test('generate extern for iife name', async t => {
diff --git a/test/import/fixtures/flattened.esm.es5.js b/test/import/fixtures/flattened.esm.es5.js
@@ -0,0 +1 @@
+var exported=function(a){console.log(a);console.log(1)};export{exported};
diff --git a/test/literal-computed-keys/fixtures/literal-computed.esm.es5.js b/test/literal-computed-keys/fixtures/literal-computed.esm.es5.js
@@ -0,0 +1 @@
+var a={};console.log((a[0]="value",a));
diff --git a/test/literal-computed-keys/fixtures/mixed-keys.esm.es5.js b/test/literal-computed-keys/fixtures/mixed-keys.esm.es5.js
@@ -0,0 +1 @@
+var a={};console.log((a["0"]="value",a[1]="value",a[2]="value2",a[3]="value3",a[4]=function(b){console.log(b)},a[5]=function(b){console.log(b)},a));
diff --git a/test/provided-externs/class.js b/test/provided-externs/class.js
@@ -21,11 +21,15 @@ const EXTERNS = path.resolve('test', 'provided-externs', 'fixtures', 'class.exte
 
 generator('provided-externs', 'class', [ESM_OUTPUT], {
   default: {
-    externs: EXTERNS
+    externs: EXTERNS,
   },
   advanced: {
     externs: EXTERNS,
     compilation_level: 'ADVANCED_OPTIMIZATIONS',
     language_out: 'ECMASCRIPT_2015',
+  },
+  es5: {
+    externs: EXTERNS,
+    language_out: 'ECMASCRIPT5_STRICT',
   }
 });
diff --git a/test/provided-externs/fixtures/class.esm.advanced.js b/test/provided-externs/fixtures/class.esm.advanced.js
@@ -1 +1 @@
-class a{constructor(b){this.a=b}console(){console.log(this.a)}}var Exported=a;export{Exported};
+class a{constructor(b){this.a=b}console(){console.log(this.a)}}var ExportThis=a;export{ExportThis};
diff --git a/test/provided-externs/fixtures/class.esm.default.js b/test/provided-externs/fixtures/class.esm.default.js
@@ -1 +1 @@
-class a{constructor(b){this.name_=b}console(){console.log(this.name_)}}var Exported=a;export{Exported};
+class a{constructor(b){this.name_=b}console(){console.log(this.name_)}}var ExportThis=a;export{ExportThis};
diff --git a/test/provided-externs/fixtures/class.esm.es5.js b/test/provided-externs/fixtures/class.esm.es5.js
@@ -0,0 +1 @@
+function a(b){this.name_=b}a.prototype.console=function(){console.log(this.name_)};var ExportThis=a;export{ExportThis};
diff --git a/test/provided-externs/fixtures/class.js b/test/provided-externs/fixtures/class.js
@@ -1,4 +1,7 @@
-export class Exported {
+/**
+ * @implements {Exported}
+ */
+export class ExportThis {
   /** 
    * @param {!string} name 
    */

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ export interface ExportNameToClosureMapping {`
`58`	`58`	`[key: string]: {`
`59`	`59`	`alias: string \| null;`
`60`	`60`	`type: ExportClosureMapping;`
	`61`	`+ range: [number, number];`
`61`	`62`	`};`
`62`	`63`	`}`
`63`	`64`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+console.log(document.getElementById(1));`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+var export1=1;var export2=function(){return 2};export{export1,export2};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+function a(b){this.name_=b}a.prototype.console=function(){console.log(this.name_)};export default a;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export default function(a){console.log(a);console.log(1)};`