add Expression alias for JSXMemberExpression & update condition

babel · Mar 29, 2022 · f7973e7 · f7973e7
1 parent e072ba9
commit f7973e7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/packages/babel-traverse/src/path/introspection.ts b/packages/babel-traverse/src/path/introspection.ts
@@ -181,12 +181,12 @@ export function referencesImport(
 ): boolean {
   if (!this.isReferencedIdentifier()) {
     if (
-      (this.isMemberExpression() ||
-        this.isJSXMemberExpression() ||
-        this.isOptionalMemberExpression()) &&
-      (this.node.computed
-        ? isStringLiteral(this.node.property, { value: importName })
-        : (this.node.property as t.Identifier).name === importName)
+      (this.isJSXMemberExpression() &&
+        (this.node.property as t.JSXIdentifier).name === importName) ||
+      ((this.isMemberExpression() || this.isOptionalMemberExpression()) &&
+        (this.node.computed
+          ? isStringLiteral(this.node.property, { value: importName })
+          : (this.node.property as t.Identifier).name === importName))
     ) {
       const object = (
         this as NodePath<t.MemberExpression | t.OptionalMemberExpression>

diff --git a/packages/babel-types/src/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -2156,6 +2156,7 @@ export type Expression =
   | OptionalCallExpression
   | TypeCastExpression
   | JSXElement
+  | JSXMemberExpression
   | JSXFragment
   | BindExpression
   | DoExpression

diff --git a/packages/babel-types/src/definitions/jsx.ts b/packages/babel-types/src/definitions/jsx.ts
@@ -107,6 +107,7 @@ defineType("JSXIdentifier", {
 
 defineType("JSXMemberExpression", {
   visitor: ["object", "property"],
+  aliases: ["Expression"],
   fields: {
     object: {
       validate: assertNodeType("JSXMemberExpression", "JSXIdentifier"),

diff --git a/packages/babel-types/src/validators/generated/index.ts b/packages/babel-types/src/validators/generated/index.ts
@@ -4357,6 +4357,7 @@ export function isExpression(
     "OptionalCallExpression" === nodeType ||
     "TypeCastExpression" === nodeType ||
     "JSXElement" === nodeType ||
+    "JSXMemberExpression" === nodeType ||
     "JSXFragment" === nodeType ||
     "BindExpression" === nodeType ||
     "DoExpression" === nodeType ||