better uid names

lib/6to5/transformation/transformers/es5-property-method-assignment.js

@@ -21,7 +21,7 @@ exports.ObjectExpression = function (node, parent, file) {
   if (!hasAny) return;
 
   if (node.properties.length) {
-    var objId = util.getUid(parent, file);
+    var objId = t.getUid(parent, file);
 
     return util.template("object-define-properties-closure", {
       KEY: objId,

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

@@ -87,11 +87,9 @@ Class.prototype.run = function () {
 
   if (superName) {
     this.closure = true;
-    // so we're only evaluating it once
-    var superRefName = "super";
-    if (className) superRefName = className.name + "Super";
 
-    var superRef = file.generateUidIdentifier(superRefName, this.scope);
+    // so we're only evaluating it once
+    var superRef = t.getUid(superName, this.file);
     body.unshift(t.variableDeclaration("var", [
       t.variableDeclarator(superRef, superName)
     ]));

lib/6to5/transformation/transformers/es6-computed-property-names.js

@@ -14,7 +14,7 @@ exports.ObjectExpression = function (node, parent, file) {
 
   if (!hasComputed) return;
 
-  var objId = util.getUid(parent, file);
+  var objId = t.getUid(parent, file);
 
   var body = [];
   var container = t.functionExpression(null, [], t.blockStatement(body));

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

@@ -1,6 +1,7 @@
 // TODO: Clean up
 
-var t = require("../../types");
+var util = require("../../util");
+var t    = require("../../types");
 
 var buildVariableAssign = function (opts, id, init) {
   var op = opts.operator;
@@ -75,7 +76,7 @@ var pushArrayPattern = function (opts, nodes, pattern, parentId) {
 
   var toArray = opts.file.toArray(parentId, !hasSpreadElement && pattern.elements.length);
 
-  var _parentId = opts.file.generateUidIdentifier("ref", opts.scope);
+  var _parentId = t.getUid(parentId, opts.file, opts.scope);
   nodes.push(t.variableDeclaration("var", [
     t.variableDeclarator(_parentId, toArray)
   ]));
@@ -113,7 +114,7 @@ var pushPattern = function (opts) {
   var scope = opts.scope;
 
   if (!t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
-    var key = file.generateUidIdentifier("ref", scope);
+    var key = t.getUid(parentId, file, scope);
 
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(key, parentId)

lib/6to5/transformation/transformers/es7-array-comprehension.js

@@ -4,8 +4,8 @@ var t        = require("../../types");
 
 exports.experimental = true;
 
-var build = function (node, file) {
-  var uid = file.generateUidIdentifier("arr");
+var build = function (node, parent, file, scope) {
+  var uid = t.getUid(parent, file, scope);
 
   var container = util.template("array-comprehension-container", {
     KEY: uid
@@ -55,8 +55,8 @@ exports._build = function (node, buildBody) {
   );
 };
 
-exports.ComprehensionExpression = function (node, parent, file) {
+exports.ComprehensionExpression = function (node, parent, file, scope) {
   if (node.generator) return;
 
-  return build(node, file);
+  return build(node, parent, file, scope);
 };

lib/6to5/transformation/transformers/playground-memoization-operator.js

@@ -10,7 +10,7 @@ var getPropRef = function (nodes, prop, file, scope) {
   if (t.isIdentifier(prop)) {
     return t.literal(prop.name);
   } else {
-    var temp = file.generateUidIdentifier("propKey", scope);
+    var temp = t.getUid(prop, file, scope);
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(temp, prop)
     ]));
@@ -20,7 +20,7 @@ var getPropRef = function (nodes, prop, file, scope) {
 
 var getObjRef = function (nodes, obj, file, scope) {
   if (t.isDynamic(obj)) {
-    var temp = file.generateUidIdentifier("obj", scope);
+    var temp = t.getUid(obj, file, scope);
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(temp, obj)
     ]));

lib/6to5/types/index.js

@@ -156,7 +156,7 @@ t.toIdentifier = function (name) {
   if (t.isIdentifier(name)) return name.name;
 
   // replace all non-valid identifiers with dashes
-  name = name.replace(/[^a-zA-Z0-9]/g, "-");
+  name = name.replace(/[^a-zA-Z0-9$_]/g, "-");
 
   // remove all dashes and numbers from start of name
   name = name.replace(/^[-0-9]+/, "");
@@ -166,6 +166,9 @@ t.toIdentifier = function (name) {
     return c ? c.toUpperCase() : "";
   });
 
+  // remove underscores from start of name
+  name = name.replace(/^\_/, "");
+
   return name || '_';
 };
 
@@ -231,6 +234,49 @@ t.toBlock = function (node, parent) {
   return t.blockStatement(node);
 };
 
+t.getUid = function (parent, file, scope) {
+  var node = parent;
+
+  if (t.isAssignmentExpression(parent)) {
+    node = parent.left;
+  } else if (t.isVariableDeclarator(parent)) {
+    node = parent.id;
+  }
+
+  var id = "ref";
+
+  if (t.isProperty(node)) {
+    node = node.key;
+  }
+
+  if (t.isIdentifier(node)) {
+    id = node.name;
+  } else if (t.isLiteral(node)) {
+    id = node.value;
+  } else if (t.isMemberExpression(node)) {
+    var parts = [];
+
+    var add = function (node) {
+      if (t.isMemberExpression(node)) {
+        add(node.object);
+        add(node.property);
+      } else if (t.isIdentifier(node)) {
+        parts.push(node.name);
+      } else if (t.isLiteral(node)) {
+        parts.push(node.value);
+      }
+    };
+
+    add(node);
+
+    id = parts.join("$");
+  }
+
+  id = id.replace(/^_/, "");
+
+  return file.generateUidIdentifier(id, scope);
+};
+
 t.getIds = function (node, map, ignoreTypes) {
   ignoreTypes = ignoreTypes || [];
 

lib/6to5/util.js

@@ -52,22 +52,6 @@ exports.arrayify = function (val) {
   throw new TypeError("illegal type for arrayify");
 };
 
-exports.getUid = function (parent, file) {
-  var node;
-
-  if (t.isAssignmentExpression(parent)) {
-    node = parent.left;
-  } else if (t.isVariableDeclarator(parent)) {
-    node = parent.id;
-  }
-
-  var id = "ref";
-
-  if (t.isIdentifier(node)) id = node.name;
-
-  return file.generateUidIdentifier(id);
-};
-
 exports.isAbsolute = function (loc) {
   if (!loc) return false;
   if (loc[0] === "/") return true; // unix