refactor: use isTestingLibraryModule for detection logic

Author: y-hsgw

lib/create-testing-library-rule/detect-testing-library-utils.ts

@@ -23,7 +23,13 @@ import {
 	ASYNC_UTILS,
 	DEBUG_UTILS,
 	PRESENCE_MATCHERS,
+	USER_EVENT_MODULE,
 } from '../utils';
+import {
+	isCustomTestingLibraryModule,
+	isOfficialTestingLibraryModule,
+	isTestingLibraryModule,
+} from '../utils/is-testing-library-module';
 
 const SETTING_OPTION_OFF = 'off';
 
@@ -133,7 +139,6 @@ export interface DetectionHelpers {
 	isNodeComingFromTestingLibrary: IsNodeComingFromTestingLibraryFn;
 }
 
-const USER_EVENT_PACKAGE = '@testing-library/user-event';
 const REACT_DOM_TEST_UTILS_PACKAGE = 'react-dom/test-utils';
 const FIRE_EVENT_NAME = 'fireEvent';
 const CREATE_EVENT_NAME = 'createEvent';
@@ -960,12 +965,11 @@ export function detectTestingLibraryUtils<
 			}
 
 			const hasImportElementMatch = hasImportMatch(importNode, identifierName);
-			const hasImportModuleMatch =
-				/testing-library/g.test(importDeclarationName) ||
-				(typeof customModuleSetting === 'string' &&
-					importDeclarationName.endsWith(customModuleSetting));
 
-			return hasImportElementMatch && hasImportModuleMatch;
+			return (
+				hasImportElementMatch &&
+				isTestingLibraryModule(importDeclarationName, customModuleSetting)
+			);
 		};
 
 		const helpers: DetectionHelpers = {
@@ -1017,17 +1021,16 @@ export function detectTestingLibraryUtils<
 				}
 				// check only if testing library import not found yet so we avoid
 				// to override importedTestingLibraryNodes after it's found
-				if (/testing-library/g.test(node.source.value)) {
+				if (isOfficialTestingLibraryModule(node.source.value)) {
 					importedTestingLibraryNodes.push(node);
 				}
 
 				// check only if custom module import not found yet so we avoid
 				// to override importedCustomModuleNode after it's found
 				const customModule = getCustomModule();
 				if (
-					customModule &&
 					!importedCustomModuleNode &&
-					node.source.value.endsWith(customModule)
+					isCustomTestingLibraryModule(node.source.value, customModule)
 				) {
 					importedCustomModuleNode = node;
 				}
@@ -1036,7 +1039,7 @@ export function detectTestingLibraryUtils<
 				// to override importedUserEventLibraryNode after it's found
 				if (
 					!importedUserEventLibraryNode &&
-					node.source.value === USER_EVENT_PACKAGE
+					node.source.value === USER_EVENT_MODULE
 				) {
 					importedUserEventLibraryNode = node;
 				}
@@ -1063,7 +1066,7 @@ export function detectTestingLibraryUtils<
 						(arg) =>
 							isLiteral(arg) &&
 							typeof arg.value === 'string' &&
-							/testing-library/g.test(arg.value)
+							isOfficialTestingLibraryModule(arg.value)
 					)
 				) {
 					importedTestingLibraryNodes.push(callExpression);
@@ -1074,10 +1077,9 @@ export function detectTestingLibraryUtils<
 					!importedCustomModuleNode &&
 					args.some(
 						(arg) =>
-							customModule &&
 							isLiteral(arg) &&
 							typeof arg.value === 'string' &&
-							arg.value.endsWith(customModule)
+							isCustomTestingLibraryModule(arg.value, customModule)
 					)
 				) {
 					importedCustomModuleNode = callExpression;
@@ -1089,7 +1091,7 @@ export function detectTestingLibraryUtils<
 						(arg) =>
 							isLiteral(arg) &&
 							typeof arg.value === 'string' &&
-							arg.value === USER_EVENT_PACKAGE
+							arg.value === USER_EVENT_MODULE
 					)
 				) {
 					importedUserEventLibraryNode = callExpression;

lib/utils/resolve-to-testing-library-fn.ts

@@ -24,7 +24,7 @@ import {
 	isSupportedAccessor,
 } from '../node-utils/accessors';
 
-import { LIBRARY_MODULES, USER_EVENT_MODULE } from '.';
+import { isTestingLibraryModule } from './is-testing-library-module';
 
 interface ImportDetails {
 	source: string;
@@ -171,12 +171,8 @@ export const resolveToTestingLibraryFn = <
 	}
 
 	const customModuleSetting = context.settings['testing-library/utils-module'];
-	const hasImportModuleMatch =
-		[...LIBRARY_MODULES, USER_EVENT_MODULE].includes(maybeImport.source) ||
-		(typeof customModuleSetting === 'string' &&
-			maybeImport.source.endsWith(customModuleSetting));
 
-	if (hasImportModuleMatch) {
+	if (isTestingLibraryModule(maybeImport.source, customModuleSetting)) {
 		return {
 			original: maybeImport.imported,
 			local: maybeImport.local,