v3.0.10

CHANGELOG.md

@@ -11,6 +11,17 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 3.0.10
+
+ * **Bug Fix**
+  * In `types.getIds` make sure the `declaration` inside of `ExportDeclaration` is actually a `Declaration`.
+
+## 3.0.9
+
+ * **Bug Fix**
+  * Make `t.isReferenced` more powerful, actually take into consideration all contexts were identifier nodes aren't actually references.
+  * Don't camelcase underscores when converting a string to a valid identifier.
+
 ## 3.0.8
 
  * **Bug Fix**

lib/6to5/transformation/transformers/internal/modules-split.js

@@ -1,5 +1,11 @@
 "use strict";
 
+// in this transformer we have to split up classes and function declarations
+// from their exports. why? because sometimes we need to replace classes with
+// nodes that aren't allowed in the same contexts. also, if you're exporting
+// a generator function as a default then regenerator will destroy the export
+// declaration and leave a variable declaration in it's place... yeah, handy.
+
 var t = require("../../../types");
 
 exports.ExportDeclaration = function (node, parent, scope) {

lib/6to5/types/index.js

@@ -226,7 +226,7 @@ t.prependToMemberExpression = function (member, append) {
 };
 
 /**
- * Description
+ * Check if the input `node` is a reference to a bound variable.
  *
  * @param {Object} node
  * @param {Object} parent
@@ -234,45 +234,94 @@ t.prependToMemberExpression = function (member, append) {
  */
 
 t.isReferenced = function (node, parent) {
-  // we're a property key and we aren't computed so we aren't referenced
-  if (t.isProperty(parent) && parent.key === node && !parent.computed) return false;
-
-  if (t.isFunction(parent)) {
-    // we're a function param
-    if (_.contains(parent.params, node)) return false;
-
-    for (var i = 0; i < parent.params.length; i++) {
-      var param = parent.params[i];
-      if (param === node) {
-        return false;
-      } else if (t.isRestElement(param) && param.argument === node) {
-        return false;
-      }
+  // yes: PARENT[NODE]
+  // yes: NODE.child
+  // no: parent.CHILD
+  if (t.isMemberExpression(parent)) {
+    if (parent.property === node && parent.computed) {
+      return true;
+    } else if (parent.object === node) {
+      return true;
+    } else {
+      return false;
     }
   }
 
-  if (t.isMethodDefinition(parent) && parent.key === node && !parent.computed) {
+  // yes: { [NODE]: "" }
+  if (t.isProperty(parent)) {
+    return parent.key === node && parent.computed;
+  }
+
+  // no: var NODE = init;
+  // yes: var id = NODE;
+  if (t.isVariableDeclarator(parent)) {
+    return parent.id !== node;
+  }
+
+  // no: function NODE() {}
+  // no: function foo(NODE) {}
+  if (t.isFunction(parent)) {
+    for (var i = 0; i < parent.params.length; i++) {
+      var param = parent.params[i];
+      if (param === node) return false;
+    }
+
+    return parent.id !== node;
+  }
+
+  // no: class NODE {}
+  if (t.isClass(parent)) {
+    return parent.id !== node;
+  }
+
+  // yes: class { [NODE](){} }
+  if (t.isMethodDefinition(parent)) {
+    return parent.key === node && parent.computed;
+  }
+
+  // no: NODE: for (;;) {}
+  if (t.isLabeledStatement(parent)) {
     return false;
   }
 
-  // we're a catch clause param
-  if (t.isCatchClause(parent) && parent.param === node) return false;
+  // no: try {} catch (NODE) {}
+  if (t.isCatchClause(parent)) {
+    return parent.param !== node;
+  }
 
-  // we're a variable declarator id so we aren't referenced
-  if (t.isVariableDeclarator(parent) && parent.id === node) return false;
+  // no: function foo(...NODE) {}
+  if (t.isRestElement(parent)) {
+    return false;
+  }
 
-  var isMemberExpression = t.isMemberExpression(parent);
+  // no: [NODE = foo] = [];
+  // yes: [foo = NODE] = [];
+  if (t.isAssignmentPattern(parent)) {
+    return parent.right !== node;
+  }
 
-  // we're in a member expression and we're the computed property so we're referenced
-  var isComputedProperty = isMemberExpression && parent.property === node && parent.computed;
+  // no: [NODE] = [];
+  // no: ({ NODE }) = [];
+  if (t.isPattern(parent)) {
+    return false;
+  }
 
-  // we're in a member expression and we're the object so we're referenced
-  var isObject = isMemberExpression && parent.object === node;
+  // no: import NODE from "bar";
+  if (t.isImportSpecifier(parent)) {
+    return false;
+  }
 
-  // we are referenced
-  if (!isMemberExpression || isComputedProperty || isObject) return true;
+  // no: import * as NODE from "foo";
+  if (t.isImportBatchSpecifier(parent)) {
+    return false;
+  }
 
-  return false;
+  // no: class Foo { private NODE; }
+  if (t.isPrivateDeclaration(parent)) {
+    return false;
+  }
+
+  return true;
 };
 
 /**
@@ -317,13 +366,10 @@ t.toIdentifier = function (name) {
   name = name.replace(/^[-0-9]+/, "");
 
   // camel case
-  name = name.replace(/[-_\s]+(.)?/g, function (match, c) {
+  name = name.replace(/[-\s]+(.)?/g, function (match, c) {
     return c ? c.toUpperCase() : "";
   });
 
-  // remove underscores from start of name
-  name = name.replace(/^\_/, "");
-
   if (!t.isValidIdentifier(name)) {
     name = "_" + name;
   }
@@ -470,6 +516,10 @@ t.getIds = function (node, map, ignoreTypes) {
 
     if (t.isIdentifier(id)) {
       ids[id.name] = id;
+    } else if (t.isExportDeclaration(id)) {
+      if (t.isDeclaration(node.declaration)) {
+        search.push(node.declaration);
+      }
     } else if (nodeKeys) {
       for (i = 0; i < nodeKeys.length; i++) {
         key = nodeKeys[i];
@@ -509,7 +559,6 @@ t.getIds.nodes = {
 t.getIds.arrays = {
   PrivateDeclaration: ["declarations"],
   ComprehensionExpression: ["blocks"],
-  ExportDeclaration: ["specifiers", "declaration"],
   ImportDeclaration: ["specifiers"],
   VariableDeclaration: ["declarations"],
   ArrayPattern: ["elements"],

package.json

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

packages/6to5-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5-runtime",
   "description": "6to5 selfContained runtime",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "repository": "6to5/6to5",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
-}
+}