Make NodePath<T | U> distributive (#16439)

Author: nicolo-ribaudo

packages/babel-helper-create-class-features-plugin/src/decorators.ts

@@ -1876,10 +1876,8 @@ function transformClass(
 
       // update originalClassPath according to the new AST
       originalClassPath = (
-        newPath.get("callee").get("body") as NodePath<t.ClassBody>
-      )
-        .get("body")[0]
-        .get("key");
+        newPath.get("callee").get("body") as NodePath<t.Class>
+      ).get("body.0.key");
     }
   }
   if (!classInitInjected && classInitCall) {
@@ -2252,11 +2250,11 @@ function NamedEvaluationVisitoryFactory(
     // the object properties under object patterns
     ObjectExpression(path, state) {
       for (const propertyPath of path.get("properties")) {
+        if (!propertyPath.isObjectProperty()) continue;
         const { node } = propertyPath;
-        if (node.type !== "ObjectProperty") continue;
         const id = node.key;
         const initializer = skipTransparentExprWrappers(
-          propertyPath.get("value"),
+          propertyPath.get("value") as NodePath<t.Expression>,
         );
         if (isAnonymous(initializer)) {
           if (!node.computed) {
@@ -2274,7 +2272,7 @@ function NamedEvaluationVisitoryFactory(
             }
           } else {
             const ref = handleComputedProperty(
-              propertyPath as NodePath<t.ObjectProperty>,
+              propertyPath,
               // The key of a computed object property must not be a private name
               id as t.Expression,
               state,

packages/babel-helper-create-class-features-plugin/src/fields.ts

@@ -1593,7 +1593,7 @@ export function buildFieldsInitNodes(
     // this maybe a bug for ts
     switch (true) {
       case isStaticBlock: {
-        const blockBody = (prop.node as t.StaticBlock).body;
+        const blockBody = prop.node.body;
         // We special-case the single expression case to avoid the iife, since
         // it's common.
         if (blockBody.length === 1 && t.isExpressionStatement(blockBody[0])) {
@@ -1640,16 +1640,13 @@ export function buildFieldsInitNodes(
         // It might still be possible to a computed static fields whose resulting
         // key is "name" or "length", but the assumption is telling us that it's
         // not going to happen.
-        // @ts-expect-error checked in switch
         if (!isNameOrLength(prop.node)) {
-          // @ts-expect-error checked in switch
           staticNodes.push(buildPublicFieldInitLoose(t.cloneNode(ref), prop));
           break;
         }
       // falls through
       case isStatic && isPublic && isField && !setPublicClassFields:
         staticNodes.push(
-          // @ts-expect-error checked in switch
           buildPublicFieldInitSpec(t.cloneNode(ref), prop, file),
         );
         break;
@@ -1681,15 +1678,13 @@ export function buildFieldsInitNodes(
         instanceNodes.unshift(
           buildPrivateMethodInitLoose(
             t.thisExpression(),
-            // @ts-expect-error checked in switch
             prop,
             privateNamesMap,
           ),
         );
         pureStaticNodes.push(
           buildPrivateMethodDeclaration(
             file,
-            // @ts-expect-error checked in switch
             prop,
             privateNamesMap,
             privateFieldsAsSymbolsOrProperties,
@@ -1703,7 +1698,6 @@ export function buildFieldsInitNodes(
         instanceNodes.unshift(
           buildPrivateInstanceMethodInitSpec(
             t.thisExpression(),
-            // @ts-expect-error checked in switch
             prop,
             privateNamesMap,
             file,
@@ -1712,7 +1706,6 @@ export function buildFieldsInitNodes(
         pureStaticNodes.push(
           buildPrivateMethodDeclaration(
             file,
-            // @ts-expect-error checked in switch
             prop,
             privateNamesMap,
             privateFieldsAsSymbolsOrProperties,
@@ -1732,7 +1725,6 @@ export function buildFieldsInitNodes(
         pureStaticNodes.push(
           buildPrivateMethodDeclaration(
             file,
-            // @ts-expect-error checked in switch
             prop,
             privateNamesMap,
             privateFieldsAsSymbolsOrProperties,
@@ -1746,7 +1738,6 @@ export function buildFieldsInitNodes(
         staticNodes.unshift(
           buildPrivateStaticMethodInitLoose(
             t.cloneNode(ref),
-            // @ts-expect-error checked in switch
             prop,
             file,
             privateNamesMap,
@@ -1755,21 +1746,18 @@ export function buildFieldsInitNodes(
         pureStaticNodes.push(
           buildPrivateMethodDeclaration(
             file,
-            // @ts-expect-error checked in switch
             prop,
             privateNamesMap,
             privateFieldsAsSymbolsOrProperties,
           ),
         );
         break;
       case isInstance && isPublic && isField && setPublicClassFields:
-        // @ts-expect-error checked in switch
         instanceNodes.push(buildPublicFieldInitLoose(t.thisExpression(), prop));
         break;
       case isInstance && isPublic && isField && !setPublicClassFields:
         lastInstanceNodeReturnsThis = true;
         instanceNodes.push(
-          // @ts-expect-error checked in switch
           buildPublicFieldInitSpec(t.thisExpression(), prop, file),
         );
         break;

packages/babel-helper-create-class-features-plugin/src/index.ts

@@ -233,7 +233,7 @@ export function createClassFeaturePlugin({
         const innerBinding = path.node.id;
         let ref: t.Identifier | null;
         if (!innerBinding || !pathIsClassDeclaration) {
-          nameFunction(path);
+          nameFunction(path as NodePath<t.ClassExpression>);
           ref = path.scope.generateUidIdentifier(innerBinding?.name || "Class");
         }
         const classRefForDefine = ref ?? t.cloneNode(innerBinding);

packages/babel-helper-member-expression-to-functions/src/index.ts

@@ -215,12 +215,9 @@ const handle = {
         );
       }
 
-      // @ts-expect-error isOptionalMemberExpression does not work with NodePath union
       const startingNode = startingOptional.isOptionalMemberExpression()
-        ? // @ts-expect-error isOptionalMemberExpression does not work with NodePath union
-          startingOptional.node.object
-        : // @ts-expect-error isOptionalMemberExpression does not work with NodePath union
-          startingOptional.node.callee;
+        ? startingOptional.node.object
+        : startingOptional.node.callee;
       const baseNeedsMemoised = scope.maybeGenerateMemoised(startingNode);
       const baseRef = baseNeedsMemoised ?? startingNode;
 

packages/babel-helper-module-transforms/src/normalize-and-load-metadata.ts

@@ -549,7 +549,6 @@ function getLocalExportMetadata(
         declaration.isFunctionDeclaration() ||
         declaration.isClassDeclaration()
       ) {
-        // @ts-expect-error todo(flow->ts): improve babel-types
         getLocalMetadata(declaration.get("id")).names.push("default");
       } else {
         // These should have been removed by the nameAnonymousExports() call.
@@ -594,9 +593,7 @@ function removeImportExportDeclarations(programPath: NodePath<t.Program>) {
       ) {
         // @ts-expect-error todo(flow->ts): avoid mutations
         declaration._blockHoist = child.node._blockHoist;
-        child.replaceWith(
-          declaration as NodePath<t.FunctionDeclaration | t.ClassDeclaration>,
-        );
+        child.replaceWith(declaration);
       } else {
         // These should have been removed by the nameAnonymousExports() call.
         throw declaration.buildCodeFrameError(

packages/babel-helper-module-transforms/src/rewrite-live-references.ts

@@ -569,7 +569,7 @@ const rewriteReferencesVisitor: Visitor<RewriteReferencesVisitorState> = {
       }
 
       path.ensureBlock();
-      const bodyPath = path.get("body");
+      const bodyPath = path.get("body") as NodePath<t.BlockStatement>;
 
       const newLoopId = scope.generateUidIdentifierBasedOnNode(left);
       path

packages/babel-helper-split-export-declaration/src/index.ts

@@ -74,10 +74,7 @@ export default function splitExportDeclaration(
     }
 
     return exportDeclaration;
-  } else if (
-    // @ts-expect-error TS can not narrow down to NodePath<t.ExportNamedDeclaration>
-    exportDeclaration.get("specifiers").length > 0
-  ) {
+  } else if (exportDeclaration.get("specifiers").length > 0) {
     throw new Error("It doesn't make sense to split exported specifiers.");
   }
 

packages/babel-helper-wrap-function/src/index.ts

@@ -117,7 +117,7 @@ function plainFunction(
       | t.FunctionExpression
       | t.CallExpression;
   } else {
-    node = path.node as t.FunctionDeclaration | t.FunctionExpression;
+    node = path.node;
   }
 
   const isDeclaration = isFunctionDeclaration(node);

packages/babel-helpers/src/index.ts

@@ -59,7 +59,6 @@ function getHelperMetadata(file: File): HelperMetadata {
       }
       if (
         child.get("specifiers").length !== 1 ||
-        // @ts-expect-error isImportDefaultSpecifier does not work with NodePath union
         !child.get("specifiers.0").isImportDefaultSpecifier()
       ) {
         throw child.buildCodeFrameError(
@@ -223,7 +222,7 @@ function permuteHelperAST(
     exp.replaceWith(decl);
   } else if (id.type === "MemberExpression") {
     exportBindingAssignments.forEach(assignPath => {
-      const assign: NodePath<t.Expression> = path.get(assignPath);
+      const assign = path.get(assignPath) as NodePath<t.Expression>;
       assign.replaceWith(assignmentExpression("=", id, assign.node));
     });
     exp.replaceWith(decl);

packages/babel-plugin-bugfix-firefox-class-in-computed-class-key/src/index.ts

@@ -93,7 +93,10 @@ export default declare(({ types: t, traverse, assertVersion }) => {
             elem.node.computed &&
             containsClassExpression(elem.get("key"))
           ) {
-            wrap(elem.get("key"));
+            wrap(
+              // @ts-expect-error .key also includes t.PrivateName
+              elem.get("key") satisfies NodePath<t.Expression>,
+            );
           }
         }
       },