@babel/plugin-proposal-decorators 7.17.12 → 7.18.9

package/lib/index.js

@@ -17,8 +17,12 @@ var _transformer = require("./transformer-2021-12");
 
 var _default = (0, _helperPluginUtils.declare)((api, options) => {
   api.assertVersion(7);
+  {
+    var {
+      legacy
+    } = options;
+  }
   const {
-    legacy,
     version
   } = options;
 

package/lib/transformer-2021-12.js

@@ -263,13 +263,14 @@ function transformClass(path, state, constantSuper) {
       const {
         key,
         value,
-        static: isStatic
+        static: isStatic,
+        computed
       } = element.node;
       const newId = generateClassPrivateUid();
       const valueNode = value ? _core.types.cloneNode(value) : undefined;
       const newField = generateClassProperty(newId, valueNode, isStatic);
       const [newPath] = element.replaceWith(newField);
-      addProxyAccessorsFor(newPath, key, newId, element.node.computed);
+      addProxyAccessorsFor(newPath, key, newId, computed);
     }
   }
 
@@ -406,7 +407,7 @@ function transformClass(path, state, constantSuper) {
             methodPath: element,
             objectRef: classLocal,
             superRef: path.node.superClass,
-            file: state,
+            file: state.file,
             refToPreserve: classLocal
           });
           replaceSupers.replace();

package/lib/transformer-legacy.js

@@ -7,9 +7,10 @@ exports.default = void 0;
 
 var _core = require("@babel/core");
 
-const buildClassDecorator = (0, _core.template)(`
+const buildClassDecorator = _core.template.statement(`
   DECORATOR(CLASS_REF = INNER) || CLASS_REF;
 `);
+
 const buildClassPrototype = (0, _core.template)(`
   CLASS_REF.prototype;
 `);
@@ -29,7 +30,7 @@ const buildGetObjectInitializer = (0, _core.template)(`
 const WARNING_CALLS = new WeakSet();
 
 function applyEnsureOrdering(path) {
-  const decorators = (path.isClass() ? [path].concat(path.get("body.body")) : path.get("properties")).reduce((acc, prop) => acc.concat(prop.node.decorators || []), []);
+  const decorators = (path.isClass() ? [path, ...path.get("body.body")] : path.get("properties")).reduce((acc, prop) => acc.concat(prop.node.decorators || []), []);
   const identDecorators = decorators.filter(decorator => !_core.types.isIdentifier(decorator.expression));
   if (identDecorators.length === 0) return;
   return _core.types.sequenceExpression(identDecorators.map(decorator => {
@@ -72,14 +73,19 @@ function hasMethodDecorators(body) {
 
 function applyObjectDecorators(path, state) {
   if (!hasMethodDecorators(path.node.properties)) return;
-  return applyTargetDecorators(path, state, path.node.properties);
+  return applyTargetDecorators(path, state, path.node.properties.filter(prop => prop.type !== "SpreadElement"));
 }
 
 function applyTargetDecorators(path, state, decoratedProps) {
   const name = path.scope.generateDeclaredUidIdentifier(path.isClass() ? "class" : "obj");
   const exprs = decoratedProps.reduce(function (acc, node) {
-    const decorators = node.decorators || [];
-    node.decorators = null;
+    let decorators = [];
+
+    if (node.decorators != null) {
+      decorators = node.decorators;
+      node.decorators = null;
+    }
+
     if (decorators.length === 0) return acc;
 
     if (node.computed) {
@@ -129,7 +135,7 @@ function decoratedClassToExpression({
   return _core.types.variableDeclaration("let", [_core.types.variableDeclarator(ref, _core.types.toExpression(node))]);
 }
 
-var _default = {
+const visitor = {
   ExportDefaultDeclaration(path) {
     const decl = path.get("declaration");
     if (!decl.isClassDeclaration()) return;
@@ -179,4 +185,5 @@ var _default = {
   }
 
 };
+var _default = visitor;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-decorators",
-  "version": "7.17.12",
+  "version": "7.18.9",
   "author": "The Babel Team (https://babel.dev/team)",
   "license": "MIT",
   "publishConfig": {
@@ -20,24 +20,26 @@
     "decorators"
   ],
   "dependencies": {
-    "@babel/helper-create-class-features-plugin": "^7.17.12",
-    "@babel/helper-plugin-utils": "^7.17.12",
-    "@babel/helper-replace-supers": "^7.16.7",
-    "@babel/helper-split-export-declaration": "^7.16.7",
-    "@babel/plugin-syntax-decorators": "^7.17.12",
-    "charcodes": "^0.2.0"
+    "@babel/helper-create-class-features-plugin": "^7.18.9",
+    "@babel/helper-plugin-utils": "^7.18.9",
+    "@babel/helper-replace-supers": "^7.18.9",
+    "@babel/helper-split-export-declaration": "^7.18.6",
+    "@babel/plugin-syntax-decorators": "^7.18.6"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.12",
-    "@babel/helper-plugin-test-runner": "^7.16.7",
-    "@babel/traverse": "^7.17.12",
-    "babel-plugin-polyfill-es-shims": "^0.6.0",
+    "@babel/core": "^7.18.9",
+    "@babel/helper-plugin-test-runner": "^7.18.6",
+    "@babel/traverse": "^7.18.9",
+    "@types/charcodes": "^0.2.0",
+    "babel-plugin-polyfill-es-shims": "^0.6.1",
+    "charcodes": "^0.2.0",
     "object.getownpropertydescriptors": "^2.1.1"
   },
   "engines": {
     "node": ">=6.9.0"
-  }
+  },
+  "type": "commonjs"
 }