condenser 0.0.8 → 0.0.9

data/lib/condenser/processors/node_modules/@babel/template/package.json

@@ -1,20 +1,20 @@
 {
-  "_from": "@babel/template@^7.4.4",
-  "_id": "@babel/template@7.4.4",
+  "_from": "@babel/template@^7.7.4",
+  "_id": "@babel/template@7.7.4",
   "_inBundle": false,
-  "_integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+  "_integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
   "_location": "/@babel/template",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "@babel/template@^7.4.4",
+    "raw": "@babel/template@^7.7.4",
     "name": "@babel/template",
     "escapedName": "@babel%2ftemplate",
     "scope": "@babel",
-    "rawSpec": "^7.4.4",
+    "rawSpec": "^7.7.4",
     "saveSpec": null,
-    "fetchSpec": "^7.4.4"
+    "fetchSpec": "^7.7.4"
   },
   "_requiredBy": [
     "/@babel/core",
@@ -26,9 +26,9 @@
     "/@babel/helpers",
     "/babel-plugin-transform-class-extended-hook"
   ],
-  "_resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-  "_shasum": "f4b88d1225689a08f5bc3a17483545be9e4ed237",
-  "_spec": "@babel/template@^7.4.4",
+  "_resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
+  "_shasum": "428a7d9eecffe27deac0a98e23bf8e3675d2a77b",
+  "_spec": "@babel/template@^7.7.4",
   "_where": "/Users/malomalo/Code/condenser/lib/condenser/processors/node_modules/@babel/core",
   "author": {
     "name": "Sebastian McKenzie",
@@ -37,12 +37,12 @@
   "bundleDependencies": false,
   "dependencies": {
     "@babel/code-frame": "^7.0.0",
-    "@babel/parser": "^7.4.4",
-    "@babel/types": "^7.4.4"
+    "@babel/parser": "^7.7.4",
+    "@babel/types": "^7.7.4"
   },
   "deprecated": false,
   "description": "Generate an AST from a string template.",
-  "gitHead": "2c88694388831b1e5b88e4bbed6781eb2be1edba",
+  "gitHead": "75767d87cb147709b9bd9b99bf44daa6688874a9",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
   "main": "lib/index.js",
@@ -54,5 +54,5 @@
     "type": "git",
     "url": "https://github.com/babel/babel/tree/master/packages/babel-template"
   },
-  "version": "7.4.4"
+  "version": "7.7.4"
 }

data/lib/condenser/processors/node_modules/@babel/traverse/lib/context.js

@@ -7,17 +7,11 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("./path"));
 
-function t() {
-  const data = _interopRequireWildcard(require("@babel/types"));
+var t = _interopRequireWildcard(require("@babel/types"));
 
-  t = function () {
-    return data;
-  };
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-  return data;
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -36,7 +30,7 @@ class TraversalContext {
     const opts = this.opts;
     if (opts.enter || opts.exit) return true;
     if (opts[node.type]) return true;
-    const keys = t().VISITOR_KEYS[node.type];
+    const keys = t.VISITOR_KEYS[node.type];
     if (!keys || !keys.length) return false;
 
     for (const key of keys) {

data/lib/condenser/processors/node_modules/@babel/traverse/lib/index.js

@@ -30,25 +30,9 @@ var visitors = _interopRequireWildcard(require("./visitors"));
 
 exports.visitors = visitors;
 
-function _includes() {
-  const data = _interopRequireDefault(require("lodash/includes"));
+var _includes = _interopRequireDefault(require("lodash/includes"));
 
-  _includes = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function t() {
-  const data = _interopRequireWildcard(require("@babel/types"));
-
-  t = function () {
-    return data;
-  };
-
-  return data;
-}
+var t = _interopRequireWildcard(require("@babel/types"));
 
 var cache = _interopRequireWildcard(require("./cache"));
 
@@ -58,7 +42,9 @@ var _scope = _interopRequireDefault(require("./scope"));
 
 var _hub = _interopRequireDefault(require("./hub"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -72,6 +58,10 @@ function traverse(parent, opts, scope, state, parentPath) {
     }
   }
 
+  if (!t.VISITOR_KEYS[parent.type]) {
+    return;
+  }
+
   visitors.explode(opts);
   traverse.node(parent, opts, scope, state, parentPath);
 }
@@ -81,11 +71,11 @@ traverse.verify = visitors.verify;
 traverse.explode = visitors.explode;
 
 traverse.cheap = function (node, enter) {
-  return t().traverseFast(node, enter);
+  return t.traverseFast(node, enter);
 };
 
 traverse.node = function (node, opts, scope, state, parentPath, skipKeys) {
-  const keys = t().VISITOR_KEYS[node.type];
+  const keys = t.VISITOR_KEYS[node.type];
   if (!keys) return;
   const context = new _context.default(scope, opts, state, parentPath);
 
@@ -96,12 +86,12 @@ traverse.node = function (node, opts, scope, state, parentPath, skipKeys) {
 };
 
 traverse.clearNode = function (node, opts) {
-  t().removeProperties(node, opts);
+  t.removeProperties(node, opts);
   cache.path.delete(node);
 };
 
 traverse.removeProperties = function (tree, opts) {
-  t().traverseFast(tree, traverse.clearNode, opts);
+  t.traverseFast(tree, traverse.clearNode, opts);
   return tree;
 };
 
@@ -113,7 +103,7 @@ function hasBlacklistedType(path, state) {
 }
 
 traverse.hasType = function (tree, type, blacklistTypes) {
-  if ((0, _includes().default)(blacklistTypes, tree.type)) return false;
+  if ((0, _includes.default)(blacklistTypes, tree.type)) return false;
   if (tree.type === type) return true;
   const state = {
     has: false,

data/lib/condenser/processors/node_modules/@babel/traverse/lib/path/ancestry.js

@@ -14,21 +14,15 @@ exports.isAncestor = isAncestor;
 exports.isDescendant = isDescendant;
 exports.inType = inType;
 
-function t() {
-  const data = _interopRequireWildcard(require("@babel/types"));
-
-  t = function () {
-    return data;
-  };
-
-  return data;
-}
+var t = _interopRequireWildcard(require("@babel/types"));
 
 var _index = _interopRequireDefault(require("./index"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function findParent(callback) {
   let path = this;
@@ -75,7 +69,7 @@ function getStatementParent() {
 function getEarliestCommonAncestorFrom(paths) {
   return this.getDeepestCommonAncestorFrom(paths, function (deepest, i, ancestries) {
     let earliest;
-    const keys = t().VISITOR_KEYS[deepest.type];
+    const keys = t.VISITOR_KEYS[deepest.type];
 
     for (const ancestry of ancestries) {
       const path = ancestry[i + 1];

data/lib/condenser/processors/node_modules/@babel/traverse/lib/path/comments.js

@@ -7,17 +7,11 @@ exports.shareCommentsWithSiblings = shareCommentsWithSiblings;
 exports.addComment = addComment;
 exports.addComments = addComments;
 
-function t() {
-  const data = _interopRequireWildcard(require("@babel/types"));
+var t = _interopRequireWildcard(require("@babel/types"));
 
-  t = function () {
-    return data;
-  };
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-  return data;
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function shareCommentsWithSiblings() {
   if (typeof this.key === "string") return;
@@ -39,9 +33,9 @@ function shareCommentsWithSiblings() {
 }
 
 function addComment(type, content, line) {
-  t().addComment(this.node, type, content, line);
+  t.addComment(this.node, type, content, line);
 }
 
 function addComments(type, comments) {
-  t().addComments(this.node, type, comments);
+  t.addComments(this.node, type, comments);
 }

data/lib/condenser/processors/node_modules/@babel/traverse/lib/path/context.js

@@ -26,6 +26,8 @@ exports._getQueueContexts = _getQueueContexts;
 
 var _index = _interopRequireDefault(require("../index"));
 
+var _index2 = require("./index");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function call(key) {
@@ -61,7 +63,7 @@ function _call(fns) {
     }
 
     if (this.node !== node) return true;
-    if (this.shouldStop || this.shouldSkip || this.removed) return true;
+    if (this._traverseFlags > 0) return true;
   }
 
   return false;
@@ -85,7 +87,7 @@ function visit() {
     return false;
   }
 
-  if (this.call("enter") || this.shouldSkip) {
+  if (this.shouldSkip || this.call("enter") || this.shouldSkip) {
     this.debug("Skip...");
     return this.shouldStop;
   }
@@ -103,12 +105,15 @@ function skip() {
 }
 
 function skipKey(key) {
+  if (this.skipKeys == null) {
+    this.skipKeys = {};
+  }
+
   this.skipKeys[key] = true;
 }
 
 function stop() {
-  this.shouldStop = true;
-  this.shouldSkip = true;
+  this._traverseFlags |= _index2.SHOULD_SKIP | _index2.SHOULD_STOP;
 }
 
 function setScope() {
@@ -127,10 +132,11 @@ function setScope() {
 }
 
 function setContext(context) {
-  this.shouldSkip = false;
-  this.shouldStop = false;
-  this.removed = false;
-  this.skipKeys = {};
+  if (this.skipKeys != null) {
+    this.skipKeys = {};
+  }
+
+  this._traverseFlags = 0;
 
   if (context) {
     this.context = context;
@@ -208,9 +214,7 @@ function pushContext(context) {
 }
 
 function setup(parentPath, container, listKey, key) {
-  this.inList = !!listKey;
   this.listKey = listKey;
-  this.parentKey = listKey || key;
   this.container = container;
   this.parentPath = parentPath || this.parentPath;
   this.setKey(key);

data/lib/condenser/processors/node_modules/@babel/traverse/lib/path/conversion.js

@@ -9,29 +9,15 @@ exports.arrowFunctionToShadowed = arrowFunctionToShadowed;
 exports.unwrapFunctionEnvironment = unwrapFunctionEnvironment;
 exports.arrowFunctionToExpression = arrowFunctionToExpression;
 
-function t() {
-  const data = _interopRequireWildcard(require("@babel/types"));
+var t = _interopRequireWildcard(require("@babel/types"));
 
-  t = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _helperFunctionName() {
-  const data = _interopRequireDefault(require("@babel/helper-function-name"));
-
-  _helperFunctionName = function () {
-    return data;
-  };
-
-  return data;
-}
+var _helperFunctionName = _interopRequireDefault(require("@babel/helper-function-name"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function toComputedKey() {
   const node = this.node;
@@ -46,7 +32,7 @@ function toComputedKey() {
   }
 
   if (!node.computed) {
-    if (t().isIdentifier(key)) key = t().stringLiteral(key.name);
+    if (t.isIdentifier(key)) key = t.stringLiteral(key.name);
   }
 
   return key;
@@ -82,14 +68,14 @@ function ensureBlock() {
 
     if (this.isFunction()) {
       key = "argument";
-      statements.push(t().returnStatement(body.node));
+      statements.push(t.returnStatement(body.node));
     } else {
       key = "expression";
-      statements.push(t().expressionStatement(body.node));
+      statements.push(t.expressionStatement(body.node));
     }
   }
 
-  this.node.body = t().blockStatement(statements);
+  this.node.body = t.blockStatement(statements);
   const parentPath = this.get(stringPath);
   body.setup(parentPath, listKey ? parentPath.node[listKey] : parentPath.node, listKey, key);
   return this.node;
@@ -126,12 +112,12 @@ function arrowFunctionToExpression({
     if (checkBinding) {
       this.parentPath.scope.push({
         id: checkBinding,
-        init: t().objectExpression([])
+        init: t.objectExpression([])
       });
     }
 
-    this.get("body").unshiftContainer("body", t().expressionStatement(t().callExpression(this.hub.addHelper("newArrowCheck"), [t().thisExpression(), checkBinding ? t().identifier(checkBinding.name) : t().identifier(thisBinding)])));
-    this.replaceWith(t().callExpression(t().memberExpression((0, _helperFunctionName().default)(this, true) || this.node, t().identifier("bind")), [checkBinding ? t().identifier(checkBinding.name) : t().thisExpression()]));
+    this.get("body").unshiftContainer("body", t.expressionStatement(t.callExpression(this.hub.addHelper("newArrowCheck"), [t.thisExpression(), checkBinding ? t.identifier(checkBinding.name) : t.identifier(thisBinding)])));
+    this.replaceWith(t.callExpression(t.memberExpression((0, _helperFunctionName.default)(this, true) || this.node, t.identifier("bind")), [checkBinding ? t.identifier(checkBinding.name) : t.thisExpression()]));
   }
 }
 
@@ -179,40 +165,25 @@ function hoistFunctionEnvironment(fnPath, specCompliant = false, allowInsertArro
     });
     const superBinding = getSuperBinding(thisEnvFn);
     allSuperCalls.forEach(superCall => {
-      const callee = t().identifier(superBinding);
+      const callee = t.identifier(superBinding);
       callee.loc = superCall.node.callee.loc;
       superCall.get("callee").replaceWith(callee);
     });
   }
 
-  let thisBinding;
-
-  if (thisPaths.length > 0 || specCompliant) {
-    thisBinding = getThisBinding(thisEnvFn, inConstructor);
-
-    if (!specCompliant || inConstructor && hasSuperClass(thisEnvFn)) {
-      thisPaths.forEach(thisChild => {
-        const thisRef = thisChild.isJSX() ? t().jsxIdentifier(thisBinding) : t().identifier(thisBinding);
-        thisRef.loc = thisChild.node.loc;
-        thisChild.replaceWith(thisRef);
-      });
-      if (specCompliant) thisBinding = null;
-    }
-  }
-
   if (argumentsPaths.length > 0) {
-    const argumentsBinding = getBinding(thisEnvFn, "arguments", () => t().identifier("arguments"));
+    const argumentsBinding = getBinding(thisEnvFn, "arguments", () => t.identifier("arguments"));
     argumentsPaths.forEach(argumentsChild => {
-      const argsRef = t().identifier(argumentsBinding);
+      const argsRef = t.identifier(argumentsBinding);
       argsRef.loc = argumentsChild.node.loc;
       argumentsChild.replaceWith(argsRef);
     });
   }
 
   if (newTargetPaths.length > 0) {
-    const newTargetBinding = getBinding(thisEnvFn, "newtarget", () => t().metaProperty(t().identifier("new"), t().identifier("target")));
+    const newTargetBinding = getBinding(thisEnvFn, "newtarget", () => t.metaProperty(t.identifier("new"), t.identifier("target")));
     newTargetPaths.forEach(targetChild => {
-      const targetRef = t().identifier(newTargetBinding);
+      const targetRef = t.identifier(newTargetBinding);
       targetRef.loc = targetChild.node.loc;
       targetChild.replaceWith(targetRef);
     });
@@ -226,41 +197,53 @@ function hoistFunctionEnvironment(fnPath, specCompliant = false, allowInsertArro
     const flatSuperProps = superProps.reduce((acc, superProp) => acc.concat(standardizeSuperProperty(superProp)), []);
     flatSuperProps.forEach(superProp => {
       const key = superProp.node.computed ? "" : superProp.get("property").node.name;
-
-      if (superProp.parentPath.isCallExpression({
+      const isAssignment = superProp.parentPath.isAssignmentExpression({
+        left: superProp.node
+      });
+      const isCall = superProp.parentPath.isCallExpression({
         callee: superProp.node
-      })) {
-        const superBinding = getSuperPropCallBinding(thisEnvFn, key);
-
-        if (superProp.node.computed) {
-          const prop = superProp.get("property").node;
-          superProp.replaceWith(t().identifier(superBinding));
-          superProp.parentPath.node.arguments.unshift(prop);
-        } else {
-          superProp.replaceWith(t().identifier(superBinding));
-        }
+      });
+      const superBinding = getSuperPropBinding(thisEnvFn, isAssignment, key);
+      const args = [];
+
+      if (superProp.node.computed) {
+        args.push(superProp.get("property").node);
+      }
+
+      if (isAssignment) {
+        const value = superProp.parentPath.node.right;
+        args.push(value);
+      }
+
+      const call = t.callExpression(t.identifier(superBinding), args);
+
+      if (isCall) {
+        superProp.parentPath.unshiftContainer("arguments", t.thisExpression());
+        superProp.replaceWith(t.memberExpression(call, t.identifier("call")));
+        thisPaths.push(superProp.parentPath.get("arguments.0"));
+      } else if (isAssignment) {
+        superProp.parentPath.replaceWith(call);
       } else {
-        const isAssignment = superProp.parentPath.isAssignmentExpression({
-          left: superProp.node
-        });
-        const superBinding = getSuperPropBinding(thisEnvFn, isAssignment, key);
-        const args = [];
-
-        if (superProp.node.computed) {
-          args.push(superProp.get("property").node);
-        }
-
-        if (isAssignment) {
-          const value = superProp.parentPath.node.right;
-          args.push(value);
-          superProp.parentPath.replaceWith(t().callExpression(t().identifier(superBinding), args));
-        } else {
-          superProp.replaceWith(t().callExpression(t().identifier(superBinding), args));
-        }
+        superProp.replaceWith(call);
       }
     });
   }
 
+  let thisBinding;
+
+  if (thisPaths.length > 0 || specCompliant) {
+    thisBinding = getThisBinding(thisEnvFn, inConstructor);
+
+    if (!specCompliant || inConstructor && hasSuperClass(thisEnvFn)) {
+      thisPaths.forEach(thisChild => {
+        const thisRef = thisChild.isJSX() ? t.jsxIdentifier(thisBinding) : t.identifier(thisBinding);
+        thisRef.loc = thisChild.node.loc;
+        thisChild.replaceWith(thisRef);
+      });
+      if (specCompliant) thisBinding = null;
+    }
+  }
+
   return thisBinding;
 }
 
@@ -273,11 +256,11 @@ function standardizeSuperProperty(superProp) {
 
     if (superProp.node.computed) {
       const tmp = superProp.scope.generateDeclaredUidIdentifier("tmp");
-      assignmentPath.get("left").replaceWith(t().memberExpression(superProp.node.object, t().assignmentExpression("=", tmp, superProp.node.property), true));
-      assignmentPath.get("right").replaceWith(t().binaryExpression(op, t().memberExpression(superProp.node.object, t().identifier(tmp.name), true), value));
+      assignmentPath.get("left").replaceWith(t.memberExpression(superProp.node.object, t.assignmentExpression("=", tmp, superProp.node.property), true));
+      assignmentPath.get("right").replaceWith(t.binaryExpression(op, t.memberExpression(superProp.node.object, t.identifier(tmp.name), true), value));
     } else {
-      assignmentPath.get("left").replaceWith(t().memberExpression(superProp.node.object, superProp.node.property));
-      assignmentPath.get("right").replaceWith(t().binaryExpression(op, t().memberExpression(superProp.node.object, t().identifier(superProp.node.property.name)), value));
+      assignmentPath.get("left").replaceWith(t.memberExpression(superProp.node.object, superProp.node.property));
+      assignmentPath.get("right").replaceWith(t.binaryExpression(op, t.memberExpression(superProp.node.object, t.identifier(superProp.node.property.name)), value));
     }
 
     return [assignmentPath.get("left"), assignmentPath.get("right").get("left")];
@@ -285,13 +268,13 @@ function standardizeSuperProperty(superProp) {
     const updateExpr = superProp.parentPath;
     const tmp = superProp.scope.generateDeclaredUidIdentifier("tmp");
     const computedKey = superProp.node.computed ? superProp.scope.generateDeclaredUidIdentifier("prop") : null;
-    const parts = [t().assignmentExpression("=", tmp, t().memberExpression(superProp.node.object, computedKey ? t().assignmentExpression("=", computedKey, superProp.node.property) : superProp.node.property, superProp.node.computed)), t().assignmentExpression("=", t().memberExpression(superProp.node.object, computedKey ? t().identifier(computedKey.name) : superProp.node.property, superProp.node.computed), t().binaryExpression("+", t().identifier(tmp.name), t().numericLiteral(1)))];
+    const parts = [t.assignmentExpression("=", tmp, t.memberExpression(superProp.node.object, computedKey ? t.assignmentExpression("=", computedKey, superProp.node.property) : superProp.node.property, superProp.node.computed)), t.assignmentExpression("=", t.memberExpression(superProp.node.object, computedKey ? t.identifier(computedKey.name) : superProp.node.property, superProp.node.computed), t.binaryExpression("+", t.identifier(tmp.name), t.numericLiteral(1)))];
 
     if (!superProp.parentPath.node.prefix) {
-      parts.push(t().identifier(tmp.name));
+      parts.push(t.identifier(tmp.name));
     }
 
-    updateExpr.replaceWith(t().sequenceExpression(parts));
+    updateExpr.replaceWith(t.sequenceExpression(parts));
     const left = updateExpr.get("expressions.0.right");
     const right = updateExpr.get("expressions.1.left");
     return [left, right];
@@ -306,7 +289,7 @@ function hasSuperClass(thisEnvFn) {
 
 function getThisBinding(thisEnvFn, inConstructor) {
   return getBinding(thisEnvFn, "this", thisBinding => {
-    if (!inConstructor || !hasSuperClass(thisEnvFn)) return t().thisExpression();
+    if (!inConstructor || !hasSuperClass(thisEnvFn)) return t.thisExpression();
     const supers = new WeakSet();
     thisEnvFn.traverse({
       Function(child) {
@@ -322,7 +305,7 @@ function getThisBinding(thisEnvFn, inConstructor) {
         if (!child.get("callee").isSuper()) return;
         if (supers.has(child.node)) return;
         supers.add(child.node);
-        child.replaceWithMultiple([child.node, t().assignmentExpression("=", t().identifier(thisBinding), t().identifier("this"))]);
+        child.replaceWithMultiple([child.node, t.assignmentExpression("=", t.identifier(thisBinding), t.identifier("this"))]);
       }
 
     });
@@ -332,25 +315,7 @@ function getThisBinding(thisEnvFn, inConstructor) {
 function getSuperBinding(thisEnvFn) {
   return getBinding(thisEnvFn, "supercall", () => {
     const argsBinding = thisEnvFn.scope.generateUidIdentifier("args");
-    return t().arrowFunctionExpression([t().restElement(argsBinding)], t().callExpression(t().super(), [t().spreadElement(t().identifier(argsBinding.name))]));
-  });
-}
-
-function getSuperPropCallBinding(thisEnvFn, propName) {
-  return getBinding(thisEnvFn, `superprop_call:${propName || ""}`, () => {
-    const argsBinding = thisEnvFn.scope.generateUidIdentifier("args");
-    const argsList = [t().restElement(argsBinding)];
-    let fnBody;
-
-    if (propName) {
-      fnBody = t().callExpression(t().memberExpression(t().super(), t().identifier(propName)), [t().spreadElement(t().identifier(argsBinding.name))]);
-    } else {
-      const method = thisEnvFn.scope.generateUidIdentifier("prop");
-      argsList.unshift(method);
-      fnBody = t().callExpression(t().memberExpression(t().super(), t().identifier(method.name), true), [t().spreadElement(t().identifier(argsBinding.name))]);
-    }
-
-    return t().arrowFunctionExpression(argsList, fnBody);
+    return t.arrowFunctionExpression([t.restElement(argsBinding)], t.callExpression(t.super(), [t.spreadElement(t.identifier(argsBinding.name))]));
   });
 }
 
@@ -361,20 +326,20 @@ function getSuperPropBinding(thisEnvFn, isAssignment, propName) {
     let fnBody;
 
     if (propName) {
-      fnBody = t().memberExpression(t().super(), t().identifier(propName));
+      fnBody = t.memberExpression(t.super(), t.identifier(propName));
     } else {
       const method = thisEnvFn.scope.generateUidIdentifier("prop");
       argsList.unshift(method);
-      fnBody = t().memberExpression(t().super(), t().identifier(method.name), true);
+      fnBody = t.memberExpression(t.super(), t.identifier(method.name), true);
     }
 
     if (isAssignment) {
       const valueIdent = thisEnvFn.scope.generateUidIdentifier("value");
       argsList.push(valueIdent);
-      fnBody = t().assignmentExpression("=", fnBody, t().identifier(valueIdent.name));
+      fnBody = t.assignmentExpression("=", fnBody, t.identifier(valueIdent.name));
     }
 
-    return t().arrowFunctionExpression(argsList, fnBody);
+    return t.arrowFunctionExpression(argsList, fnBody);
   });
 }