@babel/plugin-proposal-decorators 7.17.2 → 7.17.8

package/lib/transformer-2021-12.js

@@ -161,8 +161,13 @@ function isDecoratorInfo(info) {
   return "decorators" in info;
 }
 
+function filteredOrderedDecoratorInfo(info) {
+  const filtered = info.filter(isDecoratorInfo);
+  return [...filtered.filter(el => el.isStatic && el.kind >= ACCESSOR && el.kind <= SETTER), ...filtered.filter(el => !el.isStatic && el.kind >= ACCESSOR && el.kind <= SETTER), ...filtered.filter(el => el.isStatic && el.kind === FIELD), ...filtered.filter(el => !el.isStatic && el.kind === FIELD)];
+}
+
 function generateDecorationExprs(info) {
-  return _core.types.arrayExpression(info.filter(isDecoratorInfo).map(el => {
+  return _core.types.arrayExpression(filteredOrderedDecoratorInfo(info).map(el => {
     const decs = el.decorators.length > 1 ? _core.types.arrayExpression(el.decorators) : el.decorators[0];
     const kind = el.isStatic ? el.kind + STATIC : el.kind;
     const decInfo = [decs, _core.types.numericLiteral(kind), el.name];
@@ -181,19 +186,21 @@ function generateDecorationExprs(info) {
 }
 
 function extractElementLocalAssignments(decorationInfo) {
-  const locals = [];
+  const localIds = [];
 
-  for (const el of decorationInfo) {
-    if ("locals" in el && el.locals) {
-      if (Array.isArray(el.locals)) {
-        locals.push(...el.locals);
-      } else {
-        locals.push(el.locals);
-      }
+  for (const el of filteredOrderedDecoratorInfo(decorationInfo)) {
+    const {
+      locals
+    } = el;
+
+    if (Array.isArray(locals)) {
+      localIds.push(...locals);
+    } else if (locals !== undefined) {
+      localIds.push(locals);
     }
   }
 
-  return locals;
+  return localIds;
 }
 
 function addCallAccessorsFor(element, key, getId, setId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-decorators",
-  "version": "7.17.2",
+  "version": "7.17.8",
   "author": "The Babel Team (https://babel.dev/team)",
   "license": "MIT",
   "publishConfig": {
@@ -20,7 +20,7 @@
     "decorators"
   ],
   "dependencies": {
-    "@babel/helper-create-class-features-plugin": "^7.17.1",
+    "@babel/helper-create-class-features-plugin": "^7.17.6",
     "@babel/helper-plugin-utils": "^7.16.7",
     "@babel/helper-replace-supers": "^7.16.7",
     "@babel/plugin-syntax-decorators": "^7.17.0",
@@ -30,9 +30,9 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.2",
+    "@babel/core": "^7.17.8",
     "@babel/helper-plugin-test-runner": "^7.16.7",
-    "@babel/traverse": "^7.17.0",
+    "@babel/traverse": "^7.17.3",
     "babel-plugin-polyfill-es-shims": "^0.6.0",
     "object.getownpropertydescriptors": "^2.1.1"
   },