@babel/plugin-proposal-decorators 7.0.0-beta.46 → 7.0.0-beta.47

package/lib/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 
 function _helperPluginUtils() {
-  var data = require("@babel/helper-plugin-utils");
+  const data = require("@babel/helper-plugin-utils");
 
   _helperPluginUtils = function _helperPluginUtils() {
     return data;
@@ -16,7 +16,7 @@ function _helperPluginUtils() {
 }
 
 function _pluginSyntaxDecorators() {
-  var data = _interopRequireDefault(require("@babel/plugin-syntax-decorators"));
+  const data = _interopRequireDefault(require("@babel/plugin-syntax-decorators"));
 
   _pluginSyntaxDecorators = function _pluginSyntaxDecorators() {
     return data;
@@ -31,10 +31,10 @@ var _transformerLegacy = _interopRequireDefault(require("./transformer-legacy"))
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (0, _helperPluginUtils().declare)(function (api, options) {
+var _default = (0, _helperPluginUtils().declare)((api, options) => {
   api.assertVersion(7);
-  var _options$legacy = options.legacy,
-      legacy = _options$legacy === void 0 ? false : _options$legacy;
+  const _options$legacy = options.legacy,
+        legacy = _options$legacy === void 0 ? false : _options$legacy;
 
   if (typeof legacy !== "boolean") {
     throw new Error("'legacy' must be a boolean.");

package/lib/transformer-legacy.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 
 function _core() {
-  var data = require("@babel/core");
+  const data = require("@babel/core");
 
   _core = function _core() {
     return data;
@@ -15,35 +15,44 @@ function _core() {
   return data;
 }
 
-var buildClassDecorator = (0, _core().template)("\n  DECORATOR(CLASS_REF = INNER) || CLASS_REF;\n");
-var buildClassPrototype = (0, _core().template)("\n  CLASS_REF.prototype;\n");
-var buildGetDescriptor = (0, _core().template)("\n    Object.getOwnPropertyDescriptor(TARGET, PROPERTY);\n");
-var buildGetObjectInitializer = (0, _core().template)("\n    (TEMP = Object.getOwnPropertyDescriptor(TARGET, PROPERTY), (TEMP = TEMP ? TEMP.value : undefined), {\n        enumerable: true,\n        configurable: true,\n        writable: true,\n        initializer: function(){\n            return TEMP;\n        }\n    })\n");
-var WARNING_CALLS = new WeakSet();
+const buildClassDecorator = (0, _core().template)(`
+  DECORATOR(CLASS_REF = INNER) || CLASS_REF;
+`);
+const buildClassPrototype = (0, _core().template)(`
+  CLASS_REF.prototype;
+`);
+const buildGetDescriptor = (0, _core().template)(`
+    Object.getOwnPropertyDescriptor(TARGET, PROPERTY);
+`);
+const buildGetObjectInitializer = (0, _core().template)(`
+    (TEMP = Object.getOwnPropertyDescriptor(TARGET, PROPERTY), (TEMP = TEMP ? TEMP.value : undefined), {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        initializer: function(){
+            return TEMP;
+        }
+    })
+`);
+const WARNING_CALLS = new WeakSet();
 
 function applyEnsureOrdering(path) {
-  var decorators = (path.isClass() ? [path].concat(path.get("body.body")) : path.get("properties")).reduce(function (acc, prop) {
-    return acc.concat(prop.node.decorators || []);
-  }, []);
-  var identDecorators = decorators.filter(function (decorator) {
-    return !_core().types.isIdentifier(decorator.callee);
-  });
+  const decorators = (path.isClass() ? [path].concat(path.get("body.body")) : path.get("properties")).reduce((acc, prop) => acc.concat(prop.node.decorators || []), []);
+  const identDecorators = decorators.filter(decorator => !_core().types.isIdentifier(decorator.callee));
   if (identDecorators.length === 0) return;
-  return _core().types.sequenceExpression(identDecorators.map(function (decorator) {
-    var callee = decorator.callee;
-    var id = decorator.callee = path.scope.generateDeclaredUidIdentifier("dec");
+  return _core().types.sequenceExpression(identDecorators.map(decorator => {
+    const callee = decorator.callee;
+    const id = decorator.callee = path.scope.generateDeclaredUidIdentifier("dec");
     return _core().types.assignmentExpression("=", id, callee);
   }).concat([path.node]));
 }
 
 function applyClassDecorators(classPath) {
   if (!hasClassDecorators(classPath.node)) return;
-  var decorators = classPath.node.decorators || [];
+  const decorators = classPath.node.decorators || [];
   classPath.node.decorators = null;
-  var name = classPath.scope.generateDeclaredUidIdentifier("class");
-  return decorators.map(function (dec) {
-    return dec.callee;
-  }).reverse().reduce(function (acc, decorator) {
+  const name = classPath.scope.generateDeclaredUidIdentifier("class");
+  return decorators.map(dec => dec.callee).reverse().reduce(function (acc, decorator) {
     return buildClassDecorator({
       CLASS_REF: _core().types.cloneNode(name),
       DECORATOR: _core().types.cloneNode(decorator),
@@ -62,9 +71,7 @@ function applyMethodDecorators(path, state) {
 }
 
 function hasMethodDecorators(body) {
-  return body.some(function (node) {
-    return node.decorators && node.decorators.length;
-  });
+  return body.some(node => node.decorators && node.decorators.length);
 }
 
 function applyObjectDecorators(path, state) {
@@ -73,9 +80,9 @@ function applyObjectDecorators(path, state) {
 }
 
 function applyTargetDecorators(path, state, decoratedProps) {
-  var name = path.scope.generateDeclaredUidIdentifier(path.isClass() ? "class" : "obj");
-  var exprs = decoratedProps.reduce(function (acc, node) {
-    var decorators = node.decorators || [];
+  const name = path.scope.generateDeclaredUidIdentifier(path.isClass() ? "class" : "obj");
+  const exprs = decoratedProps.reduce(function (acc, node) {
+    const decorators = node.decorators || [];
     node.decorators = null;
     if (decorators.length === 0) return acc;
 
@@ -83,25 +90,21 @@ function applyTargetDecorators(path, state, decoratedProps) {
       throw path.buildCodeFrameError("Computed method/property decorators are not yet supported.");
     }
 
-    var property = _core().types.isLiteral(node.key) ? node.key : _core().types.stringLiteral(node.key.name);
-    var target = path.isClass() && !node.static ? buildClassPrototype({
+    const property = _core().types.isLiteral(node.key) ? node.key : _core().types.stringLiteral(node.key.name);
+    const target = path.isClass() && !node.static ? buildClassPrototype({
       CLASS_REF: name
     }).expression : name;
 
     if (_core().types.isClassProperty(node, {
       static: false
     })) {
-      var descriptor = path.scope.generateDeclaredUidIdentifier("descriptor");
-      var initializer = node.value ? _core().types.functionExpression(null, [], _core().types.blockStatement([_core().types.returnStatement(node.value)])) : _core().types.nullLiteral();
+      const descriptor = path.scope.generateDeclaredUidIdentifier("descriptor");
+      const initializer = node.value ? _core().types.functionExpression(null, [], _core().types.blockStatement([_core().types.returnStatement(node.value)])) : _core().types.nullLiteral();
       node.value = _core().types.callExpression(state.addHelper("initializerWarningHelper"), [descriptor, _core().types.thisExpression()]);
       WARNING_CALLS.add(node.value);
-      acc = acc.concat([_core().types.assignmentExpression("=", descriptor, _core().types.callExpression(state.addHelper("applyDecoratedDescriptor"), [_core().types.cloneNode(target), _core().types.cloneNode(property), _core().types.arrayExpression(decorators.map(function (dec) {
-        return _core().types.cloneNode(dec.callee);
-      })), _core().types.objectExpression([_core().types.objectProperty(_core().types.identifier("enumerable"), _core().types.booleanLiteral(true)), _core().types.objectProperty(_core().types.identifier("initializer"), initializer)])]))]);
+      acc = acc.concat([_core().types.assignmentExpression("=", descriptor, _core().types.callExpression(state.addHelper("applyDecoratedDescriptor"), [_core().types.cloneNode(target), _core().types.cloneNode(property), _core().types.arrayExpression(decorators.map(dec => _core().types.cloneNode(dec.callee))), _core().types.objectExpression([_core().types.objectProperty(_core().types.identifier("enumerable"), _core().types.booleanLiteral(true)), _core().types.objectProperty(_core().types.identifier("initializer"), initializer)])]))]);
     } else {
-      acc = acc.concat(_core().types.callExpression(state.addHelper("applyDecoratedDescriptor"), [_core().types.cloneNode(target), _core().types.cloneNode(property), _core().types.arrayExpression(decorators.map(function (dec) {
-        return _core().types.cloneNode(dec.callee);
-      })), _core().types.isObjectProperty(node) || _core().types.isClassProperty(node, {
+      acc = acc.concat(_core().types.callExpression(state.addHelper("applyDecoratedDescriptor"), [_core().types.cloneNode(target), _core().types.cloneNode(property), _core().types.arrayExpression(decorators.map(dec => _core().types.cloneNode(dec.callee))), _core().types.isObjectProperty(node) || _core().types.isClassProperty(node, {
         static: true
       }) ? buildGetObjectInitializer({
         TEMP: path.scope.generateDeclaredUidIdentifier("init"),
@@ -119,16 +122,16 @@ function applyTargetDecorators(path, state, decoratedProps) {
 }
 
 var _default = {
-  ClassDeclaration: function ClassDeclaration(path) {
-    var node = path.node;
+  ClassDeclaration(path) {
+    const node = path.node;
 
     if (!hasClassDecorators(node) && !hasMethodDecorators(node.body.body)) {
       return;
     }
 
-    var ref = node.id ? _core().types.cloneNode(node.id) : path.scope.generateUidIdentifier("class");
+    const ref = node.id ? _core().types.cloneNode(node.id) : path.scope.generateUidIdentifier("class");
 
-    var letDeclaration = _core().types.variableDeclaration("let", [_core().types.variableDeclarator(ref, _core().types.toExpression(node))]);
+    const letDeclaration = _core().types.variableDeclaration("let", [_core().types.variableDeclarator(ref, _core().types.toExpression(node))]);
 
     if (path.parentPath.isExportDefaultDeclaration()) {
       path.parentPath.replaceWithMultiple([letDeclaration, _core().types.exportNamedDeclaration(null, [_core().types.exportSpecifier(_core().types.cloneNode(ref), _core().types.identifier("default"))])]);
@@ -136,17 +139,21 @@ var _default = {
       path.replaceWith(letDeclaration);
     }
   },
-  ClassExpression: function ClassExpression(path, state) {
-    var decoratedClass = applyEnsureOrdering(path) || applyClassDecorators(path, state) || applyMethodDecorators(path, state);
+
+  ClassExpression(path, state) {
+    const decoratedClass = applyEnsureOrdering(path) || applyClassDecorators(path, state) || applyMethodDecorators(path, state);
     if (decoratedClass) path.replaceWith(decoratedClass);
   },
-  ObjectExpression: function ObjectExpression(path, state) {
-    var decoratedObject = applyEnsureOrdering(path) || applyObjectDecorators(path, state);
+
+  ObjectExpression(path, state) {
+    const decoratedObject = applyEnsureOrdering(path) || applyObjectDecorators(path, state);
     if (decoratedObject) path.replaceWith(decoratedObject);
   },
-  AssignmentExpression: function AssignmentExpression(path, state) {
+
+  AssignmentExpression(path, state) {
     if (!WARNING_CALLS.has(path.node.right)) return;
     path.replaceWith(_core().types.callExpression(state.addHelper("initializerDefineProperty"), [_core().types.cloneNode(path.get("left.object").node), _core().types.stringLiteral(path.get("left.property").node.name), _core().types.cloneNode(path.get("right.arguments")[0].node), _core().types.cloneNode(path.get("right.arguments")[1].node)]));
   }
+
 };
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-decorators",
-  "version": "7.0.0-beta.46",
+  "version": "7.0.0-beta.47",
   "author": "Logan Smyth <loganfsmyth@gmail.com>",
   "license": "MIT",
   "description": "Compile class and object decorators to ES5",
@@ -12,14 +12,14 @@
     "decorators"
   ],
   "dependencies": {
-    "@babel/helper-plugin-utils": "7.0.0-beta.46",
-    "@babel/plugin-syntax-decorators": "7.0.0-beta.46"
+    "@babel/helper-plugin-utils": "7.0.0-beta.47",
+    "@babel/plugin-syntax-decorators": "7.0.0-beta.47"
   },
   "peerDependencies": {
-    "@babel/core": "7.0.0-beta.46"
+    "@babel/core": "7.0.0-beta.47"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.46",
-    "@babel/helper-plugin-test-runner": "7.0.0-beta.46"
+    "@babel/core": "7.0.0-beta.47",
+    "@babel/helper-plugin-test-runner": "7.0.0-beta.47"
   }
 }