@@ -69,10 +69,11 @@ function lastChildUtility(element: ESTree.JSXElement) {
6969 return undefined ;
7070}
7171
72- /** JSX an expression can render: both branches of a ternary, the right of `&&`, a map callback's result. */
73- function renderedBy ( expression : ESTree . Node | null | undefined ) : ESTree . Node [ ] {
72+ /** JSX an expression can render: both branches of a ternary or `||` , the right of `&&`, a map callback's result. */
73+ function renderedBy ( expression : ESTree . Node | JsxChild | null | undefined ) : ESTree . Node [ ] {
7474 if ( ! expression ) return [ ] ;
7575 switch ( expression . type ) {
76+ case "JSXExpressionContainer" :
7677 case "ParenthesizedExpression" :
7778 return renderedBy ( expression . expression ) ;
7879 case "JSXElement" :
@@ -82,7 +83,9 @@ function renderedBy(expression: ESTree.Node | null | undefined): ESTree.Node[] {
8283 case "ConditionalExpression" :
8384 return [ ...renderedBy ( expression . consequent ) , ...renderedBy ( expression . alternate ) ] ;
8485 case "LogicalExpression" :
85- return renderedBy ( expression . right ) ;
86+ return expression . operator === "&&"
87+ ? renderedBy ( expression . right )
88+ : [ ...renderedBy ( expression . left ) , ...renderedBy ( expression . right ) ] ;
8689 case "CallExpression" : {
8790 const callback = expression . arguments [ 0 ] ;
8891 if ( callback ?. type !== "ArrowFunctionExpression" && callback ?. type !== "FunctionExpression" )
@@ -109,44 +112,53 @@ function returnedBy(body: ESTree.Node): ESTree.Node[] {
109112 return found ;
110113}
111114
112- /** Whether an expression can render nothing, letting an earlier sibling end up last. */
113- function mayRenderNothing ( expression : ESTree . Node | JsxChild ) : boolean {
115+ type Rendered = "element" | "maybe" | "none" ;
116+
117+ const either = ( a : Rendered , b : Rendered ) : Rendered => ( a === b ? a : "maybe" ) ;
118+
119+ /** Whether an expression, or only its truthy values, always, maybe, or never renders an element; text counts as none. */
120+ function renders ( expression : ESTree . Node | JsxChild , truthy = false ) : Rendered {
114121 switch ( expression . type ) {
122+ case "JSXElement" :
123+ return "element" ;
124+ case "JSXFragment" : {
125+ const children = expression . children . map ( ( child ) => renders ( child ) ) ;
126+ if ( children . includes ( "element" ) ) return "element" ;
127+ return children . includes ( "maybe" ) ? "maybe" : "none" ;
128+ }
115129 case "JSXText" :
116- return expression . value . trim ( ) === "" ;
117130 case "JSXEmptyExpression" :
118- return true ;
131+ case "Literal" :
132+ case "TemplateLiteral" :
133+ return "none" ;
119134 case "JSXExpressionContainer" :
120135 case "ParenthesizedExpression" :
121- return mayRenderNothing ( expression . expression ) ;
122- case "Literal" :
123- return expression . value === null || expression . value === false ;
136+ return renders ( expression . expression , truthy ) ;
124137 case "Identifier" :
125- return expression . name === "undefined" ;
126- case "LogicalExpression" :
127- case "CallExpression" :
128- return true ;
138+ return expression . name === "undefined" ? "none" : "maybe" ;
139+ case "LogicalExpression" : {
140+ const right = renders ( expression . right , truthy ) ;
141+ if ( expression . operator === "&&" ) {
142+ return truthy || renders ( expression . left ) === "element" ? right : either ( "none" , right ) ;
143+ }
144+ return either ( renders ( expression . left , expression . operator === "||" ) , right ) ;
145+ }
129146 case "ConditionalExpression" :
130- return mayRenderNothing ( expression . consequent ) || mayRenderNothing ( expression . alternate ) ;
131- case "JSXFragment" :
132- return expression . children . every ( mayRenderNothing ) ;
147+ return either ( renders ( expression . consequent , truthy ) , renders ( expression . alternate , truthy ) ) ;
133148 default :
134- return false ;
149+ return "maybe" ;
135150 }
136151}
137152
138- /** Nodes that can end up as the last rendered child. */
153+ /** Nodes that can end up as the last rendered element child. */
139154function possiblyLast ( children : ReadonlyArray < JsxChild > ) : ESTree . Node [ ] {
140- const meaningful = children . filter (
141- ( child ) =>
142- ! ( child . type === "JSXText" && child . value . trim ( ) === "" ) &&
143- ! ( child . type === "JSXExpressionContainer" && child . expression . type === "JSXEmptyExpression" ) ,
144- ) ;
145155 const found : ESTree . Node [ ] = [ ] ;
146- for ( let index = meaningful . length - 1 ; index >= 0 ; index -- ) {
147- const child = meaningful [ index ] ! ;
148- found . push ( ...renderedBy ( child . type === "JSXExpressionContainer" ? child . expression : child ) ) ;
149- if ( ! mayRenderNothing ( child ) ) break ;
156+ for ( let index = children . length - 1 ; index >= 0 ; index -- ) {
157+ const child = children [ index ] ! ;
158+ const rendered = renders ( child ) ;
159+ if ( rendered === "none" ) continue ;
160+ found . push ( ...renderedBy ( child ) ) ;
161+ if ( rendered === "element" ) break ;
150162 }
151163 return found ;
152164}
0 commit comments