v1.11.15

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.11.15
+
+ * Fix JSX literal whitespace generation.
+
+# 1.11.14
+
+ * Avoid using a switch for let-scoping continue and break statements and use an if statement instead.
+ * Remove excess whitespace and newlines from JSX literals.
+
 # 1.11.13
 
  * Update regenerator-6to5

lib/6to5/file.js

@@ -146,7 +146,7 @@ File.prototype.generate = function () {
 
   if (this.shebang) {
     // add back shebang
-    result.code = this.shebang + result.code;
+    result.code = this.shebang + "\n" + result.code;
   }
 
   if (opts.sourceMap === "inline") {

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

@@ -46,15 +46,11 @@ exports.XJSElement = function (node, print) {
 
   this.indent();
   _.each(node.children, function (child) {
-    if (t.isLiteral(child) && typeof child.value === "string") {
-      if (/\S/.test(child.value)) {
-        return self.push(child.value.replace(/^\s+|\s+$/g, ""));
-      } else if (/\n/.test(child.value)) {
-        return self.newline();
-      }
+    if (t.isLiteral(child)) {
+      self.push(child.value);
+    } else {
+      print(child);
     }
-
-    print(child);
   });
   this.dedent();
 

lib/6to5/generation/node.js

@@ -80,6 +80,10 @@ Node.prototype.needsWhitespace = function (type) {
     if (t.isProperty(node) && parent.properties[0] === node) {
       return 1;
     }
+
+    if (t.isSwitchCase(node) && parent.cases[0] === node) {
+      return 1;
+    }
   }
 
   if (type === "after") {

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

@@ -80,7 +80,19 @@ exports.XJSElement = {
     var callExpr = node.openingElement;
     var children = node.children;
 
-    _.each(children, function (child) {
+    _.each(children, function (child, i) {
+      var val = child.value;
+      if (t.isLiteral(child) && _.isString(val)) {
+        val = val.replace(/\n(\s+)/g, " ");
+
+        i = +i;
+        if (i === 0) val = val.trimLeft();
+        if (i === children.length - 1) val = val.trimRight();
+
+        if (!val) return;
+        child.value = val;
+      }
+
       callExpr.arguments.push(child);
     });
 

lib/6to5/transformation/transformers/let-scoping.js

@@ -133,7 +133,7 @@ var checkFor = function (forParent, block) {
       } else if (t.isReturnStatement(node)) {
         has.hasReturn = true;
         replace = t.returnStatement(t.objectExpression([
-          t.property("init", t.identifier("v"), node.argument)
+          t.property("init", t.identifier("v"), node.argument || t.identifier("undefined"))
         ]));
       }
 
@@ -286,16 +286,13 @@ var run = function (forParent, block, parent, file, scope) {
 
     var retCheck;
 
+    var cases = [];
+
     if (has.hasReturn) {
       // typeof ret === "object"
       retCheck = util.template("let-scoping-return", {
         RETURN: ret,
       });
-
-      // there's no `break` or `continue` so we can just push in the `if`
-      if (!has.hasBreak && !has.hasContinue) {
-        body.push(retCheck);
-      }
     }
 
     if (has.hasBreak || has.hasContinue) {
@@ -303,8 +300,6 @@ var run = function (forParent, block, parent, file, scope) {
       // need to be able to access it
       var label = forParent.label = forParent.label || t.identifier(file.generateUid("loop", scope));
 
-      var cases = [];
-
       if (has.hasBreak) {
         cases.push(t.switchCase(t.literal("break"), [t.breakStatement(label)]));
       }
@@ -317,7 +312,17 @@ var run = function (forParent, block, parent, file, scope) {
         cases.push(t.switchCase(null, [retCheck]));
       }
 
-      body.push(t.switchStatement(ret, cases));
+      if (cases.length === 1) {
+        var single = cases[0];
+        body.push(t.ifStatement(
+          t.binaryExpression("===", ret, single.test),
+          single.consequent[0]
+        ));
+      } else {
+        body.push(t.switchStatement(ret, cases));
+      }
+    } else {
+      if (has.hasReturn) body.push(retCheck);
     }
   } else {
     body.push(t.expressionStatement(call));

lib/6to5/traverse/index.js

@@ -40,8 +40,6 @@ function traverse(parent, callbacks, opts) {
       // type is blacklisted
       if (_.contains(blacklistTypes, node.type)) return;
 
-      var result;
-
       // replace node
       var maybeReplace = function (result) {
         if (result === false) return;
@@ -54,12 +52,11 @@ function traverse(parent, callbacks, opts) {
 
       // enter
       if (callbacks.enter) {
-        result = callbacks.enter(node, parent, opts2.scope);
+        var result = callbacks.enter(node, parent, opts2.scope);
+        maybeReplace(result);
 
         // stop iteration
         if (result === false) return;
-
-        maybeReplace(result);
       }
 
       // traverse node
@@ -114,25 +111,18 @@ traverse.hasType = function (tree, type, blacklistTypes) {
 
   var has = false;
 
-  if (_.isArray(tree)) {
-    // array of nodes, find the first
-    return tree.some(function (node) {
-      return traverse.hasType(node, type, blacklistTypes);
-    });
-  } else {
-    // the node we're searching in is blacklisted
-    if (_.contains(blacklistTypes, tree.type)) return false;
+  // the node we're searching in is blacklisted
+  if (_.contains(blacklistTypes, tree.type)) return false;
 
-    // the type we're looking for is the same as the passed node
-    if (tree.type === type) return true;
+  // the type we're looking for is the same as the passed node
+  if (tree.type === type) return true;
 
-    traverse(tree, function (node) {
-      if (node.type === type) {
-        has = true;
-        return false;
-      }
-    }, { blacklist: blacklistTypes });
-  }
+  traverse(tree, function (node) {
+    if (node.type === type) {
+      has = true;
+      return false;
+    }
+  }, { blacklist: blacklistTypes });
 
   return has;
 };

package.json

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

test/fixtures/transformation/jsx/everything/expected.js

@@ -3,5 +3,5 @@
 X({
   "data-prop": x ? Y({
     prop: 2
-  }) : Z(null, "\n")
+  }) : Z(null)
 });

test/fixtures/transformation/jsx/tags-with-literals/expected.js

@@ -1,9 +1,9 @@
 "use strict";
 
-(X(null, "   "));
+(X(null));
 
-(X(null, "\n"));
+(X(null));
 
-(X(null, "\n  string\n"));
+(X(null, "string"));
 
-(X(null, "\n  string\n  string\n  "));
+(X(null, "string string"));

test/fixtures/transformation/let-scoping/for-break-continue-return/actual.js

@@ -0,0 +1,10 @@
+for (let i in nums) {
+  fns.push(function () { return i; });
+  if (i === 1) {
+    continue;
+  } else if (i === 2) {
+    break;
+  } else if (i === 3) {
+    return i;
+  }
+}

test/fixtures/transformation/let-scoping/for-break-continue-return/expected.js

@@ -0,0 +1,24 @@
+"use strict";
+
+_loop: for (var i in nums) {
+  var _ret = (function (i) {
+    fns.push(function () {
+      return i;
+    });
+    if (i === 1) {
+      return "continue";
+    } else if (i === 2) {
+      return "break";
+    } else if (i === 3) {
+      return {
+        v: i
+      };
+    }
+  })(i);
+
+  switch (_ret) {
+    case "break": break _loop;
+    case "continue": continue _loop;
+    default: if (typeof _ret === "object") return _ret.v;
+  }
+}

test/fixtures/transformation/let-scoping/for-break/actual.js

@@ -0,0 +1,4 @@
+for (let i in nums) {
+  fns.push(function () { return i; });
+  break;
+}

test/fixtures/transformation/let-scoping/for-break/expected.js

@@ -0,0 +1,12 @@
+"use strict";
+
+_loop: for (var i in nums) {
+  var _ret = (function (i) {
+    fns.push(function () {
+      return i;
+    });
+    return "break";
+  })(i);
+
+  if (_ret === "break") break _loop;
+}

test/fixtures/transformation/let-scoping/for-continue/actual.js

@@ -0,0 +1,4 @@
+for (let i in nums) {
+  fns.push(function () { return i; });
+  continue;
+}

test/fixtures/transformation/let-scoping/for-continue/expected.js

@@ -0,0 +1,12 @@
+"use strict";
+
+_loop: for (var i in nums) {
+  var _ret = (function (i) {
+    fns.push(function () {
+      return i;
+    });
+    return "continue";
+  })(i);
+
+  if (_ret === "continue") continue _loop;
+}

test/fixtures/transformation/let-scoping/for-return-undefined/actual.js

@@ -0,0 +1,4 @@
+for (let i in nums) {
+  fns.push(function () { return i; });
+  return;
+}

test/fixtures/transformation/let-scoping/for-return-undefined/expected.js

@@ -0,0 +1,14 @@
+"use strict";
+
+for (var i in nums) {
+  var _ret = (function (i) {
+    fns.push(function () {
+      return i;
+    });
+    return {
+      v: undefined
+    };
+  })(i);
+
+  if (typeof _ret === "object") return _ret.v;
+}

test/fixtures/transformation/let-scoping/for-return/actual.js

@@ -0,0 +1,4 @@
+for (let i in nums) {
+  fns.push(function () { return i; });
+  return i;
+}

test/fixtures/transformation/let-scoping/for-return/expected.js

@@ -0,0 +1,14 @@
+"use strict";
+
+for (var i in nums) {
+  var _ret = (function (i) {
+    fns.push(function () {
+      return i;
+    });
+    return {
+      v: i
+    };
+  })(i);
+
+  if (typeof _ret === "object") return _ret.v;
+}

test/fixtures/transformation/let-scoping/function/actual.js

@@ -0,0 +1,3 @@
+function test() {
+  let foo = "bar";
+}

test/fixtures/transformation/let-scoping/function/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+function test() {
+  var foo = "bar";
+}

test/fixtures/transformation/let-scoping/program/actual.js

@@ -0,0 +1 @@
+let test = "foo";

test/fixtures/transformation/let-scoping/program/expected.js

@@ -0,0 +1,3 @@
+"use strict";
+
+var test = "foo";

test/fixtures/transformation/misc/custom-runtime/actual.js

@@ -0,0 +1,3 @@
+function foo(...test) {
+
+}

test/fixtures/transformation/misc/custom-runtime/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+function foo() {
+  var test = customNamespace.slice.call(arguments);
+}

test/fixtures/transformation/misc/custom-runtime/options.json

@@ -0,0 +1,3 @@
+{
+  "runtime": "customNamespace"
+}

test/fixtures/transformation/misc/property-literals/actual.js

@@ -0,0 +1,3 @@
+var obj = {
+  "foobar": "lol"
+};

test/fixtures/transformation/misc/property-literals/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+var obj = {
+  foobar: "lol"
+};

test/fixtures/transformation/misc/runtime/actual.js

@@ -0,0 +1,3 @@
+function foo(...test) {
+
+}

test/fixtures/transformation/misc/runtime/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+function foo() {
+  var test = to5Runtime.slice.call(arguments);
+}

test/fixtures/transformation/misc/runtime/options.json

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

test/fixtures/transformation/misc/shebang/actual.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+foobar();

test/fixtures/transformation/misc/shebang/expected.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+"use strict";
+
+foobar();