@@ -25,6 +25,7 @@ import {
25
25
ABSENCE_MATCHERS ,
26
26
ALL_QUERIES_COMBINATIONS ,
27
27
ASYNC_UTILS ,
28
+ DEBUG_UTILS ,
28
29
PRESENCE_MATCHERS ,
29
30
} from '../utils' ;
30
31
@@ -79,10 +80,9 @@ type IsRenderUtilFn = (node: TSESTree.Identifier) => boolean;
79
80
type IsRenderVariableDeclaratorFn = (
80
81
node : TSESTree . VariableDeclarator
81
82
) => boolean ;
82
- type IsDebugUtilFn = ( identifierNode : TSESTree . Identifier ) => boolean ;
83
- type IsOneOfDebugUtils = (
83
+ type IsDebugUtilFn = (
84
84
identifierNode : TSESTree . Identifier ,
85
- names : string [ ]
85
+ validNames ?: ReadonlyArray < typeof DEBUG_UTILS [ number ] >
86
86
) => boolean ;
87
87
type IsPresenceAssertFn = ( node : TSESTree . MemberExpression ) => boolean ;
88
88
type IsAbsenceAssertFn = ( node : TSESTree . MemberExpression ) => boolean ;
@@ -116,7 +116,6 @@ export interface DetectionHelpers {
116
116
isRenderUtil : IsRenderUtilFn ;
117
117
isRenderVariableDeclarator : IsRenderVariableDeclaratorFn ;
118
118
isDebugUtil : IsDebugUtilFn ;
119
- isOneOfDebugUtils : IsOneOfDebugUtils ;
120
119
isPresenceAssert : IsPresenceAssertFn ;
121
120
isAbsenceAssert : IsAbsenceAssertFn ;
122
121
canReportErrors : CanReportErrorsFn ;
@@ -600,9 +599,9 @@ export function detectTestingLibraryUtils<
600
599
return isRenderUtil ( initIdentifierNode ) ;
601
600
} ;
602
601
603
- const isOneOfDebugUtils : IsOneOfDebugUtils = (
602
+ const isDebugUtil : IsDebugUtilFn = (
604
603
identifierNode ,
605
- names : string [ ]
604
+ validNames = DEBUG_UTILS
606
605
) => {
607
606
const isBuiltInConsole =
608
607
isMemberExpression ( identifierNode . parent ) &&
@@ -614,26 +613,11 @@ export function detectTestingLibraryUtils<
614
613
isTestingLibraryUtil (
615
614
identifierNode ,
616
615
( identifierNodeName , originalNodeName ) => {
617
- return names . includes ( originalNodeName || identifierNodeName ) ;
618
- }
619
- )
620
- ) ;
621
- } ;
622
-
623
- const isDebugUtil : IsDebugUtilFn = ( identifierNode ) => {
624
- const isBuiltInConsole =
625
- isMemberExpression ( identifierNode . parent ) &&
626
- ASTUtils . isIdentifier ( identifierNode . parent . object ) &&
627
- identifierNode . parent . object . name === 'console' ;
628
-
629
- return (
630
- ! isBuiltInConsole &&
631
- isTestingLibraryUtil (
632
- identifierNode ,
633
- ( identifierNodeName , originalNodeName ) => {
634
- return [ identifierNodeName , originalNodeName ]
635
- . filter ( Boolean )
636
- . includes ( 'debug' ) ;
616
+ return (
617
+ ( validNames as string [ ] ) . includes ( identifierNodeName ) ||
618
+ ( ! ! originalNodeName &&
619
+ ( validNames as string [ ] ) . includes ( originalNodeName ) )
620
+ ) ;
637
621
}
638
622
)
639
623
) ;
@@ -832,7 +816,6 @@ export function detectTestingLibraryUtils<
832
816
isRenderUtil,
833
817
isRenderVariableDeclarator,
834
818
isDebugUtil,
835
- isOneOfDebugUtils,
836
819
isPresenceAssert,
837
820
isAbsenceAssert,
838
821
canReportErrors,
0 commit comments