fix(optimizer): support wrapping logical expressions in templates

Author: Varixo

.changeset/shy-walls-shake.md

@@ -2,4 +2,4 @@
 '@qwik.dev/core': patch
 ---
 
-fix: support wrapping type-asserted variables in templates
+fix: reactivity for type-asserted variables in templates

.changeset/some-birds-juggle.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+fix: reactivity for logical expressions in templates

packages/qwik/src/optimizer/core/src/inlined_fn.rs

@@ -213,15 +213,54 @@ struct ObjectUsageChecker<'a> {
 	used_as_object: bool,
 }
 
-impl<'a> Visit for ObjectUsageChecker<'a> {
-	fn visit_member_expr(&mut self, node: &ast::MemberExpr) {
-		if let ast::Expr::Ident(obj_ident) = &*node.obj {
-			for id in self.identifiers {
-				if obj_ident.sym == id.0 {
+impl<'a> ObjectUsageChecker<'a> {
+	// Helper function to recursively check if an expression contains one of the target identifiers.
+	fn recursively_check_object_expr(&mut self, expr: &ast::Expr) {
+		if self.used_as_object {
+			return; // Already found
+		}
+		match expr {
+			ast::Expr::Ident(ident) => {
+				// Check if this identifier is one of the target identifiers
+				if self
+					.identifiers
+					.iter()
+					.any(|id| id.0 == ident.sym /* && id.1 == ident.ctxt */)
+				{
 					self.used_as_object = true;
-					return;
 				}
 			}
+			ast::Expr::Bin(bin_expr) => {
+				// If it's a binary expression, specifically look for logical OR
+				if bin_expr.op == ast::BinaryOp::LogicalOr {
+					self.recursively_check_object_expr(&bin_expr.left);
+					if self.used_as_object {
+						return;
+					}
+					self.recursively_check_object_expr(&bin_expr.right);
+				}
+			}
+			ast::Expr::Paren(paren_expr) => {
+				// If it's a parenthesized expression, check the inner expression
+				self.recursively_check_object_expr(&paren_expr.expr);
+			}
+			_ => {
+				// For other expression types, traversal is handled by the Visit trait
+			}
+		}
+	}
+}
+
+impl<'a> Visit for ObjectUsageChecker<'a> {
+	fn visit_member_expr(&mut self, node: &ast::MemberExpr) {
+		if self.used_as_object {
+			return;
+		}
+
+		self.recursively_check_object_expr(&node.obj);
+
+		if self.used_as_object {
+			return;
 		}
 		node.visit_children_with(self);
 	}

packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__should_wrap_logical_expression_in_template.snap

@@ -0,0 +1,68 @@
+---
+source: packages/qwik/src/optimizer/core/src/test.rs
+assertion_line: 4405
+expression: output
+snapshot_kind: text
+---
+==INPUT==
+
+
+		import { component$, useSignal } from '@qwik.dev/core';
+
+		export default component$(() => {
+			const count = useSignal(0);
+			const count2 = useSignal(0);
+			return (
+				<div>
+					{(count || count2).value}
+				</div>
+			);
+		});
+		
+============================= test.js ==
+
+import { componentQrl } from "@qwik.dev/core";
+import { qrl } from "@qwik.dev/core";
+export default /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./test.tsx_test_component_LUXeXe0DQrg"), "test_component_LUXeXe0DQrg"));
+
+
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;AAGE,6BAAe,mHAQZ\"}")
+============================= test.tsx_test_component_LUXeXe0DQrg.js (ENTRY POINT)==
+
+import { _fnSignal } from "@qwik.dev/core";
+import { _jsxSorted } from "@qwik.dev/core";
+import { useSignal } from "@qwik.dev/core";
+export const test_component_LUXeXe0DQrg = ()=>{
+    const count = useSignal(0);
+    const count2 = useSignal(0);
+    return /*#__PURE__*/ _jsxSorted("div", null, null, _fnSignal((p0, p1)=>(p0 || p1).value, [
+        count,
+        count2
+    ], "(p0||p1).value"), 3, "u6_0");
+};
+
+
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;0CAG4B;IACzB,MAAM,QAAQ,UAAU;IACxB,MAAM,SAAS,UAAU;IACzB,qBACC,WAAC,uCACC,CAAC,QAAe,EAAE,KAAK;;;;AAG3B\"}")
+/*
+{
+  "origin": "test.tsx",
+  "name": "test_component_LUXeXe0DQrg",
+  "entry": null,
+  "displayName": "test.tsx_test_component",
+  "hash": "LUXeXe0DQrg",
+  "canonicalFilename": "test.tsx_test_component_LUXeXe0DQrg",
+  "path": "",
+  "extension": "js",
+  "parent": null,
+  "ctxKind": "function",
+  "ctxName": "component$",
+  "captures": false,
+  "loc": [
+    89,
+    233
+  ]
+}
+*/
+== DIAGNOSTICS ==
+
+[]

packages/qwik/src/optimizer/core/src/test.rs

@@ -4377,6 +4377,29 @@ fn should_wrap_type_asserted_variables_in_template() {
 	});
 }
 
+#[test]
+fn should_wrap_logical_expression_in_template() {
+	test_input!(TestInput {
+		code: r#"
+		import { component$, useSignal } from '@qwik.dev/core';
+
+		export default component$(() => {
+			const count = useSignal(0);
+			const count2 = useSignal(0);
+			return (
+				<div>
+					{(count || count2).value}
+				</div>
+			);
+		});
+		"#
+		.to_string(),
+		transpile_ts: true,
+		transpile_jsx: true,
+		..TestInput::default()
+	});
+}
+
 // TODO(misko): Make this test work by implementing strict serialization.
 // #[test]
 // fn example_of_synchronous_qrl_that_cant_be_serialized() {