Restore class fields transform compat with old @babel/types (#14231)

nicolo-ribaudo · web-flow · commit 963da8960b21 · 2022-02-03T17:44:52.000+01:00
diff --git a/packages/babel-helper-create-class-features-plugin/src/decorators.ts b/packages/babel-helper-create-class-features-plugin/src/decorators.ts
@@ -82,7 +82,8 @@ function extractElementDescriptor(
     prop("decorators", takeDecorators(node as Decorable)),
     prop(
       "static",
-      !t.isStaticBlock(node) && node.static && t.booleanLiteral(true),
+      // @ts-expect-error: TS doesn't infer that node is not a StaticBlock
+      !t.isStaticBlock?.(node) && node.static && t.booleanLiteral(true),
     ),
     prop("key", getKey(node)),
   ].filter(Boolean);
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.ts b/packages/babel-helper-create-class-features-plugin/src/fields.ts
@@ -911,7 +911,8 @@ function replaceThisContext(
     getSuperRef,
     getObjectRef() {
       state.needsClassRef = true;
-      return t.isStaticBlock(path.node) || path.node.static
+      // @ts-expect-error: TS doesn't infer that path.node is not a StaticBlock
+      return t.isStaticBlock?.(path.node) || path.node.static
         ? ref
         : t.memberExpression(ref, t.identifier("prototype"));
     },
@@ -964,7 +965,8 @@ export function buildFieldsInitNodes(
   for (const prop of props) {
     prop.isClassProperty() && ts.assertFieldTransformed(prop);
 
-    const isStatic = !t.isStaticBlock(prop.node) && prop.node.static;
+    // @ts-expect-error: TS doesn't infer that prop.node is not a StaticBlock
+    const isStatic = !t.isStaticBlock?.(prop.node) && prop.node.static;
     const isInstance = !isStatic;
     const isPrivate = prop.isPrivate();
     const isPublic = !isPrivate;
diff --git a/packages/babel-helper-create-class-features-plugin/src/index.ts b/packages/babel-helper-create-class-features-plugin/src/index.ts
@@ -242,7 +242,8 @@ export function createClassFeaturePlugin({
             (referenceVisitor, state) => {
               if (isDecorated) return;
               for (const prop of props) {
-                if (t.isStaticBlock(prop.node) || prop.node.static) continue;
+                // @ts-expect-error: TS doesn't infer that prop.node is not a StaticBlock
+                if (t.isStaticBlock?.(prop.node) || prop.node.static) continue;
                 prop.traverse(referenceVisitor, state);
               }
             },
