@babel/plugin-proposal-decorators 7.19.6 → 7.20.2

package/lib/index.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _helperPluginUtils = require("@babel/helper-plugin-utils");
-
 var _pluginSyntaxDecorators = require("@babel/plugin-syntax-decorators");
-
 var _helperCreateClassFeaturesPlugin = require("@babel/helper-create-class-features-plugin");
-
 var _transformerLegacy = require("./transformer-legacy");
-
 var _transformer = require("./transformer-2022-03");
-
 var _default = (0, _helperPluginUtils.declare)((api, options) => {
   api.assertVersion(7);
+
   {
     var {
       legacy
@@ -25,7 +20,6 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
   const {
     version
   } = options;
-
   if (legacy || version === "legacy") {
     return {
       name: "proposal-decorators",
@@ -43,7 +37,6 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
     });
   }
 });
-
 exports.default = _default;
 
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["declare","api","options","assertVersion","legacy","version","name","inherits","syntaxDecorators","visitor","legacyVisitor","transformer2022_03","createClassFeaturePlugin","feature","FEATURES","decorators"],"sources":["../src/index.ts"],"sourcesContent":["/* eslint-disable @babel/development/plugin-name */\n\nimport { declare } from \"@babel/helper-plugin-utils\";\nimport syntaxDecorators from \"@babel/plugin-syntax-decorators\";\nimport {\n  createClassFeaturePlugin,\n  FEATURES,\n} from \"@babel/helper-create-class-features-plugin\";\nimport legacyVisitor from \"./transformer-legacy\";\nimport transformer2022_03 from \"./transformer-2022-03\";\nimport type { Options as SyntaxOptions } from \"@babel/plugin-syntax-decorators\";\n\ninterface Options extends SyntaxOptions {\n  /** @depreated use `constantSuper` assumption instead. Only supported in 2021-12 version. */\n  loose?: boolean;\n}\n\nexport type { Options };\n\nexport default declare((api, options: Options) => {\n  api.assertVersion(7);\n\n  // Options are validated in @babel/plugin-syntax-decorators\n  if (!process.env.BABEL_8_BREAKING) {\n    // eslint-disable-next-line no-var\n    var { legacy } = options;\n  }\n  const { version } = options;\n\n  if (\n    process.env.BABEL_8_BREAKING\n      ? version === \"legacy\"\n      : legacy || version === \"legacy\"\n  ) {\n    return {\n      name: \"proposal-decorators\",\n      inherits: syntaxDecorators,\n      visitor: legacyVisitor,\n    };\n  } else if (version === \"2021-12\" || version === \"2022-03\") {\n    return transformer2022_03(api, options, version);\n  } else if (!process.env.BABEL_8_BREAKING) {\n    return createClassFeaturePlugin({\n      name: \"proposal-decorators\",\n\n      api,\n      feature: FEATURES.decorators,\n      inherits: syntaxDecorators,\n      // loose: options.loose, Not supported\n    });\n  } else {\n    throw new Error(\n      \"The '.version' option must be one of 'legacy', '2021-12' or '2022-03'.\",\n    );\n  }\n});\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AAIA;;AACA;;eAUe,IAAAA,0BAAA,EAAQ,CAACC,GAAD,EAAMC,OAAN,KAA2B;EAChDD,GAAG,CAACE,aAAJ,CAAkB,CAAlB;EAGmC;IAEjC,IAAI;MAAEC;IAAF,IAAaF,OAAjB;EACD;EACD,MAAM;IAAEG;EAAF,IAAcH,OAApB;;EAEA,IAGME,MAAM,IAAIC,OAAO,KAAK,QAH5B,EAIE;IACA,OAAO;MACLC,IAAI,EAAE,qBADD;MAELC,QAAQ,EAAEC,+BAFL;MAGLC,OAAO,EAAEC;IAHJ,CAAP;EAKD,CAVD,MAUO,IAAIL,OAAO,KAAK,SAAZ,IAAyBA,OAAO,KAAK,SAAzC,EAAoD;IACzD,OAAO,IAAAM,oBAAA,EAAmBV,GAAnB,EAAwBC,OAAxB,EAAiCG,OAAjC,CAAP;EACD,CAFM,MAEmC;IACxC,OAAO,IAAAO,yDAAA,EAAyB;MAC9BN,IAAI,EAAE,qBADwB;MAG9BL,GAH8B;MAI9BY,OAAO,EAAEC,yCAAA,CAASC,UAJY;MAK9BR,QAAQ,EAAEC;IALoB,CAAzB,CAAP;EAQD;AAKF,CApCc,C"}
+{"version":3,"names":["declare","api","options","assertVersion","legacy","version","name","inherits","syntaxDecorators","visitor","legacyVisitor","transformer2022_03","createClassFeaturePlugin","feature","FEATURES","decorators"],"sources":["../src/index.ts"],"sourcesContent":["/* eslint-disable @babel/development/plugin-name */\n\nimport { declare } from \"@babel/helper-plugin-utils\";\nimport syntaxDecorators from \"@babel/plugin-syntax-decorators\";\nimport {\n  createClassFeaturePlugin,\n  FEATURES,\n} from \"@babel/helper-create-class-features-plugin\";\nimport legacyVisitor from \"./transformer-legacy\";\nimport transformer2022_03 from \"./transformer-2022-03\";\nimport type { Options as SyntaxOptions } from \"@babel/plugin-syntax-decorators\";\n\ninterface Options extends SyntaxOptions {\n  /** @depreated use `constantSuper` assumption instead. Only supported in 2021-12 version. */\n  loose?: boolean;\n}\n\nexport type { Options };\n\nexport default declare((api, options: Options) => {\n  api.assertVersion(7);\n\n  // Options are validated in @babel/plugin-syntax-decorators\n  if (!process.env.BABEL_8_BREAKING) {\n    // eslint-disable-next-line no-var\n    var { legacy } = options;\n  }\n  const { version } = options;\n\n  if (\n    process.env.BABEL_8_BREAKING\n      ? version === \"legacy\"\n      : legacy || version === \"legacy\"\n  ) {\n    return {\n      name: \"proposal-decorators\",\n      inherits: syntaxDecorators,\n      visitor: legacyVisitor,\n    };\n  } else if (version === \"2021-12\" || version === \"2022-03\") {\n    return transformer2022_03(api, options, version);\n  } else if (!process.env.BABEL_8_BREAKING) {\n    return createClassFeaturePlugin({\n      name: \"proposal-decorators\",\n\n      api,\n      feature: FEATURES.decorators,\n      inherits: syntaxDecorators,\n      // loose: options.loose, Not supported\n    });\n  } else {\n    throw new Error(\n      \"The '.version' option must be one of 'legacy', '2021-12' or '2022-03'.\",\n    );\n  }\n});\n"],"mappings":";;;;;;AAEA;AACA;AACA;AAIA;AACA;AAAuD,eAUxC,IAAAA,0BAAO,EAAC,CAACC,GAAG,EAAEC,OAAgB,KAAK;EAChDD,GAAG,CAACE,aAAa,CAAC,CAAC,CAAC;;EAGe;IAEjC,IAAI;MAAEC;IAAO,CAAC,GAAGF,OAAO;EAC1B;EACA,MAAM;IAAEG;EAAQ,CAAC,GAAGH,OAAO;EAE3B,IAGME,MAAM,IAAIC,OAAO,KAAK,QAAQ,EAClC;IACA,OAAO;MACLC,IAAI,EAAE,qBAAqB;MAC3BC,QAAQ,EAAEC,+BAAgB;MAC1BC,OAAO,EAAEC;IACX,CAAC;EACH,CAAC,MAAM,IAAIL,OAAO,KAAK,SAAS,IAAIA,OAAO,KAAK,SAAS,EAAE;IACzD,OAAO,IAAAM,oBAAkB,EAACV,GAAG,EAAEC,OAAO,EAAEG,OAAO,CAAC;EAClD,CAAC,MAAyC;IACxC,OAAO,IAAAO,yDAAwB,EAAC;MAC9BN,IAAI,EAAE,qBAAqB;MAE3BL,GAAG;MACHY,OAAO,EAAEC,yCAAQ,CAACC,UAAU;MAC5BR,QAAQ,EAAEC;IAEZ,CAAC,CAAC;EACJ;AAKF,CAAC,CAAC;AAAA"}

package/lib/transformer-2022-03.js

@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _core = require("@babel/core");
-
 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);
     return;
   }
-
   const current = id[idx];
-
   if (current === 90) {
     id[idx] = 97;
   } else if (current === 122) {
@@ -38,16 +31,13 @@ function createPrivateUidGeneratorForClass(classPath) {
     PrivateName(path) {
       privateNames.add(path.node.id.name);
     }
-
   });
   return () => {
     let reifiedId;
-
     do {
       incrementId(currentPrivateId);
       reifiedId = String.fromCharCode(...currentPrivateId);
     } while (privateNames.has(reifiedId));
-
     return _core.types.privateName(_core.types.identifier(reifiedId));
   };
 }
@@ -58,7 +48,6 @@ function createLazyPrivateUidGeneratorForClass(classPath) {
     if (!generator) {
       generator = createPrivateUidGeneratorForClass(classPath);
     }
-
     return generator();
   };
 }
@@ -66,9 +55,7 @@ function createLazyPrivateUidGeneratorForClass(classPath) {
 function replaceClassWithVar(path) {
   if (path.type === "ClassDeclaration") {
     const varId = path.scope.generateUidIdentifierBasedOnNode(path.node.id);
-
     const classId = _core.types.identifier(path.node.id.name);
-
     path.scope.rename(classId.name, varId.name);
     path.insertBefore(_core.types.variableDeclaration("let", [_core.types.variableDeclarator(varId)]));
     path.get("id").replaceWith(classId);
@@ -76,7 +63,6 @@ function replaceClassWithVar(path) {
   } else {
     let className;
     let varId;
-
     if (path.node.id) {
       className = path.node.id.name;
       varId = path.scope.parent.generateDeclaredUidIdentifier(className);
@@ -87,14 +73,11 @@ function replaceClassWithVar(path) {
     } else {
       varId = path.scope.parent.generateDeclaredUidIdentifier("decorated_class");
     }
-
     const newClassExpr = _core.types.classExpression(className && _core.types.identifier(className), path.node.superClass, path.node.body);
-
     const [newPath] = path.replaceWith(_core.types.sequenceExpression([newClassExpr, varId]));
     return [_core.types.cloneNode(varId), newPath.get("expressions.0")];
   }
 }
-
 function generateClassProperty(key, value, isStatic) {
   if (key.type === "PrivateName") {
     return _core.types.classPrivateProperty(key, value, undefined, isStatic);
@@ -102,18 +85,13 @@ function generateClassProperty(key, value, isStatic) {
     return _core.types.classProperty(key, value, undefined, undefined, isStatic);
   }
 }
-
 function addProxyAccessorsFor(element, originalKey, targetKey, isComputed = false) {
   const {
     static: isStatic
   } = element.node;
-
   const getterBody = _core.types.blockStatement([_core.types.returnStatement(_core.types.memberExpression(_core.types.thisExpression(), _core.types.cloneNode(targetKey)))]);
-
   const setterBody = _core.types.blockStatement([_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.memberExpression(_core.types.thisExpression(), _core.types.cloneNode(targetKey)), _core.types.identifier("v")))]);
-
   let getter, setter;
-
   if (originalKey.type === "PrivateName") {
     getter = _core.types.classPrivateMethod("get", _core.types.cloneNode(originalKey), [], getterBody, isStatic);
     setter = _core.types.classPrivateMethod("set", _core.types.cloneNode(originalKey), [_core.types.identifier("v")], setterBody, isStatic);
@@ -121,31 +99,25 @@ function addProxyAccessorsFor(element, originalKey, targetKey, isComputed = fals
     getter = _core.types.classMethod("get", _core.types.cloneNode(originalKey), [], getterBody, isComputed, isStatic);
     setter = _core.types.classMethod("set", _core.types.cloneNode(originalKey), [_core.types.identifier("v")], setterBody, isComputed, isStatic);
   }
-
   element.insertAfter(setter);
   element.insertAfter(getter);
 }
-
 function extractProxyAccessorsFor(targetKey) {
   return [_core.types.functionExpression(undefined, [], _core.types.blockStatement([_core.types.returnStatement(_core.types.memberExpression(_core.types.thisExpression(), _core.types.cloneNode(targetKey)))])), _core.types.functionExpression(undefined, [_core.types.identifier("value")], _core.types.blockStatement([_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.memberExpression(_core.types.thisExpression(), _core.types.cloneNode(targetKey)), _core.types.identifier("value")))]))];
 }
-
 const FIELD = 0;
 const ACCESSOR = 1;
 const METHOD = 2;
 const GETTER = 3;
 const SETTER = 4;
 const STATIC = 5;
-
 function getElementKind(element) {
   switch (element.node.type) {
     case "ClassProperty":
     case "ClassPrivateProperty":
       return FIELD;
-
     case "ClassAccessorProperty":
       return ACCESSOR;
-
     case "ClassMethod":
     case "ClassPrivateMethod":
       if (element.node.kind === "get") {
@@ -155,19 +127,16 @@ function getElementKind(element) {
       } else {
         return METHOD;
       }
-
   }
 }
 
 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(filteredOrderedDecoratorInfo(info).map(el => {
     const decs = el.decorators.length > 1 ? _core.types.arrayExpression(el.decorators) : el.decorators[0];
@@ -176,48 +145,38 @@ function generateDecorationExprs(info) {
     const {
       privateMethods
     } = el;
-
     if (Array.isArray(privateMethods)) {
       decInfo.push(...privateMethods);
     } else if (privateMethods) {
       decInfo.push(privateMethods);
     }
-
     return _core.types.arrayExpression(decInfo);
   }));
 }
-
 function extractElementLocalAssignments(decorationInfo) {
   const localIds = [];
-
   for (const el of filteredOrderedDecoratorInfo(decorationInfo)) {
     const {
       locals
     } = el;
-
     if (Array.isArray(locals)) {
       localIds.push(...locals);
     } else if (locals !== undefined) {
       localIds.push(locals);
     }
   }
-
   return localIds;
 }
-
 function addCallAccessorsFor(element, key, getId, setId) {
   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")]))])));
 }
-
 function isNotTsParameter(node) {
   return node.type !== "TSParameterProperty";
 }
-
 function movePrivateAccessor(element, key, methodLocalVar, isStatic) {
   let params;
   let block;
-
   if (element.node.kind === "set") {
     params = [_core.types.identifier("v")];
     block = [_core.types.expressionStatement(_core.types.callExpression(methodLocalVar, [_core.types.thisExpression(), _core.types.identifier("v")]))];
@@ -225,27 +184,22 @@ function movePrivateAccessor(element, key, methodLocalVar, isStatic) {
     params = [];
     block = [_core.types.returnStatement(_core.types.callExpression(methodLocalVar, [_core.types.thisExpression()]))];
   }
-
   element.replaceWith(_core.types.classPrivateMethod(element.node.kind, _core.types.cloneNode(key), params, _core.types.blockStatement(block), isStatic));
 }
-
 function isClassDecoratableElementPath(path) {
   const {
     type
   } = path;
   return type !== "TSDeclareMethod" && type !== "TSIndexSignature" && type !== "StaticBlock";
 }
-
 function staticBlockToIIFE(block) {
   return _core.types.callExpression(_core.types.arrowFunctionExpression([], _core.types.blockStatement(block.body)), []);
 }
-
 function maybeSequenceExpression(exprs) {
   if (exprs.length === 0) return _core.types.unaryExpression("void", _core.types.numericLiteral(0));
   if (exprs.length === 1) return exprs[0];
   return _core.types.sequenceExpression(exprs);
 }
-
 function transformClass(path, state, constantSuper, version) {
   const body = path.get("body.body");
   const classDecorators = path.node.decorators;
@@ -256,7 +210,6 @@ function transformClass(path, state, constantSuper, version) {
     if (!isClassDecoratableElementPath(element)) {
       continue;
     }
-
     if (element.node.decorators && element.node.decorators.length > 0) {
       hasElementDecorators = true;
     } else if (element.node.type === "ClassAccessorProperty") {
@@ -276,6 +229,7 @@ function transformClass(path, state, constantSuper, version) {
 
   if (!classDecorators && !hasElementDecorators) return;
   const elementDecoratorInfo = [];
+
   let firstFieldPath;
   let constructorPath;
   let requiresProtoInit = false;
@@ -284,20 +238,17 @@ function transformClass(path, state, constantSuper, version) {
   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 = 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");
@@ -307,22 +258,18 @@ function transformClass(path, state, constantSuper, version) {
     if (!path.node.id) {
       path.node.id = path.scope.generateUidIdentifier("Class");
     }
-
     classLocal = _core.types.cloneNode(path.node.id);
   }
-
   if (hasElementDecorators) {
     for (const element of body) {
       if (!isClassDecoratableElementPath(element)) {
         continue;
       }
-
       const {
         node
       } = element;
       const decorators = element.get("decorators");
       const hasDecorators = Array.isArray(decorators) && decorators.length > 0;
-
       if (hasDecorators) {
         for (const decoratorPath of decorators) {
           if (!scopeParent.isStatic(decoratorPath.node.expression)) {
@@ -330,15 +277,12 @@ function transformClass(path, state, constantSuper, version) {
           }
         }
       }
-
       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
@@ -346,41 +290,32 @@ function transformClass(path, state, constantSuper, version) {
       const isPrivate = key.type === "PrivateName";
       const isStatic = !!element.node.static;
       let name = "computedKey";
-
       if (isPrivate) {
         name = key.id.name;
       } else if (!isComputed && key.type === "Identifier") {
         name = key.name;
       }
-
       if (element.isClassMethod({
         kind: "constructor"
       })) {
         constructorPath = element;
       }
-
       if (hasDecorators) {
         let locals;
         let privateMethods;
-
         if (kind === ACCESSOR) {
           const {
             value
           } = element.node;
           const params = [_core.types.thisExpression()];
-
           if (value) {
             params.push(_core.types.cloneNode(value));
           }
-
           const newId = generateClassPrivateUid();
           const newFieldInitId = element.scope.parent.generateDeclaredUidIdentifier(`init_${name}`);
-
           const newValue = _core.types.callExpression(_core.types.cloneNode(newFieldInitId), params);
-
           const newField = generateClassProperty(newId, newValue, isStatic);
           const [newPath] = element.replaceWith(newField);
-
           if (isPrivate) {
             privateMethods = extractProxyAccessorsFor(newId);
             const getId = newPath.scope.parent.generateDeclaredUidIdentifier(`get_${name}`);
@@ -396,7 +331,6 @@ function transformClass(path, state, constantSuper, version) {
           const valuePath = element.get("value");
           valuePath.replaceWith(_core.types.callExpression(_core.types.cloneNode(initId), [_core.types.thisExpression(), valuePath.node].filter(v => v)));
           locals = initId;
-
           if (isPrivate) {
             privateMethods = extractProxyAccessorsFor(key);
           }
@@ -417,19 +351,17 @@ function transformClass(path, state, constantSuper, version) {
             async: isAsync
           } = element.node;
           privateMethods = _core.types.functionExpression(undefined, params.filter(isNotTsParameter), body, isAsync);
-
           if (kind === GETTER || kind === SETTER) {
             movePrivateAccessor(element, _core.types.cloneNode(key), _core.types.cloneNode(locals), isStatic);
           } else {
             const node = element.node;
+
             path.node.body.body.unshift(_core.types.classPrivateProperty(key, _core.types.cloneNode(locals), [], node.static));
             decoratedPrivateMethods.add(key.id.name);
             element.remove();
           }
         }
-
         let nameExpr;
-
         if (isComputed) {
           nameExpr = _core.types.cloneNode(key);
         } else if (key.type === "PrivateName") {
@@ -439,7 +371,6 @@ function transformClass(path, state, constantSuper, version) {
         } else {
           nameExpr = _core.types.cloneNode(key);
         }
-
         elementDecoratorInfo.push({
           kind,
           decorators: decorators.map(d => d.node.expression),
@@ -448,7 +379,6 @@ function transformClass(path, state, constantSuper, version) {
           privateMethods,
           locals
         });
-
         if (kind !== FIELD) {
           if (isStatic) {
             requiresStaticInit = true;
@@ -456,38 +386,28 @@ function transformClass(path, state, constantSuper, version) {
             requiresProtoInit = true;
           }
         }
-
         if (element.node) {
           element.node.decorators = null;
         }
-
         if (!firstFieldPath && !isStatic && (kind === FIELD || kind === ACCESSOR)) {
           firstFieldPath = element;
         }
       }
     }
   }
-
   const elementDecorations = generateDecorationExprs(elementDecoratorInfo);
-
   const classDecorations = _core.types.arrayExpression((classDecorators || []).map(d => d.expression));
-
   const locals = extractElementLocalAssignments(elementDecoratorInfo);
-
   if (requiresProtoInit) {
     protoInitLocal = scopeParent.generateDeclaredUidIdentifier("initProto");
     locals.push(protoInitLocal);
-
     const protoInitCall = _core.types.callExpression(_core.types.cloneNode(protoInitLocal), [_core.types.thisExpression()]);
-
     if (firstFieldPath) {
       const value = firstFieldPath.get("value");
       const body = [protoInitCall];
-
       if (value.node) {
         body.push(value.node);
       }
-
       value.replaceWith(_core.types.sequenceExpression(body));
     } else if (constructorPath) {
       if (path.node.superClass) {
@@ -498,7 +418,6 @@ function transformClass(path, state, constantSuper, version) {
               path.replaceWith(_core.types.callExpression(_core.types.cloneNode(protoInitLocal), [path.node]));
               path.skip();
             }
-
           }
         });
       } else {
@@ -506,41 +425,37 @@ function transformClass(path, state, constantSuper, version) {
       }
     } else {
       const body = [_core.types.expressionStatement(protoInitCall)];
-
       if (path.node.superClass) {
         body.unshift(_core.types.expressionStatement(_core.types.callExpression(_core.types.super(), [_core.types.spreadElement(_core.types.identifier("args"))])));
       }
-
       path.node.body.body.unshift(_core.types.classMethod("constructor", _core.types.identifier("constructor"), [_core.types.restElement(_core.types.identifier("args"))], _core.types.blockStatement(body)));
     }
   }
-
   if (requiresStaticInit) {
     staticInitLocal = scopeParent.generateDeclaredUidIdentifier("initStatic");
     locals.push(staticInitLocal);
   }
-
   if (decoratedPrivateMethods.size > 0) {
     path.traverse({
       PrivateName(path) {
         if (!decoratedPrivateMethods.has(path.node.id.name)) return;
         const parentPath = path.parentPath;
         const parentParentPath = parentPath.parentPath;
-
-        if (parentParentPath.node.type === "AssignmentExpression" && parentParentPath.node.left === parentPath.node || parentParentPath.node.type === "UpdateExpression" || parentParentPath.node.type === "RestElement" || parentParentPath.node.type === "ArrayPattern" || parentParentPath.node.type === "ObjectProperty" && parentParentPath.node.value === parentPath.node && parentParentPath.parentPath.type === "ObjectPattern" || parentParentPath.node.type === "ForOfStatement" && parentParentPath.node.left === parentPath.node) {
+        if (
+        parentParentPath.node.type === "AssignmentExpression" && parentParentPath.node.left === parentPath.node ||
+        parentParentPath.node.type === "UpdateExpression" ||
+        parentParentPath.node.type === "RestElement" ||
+        parentParentPath.node.type === "ArrayPattern" ||
+        parentParentPath.node.type === "ObjectProperty" && parentParentPath.node.value === parentPath.node && parentParentPath.parentPath.type === "ObjectPattern" ||
+        parentParentPath.node.type === "ForOfStatement" && parentParentPath.node.left === parentPath.node) {
           throw path.buildCodeFrameError(`Decorated private methods are not updatable, but "#${path.node.id.name}" is updated via this expression.`);
         }
       }
-
     });
   }
-
   let classInitInjected = false;
-
   const classInitCall = classInitLocal && _core.types.callExpression(_core.types.cloneNode(classInitLocal), []);
-
   const originalClass = path.node;
-
   if (classDecorators) {
     locals.push(classLocal, classInitLocal);
     const statics = [];
@@ -551,9 +466,7 @@ function transformClass(path, state, constantSuper, version) {
         element.remove();
         return;
       }
-
       const isProperty = element.isClassProperty() || element.isClassPrivateProperty();
-
       if ((isProperty || element.isClassPrivateMethod()) && element.node.static) {
         if (isProperty && staticBlocks.length > 0) {
           const allValues = staticBlocks.map(staticBlockToIIFE);
@@ -561,52 +474,45 @@ function transformClass(path, state, constantSuper, version) {
           element.node.value = maybeSequenceExpression(allValues);
           staticBlocks = [];
         }
-
         element.node.static = false;
         statics.push(element.node);
         element.remove();
       }
     });
-
     if (statics.length > 0 || staticBlocks.length > 0) {
       const staticsClass = _core.template.expression.ast`
         class extends ${state.addHelper("identity")} {}
       `;
-      staticsClass.body.body = [_core.types.staticBlock([_core.types.toStatement(path.node, false)]), ...statics];
+      staticsClass.body.body = [_core.types.staticBlock([_core.types.toStatement(originalClass, true) ||
+      _core.types.expressionStatement(originalClass)]), ...statics];
       const constructorBody = [];
-
       const newExpr = _core.types.newExpression(staticsClass, []);
-
       if (staticBlocks.length > 0) {
         constructorBody.push(...staticBlocks.map(staticBlockToIIFE));
       }
-
       if (classInitCall) {
         classInitInjected = true;
         constructorBody.push(classInitCall);
       }
-
       if (constructorBody.length > 0) {
         constructorBody.unshift(_core.types.callExpression(_core.types.super(), [_core.types.cloneNode(classLocal)]));
         staticsClass.body.body.push(_core.types.classMethod("constructor", _core.types.identifier("constructor"), [], _core.types.blockStatement([_core.types.expressionStatement(_core.types.sequenceExpression(constructorBody))])));
       } else {
         newExpr.arguments.push(_core.types.cloneNode(classLocal));
       }
-
       path.replaceWith(newExpr);
     }
   }
-
   if (!classInitInjected && classInitCall) {
     path.node.body.body.push(_core.types.staticBlock([_core.types.expressionStatement(classInitCall)]));
   }
-
   originalClass.body.body.unshift(_core.types.staticBlock([_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.arrayPattern(locals), _core.types.callExpression(state.addHelper(version === "2021-12" ? "applyDecs" : "applyDecs2203"), [_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;
 }
-
 function _default({
   assertVersion,
   assumption
@@ -614,7 +520,6 @@ function _default({
   loose
 }, version) {
   var _assumption;
-
   assertVersion(version === "2021-12" ? "^7.16.0" : "^7.19.0");
   const VISITED = new WeakSet();
   const constantSuper = (_assumption = assumption("constantSuper")) != null ? _assumption : loose;
@@ -624,22 +529,19 @@ function _default({
     visitor: {
       "ExportNamedDeclaration|ExportDefaultDeclaration"(path) {
         var _declaration$decorato;
-
         const {
           declaration
         } = path.node;
-
-        if ((declaration == null ? void 0 : declaration.type) === "ClassDeclaration" && ((_declaration$decorato = declaration.decorators) == null ? void 0 : _declaration$decorato.length) > 0) {
+        if ((declaration == null ? void 0 : declaration.type) === "ClassDeclaration" &&
+        ((_declaration$decorato = declaration.decorators) == null ? void 0 : _declaration$decorato.length) > 0) {
           (0, _helperSplitExportDeclaration.default)(path);
         }
       },
-
       Class(path, state) {
         if (VISITED.has(path)) return;
         const newPath = transformClass(path, state, constantSuper, version);
         if (newPath) VISITED.add(newPath);
       }
-
     }
   };
 }