condenser 0.0.8 → 0.0.9

data/lib/condenser/processors/node_modules/@babel/helper-builder-binary-assignment-operator-visitor/package.json

@@ -1,35 +1,36 @@
 {
-  "_from": "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0",
-  "_id": "@babel/helper-builder-binary-assignment-operator-visitor@7.1.0",
+  "_from": "@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4",
+  "_id": "@babel/helper-builder-binary-assignment-operator-visitor@7.7.4",
   "_inBundle": false,
-  "_integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+  "_integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==",
   "_location": "/@babel/helper-builder-binary-assignment-operator-visitor",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0",
+    "raw": "@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4",
     "name": "@babel/helper-builder-binary-assignment-operator-visitor",
     "escapedName": "@babel%2fhelper-builder-binary-assignment-operator-visitor",
     "scope": "@babel",
-    "rawSpec": "^7.1.0",
+    "rawSpec": "^7.7.4",
     "saveSpec": null,
-    "fetchSpec": "^7.1.0"
+    "fetchSpec": "^7.7.4"
   },
   "_requiredBy": [
     "/@babel/plugin-transform-exponentiation-operator"
   ],
-  "_resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
-  "_shasum": "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f",
-  "_spec": "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0",
+  "_resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz",
+  "_shasum": "5f73f2b28580e224b5b9bd03146a4015d6217f5f",
+  "_spec": "@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4",
   "_where": "/Users/malomalo/Code/condenser/lib/condenser/processors/node_modules/@babel/plugin-transform-exponentiation-operator",
   "bundleDependencies": false,
   "dependencies": {
-    "@babel/helper-explode-assignable-expression": "^7.1.0",
-    "@babel/types": "^7.0.0"
+    "@babel/helper-explode-assignable-expression": "^7.7.4",
+    "@babel/types": "^7.7.4"
   },
   "deprecated": false,
   "description": "Helper function to build binary assignment operator visitors",
+  "gitHead": "75767d87cb147709b9bd9b99bf44daa6688874a9",
   "license": "MIT",
   "main": "lib/index.js",
   "name": "@babel/helper-builder-binary-assignment-operator-visitor",
@@ -40,5 +41,5 @@
     "type": "git",
     "url": "https://github.com/babel/babel/tree/master/packages/babel-helper-builder-binary-assignment-operator-visitor"
   },
-  "version": "7.1.0"
+  "version": "7.7.4"
 }

data/lib/condenser/processors/node_modules/@babel/helper-call-delegate/lib/index.js

@@ -5,27 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 
-function _helperHoistVariables() {
-  const data = _interopRequireDefault(require("@babel/helper-hoist-variables"));
+var _helperHoistVariables = _interopRequireDefault(require("@babel/helper-hoist-variables"));
 
-  _helperHoistVariables = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function t() {
-  const data = _interopRequireWildcard(require("@babel/types"));
-
-  t = function () {
-    return data;
-  };
+var t = _interopRequireWildcard(require("@babel/types"));
 
-  return data;
-}
+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; } 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 }; }
 
@@ -52,10 +38,10 @@ function _default(path, scope = path.scope) {
   const {
     node
   } = path;
-  const container = t().functionExpression(null, [], node.body, node.generator, node.async);
+  const container = t.functionExpression(null, [], node.body, node.generator, node.async);
   let callee = container;
   let args = [];
-  (0, _helperHoistVariables().default)(path, id => scope.push({
+  (0, _helperHoistVariables.default)(path, id => scope.push({
     id
   }));
   const state = {
@@ -65,20 +51,20 @@ function _default(path, scope = path.scope) {
   path.traverse(visitor, state);
 
   if (state.foundArguments || state.foundThis) {
-    callee = t().memberExpression(container, t().identifier("apply"));
+    callee = t.memberExpression(container, t.identifier("apply"));
     args = [];
 
     if (state.foundThis) {
-      args.push(t().thisExpression());
+      args.push(t.thisExpression());
     }
 
     if (state.foundArguments) {
-      if (!state.foundThis) args.push(t().nullLiteral());
-      args.push(t().identifier("arguments"));
+      if (!state.foundThis) args.push(t.nullLiteral());
+      args.push(t.identifier("arguments"));
     }
   }
 
-  let call = t().callExpression(callee, args);
-  if (node.generator) call = t().yieldExpression(call, true);
-  return t().returnStatement(call);
+  let call = t.callExpression(callee, args);
+  if (node.generator) call = t.yieldExpression(call, true);
+  return t.returnStatement(call);
 }

data/lib/condenser/processors/node_modules/@babel/helper-call-delegate/package.json

@@ -1,37 +1,37 @@
 {
-  "_from": "@babel/helper-call-delegate@^7.4.4",
-  "_id": "@babel/helper-call-delegate@7.4.4",
+  "_from": "@babel/helper-call-delegate@^7.7.4",
+  "_id": "@babel/helper-call-delegate@7.7.4",
   "_inBundle": false,
-  "_integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+  "_integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==",
   "_location": "/@babel/helper-call-delegate",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "@babel/helper-call-delegate@^7.4.4",
+    "raw": "@babel/helper-call-delegate@^7.7.4",
     "name": "@babel/helper-call-delegate",
     "escapedName": "@babel%2fhelper-call-delegate",
     "scope": "@babel",
-    "rawSpec": "^7.4.4",
+    "rawSpec": "^7.7.4",
     "saveSpec": null,
-    "fetchSpec": "^7.4.4"
+    "fetchSpec": "^7.7.4"
   },
   "_requiredBy": [
     "/@babel/plugin-transform-parameters"
   ],
-  "_resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
-  "_shasum": "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43",
-  "_spec": "@babel/helper-call-delegate@^7.4.4",
+  "_resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz",
+  "_shasum": "621b83e596722b50c0066f9dc37d3232e461b801",
+  "_spec": "@babel/helper-call-delegate@^7.7.4",
   "_where": "/Users/malomalo/Code/condenser/lib/condenser/processors/node_modules/@babel/plugin-transform-parameters",
   "bundleDependencies": false,
   "dependencies": {
-    "@babel/helper-hoist-variables": "^7.4.4",
-    "@babel/traverse": "^7.4.4",
-    "@babel/types": "^7.4.4"
+    "@babel/helper-hoist-variables": "^7.7.4",
+    "@babel/traverse": "^7.7.4",
+    "@babel/types": "^7.7.4"
   },
   "deprecated": false,
   "description": "Helper function to call delegate",
-  "gitHead": "2c88694388831b1e5b88e4bbed6781eb2be1edba",
+  "gitHead": "75767d87cb147709b9bd9b99bf44daa6688874a9",
   "license": "MIT",
   "main": "lib/index.js",
   "name": "@babel/helper-call-delegate",
@@ -42,5 +42,5 @@
     "type": "git",
     "url": "https://github.com/babel/babel/tree/master/packages/babel-helper-call-delegate"
   },
-  "version": "7.4.4"
+  "version": "7.7.4"
 }

data/lib/condenser/processors/node_modules/@babel/helper-create-class-features-plugin/lib/decorators.js

@@ -7,35 +7,11 @@ exports.hasOwnDecorators = hasOwnDecorators;
 exports.hasDecorators = hasDecorators;
 exports.buildDecoratedClass = buildDecoratedClass;
 
-function _core() {
-  const data = require("@babel/core");
+var _core = require("@babel/core");
 
-  _core = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _helperReplaceSupers() {
-  const data = _interopRequireDefault(require("@babel/helper-replace-supers"));
-
-  _helperReplaceSupers = function () {
-    return data;
-  };
+var _helperReplaceSupers = _interopRequireDefault(require("@babel/helper-replace-supers"));
 
-  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 }; }
 
@@ -49,18 +25,18 @@ function hasDecorators(node) {
 
 function prop(key, value) {
   if (!value) return null;
-  return _core().types.objectProperty(_core().types.identifier(key), value);
+  return _core.types.objectProperty(_core.types.identifier(key), value);
 }
 
 function method(key, body) {
-  return _core().types.objectMethod("method", _core().types.identifier(key), [], _core().types.blockStatement(body));
+  return _core.types.objectMethod("method", _core.types.identifier(key), [], _core.types.blockStatement(body));
 }
 
 function takeDecorators(node) {
   let result;
 
   if (node.decorators && node.decorators.length > 0) {
-    result = _core().types.arrayExpression(node.decorators.map(decorator => decorator.expression));
+    result = _core.types.arrayExpression(node.decorators.map(decorator => decorator.expression));
   }
 
   node.decorators = undefined;
@@ -70,10 +46,10 @@ function takeDecorators(node) {
 function getKey(node) {
   if (node.computed) {
     return node.key;
-  } else if (_core().types.isIdentifier(node.key)) {
-    return _core().types.stringLiteral(node.key.name);
+  } else if (_core.types.isIdentifier(node.key)) {
+    return _core.types.stringLiteral(node.key.name);
   } else {
-    return _core().types.stringLiteral(String(node.key.value));
+    return _core.types.stringLiteral(String(node.key.value));
   }
 }
 
@@ -88,7 +64,7 @@ function extractElementDescriptor(classRef, superRef, path) {
     throw path.buildCodeFrameError(`Private ${isMethod ? "methods" : "fields"} in decorated classes are not supported yet.`);
   }
 
-  new (_helperReplaceSupers().default)({
+  new _helperReplaceSupers.default({
     methodPath: path,
     methodNode: node,
     objectRef: classRef,
@@ -97,26 +73,26 @@ function extractElementDescriptor(classRef, superRef, path) {
     scope,
     file: this
   }, true).replace();
-  const properties = [prop("kind", _core().types.stringLiteral(isMethod ? node.kind : "field")), prop("decorators", takeDecorators(node)), prop("static", node.static && _core().types.booleanLiteral(true)), prop("key", getKey(node))].filter(Boolean);
+  const properties = [prop("kind", _core.types.stringLiteral(isMethod ? node.kind : "field")), prop("decorators", takeDecorators(node)), prop("static", node.static && _core.types.booleanLiteral(true)), prop("key", getKey(node))].filter(Boolean);
 
   if (isMethod) {
     const id = node.computed ? null : node.key;
 
-    _core().types.toExpression(node);
+    _core.types.toExpression(node);
 
-    properties.push(prop("value", (0, _helperFunctionName().default)({
+    properties.push(prop("value", (0, _helperFunctionName.default)({
       node,
       id,
       scope
     }) || node));
   } else if (node.value) {
-    properties.push(method("value", _core().template.statements.ast`return ${node.value}`));
+    properties.push(method("value", _core.template.statements.ast`return ${node.value}`));
   } else {
     properties.push(prop("value", scope.buildUndefinedNode()));
   }
 
   path.remove();
-  return _core().types.objectExpression(properties);
+  return _core.types.objectExpression(properties);
 }
 
 function addDecorateHelper(file) {
@@ -143,7 +119,7 @@ function buildDecoratedClass(ref, path, elements, file) {
     superClass
   } = node;
   node.type = "ClassDeclaration";
-  if (!node.id) node.id = _core().types.cloneNode(ref);
+  if (!node.id) node.id = _core.types.cloneNode(ref);
   let superId;
 
   if (superClass) {
@@ -153,14 +129,14 @@ function buildDecoratedClass(ref, path, elements, file) {
 
   const classDecorators = takeDecorators(node);
 
-  const definitions = _core().types.arrayExpression(elements.map(extractElementDescriptor.bind(file, node.id, superId)));
+  const definitions = _core.types.arrayExpression(elements.map(extractElementDescriptor.bind(file, node.id, superId)));
 
-  let replacement = _core().template.expression.ast`
+  let replacement = _core.template.expression.ast`
     ${addDecorateHelper(file)}(
-      ${classDecorators || _core().types.nullLiteral()},
+      ${classDecorators || _core.types.nullLiteral()},
       function (${initializeId}, ${superClass ? superId : null}) {
         ${node}
-        return { F: ${_core().types.cloneNode(node.id)}, d: ${definitions} };
+        return { F: ${_core.types.cloneNode(node.id)}, d: ${definitions} };
       },
       ${superClass}
     )
@@ -168,16 +144,16 @@ function buildDecoratedClass(ref, path, elements, file) {
   let classPathDesc = "arguments.1.body.body.0";
 
   if (!isStrict) {
-    replacement.arguments[1].body.directives.push(_core().types.directive(_core().types.directiveLiteral("use strict")));
+    replacement.arguments[1].body.directives.push(_core.types.directive(_core.types.directiveLiteral("use strict")));
   }
 
   if (isDeclaration) {
-    replacement = _core().template.ast`let ${ref} = ${replacement}`;
+    replacement = _core.template.ast`let ${ref} = ${replacement}`;
     classPathDesc = "declarations.0.init." + classPathDesc;
   }
 
   return {
-    instanceNodes: [_core().template.statement.ast`${initializeId}(this)`],
+    instanceNodes: [_core.template.statement.ast`${initializeId}(this)`],
 
     wrapClass(path) {
       path.replaceWith(replacement);

data/lib/condenser/processors/node_modules/@babel/helper-create-class-features-plugin/lib/features.js

@@ -49,10 +49,6 @@ function verifyUsedFeatures(path, file) {
     if (!hasFeature(file, FEATURES.privateMethods)) {
       throw path.buildCodeFrameError("Class private methods are not enabled.");
     }
-
-    if (path.node.static && path.node.kind !== "method") {
-      throw path.buildCodeFrameError("@babel/plugin-class-features doesn't support class static private accessors yet.");
-    }
   }
 
   if (hasFeature(file, FEATURES.privateMethods) && hasFeature(file, FEATURES.fields) && isLoose(file, FEATURES.privateMethods) !== isLoose(file, FEATURES.fields)) {

data/lib/condenser/processors/node_modules/@babel/helper-create-class-features-plugin/lib/fields.js

@@ -8,49 +8,21 @@ exports.buildPrivateNamesNodes = buildPrivateNamesNodes;
 exports.transformPrivateNamesUsage = transformPrivateNamesUsage;
 exports.buildFieldsInitNodes = buildFieldsInitNodes;
 
-function _core() {
-  const data = require("@babel/core");
+var _core = require("@babel/core");
 
-  _core = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _helperReplaceSupers() {
-  const data = _interopRequireWildcard(require("@babel/helper-replace-supers"));
-
-  _helperReplaceSupers = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _helperMemberExpressionToFunctions() {
-  const data = _interopRequireDefault(require("@babel/helper-member-expression-to-functions"));
-
-  _helperMemberExpressionToFunctions = function () {
-    return data;
-  };
+var _helperReplaceSupers = _interopRequireWildcard(require("@babel/helper-replace-supers"));
 
-  return data;
-}
+var _helperMemberExpressionToFunctions = _interopRequireDefault(require("@babel/helper-member-expression-to-functions"));
 
-function _helperOptimiseCallExpression() {
-  const data = _interopRequireDefault(require("@babel/helper-optimise-call-expression"));
+var _helperOptimiseCallExpression = _interopRequireDefault(require("@babel/helper-optimise-call-expression"));
 
-  _helperOptimiseCallExpression = function () {
-    return data;
-  };
-
-  return data;
-}
+var ts = _interopRequireWildcard(require("./typescript"));
 
 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 buildPrivateNamesMap(props) {
   const privateNamesMap = new Map();
@@ -96,19 +68,20 @@ function buildPrivateNamesNodes(privateNamesMap, loose, state) {
       getId,
       setId
     } = value;
+    const isAccessor = getId || setId;
 
     if (loose) {
-      initNodes.push(_core().template.statement.ast`
+      initNodes.push(_core.template.statement.ast`
           var ${id} = ${state.addHelper("classPrivateFieldLooseKey")}("${name}")
         `);
     } else if (isMethod && !isStatic) {
-      if (getId || setId) {
-        initNodes.push(_core().template.statement.ast`var ${id} = new WeakMap();`);
+      if (isAccessor) {
+        initNodes.push(_core.template.statement.ast`var ${id} = new WeakMap();`);
       } else {
-        initNodes.push(_core().template.statement.ast`var ${id} = new WeakSet();`);
+        initNodes.push(_core.template.statement.ast`var ${id} = new WeakSet();`);
       }
     } else if (!isStatic) {
-      initNodes.push(_core().template.statement.ast`var ${id} = new WeakMap();`);
+      initNodes.push(_core.template.statement.ast`var ${id} = new WeakMap();`);
     }
   }
 
@@ -151,9 +124,9 @@ const privateNameVisitor = {
 
 };
 
-const privateNameInnerVisitor = _core().traverse.visitors.merge([{
+const privateNameInnerVisitor = _core.traverse.visitors.merge([{
   PrivateName: privateNameVisitor.PrivateName
-}, _helperReplaceSupers().environmentVisitor]);
+}, _helperReplaceSupers.environmentVisitor]);
 
 const privateNameHandlerSpec = {
   memoise(member, count) {
@@ -178,10 +151,10 @@ const privateNameHandlerSpec = {
     } = member.node;
 
     if (this.memoiser.has(object)) {
-      return _core().types.cloneNode(this.memoiser.get(object));
+      return _core.types.cloneNode(this.memoiser.get(object));
     }
 
-    return _core().types.cloneNode(object);
+    return _core.types.cloneNode(object);
   },
 
   get(member) {
@@ -201,21 +174,22 @@ const privateNameHandlerSpec = {
       getId,
       setId
     } = privateNamesMap.get(name);
+    const isAccessor = getId || setId;
 
     if (isStatic) {
-      const helperName = isMethod ? "classStaticPrivateMethodGet" : "classStaticPrivateFieldSpecGet";
-      return _core().types.callExpression(file.addHelper(helperName), [this.receiver(member), _core().types.cloneNode(classRef), _core().types.cloneNode(id)]);
+      const helperName = isMethod && !isAccessor ? "classStaticPrivateMethodGet" : "classStaticPrivateFieldSpecGet";
+      return _core.types.callExpression(file.addHelper(helperName), [this.receiver(member), _core.types.cloneNode(classRef), _core.types.cloneNode(id)]);
     }
 
     if (isMethod) {
-      if (getId || setId) {
-        return _core().types.callExpression(file.addHelper("classPrivateFieldGet"), [this.receiver(member), _core().types.cloneNode(id)]);
+      if (isAccessor) {
+        return _core.types.callExpression(file.addHelper("classPrivateFieldGet"), [this.receiver(member), _core.types.cloneNode(id)]);
       }
 
-      return _core().types.callExpression(file.addHelper("classPrivateMethodGet"), [this.receiver(member), _core().types.cloneNode(id), _core().types.cloneNode(methodId)]);
+      return _core.types.callExpression(file.addHelper("classPrivateMethodGet"), [this.receiver(member), _core.types.cloneNode(id), _core.types.cloneNode(methodId)]);
     }
 
-    return _core().types.callExpression(file.addHelper("classPrivateFieldGet"), [this.receiver(member), _core().types.cloneNode(id)]);
+    return _core.types.callExpression(file.addHelper("classPrivateFieldGet"), [this.receiver(member), _core.types.cloneNode(id)]);
   },
 
   set(member, value) {
@@ -231,23 +205,25 @@ const privateNameHandlerSpec = {
       id,
       static: isStatic,
       method: isMethod,
-      setId
+      setId,
+      getId
     } = privateNamesMap.get(name);
+    const isAccessor = getId || setId;
 
     if (isStatic) {
-      const helperName = isMethod ? "classStaticPrivateMethodSet" : "classStaticPrivateFieldSpecSet";
-      return _core().types.callExpression(file.addHelper(helperName), [this.receiver(member), _core().types.cloneNode(classRef), _core().types.cloneNode(id), value]);
+      const helperName = isMethod && !isAccessor ? "classStaticPrivateMethodSet" : "classStaticPrivateFieldSpecSet";
+      return _core.types.callExpression(file.addHelper(helperName), [this.receiver(member), _core.types.cloneNode(classRef), _core.types.cloneNode(id), value]);
     }
 
     if (isMethod) {
       if (setId) {
-        return _core().types.callExpression(file.addHelper("classPrivateFieldSet"), [this.receiver(member), _core().types.cloneNode(id), value]);
+        return _core.types.callExpression(file.addHelper("classPrivateFieldSet"), [this.receiver(member), _core.types.cloneNode(id), value]);
       }
 
-      return _core().types.callExpression(file.addHelper("classPrivateMethodSet"), []);
+      return _core.types.callExpression(file.addHelper("classPrivateMethodSet"), []);
     }
 
-    return _core().types.callExpression(file.addHelper("classPrivateFieldSet"), [this.receiver(member), _core().types.cloneNode(id), value]);
+    return _core.types.callExpression(file.addHelper("classPrivateFieldSet"), [this.receiver(member), _core.types.cloneNode(id), value]);
   },
 
   destructureSet(member) {
@@ -261,12 +237,12 @@ const privateNameHandlerSpec = {
     const {
       id
     } = privateNamesMap.get(name);
-    return _core().types.memberExpression(_core().types.callExpression(file.addHelper("classPrivateFieldDestructureSet"), [this.receiver(member), _core().types.cloneNode(id)]), _core().types.identifier("value"));
+    return _core.types.memberExpression(_core.types.callExpression(file.addHelper("classPrivateFieldDestructureSet"), [this.receiver(member), _core.types.cloneNode(id)]), _core.types.identifier("value"));
   },
 
   call(member, args) {
     this.memoise(member, 1);
-    return (0, _helperOptimiseCallExpression().default)(this.get(member), this.receiver(member), args);
+    return (0, _helperOptimiseCallExpression.default)(this.get(member), this.receiver(member), args);
   }
 
 };
@@ -282,7 +258,7 @@ const privateNameHandlerLoose = {
     const {
       name
     } = member.node.property.id;
-    member.replaceWith(_core().template.expression`BASE(REF, PROP)[PROP]`({
+    member.replaceWith(_core.template.expression`BASE(REF, PROP)[PROP]`({
       BASE: file.addHelper("classPrivateFieldLooseBase"),
       REF: object,
       PROP: privateNamesMap.get(name).id
@@ -300,7 +276,7 @@ function transformPrivateNamesUsage(ref, path, privateNamesMap, loose, state) {
       file: state
     }, privateNameHandlerLoose));
   } else {
-    (0, _helperMemberExpressionToFunctions().default)(body, privateNameVisitor, Object.assign({
+    (0, _helperMemberExpressionToFunctions.default)(body, privateNameVisitor, Object.assign({
       privateNamesMap,
       classRef: ref,
       file: state
@@ -313,7 +289,7 @@ function buildPrivateFieldInitLoose(ref, prop, privateNamesMap) {
     id
   } = privateNamesMap.get(prop.node.key.id.name);
   const value = prop.node.value || prop.scope.buildUndefinedNode();
-  return _core().template.statement.ast`
+  return _core.template.statement.ast`
     Object.defineProperty(${ref}, ${id}, {
       // configurable is false by default
       // enumerable is false by default
@@ -328,7 +304,7 @@ function buildPrivateInstanceFieldInitSpec(ref, prop, privateNamesMap) {
     id
   } = privateNamesMap.get(prop.node.key.id.name);
   const value = prop.node.value || prop.scope.buildUndefinedNode();
-  return _core().template.statement.ast`${id}.set(${ref}, {
+  return _core.template.statement.ast`${id}.set(${ref}, {
     // configurable is always false for private elements
     // enumerable is always false for private elements
     writable: true,
@@ -337,11 +313,33 @@ function buildPrivateInstanceFieldInitSpec(ref, prop, privateNamesMap) {
 }
 
 function buildPrivateStaticFieldInitSpec(prop, privateNamesMap) {
+  const privateName = privateNamesMap.get(prop.node.key.id.name);
   const {
-    id
-  } = privateNamesMap.get(prop.node.key.id.name);
+    id,
+    getId,
+    setId,
+    initAdded
+  } = privateName;
+  const isAccessor = getId || setId;
+  if (!prop.isProperty() && (initAdded || !isAccessor)) return;
+
+  if (isAccessor) {
+    privateNamesMap.set(prop.node.key.id.name, Object.assign({}, privateName, {
+      initAdded: true
+    }));
+    return _core.template.statement.ast`
+      var ${id.name} = {
+        // configurable is false by default
+        // enumerable is false by default
+        // writable is false by default
+        get: ${getId ? getId.name : prop.scope.buildUndefinedNode()},
+        set: ${setId ? setId.name : prop.scope.buildUndefinedNode()}
+      }
+    `;
+  }
+
   const value = prop.node.value || prop.scope.buildUndefinedNode();
-  return _core().template.statement.ast`
+  return _core.template.statement.ast`
     var ${id} = {
       // configurable is false by default
       // enumerable is false by default
@@ -363,7 +361,7 @@ function buildPrivateMethodInitLoose(ref, prop, privateNamesMap) {
   if (initAdded) return;
 
   if (methodId) {
-    return _core().template.statement.ast`
+    return _core.template.statement.ast`
         Object.defineProperty(${ref}, ${id}, {
           // configurable is false by default
           // enumerable is false by default
@@ -373,40 +371,21 @@ function buildPrivateMethodInitLoose(ref, prop, privateNamesMap) {
       `;
   }
 
-  if (getId || setId) {
+  const isAccessor = getId || setId;
+
+  if (isAccessor) {
     privateNamesMap.set(prop.node.key.id.name, Object.assign({}, privateName, {
       initAdded: true
     }));
-
-    if (getId && setId) {
-      return _core().template.statement.ast`
-        Object.defineProperty(${ref}, ${id}, {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          get: ${getId.name},
-          set: ${setId.name}
-        });
-      `;
-    } else if (getId && !setId) {
-      return _core().template.statement.ast`
-        Object.defineProperty(${ref}, ${id}, {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          get: ${getId.name}
-        });
-      `;
-    } else if (!getId && setId) {
-      return _core().template.statement.ast`
-        Object.defineProperty(${ref}, ${id}, {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          set: ${setId.name}
-        });
-      `;
-    }
+    return _core.template.statement.ast`
+      Object.defineProperty(${ref}, ${id}, {
+        // configurable is false by default
+        // enumerable is false by default
+        // writable is false by default
+        get: ${getId ? getId.name : prop.scope.buildUndefinedNode()},
+        set: ${setId ? setId.name : prop.scope.buildUndefinedNode()}
+      });
+    `;
   }
 }
 
@@ -419,35 +398,21 @@ function buildPrivateInstanceMethodInitSpec(ref, prop, privateNamesMap) {
     initAdded
   } = privateName;
   if (initAdded) return;
+  const isAccessor = getId || setId;
 
-  if (getId || setId) {
+  if (isAccessor) {
     privateNamesMap.set(prop.node.key.id.name, Object.assign({}, privateName, {
       initAdded: true
     }));
-
-    if (getId && setId) {
-      return _core().template.statement.ast`
-        ${id}.set(${ref}, {
-          get: ${getId.name},
-          set: ${setId.name}
-        });
-      `;
-    } else if (getId && !setId) {
-      return _core().template.statement.ast`
-        ${id}.set(${ref}, {
-          get: ${getId.name}
-        });
-      `;
-    } else if (!getId && setId) {
-      return _core().template.statement.ast`
-        ${id}.set(${ref}, {
-          set: ${setId.name}
-        });
-      `;
-    }
+    return _core.template.statement.ast`
+      ${id}.set(${ref}, {
+        get: ${getId ? getId.name : prop.scope.buildUndefinedNode()},
+        set: ${setId ? setId.name : prop.scope.buildUndefinedNode()}
+      });
+    `;
   }
 
-  return _core().template.statement.ast`${id}.add(${ref})`;
+  return _core.template.statement.ast`${id}.add(${ref})`;
 }
 
 function buildPublicFieldInitLoose(ref, prop) {
@@ -456,7 +421,7 @@ function buildPublicFieldInitLoose(ref, prop) {
     computed
   } = prop.node;
   const value = prop.node.value || prop.scope.buildUndefinedNode();
-  return _core().types.expressionStatement(_core().types.assignmentExpression("=", _core().types.memberExpression(ref, key, computed || _core().types.isLiteral(key)), value));
+  return _core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.memberExpression(ref, key, computed || _core.types.isLiteral(key)), value));
 }
 
 function buildPublicFieldInitSpec(ref, prop, state) {
@@ -465,15 +430,37 @@ function buildPublicFieldInitSpec(ref, prop, state) {
     computed
   } = prop.node;
   const value = prop.node.value || prop.scope.buildUndefinedNode();
-  return _core().types.expressionStatement(_core().types.callExpression(state.addHelper("defineProperty"), [ref, computed || _core().types.isLiteral(key) ? key : _core().types.stringLiteral(key.name), value]));
+  return _core.types.expressionStatement(_core.types.callExpression(state.addHelper("defineProperty"), [ref, computed || _core.types.isLiteral(key) ? key : _core.types.stringLiteral(key.name), value]));
 }
 
 function buildPrivateStaticMethodInitLoose(ref, prop, state, privateNamesMap) {
+  const privateName = privateNamesMap.get(prop.node.key.id.name);
   const {
     id,
-    methodId
-  } = privateNamesMap.get(prop.node.key.id.name);
-  return _core().template.statement.ast`
+    methodId,
+    getId,
+    setId,
+    initAdded
+  } = privateName;
+  if (initAdded) return;
+  const isAccessor = getId || setId;
+
+  if (isAccessor) {
+    privateNamesMap.set(prop.node.key.id.name, Object.assign({}, privateName, {
+      initAdded: true
+    }));
+    return _core.template.statement.ast`
+      Object.defineProperty(${ref}, ${id}, {
+        // configurable is false by default
+        // enumerable is false by default
+        // writable is false by default
+        get: ${getId ? getId.name : prop.scope.buildUndefinedNode()},
+        set: ${setId ? setId.name : prop.scope.buildUndefinedNode()}
+      })
+    `;
+  }
+
+  return _core.template.statement.ast`
     Object.defineProperty(${ref}, ${id}, {
       // configurable is false by default
       // enumerable is false by default
@@ -501,7 +488,7 @@ function buildPrivateMethodDeclaration(prop, privateNamesMap, loose = false) {
     async
   } = prop.node;
 
-  const methodValue = _core().types.functionExpression(methodId, params, body, generator, async);
+  const methodValue = _core.types.functionExpression(methodId, params, body, generator, async);
 
   const isGetter = getId && !getterDeclared && params.length === 0;
   const isSetter = setId && !setterDeclared && params.length > 0;
@@ -510,37 +497,37 @@ function buildPrivateMethodDeclaration(prop, privateNamesMap, loose = false) {
     privateNamesMap.set(prop.node.key.id.name, Object.assign({}, privateName, {
       getterDeclared: true
     }));
-    return _core().types.variableDeclaration("var", [_core().types.variableDeclarator(getId, methodValue)]);
+    return _core.types.variableDeclaration("var", [_core.types.variableDeclarator(getId, methodValue)]);
   }
 
   if (isSetter) {
     privateNamesMap.set(prop.node.key.id.name, Object.assign({}, privateName, {
       setterDeclared: true
     }));
-    return _core().types.variableDeclaration("var", [_core().types.variableDeclarator(setId, methodValue)]);
+    return _core.types.variableDeclaration("var", [_core.types.variableDeclarator(setId, methodValue)]);
   }
 
   if (isStatic && !loose) {
-    return _core().types.variableDeclaration("var", [_core().types.variableDeclarator(id, _core().types.functionExpression(id, params, body, generator, async))]);
+    return _core.types.variableDeclaration("var", [_core.types.variableDeclarator(id, _core.types.functionExpression(id, params, body, generator, async))]);
   }
 
-  return _core().types.variableDeclaration("var", [_core().types.variableDeclarator(methodId, methodValue)]);
+  return _core.types.variableDeclaration("var", [_core.types.variableDeclarator(methodId, methodValue)]);
 }
 
-const thisContextVisitor = _core().traverse.visitors.merge([{
+const thisContextVisitor = _core.traverse.visitors.merge([{
   ThisExpression(path, state) {
     state.needsClassRef = true;
-    path.replaceWith(_core().types.cloneNode(state.classRef));
+    path.replaceWith(_core.types.cloneNode(state.classRef));
   }
 
-}, _helperReplaceSupers().environmentVisitor]);
+}, _helperReplaceSupers.environmentVisitor]);
 
 function replaceThisContext(path, ref, superRef, file, loose) {
   const state = {
     classRef: ref,
     needsClassRef: false
   };
-  const replacer = new (_helperReplaceSupers().default)({
+  const replacer = new _helperReplaceSupers.default({
     methodPath: path,
     isLoose: loose,
     superRef,
@@ -548,7 +535,7 @@ function replaceThisContext(path, ref, superRef, file, loose) {
 
     getObjectRef() {
       state.needsClassRef = true;
-      return path.node.static ? ref : _core().types.memberExpression(ref, _core().types.identifier("prototype"));
+      return path.node.static ? ref : _core.types.memberExpression(ref, _core.types.identifier("prototype"));
     }
 
   });
@@ -567,6 +554,7 @@ function buildFieldsInitNodes(ref, superRef, props, privateNamesMap, state, loos
   let needsClassRef = false;
 
   for (const prop of props) {
+    ts.assertFieldTransformed(prop);
     const isStatic = prop.node.static;
     const isInstance = !isStatic;
     const isPrivate = prop.isPrivate();
@@ -582,7 +570,7 @@ function buildFieldsInitNodes(ref, superRef, props, privateNamesMap, state, loos
     switch (true) {
       case isStatic && isPrivate && isField && loose:
         needsClassRef = true;
-        staticNodes.push(buildPrivateFieldInitLoose(_core().types.cloneNode(ref), prop, privateNamesMap));
+        staticNodes.push(buildPrivateFieldInitLoose(_core.types.cloneNode(ref), prop, privateNamesMap));
         break;
 
       case isStatic && isPrivate && isField && !loose:
@@ -592,49 +580,50 @@ function buildFieldsInitNodes(ref, superRef, props, privateNamesMap, state, loos
 
       case isStatic && isPublic && isField && loose:
         needsClassRef = true;
-        staticNodes.push(buildPublicFieldInitLoose(_core().types.cloneNode(ref), prop));
+        staticNodes.push(buildPublicFieldInitLoose(_core.types.cloneNode(ref), prop));
         break;
 
       case isStatic && isPublic && isField && !loose:
         needsClassRef = true;
-        staticNodes.push(buildPublicFieldInitSpec(_core().types.cloneNode(ref), prop, state));
+        staticNodes.push(buildPublicFieldInitSpec(_core.types.cloneNode(ref), prop, state));
         break;
 
       case isInstance && isPrivate && isField && loose:
-        instanceNodes.push(buildPrivateFieldInitLoose(_core().types.thisExpression(), prop, privateNamesMap));
+        instanceNodes.push(buildPrivateFieldInitLoose(_core.types.thisExpression(), prop, privateNamesMap));
         break;
 
       case isInstance && isPrivate && isField && !loose:
-        instanceNodes.push(buildPrivateInstanceFieldInitSpec(_core().types.thisExpression(), prop, privateNamesMap));
+        instanceNodes.push(buildPrivateInstanceFieldInitSpec(_core.types.thisExpression(), prop, privateNamesMap));
         break;
 
       case isInstance && isPrivate && isMethod && loose:
-        instanceNodes.unshift(buildPrivateMethodInitLoose(_core().types.thisExpression(), prop, privateNamesMap));
+        instanceNodes.unshift(buildPrivateMethodInitLoose(_core.types.thisExpression(), prop, privateNamesMap));
         staticNodes.push(buildPrivateMethodDeclaration(prop, privateNamesMap, loose));
         break;
 
       case isInstance && isPrivate && isMethod && !loose:
-        instanceNodes.unshift(buildPrivateInstanceMethodInitSpec(_core().types.thisExpression(), prop, privateNamesMap));
+        instanceNodes.unshift(buildPrivateInstanceMethodInitSpec(_core.types.thisExpression(), prop, privateNamesMap));
         staticNodes.push(buildPrivateMethodDeclaration(prop, privateNamesMap, loose));
         break;
 
       case isStatic && isPrivate && isMethod && !loose:
         needsClassRef = true;
-        staticNodes.push(buildPrivateMethodDeclaration(prop, privateNamesMap, loose));
+        staticNodes.push(buildPrivateStaticFieldInitSpec(prop, privateNamesMap));
+        staticNodes.unshift(buildPrivateMethodDeclaration(prop, privateNamesMap, loose));
         break;
 
       case isStatic && isPrivate && isMethod && loose:
         needsClassRef = true;
-        staticNodes.push(buildPrivateMethodDeclaration(prop, privateNamesMap, loose));
-        staticNodes.push(buildPrivateStaticMethodInitLoose(_core().types.cloneNode(ref), prop, state, privateNamesMap));
+        staticNodes.push(buildPrivateStaticMethodInitLoose(_core.types.cloneNode(ref), prop, state, privateNamesMap));
+        staticNodes.unshift(buildPrivateMethodDeclaration(prop, privateNamesMap, loose));
         break;
 
       case isInstance && isPublic && isField && loose:
-        instanceNodes.push(buildPublicFieldInitLoose(_core().types.thisExpression(), prop));
+        instanceNodes.push(buildPublicFieldInitLoose(_core.types.thisExpression(), prop));
         break;
 
       case isInstance && isPublic && isField && !loose:
-        instanceNodes.push(buildPublicFieldInitSpec(_core().types.thisExpression(), prop, state));
+        instanceNodes.push(buildPublicFieldInitSpec(_core.types.thisExpression(), prop, state));
         break;
 
       default:
@@ -643,7 +632,7 @@ function buildFieldsInitNodes(ref, superRef, props, privateNamesMap, state, loos
   }
 
   return {
-    staticNodes,
+    staticNodes: staticNodes.filter(Boolean),
     instanceNodes: instanceNodes.filter(Boolean),
 
     wrapClass(path) {
@@ -657,7 +646,7 @@ function buildFieldsInitNodes(ref, superRef, props, privateNamesMap, state, loos
         path.scope.push({
           id: ref
         });
-        path.replaceWith(_core().types.assignmentExpression("=", _core().types.cloneNode(ref), path.node));
+        path.replaceWith(_core.types.assignmentExpression("=", _core.types.cloneNode(ref), path.node));
       } else if (!path.node.id) {
         path.node.id = ref;
       }