From 7f6eb3dba37c2c121e92ab7753f07e60aa170137 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 20 Jan 2015 01:42:43 +1100
Subject: [PATCH] update selfContained transformer to use new File data layer

---
 .../transformers/optional-self-contained.js        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/6to5/transformation/transformers/optional-self-contained.js b/lib/6to5/transformation/transformers/optional-self-contained.js
index 5d4ec3ff1e..532235582c 100644
--- a/lib/6to5/transformation/transformers/optional-self-contained.js
+++ b/lib/6to5/transformation/transformers/optional-self-contained.js
@@ -23,9 +23,9 @@ exports.optional = true;
 
 exports.ast = {
   enter: function (ast, file) {
-    file.opts.runtime = file.addImport("6to5-runtime/helpers", "to5Runtime").name;
-    file._coreId = file.addImport("6to5-runtime/core-js", "core");
-    file._regeneratorId = file.addImport("6to5-runtime/regenerator", "regeneratorRuntime");
+    file.set("runtimeIdentifier", file.addImport("6to5-runtime/helpers", "to5Runtime"));
+    file.set("coreIdentifier", file.addImport("6to5-runtime/core-js", "core"));
+    file.set("regeneratorIdentifier", file.addImport("6to5-runtime/regenerator", "regeneratorRuntime"));
   },
 
   exit: function (ast, file) {
@@ -42,11 +42,11 @@ exports.ast = {
 
           if (!node.computed && coreHas(obj) && _.has(core[obj.name], prop.name)) {
             context.skip();
-            return t.prependToMemberExpression(node, file._coreId);
+            return t.prependToMemberExpression(node, file.get("coreIdentifier"));
           }
         } else if (t.isReferencedIdentifier(node, parent) && !t.isMemberExpression(parent) && _.contains(ALIASABLE_CONSTRUCTORS, node.name)) {
           // Symbol() -> _core.Symbol(); new Promise -> new _core.Promise
-          return t.memberExpression(file._coreId, node);
+          return t.memberExpression(file.get("coreIdentifier"), node);
         } else if (t.isCallExpression(node)) {
           // arr[Symbol.iterator]() -> _core.$for.getIterator(arr)
 
@@ -61,7 +61,7 @@ exports.ast = {
           if (!t.isIdentifier(prop.property, { name: "iterator" })) return;
 
           return util.template("corejs-iterator", {
-            CORE_ID: file._coreId,
+            CORE_ID: file.get("coreIdentifier"),
             VALUE:   callee.object
           });
         }
@@ -72,6 +72,6 @@ exports.ast = {
 
 exports.Identifier = function (node, parent, scope, context, file) {
   if (node.name === "regeneratorRuntime" && t.isReferenced(node, parent)) {
-    node.name = file._regeneratorId;
+    return file.get("regeneratorIdentifier");
   }
 };