@@ -10,14 +10,14 @@ const mappedTypeFlag = 32;
1010
1111const isMappedType = type => ( type . objectFlags % ( mappedTypeFlag * 2 ) ) >= mappedTypeFlag ;
1212
13- function getConfiguredMemberName ( type , checker , booleanWrappers , visitedTypes = new Set ( ) ) {
13+ function getConfiguredMemberName ( type , checker , wrappers , visitedTypes = new Set ( ) ) {
1414 if ( ! type ) {
1515 return ;
1616 }
1717
1818 const nonNullableType = checker . getNonNullableType ( type ) ;
1919 if ( nonNullableType !== type ) {
20- return getConfiguredMemberName ( nonNullableType , checker , booleanWrappers , visitedTypes ) ;
20+ return getConfiguredMemberName ( nonNullableType , checker , wrappers , visitedTypes ) ;
2121 }
2222
2323 if ( visitedTypes . has ( type ) ) {
@@ -32,19 +32,19 @@ function getConfiguredMemberName(type, checker, booleanWrappers, visitedTypes =
3232 type . target ?. symbol ?. name ,
3333 ] ;
3434 const memberName = typeNames
35- . map ( typeName => booleanWrappers . get ( typeName ) )
35+ . map ( typeName => wrappers . get ( typeName ) )
3636 . find ( Boolean ) ;
3737 if ( memberName ) {
3838 return memberName ;
3939 }
4040
4141 if ( isTypeParameterType ( type ) ) {
42- return getConfiguredMemberName ( type . getConstraint ( ) , checker , booleanWrappers , visitedTypes ) ;
42+ return getConfiguredMemberName ( type . getConstraint ( ) , checker , wrappers , visitedTypes ) ;
4343 }
4444
4545 if ( type . isIntersection ( ) ) {
4646 for ( const constituentType of type . types ) {
47- const memberName = getConfiguredMemberName ( constituentType , checker , booleanWrappers , visitedTypes ) ;
47+ const memberName = getConfiguredMemberName ( constituentType , checker , wrappers , visitedTypes ) ;
4848 if ( memberName ) {
4949 return memberName ;
5050 }
@@ -53,15 +53,15 @@ function getConfiguredMemberName(type, checker, booleanWrappers, visitedTypes =
5353
5454 if ( isMappedType ( type ) ) {
5555 for ( const typeArgument of type . aliasTypeArguments ?? [ ] ) {
56- const memberName = getConfiguredMemberName ( typeArgument , checker , booleanWrappers , visitedTypes ) ;
56+ const memberName = getConfiguredMemberName ( typeArgument , checker , wrappers , visitedTypes ) ;
5757 if ( memberName ) {
5858 return memberName ;
5959 }
6060 }
6161 }
6262
6363 for ( const baseType of getBaseTypes ( type , checker ) ) {
64- const memberName = getConfiguredMemberName ( baseType , checker , booleanWrappers , visitedTypes ) ;
64+ const memberName = getConfiguredMemberName ( baseType , checker , wrappers , visitedTypes ) ;
6565 if ( memberName ) {
6666 return memberName ;
6767 }
@@ -96,31 +96,31 @@ function getBooleanWrapperMemberState(type, memberName, checker) {
9696 : getBooleanValueState ( memberType , checker ) ;
9797}
9898
99- function getBooleanWrapperTypeState ( type , checker , booleanWrappers ) {
99+ function getBooleanWrapperTypeState ( type , checker , wrappers ) {
100100 if ( ! type ) {
101101 return unknown ;
102102 }
103103
104104 const nonNullableType = checker . getNonNullableType ( type ) ;
105105 if ( nonNullableType !== type ) {
106- return getBooleanWrapperTypeState ( nonNullableType , checker , booleanWrappers ) ;
106+ return getBooleanWrapperTypeState ( nonNullableType , checker , wrappers ) ;
107107 }
108108
109109 if ( type . isUnion ( ) ) {
110- return combineBooleanStates ( type . types . map ( type => getBooleanWrapperTypeState ( type , checker , booleanWrappers ) ) ) ;
110+ return combineBooleanStates ( type . types . map ( type => getBooleanWrapperTypeState ( type , checker , wrappers ) ) ) ;
111111 }
112112
113- const memberName = getConfiguredMemberName ( type , checker , booleanWrappers ) ;
113+ const memberName = getConfiguredMemberName ( type , checker , wrappers ) ;
114114 if ( ! memberName ) {
115115 return unknown ;
116116 }
117117
118118 return getBooleanWrapperMemberState ( type , memberName , checker ) ;
119119}
120120
121- function getBooleanWrapperVariableState ( { variable, definition, context, booleanWrappers } ) {
121+ function getBooleanWrapperVariableState ( { variable, definition, context, wrappers } ) {
122122 if (
123- booleanWrappers . size === 0
123+ wrappers . size === 0
124124 || ! definition
125125 || ! [ 'Variable' , 'Parameter' ] . includes ( definition . type )
126126 || variable . references . some ( reference => ! reference . init && reference . isWrite ( ) )
@@ -137,7 +137,7 @@ function getBooleanWrapperVariableState({variable, definition, context, booleanW
137137 return getBooleanWrapperTypeState (
138138 parserServices . getTypeAtLocation ( definition . name ) ,
139139 parserServices . program . getTypeChecker ( ) ,
140- booleanWrappers ,
140+ wrappers ,
141141 ) ;
142142 } catch {
143143 return unknown ;
0 commit comments