@babel/plugin-proposal-decorators 7.17.0 → 7.17.9

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")]))])));
 }
 
@@ -270,16 +279,29 @@ function transformClass(path, state, constantSuper) {
   let constructorPath;
   let requiresProtoInit = false;
   let requiresStaticInit = false;
-  let hasComputedProps = false;
   const decoratedPrivateMethods = new Set();
   let protoInitLocal, staticInitLocal, classInitLocal, classLocal;
+  const assignments = [];
+  const scopeParent = path.scope.parent;
+
+  const memoiseExpression = (expression, hint) => {
+    const localEvaluatedId = scopeParent.generateDeclaredUidIdentifier(hint);
+    assignments.push(_core.types.assignmentExpression("=", localEvaluatedId, expression));
+    return _core.types.cloneNode(localEvaluatedId);
+  };
 
   if (classDecorators) {
-    classInitLocal = path.scope.parent.generateDeclaredUidIdentifier("initClass");
+    classInitLocal = scopeParent.generateDeclaredUidIdentifier("initClass");
     const [localId, classPath] = replaceClassWithVar(path);
     path = classPath;
     classLocal = localId;
     path.node.decorators = null;
+
+    for (const classDecorator of classDecorators) {
+      if (!scopeParent.isStatic(classDecorator.expression)) {
+        classDecorator.expression = memoiseExpression(classDecorator.expression, "dec");
+      }
+    }
   } else {
     if (!path.node.id) {
       path.node.id = path.scope.generateUidIdentifier("Class");
@@ -294,19 +316,39 @@ function transformClass(path, state, constantSuper) {
         continue;
       }
 
-      let {
-        key
-      } = element.node;
-      const kind = getElementKind(element);
+      const {
+        node
+      } = element;
       const decorators = element.get("decorators");
-      const isPrivate = key.type === "PrivateName";
+      const hasDecorators = Array.isArray(decorators) && decorators.length > 0;
+
+      if (hasDecorators) {
+        for (const decoratorPath of decorators) {
+          if (!scopeParent.isStatic(decoratorPath.node.expression)) {
+            decoratorPath.node.expression = memoiseExpression(decoratorPath.node.expression, "dec");
+          }
+        }
+      }
+
       const isComputed = "computed" in element.node && element.node.computed === true;
+
+      if (isComputed) {
+        if (!scopeParent.isStatic(node.key)) {
+          node.key = memoiseExpression(node.key, "computedKey");
+        }
+      }
+
+      const kind = getElementKind(element);
+      const {
+        key
+      } = node;
+      const isPrivate = key.type === "PrivateName";
       const isStatic = !!element.node.static;
       let name = "computedKey";
 
       if (isPrivate) {
         name = key.id.name;
-      } else if (key.type === "Identifier") {
+      } else if (!isComputed && key.type === "Identifier") {
         name = key.name;
       }
 
@@ -316,19 +358,7 @@ function transformClass(path, state, constantSuper) {
         constructorPath = element;
       }
 
-      if (isComputed) {
-        const keyPath = element.get("key");
-        const localComputedNameId = keyPath.scope.parent.generateDeclaredUidIdentifier(name);
-        keyPath.replaceWith(localComputedNameId);
-        elementDecoratorInfo.push({
-          localComputedNameId: _core.types.cloneNode(localComputedNameId),
-          keyNode: _core.types.cloneNode(key)
-        });
-        key = localComputedNameId;
-        hasComputedProps = true;
-      }
-
-      if (Array.isArray(decorators) && decorators.length > 0) {
+      if (hasDecorators) {
         let locals;
         let privateMethods;
 
@@ -437,43 +467,14 @@ function transformClass(path, state, constantSuper) {
     }
   }
 
-  if (hasComputedProps) {
-    const assignments = [];
-
-    for (const info of elementDecoratorInfo) {
-      if (isDecoratorInfo(info)) {
-        const {
-          decorators
-        } = info;
-        const newDecorators = [];
-
-        for (const decorator of decorators) {
-          const localComputedNameId = path.scope.parent.generateDeclaredUidIdentifier("dec");
-          assignments.push(_core.types.assignmentExpression("=", localComputedNameId, decorator));
-          newDecorators.push(_core.types.cloneNode(localComputedNameId));
-        }
-
-        info.decorators = newDecorators;
-      } else {
-        assignments.push(_core.types.assignmentExpression("=", info.localComputedNameId, info.keyNode));
-      }
-    }
-
-    path.insertBefore(assignments);
-  }
-
   const elementDecorations = generateDecorationExprs(elementDecoratorInfo);
 
   const classDecorations = _core.types.arrayExpression((classDecorators || []).map(d => d.expression));
 
   const locals = extractElementLocalAssignments(elementDecoratorInfo);
 
-  if (classDecorators) {
-    locals.push(classLocal, classInitLocal);
-  }
-
   if (requiresProtoInit) {
-    protoInitLocal = path.scope.parent.generateDeclaredUidIdentifier("initProto");
+    protoInitLocal = scopeParent.generateDeclaredUidIdentifier("initProto");
     locals.push(protoInitLocal);
 
     const protoInitCall = _core.types.callExpression(_core.types.cloneNode(protoInitLocal), [_core.types.thisExpression()]);
@@ -514,7 +515,7 @@ function transformClass(path, state, constantSuper) {
   }
 
   if (requiresStaticInit) {
-    staticInitLocal = path.scope.parent.generateDeclaredUidIdentifier("initStatic");
+    staticInitLocal = scopeParent.generateDeclaredUidIdentifier("initStatic");
     locals.push(staticInitLocal);
   }
 
@@ -540,6 +541,7 @@ function transformClass(path, state, constantSuper) {
   const originalClass = path.node;
 
   if (classDecorators) {
+    locals.push(classLocal, classInitLocal);
     const statics = [];
     let staticBlocks = [];
     path.get("body.body").forEach(element => {
@@ -599,6 +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.map(expr => _core.types.expressionStatement(expr)));
   path.scope.crawl();
   return path;
 }
@@ -618,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.0",
+  "version": "7.17.9",
   "author": "The Babel Team (https://babel.dev/team)",
   "license": "MIT",
   "publishConfig": {
@@ -20,9 +20,10 @@
     "decorators"
   ],
   "dependencies": {
-    "@babel/helper-create-class-features-plugin": "^7.17.0",
+    "@babel/helper-create-class-features-plugin": "^7.17.9",
     "@babel/helper-plugin-utils": "^7.16.7",
     "@babel/helper-replace-supers": "^7.16.7",
+    "@babel/helper-split-export-declaration": "^7.16.7",
     "@babel/plugin-syntax-decorators": "^7.17.0",
     "charcodes": "^0.2.0"
   },
@@ -30,9 +31,9 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.0",
+    "@babel/core": "^7.17.9",
     "@babel/helper-plugin-test-runner": "^7.16.7",
-    "@babel/traverse": "^7.17.0",
+    "@babel/traverse": "^7.17.9",
     "babel-plugin-polyfill-es-shims": "^0.6.0",
     "object.getownpropertydescriptors": "^2.1.1"
   },