v2.8.0

Add --indent option to change indent width

CHANGELOG.md

@@ -11,6 +11,18 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 2.8.0
+
+ * **New Feature**
+  * Add `commonStrict`, `amdStrict` and `umdStrict` module formatters that remove `module.exports` interop assignment.
+  * Add `--indent` option to the 6to5 CLI.
+
+## 2.7.4
+
+ * **Polish**
+  * Inherit assignments from their declaration in destructuring.
+  * Properly align multi-declarator variable declarations.
+
 ## 2.7.3
 
  * **Polish**

NOTES.md

@@ -1,8 +1,9 @@
 # Notes
 
- * Wildcard exports/imports wont normalise if `export default` is a non-object.
+ * Wildcard exports/imports wont normalise if `export default` is a non-object. See [#224](https://github.com/6to5/6to5/issues/224).
 
 ## 3.0.0 breaking changes
 
  * Remove `allowImportExportEverywhere` option from acorn.
  * Remove this shorthand from playground.
+ * Remove `super()` inside non-constructors - add descriptive error message.

bin/6to5/index.js

@@ -21,6 +21,7 @@ commander.option("-i, --optional [list]", "List of optional transformers to enab
 commander.option("-o, --out-file [out]", "Compile all input files into a single file");
 commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory");
 commander.option("-c, --remove-comments", "Remove comments from the compiled code", false);
+commander.option("-I, --indent [width]", "Indent width [2]", 2);
 commander.option("-a, --amd-module-ids", "Insert module id in AMD modules", false); // todo: remove in 3.0.0
 commander.option("-m, --module-ids", "Insert module id in modules", false);
 
@@ -108,7 +109,12 @@ exports.opts = {
   optional:      commander.optional,
   comments:      !commander.removeComments,
   runtime:       commander.runtime,
-  modules:       commander.modules
+  modules:       commander.modules,
+  format: {
+    indent: {
+      style:     util.repeat(parseInt(commander.indent))
+    }
+  }
 };
 
 var fn;

lib/6to5/generation/generators/expressions.js

@@ -62,7 +62,7 @@ exports.CallExpression = function (node, print) {
 
   var separator = ",";
 
-  if (node._prettyPrint) {
+  if (node._prettyCall) {
     separator += "\n";
     this.newline();
     this.indent();
@@ -74,7 +74,7 @@ exports.CallExpression = function (node, print) {
     separator: separator
   });
 
-  if (node._prettyPrint) {
+  if (node._prettyCall) {
     this.newline();
     this.dedent();
   }

lib/6to5/generation/generators/statements.js

@@ -1,4 +1,5 @@
-var t = require("../../types");
+var util = require("../../util");
+var t    = require("../../types");
 
 exports.WithStatement = function (node, print) {
   this.keyword("with");
@@ -157,7 +158,24 @@ exports.DebuggerStatement = function () {
 exports.VariableDeclaration = function (node, print, parent) {
   this.push(node.kind + " ");
 
-  print.join(node.declarations, { separator: ", " });
+  var inits = 0;
+  var noInits = 0;
+  for (var i in node.declarations) {
+    if (node.declarations[i].init) {
+      inits++;
+    } else {
+      noInits++;
+    }
+  }
+
+  var sep = ",";
+  if (inits > noInits) { // more inits than noinits
+    sep += "\n" + util.repeat(node.kind.length + 1);
+  } else {
+    sep += " ";
+  }
+
+  print.join(node.declarations, { separator: sep });
 
   if (!t.isFor(parent)) {
     this.semicolon();

lib/6to5/transformation/modules/_strict.js

@@ -0,0 +1,12 @@
+var util = require("../../util");
+
+module.exports = function (Parent) {
+  var Constructor = function () {
+    this.noInteropExport = true;
+    Parent.apply(this, arguments);
+  };
+
+  util.inherits(Constructor, Parent);
+
+  return Constructor;
+};

lib/6to5/transformation/modules/amd-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./amd"));

lib/6to5/transformation/modules/amd.js

@@ -7,8 +7,8 @@ var t                = require("../../types");
 var _                = require("lodash");
 
 function AMDFormatter() {
-  DefaultFormatter.apply(this, arguments);
-  this.ids  = {};
+  CommonFormatter.apply(this, arguments);
+  this.ids = {};
 }
 
 util.inherits(AMDFormatter, DefaultFormatter);
@@ -101,7 +101,7 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
 };
 
 AMDFormatter.prototype.exportDeclaration = function (node) {
-  if (node.default) {
+  if (node.default && !this.noInteropExport) {
     this.passModuleArg = true;
   }
 

lib/6to5/transformation/modules/common-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./common"));

lib/6to5/transformation/modules/common.js

@@ -61,7 +61,7 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
 };
 
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
-  if (node.default && !this.exportIdentifier) {
+  if (node.default && !this.noInteropRequire && !this.noInteropExport) {
     var declar = node.declaration;
     var assign;
 

lib/6to5/transformation/modules/umd-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./umd"));

lib/6to5/transformation/modules/umd.js

@@ -38,10 +38,9 @@ UMDFormatter.prototype.transform = function (ast) {
   defineArgs = defineArgs.concat(names);
   defineArgs = [t.arrayExpression(defineArgs)];
 
-  // typeof exports !== "undefined" && typeof module !== "undefined"
-  var testExports = t.binaryExpression("!==", t.unaryExpression("typeof", t.identifier("exports"), true), t.literal("undefined")),
-      testModule = t.binaryExpression("!==", t.unaryExpression("typeof", t.identifier("module"), true), t.literal("undefined")),
-      commonTests = this.passModuleArg ? t.logicalExpression("&&", testExports, testModule) : testExports;
+  var testExports = util.template("test-exports");
+  var testModule = util.template("test-module");
+  var commonTests = this.passModuleArg ? t.logicalExpression("&&", testExports, testModule) : testExports;
 
   var commonArgs = [t.identifier("exports")];
   if (this.passModuleArg) commonArgs.push(t.identifier("module"));

lib/6to5/transformation/templates/test-exports.js

@@ -0,0 +1 @@
+typeof exports !== "undefined"

lib/6to5/transformation/templates/test-module.js

@@ -0,0 +1 @@
+typeof module !== "undefined"

lib/6to5/transformation/transform.js

@@ -31,11 +31,14 @@ transform._ensureTransformerNames = function (type, keys) {
 transform.transformers = {};
 
 transform.moduleFormatters = {
-  common: require("./modules/common"),
-  system: require("./modules/system"),
-  ignore: require("./modules/ignore"),
-  amd:    require("./modules/amd"),
-  umd:    require("./modules/umd")
+  commonStrict: require("./modules/common-strict"),
+  umdStrict:    require("./modules/umd-strict"),
+  amdStrict:    require("./modules/amd-strict"),
+  common:       require("./modules/common"),
+  system:       require("./modules/system"),
+  ignore:       require("./modules/ignore"),
+  amd:          require("./modules/amd"),
+  umd:          require("./modules/umd")
 };
 
 _.each({

lib/6to5/transformation/transformers/es6-destructuring.js

@@ -300,10 +300,17 @@ exports.VariableDeclaration = function (node, parent, file, scope) {
       file:    file,
       scope:   scope
     };
+
     if (t.isPattern(pattern) && patternId) {
       pushPattern(opts);
+
+      if (+i !== node.declarations.length - 1) {
+        // we aren't the last declarator so let's just make the
+        // last transformed node inherit from us
+        t.inherits(nodes[nodes.length - 1], declar);
+      }
     } else {
-      nodes.push(buildVariableAssign(opts, declar.id, declar.init));
+      nodes.push(t.inherits(buildVariableAssign(opts, declar.id, declar.init), declar));
     }
   }
 

lib/6to5/transformation/transformers/react.js

@@ -166,7 +166,7 @@ exports.XJSElement = {
     }
 
     if (callExpr.arguments.length >= 3) {
-      callExpr._prettyPrint = true;
+      callExpr._prettyCall = true;
     }
 
     return t.inherits(callExpr, node);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.7.3",
+  "version": "2.8.0",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {

test/fixtures/generation/comments/computed-property-comments-2/expected.js

@@ -7,4 +7,5 @@ var test = {
     * Inside bracket init
     */
   "b"]: "2"
-}, ok = 42;
+},
+    ok = 42;

test/fixtures/generation/comments/variable-declarator-line-comment/expected.js

@@ -3,6 +3,7 @@ function test() {
   // Leading to VariableDeclarator
   // Leading to VariableDeclarator
   i = 20,
+
   // Leading to VariableDeclarator
   // Leading to VariableDeclarator
   j = 20;

test/fixtures/generation/comments/variable-declarator-multi-comment/expected.js

@@ -5,6 +5,7 @@ function test() {
    * Leading to VariableDeclarator
    */
   i = 20,
+
   /*
    * Leading to VariableDeclarator
    * Leading to VariableDeclarator

test/fixtures/generation/harmony-edgecase/yield-precedence/expected.js

@@ -1,5 +1,6 @@
 function* foo() {
-  var a = yield wat(), b = 2;
+  var a = yield wat(),
+      b = 2;
   var c = yield a = b;
   yield a, yield b;
   yield a = b;

test/fixtures/generation/types/VariableDeclaration-VariableDeclarator/expected.js

@@ -8,6 +8,9 @@ const foo = "foo";
 let foo, bar = "bar";
 var foo, bar = "bar";
 
-let foo = "foo", bar = "bar";
-var foo = "foo", bar = "bar";
-const foo = "foo", bar = "bar";
+let foo = "foo",
+    bar = "bar";
+var foo = "foo",
+    bar = "bar";
+const foo = "foo",
+      bar = "bar";

test/fixtures/transformation/es6-destructuring/multiple/actual.js

@@ -1 +1,2 @@
-var { x, y } = coords, foo = "bar";
+var { x, y } = coords,
+    foo = "bar";

test/fixtures/transformation/es6-modules-amd-strict/exports-default/actual.js

@@ -0,0 +1,8 @@
+export default 42;
+export default {};
+export default [];
+export default foo;
+export default function () {}
+export default class {}
+export default function foo () {}
+export default class Foo {}

test/fixtures/transformation/es6-modules-amd-strict/exports-default/expected.js

@@ -0,0 +1,17 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  exports["default"] = foo;
+  exports["default"] = 42;
+  exports["default"] = {};
+  exports["default"] = [];
+  exports["default"] = foo;
+  exports["default"] = function () {};
+
+  exports["default"] = function () {};
+
+  function foo() {}
+  var Foo = function Foo() {};
+
+  exports["default"] = Foo;
+});

test/fixtures/transformation/es6-modules-amd-strict/exports-from/actual.js

@@ -0,0 +1,6 @@
+export * from "foo";
+export {foo} from "foo";
+export {foo, bar} from "foo";
+export {foo as bar} from "foo";
+export {foo as default} from "foo";
+export {foo as default, bar} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/exports-from/expected.js

@@ -0,0 +1,27 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var _interopRequireWildcard = function (obj) {
+    return obj && obj.constructor === Object ? obj : {
+      "default": obj
+    };
+  };
+
+  var _exportsWildcard = function (obj) {
+    for (var i in obj) {
+      if (exports[i] !== undefined) {
+        exports[i] = obj[i];
+      }
+    }
+  };
+
+  _exportsWildcard(_interopRequireWildcard(_foo));
+
+  exports.foo = _foo.foo;
+  exports.foo = _foo.foo;
+  exports.bar = _foo.bar;
+  exports.bar = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports.bar = _foo.bar;
+});

test/fixtures/transformation/es6-modules-amd-strict/exports-named/actual.js

@@ -0,0 +1,5 @@
+export {foo};
+export {foo, bar};
+export {foo as bar};
+export {foo as default};
+export {foo as default, bar};

test/fixtures/transformation/es6-modules-amd-strict/exports-named/expected.js

@@ -0,0 +1,11 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  exports.foo = foo;
+  exports.foo = foo;
+  exports.bar = bar;
+  exports.bar = foo;
+  exports["default"] = foo;
+  exports["default"] = foo;
+  exports.bar = bar;
+});

test/fixtures/transformation/es6-modules-amd-strict/exports-variable/actual.js

@@ -0,0 +1,9 @@
+export var foo = 1;
+export var foo = 1, bar = 2;
+export var foo2 = function () {};
+export var foo3;
+export let foo4 = 2;
+export let foo5;
+export const foo6 = 3;
+export function foo7 () {}
+export class foo8 {}

test/fixtures/transformation/es6-modules-amd-strict/exports-variable/expected.js

@@ -0,0 +1,17 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  exports.foo7 = foo7;
+  var foo = exports.foo = 1;
+  var foo = exports.foo = 1;
+  var bar = exports.bar = 2;
+  var foo2 = exports.foo2 = function () {};
+  var foo3 = exports.foo3 = undefined;
+  var foo4 = exports.foo4 = 2;
+  var foo5 = exports.foo5 = undefined;
+  var foo6 = exports.foo6 = 3;
+  function foo7() {}
+  var foo8 = function foo8() {};
+
+  exports.foo8 = foo8;
+});

test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/actual.js

@@ -0,0 +1,11 @@
+import { isEven } from "./evens";
+
+export function nextOdd(n) {
+  return isEven(n) ? n + 1 : n + 2;
+}
+
+export var isOdd = (function (isEven) {
+  return function (n) {
+    return !isEven(n);
+  };
+})(isEven);

test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/expected.js

@@ -0,0 +1,15 @@
+define(["exports", "./evens"], function (exports, _evens) {
+  "use strict";
+
+  exports.nextOdd = nextOdd;
+  var isEven = _evens.isEven;
+  function nextOdd(n) {
+    return isEven(n) ? n + 1 : n + 2;
+  }
+
+  var isOdd = exports.isOdd = (function (isEven) {
+    return function (n) {
+      return !isEven(n);
+    };
+  })(isEven);
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-default/actual.js

@@ -0,0 +1,2 @@
+import foo from "foo";
+import {default as foo2} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-default/expected.js

@@ -0,0 +1,11 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
+  var foo = _interopRequire(_foo);
+
+  var foo2 = _interopRequire(_foo);
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-glob/actual.js

@@ -0,0 +1 @@
+import * as foo from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-glob/expected.js

@@ -0,0 +1,5 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var foo = _foo;
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/actual.js

@@ -0,0 +1 @@
+import foo, {baz as xyz} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/expected.js

@@ -0,0 +1,11 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
+  var foo = _interopRequire(_foo);
+
+  var xyz = _foo.baz;
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-named/actual.js

@@ -0,0 +1,4 @@
+import {bar} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-named/expected.js

@@ -0,0 +1,10 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var bar = _foo.bar;
+  var bar2 = _foo.bar2;
+  var baz = _foo.baz;
+  var baz2 = _foo.bar;
+  var baz3 = _foo.bar;
+  var xyz = _foo.xyz;
+});

test/fixtures/transformation/es6-modules-amd-strict/imports/actual.js

@@ -0,0 +1,3 @@
+import "foo";
+import "foo-bar";
+import "./directory/foo-bar";

test/fixtures/transformation/es6-modules-amd-strict/imports/expected.js

@@ -0,0 +1,3 @@
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+});

test/fixtures/transformation/es6-modules-amd-strict/module-name/actual.js

@@ -0,0 +1 @@
+foobar();

test/fixtures/transformation/es6-modules-amd-strict/module-name/expected.js

@@ -0,0 +1,5 @@
+define("es6-modules-amd-strict/module-name/expected", ["exports"], function (exports) {
+  "use strict";
+
+  foobar();
+});

test/fixtures/transformation/es6-modules-amd-strict/module-name/options.json

@@ -0,0 +1,3 @@
+{
+  "amdModuleIds": true
+}

test/fixtures/transformation/es6-modules-amd-strict/options.json

@@ -0,0 +1,3 @@
+{
+  "modules": "amdStrict"
+}

test/fixtures/transformation/es6-modules-amd-strict/overview/actual.js

@@ -0,0 +1,12 @@
+import "foo";
+import "foo-bar";
+import "./directory/foo-bar";
+import foo from "foo";
+import * as foo2 from "foo";
+import {bar} from "foo";
+import {foo as bar2} from "foo";
+
+export {test};
+export var test2 = 5;
+
+export default test;

test/fixtures/transformation/es6-modules-amd-strict/overview/expected.js

@@ -0,0 +1,17 @@
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
+  var foo = _interopRequire(_foo);
+
+  var foo2 = _foo;
+  var bar = _foo.bar;
+  var bar2 = _foo.foo;
+  exports.test = test;
+  var test2 = exports.test2 = 5;
+
+  exports["default"] = test;
+});

test/fixtures/transformation/es6-modules-amd-strict/remap/actual.js

@@ -0,0 +1,9 @@
+export var test = 2;
+test = 5;
+test++;
+
+(function () {
+  var test = 2;
+  test = 3;
+  test++;
+})();

test/fixtures/transformation/es6-modules-amd-strict/remap/expected.js

@@ -0,0 +1,13 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  var test = exports.test = 2;
+  test = exports.test = 5;
+  test = exports.test += 1;
+
+  (function () {
+    var test = 2;
+    test = 3;
+    test++;
+  })();
+});

test/fixtures/transformation/es6-modules-amd/overview/expected.js

@@ -1,6 +1,17 @@
 define(["exports", "module", "foo", "foo-bar", "./directory/foo-bar"], function (exports, module, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
+  var _extends = function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        target[key] = source[key];
+      }
+    }
+
+    return target;
+  };
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
@@ -13,5 +24,6 @@ define(["exports", "module", "foo", "foo-bar", "./directory/foo-bar"], function
   exports.test = test;
   var test2 = exports.test2 = 5;
 
-  module.exports = test;
+  exports["default"] = test;
+  module.exports = _extends(exports["default"], exports);
 });

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+var foo;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+foo.bar = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/actual.js

@@ -0,0 +1,2 @@
+import * as foo from "foo";
+foo = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/actual.js

@@ -0,0 +1,2 @@
+import * as foo from "foo";
+var foo;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/actual.js

@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+var bar;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/actual.js

@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+bar = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+import { foo } from "bar";

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/actual.js

@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+import { foo as bar } from "bar";

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+foo = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/actual.js

@@ -0,0 +1,3 @@
+export default new Cachier()
+
+export function Cachier(databaseName) {}

test/fixtures/transformation/es6-modules-common-strict/exports-default-non-function/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+exports.Cachier = Cachier;
+exports["default"] = new Cachier();
+function Cachier(databaseName) {}

test/fixtures/transformation/es6-modules-common-strict/exports-default/actual.js

@@ -0,0 +1,8 @@
+export default 42;
+export default {};
+export default [];
+export default foo;
+export default function () {}
+export default class {}
+export default function foo () {}
+export default class Foo {}

test/fixtures/transformation/es6-modules-common-strict/exports-default/expected.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports["default"] = foo;
+exports["default"] = 42;
+exports["default"] = {};
+exports["default"] = [];
+exports["default"] = foo;
+exports["default"] = function () {};
+
+exports["default"] = function () {};
+
+function foo() {}
+var Foo = function Foo() {};
+
+exports["default"] = Foo;

test/fixtures/transformation/es6-modules-common-strict/exports-from/actual.js

@@ -0,0 +1,6 @@
+export * from "foo";
+export {foo} from "foo";
+export {foo, bar} from "foo";
+export {foo as bar} from "foo";
+export {foo as default} from "foo";
+export {foo as default, bar} from "foo";

test/fixtures/transformation/es6-modules-common-strict/exports-from/expected.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireWildcard = function (obj) {
+  return obj && obj.constructor === Object ? obj : {
+    "default": obj
+  };
+};
+
+var _exportsWildcard = function (obj) {
+  for (var i in obj) {
+    if (exports[i] !== undefined) {
+      exports[i] = obj[i];
+    }
+  }
+};
+
+_exportsWildcard(_interopRequireWildcard(require("foo")));
+
+exports.foo = require("foo").foo;
+exports.foo = require("foo").foo;
+exports.bar = require("foo").bar;
+exports.bar = require("foo").foo;
+exports["default"] = require("foo").foo;
+exports["default"] = require("foo").foo;
+exports.bar = require("foo").bar;

test/fixtures/transformation/es6-modules-common-strict/exports-named/actual.js

@@ -0,0 +1,5 @@
+export {foo};
+export {foo, bar};
+export {foo as bar};
+export {foo as default};
+export {foo as default, bar};

test/fixtures/transformation/es6-modules-common-strict/exports-named/expected.js

@@ -0,0 +1,9 @@
+"use strict";
+
+exports.foo = foo;
+exports.foo = foo;
+exports.bar = bar;
+exports.bar = foo;
+exports["default"] = foo;
+exports["default"] = foo;
+exports.bar = bar;

test/fixtures/transformation/es6-modules-common-strict/exports-variable/actual.js

@@ -0,0 +1,9 @@
+export var foo = 1;
+export var foo = 1, bar = 2;
+export var foo2 = function () {};
+export var foo3;
+export let foo4 = 2;
+export let foo5;
+export const foo6 = 3;
+export function foo7 () {}
+export class foo8 {}

test/fixtures/transformation/es6-modules-common-strict/exports-variable/expected.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports.foo7 = foo7;
+var foo = exports.foo = 1;
+var foo = exports.foo = 1;
+var bar = exports.bar = 2;
+var foo2 = exports.foo2 = function () {};
+var foo3 = exports.foo3 = undefined;
+var foo4 = exports.foo4 = 2;
+var foo5 = exports.foo5 = undefined;
+var foo6 = exports.foo6 = 3;
+function foo7() {}
+var foo8 = function foo8() {};
+
+exports.foo8 = foo8;

test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/actual.js

@@ -0,0 +1,11 @@
+import { isEven } from "./evens";
+
+export function nextOdd(n) {
+  return isEven(n) ? n + 1 : n + 2;
+}
+
+export var isOdd = (function (isEven) {
+  return function (n) {
+    return !isEven(n);
+  };
+})(isEven);

test/fixtures/transformation/es6-modules-common-strict/hoist-function-exports/expected.js

@@ -0,0 +1,13 @@
+"use strict";
+
+exports.nextOdd = nextOdd;
+var isEven = require("./evens").isEven;
+function nextOdd(n) {
+  return isEven(n) ? n + 1 : n + 2;
+}
+
+var isOdd = exports.isOdd = (function (isEven) {
+  return function (n) {
+    return !isEven(n);
+  };
+})(isEven);

test/fixtures/transformation/es6-modules-common-strict/imports-default/actual.js

@@ -0,0 +1,2 @@
+import foo from "foo";
+import {default as foo2} from "foo";

test/fixtures/transformation/es6-modules-common-strict/imports-default/expected.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var _interopRequire = function (obj) {
+  return obj && (obj["default"] || obj);
+};
+
+var foo = _interopRequire(require("foo"));
+
+var foo2 = _interopRequire(require("foo"));

test/fixtures/transformation/es6-modules-common-strict/imports-glob/actual.js

@@ -0,0 +1 @@
+import * as foo from "foo";

test/fixtures/transformation/es6-modules-common-strict/imports-glob/expected.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var _interopRequireWildcard = function (obj) {
+  return obj && obj.constructor === Object ? obj : {
+    "default": obj
+  };
+};
+
+var foo = _interopRequireWildcard(require("foo"));

test/fixtures/transformation/es6-modules-common-strict/imports-mixing/actual.js

@@ -0,0 +1 @@
+import foo, {baz as xyz} from "foo";

test/fixtures/transformation/es6-modules-common-strict/imports-mixing/expected.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var _interopRequire = function (obj) {
+  return obj && (obj["default"] || obj);
+};
+
+var foo = _interopRequire(require("foo"));
+
+var xyz = require("foo").baz;

test/fixtures/transformation/es6-modules-common-strict/imports-named/actual.js

@@ -0,0 +1,4 @@
+import {bar} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";

test/fixtures/transformation/es6-modules-common-strict/imports-named/expected.js

@@ -0,0 +1,8 @@
+"use strict";
+
+var bar = require("foo").bar;
+var bar2 = require("foo").bar2;
+var baz = require("foo").baz;
+var baz2 = require("foo").bar;
+var baz3 = require("foo").bar;
+var xyz = require("foo").xyz;

test/fixtures/transformation/es6-modules-common-strict/imports/actual.js

@@ -0,0 +1,3 @@
+import "foo";
+import "foo-bar";
+import "./directory/foo-bar";

test/fixtures/transformation/es6-modules-common-strict/imports/expected.js

@@ -0,0 +1,7 @@
+"use strict";
+
+require("foo");
+
+require("foo-bar");
+
+require("./directory/foo-bar");

test/fixtures/transformation/es6-modules-common-strict/options.json

@@ -0,0 +1,3 @@
+{
+  "modules": "commonStrict"
+}

test/fixtures/transformation/es6-modules-common-strict/overview/actual.js

@@ -0,0 +1,10 @@
+import "foo";
+import "foo-bar";
+import "./directory/foo-bar";
+import foo from "foo";
+import * as foo2 from "foo";
+import {bar} from "foo";
+import {foo as bar2} from "foo";
+
+export {test};
+export var test = 5;

test/fixtures/transformation/es6-modules-common-strict/overview/expected.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireWildcard = function (obj) {
+  return obj && obj.constructor === Object ? obj : {
+    "default": obj
+  };
+};
+
+var _interopRequire = function (obj) {
+  return obj && (obj["default"] || obj);
+};
+
+require("foo");
+
+require("foo-bar");
+
+require("./directory/foo-bar");
+
+var foo = _interopRequire(require("foo"));
+
+var foo2 = _interopRequireWildcard(require("foo"));
+
+var bar = require("foo").bar;
+var bar2 = require("foo").foo;
+exports.test = test;
+var test = exports.test = 5;

test/fixtures/transformation/es6-modules-common-strict/remap/actual.js

@@ -0,0 +1,9 @@
+export var test = 2;
+test = 5;
+test++;
+
+(function () {
+  var test = 2;
+  test = 3;
+  test++;
+})();

test/fixtures/transformation/es6-modules-common-strict/remap/expected.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var test = exports.test = 2;
+test = exports.test = 5;
+test = exports.test += 1;
+
+(function () {
+  var test = 2;
+  test = 3;
+  test++;
+})();

test/fixtures/transformation/es6-modules-ignore/exports-variable/expected.js

@@ -1,7 +1,8 @@
 "use strict";
 
 var foo = 1;
-var foo = 1, bar = 2;
+var foo = 1,
+    bar = 2;
 var foo2 = function () {};
 var foo3 = undefined;
 var foo4 = 2;