@babel/plugin-proposal-decorators 7.17.2 → 7.17.12

package/lib/transformer-2021-12.js

@@ -11,6 +11,8 @@ var _pluginSyntaxDecorators = require("@babel/plugin-syntax-decorators");
 
 var _helperReplaceSupers = require("@babel/helper-replace-supers");
 
+var _helperSplitExportDeclaration = require("@babel/helper-split-export-declaration");
+
 function incrementId(id, idx = id.length - 1) {
   if (idx === -1) {
     id.unshift(65);
@@ -161,8 +163,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,23 +188,25 @@ 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) {
-  element.insertAfter(_core.types.classPrivateMethod("get", _core.types.cloneNode(key), [], _core.types.blockStatement([_core.types.expressionStatement(_core.types.callExpression(_core.types.cloneNode(getId), [_core.types.thisExpression()]))])));
+  element.insertAfter(_core.types.classPrivateMethod("get", _core.types.cloneNode(key), [], _core.types.blockStatement([_core.types.returnStatement(_core.types.callExpression(_core.types.cloneNode(getId), [_core.types.thisExpression()]))])));
   element.insertAfter(_core.types.classPrivateMethod("set", _core.types.cloneNode(key), [_core.types.identifier("v")], _core.types.blockStatement([_core.types.expressionStatement(_core.types.callExpression(_core.types.cloneNode(setId), [_core.types.thisExpression(), _core.types.identifier("v")]))])));
 }
 
@@ -592,7 +601,7 @@ function transformClass(path, state, constantSuper) {
   }
 
   originalClass.body.body.unshift(_core.types.staticBlock([_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.arrayPattern(locals), _core.types.callExpression(state.addHelper("applyDecs"), [_core.types.thisExpression(), elementDecorations, classDecorations]))), requiresStaticInit && _core.types.expressionStatement(_core.types.callExpression(_core.types.cloneNode(staticInitLocal), [_core.types.thisExpression()]))].filter(Boolean)));
-  path.insertBefore(assignments);
+  path.insertBefore(assignments.map(expr => _core.types.expressionStatement(expr)));
   path.scope.crawl();
   return path;
 }
@@ -612,22 +621,22 @@ function _default({
     name: "proposal-decorators",
     inherits: _pluginSyntaxDecorators.default,
     visitor: {
-      ClassDeclaration(path, state) {
-        if (VISITED.has(path)) return;
-        const newPath = transformClass(path, state, constantSuper);
+      "ExportNamedDeclaration|ExportDefaultDeclaration"(path) {
+        var _declaration$decorato;
 
-        if (newPath) {
-          VISITED.add(newPath);
+        const {
+          declaration
+        } = path.node;
+
+        if ((declaration == null ? void 0 : declaration.type) === "ClassDeclaration" && ((_declaration$decorato = declaration.decorators) == null ? void 0 : _declaration$decorato.length) > 0) {
+          (0, _helperSplitExportDeclaration.default)(path);
         }
       },
 
-      ClassExpression(path, state) {
+      Class(path, state) {
         if (VISITED.has(path)) return;
         const newPath = transformClass(path, state, constantSuper);
-
-        if (newPath) {
-          VISITED.add(newPath);
-        }
+        if (newPath) VISITED.add(newPath);
       }
 
     }

package/package.json

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