refactor: get rid of nodeIsComponentNamed helper

patternfly · Aug 26, 2024 · f4b868d · f4b868d
1 parent 6ee3bff
commit f4b868d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/packages/eslint-plugin-pf-codemods/src/rules/helpers/index.ts b/packages/eslint-plugin-pf-codemods/src/rules/helpers/index.ts
@@ -21,7 +21,6 @@ export * from "./importAndExport";
 export * from "./includesImport";
 export * from "./interfaces";
 export * from "./JSXAttributes";
-export * from "./nodeIsComponentNamed";
 export * from "./nodeMatches";
 export * from "./pfPackageMatches";
 export * from "./removeElement";

diff --git a/packages/eslint-plugin-pf-codemods/src/rules/helpers/nodeIsComponentNamed.ts b/packages/eslint-plugin-pf-codemods/src/rules/helpers/nodeIsComponentNamed.ts
diff --git a/.../src/rules/v6/emptyStateHeaderMoveIntoEmptyState/emptyStateHeader-move-into-emptyState.ts b/.../src/rules/v6/emptyStateHeaderMoveIntoEmptyState/emptyStateHeader-move-into-emptyState.ts
@@ -7,15 +7,14 @@ import {
   Node,
 } from "estree-jsx";
 import {
+  checkMatchingJSXOpeningElement,
   getAttribute,
   getAttributeText,
   getAttributeValueText,
   getChildJSXElementByName,
   getDefaultImportsFromPackage,
   getExpression,
   getFromPackage,
-  includesImport,
-  nodeIsComponentNamed,
   getChildrenAsAttributeValueText,
   getRemoveElementFixes,
 } from "../../helpers";
@@ -149,13 +148,19 @@ module.exports = {
     const pkg = "@patternfly/react-core";
     const { imports } = getFromPackage(context, pkg);
 
-    if (!includesImport(imports, "EmptyState")) {
+    const emptyStateImport = imports.find(
+      (specifier) => specifier.imported.name === "EmptyState"
+    );
+
+    if (!emptyStateImport) {
       return {};
     }
 
     return {
       JSXElement(node: JSXElement) {
-        if (!nodeIsComponentNamed(node, "EmptyState")) {
+        if (
+          !checkMatchingJSXOpeningElement(node.openingElement, emptyStateImport)
+        ) {
           return;
         }
 

diff --git a/...v6/loginMainFooterLinksItemStructureUpdated/loginMainFooterLinksItem-structure-updated.ts b/...v6/loginMainFooterLinksItemStructureUpdated/loginMainFooterLinksItem-structure-updated.ts
@@ -1,12 +1,12 @@
 import { Rule } from "eslint";
 import { JSXElement } from "estree-jsx";
 import {
+  checkMatchingJSXOpeningElement,
   getAttribute,
   getAttributeText,
   getExpression,
   getFromPackage,
   includesImport,
-  nodeIsComponentNamed,
 } from "../../helpers";
 
 // https://github.com/patternfly/patternfly-react/pull/10107
@@ -25,7 +25,12 @@ module.exports = {
 
     return {
       JSXElement(node: JSXElement) {
-        if (!nodeIsComponentNamed(node, "LoginMainFooterLinksItem")) {
+        if (
+          !checkMatchingJSXOpeningElement(
+            node.openingElement,
+            loginMainFooterLinksItemImport
+          )
+        ) {
           return;
         }