Merge pull request #7386 from QwikDev/v2-fix-unwrap-flag

fix: wrap WrappedSignal without unwrap flag

Author: wmertens

packages/qwik/src/core/signal/signal-utils.ts

@@ -1,7 +1,7 @@
 import { _CONST_PROPS, _IMMUTABLE } from '../shared/utils/constants';
 import { assertEqual } from '../shared/error/assert';
 import { isObject } from '../shared/utils/types';
-import { SignalFlags, WrappedSignal } from './signal';
+import { SignalFlags, WrappedSignal, WrappedSignalFlags } from './signal';
 import { isSignal, type Signal } from './signal.public';
 import { getStoreTarget } from './store';
 import { isPropsProxy } from '../shared/jsx/jsx-runtime';
@@ -33,7 +33,7 @@ export const _wrapProp = <T extends Record<any, any>, P extends keyof T>(...args
   }
   if (isSignal(obj)) {
     assertEqual(prop, 'value', 'Left side is a signal, prop must be value');
-    if (obj instanceof WrappedSignal) {
+    if (obj instanceof WrappedSignal && obj.flags & WrappedSignalFlags.UNWRAP) {
       return obj;
     }
     return getWrapped(args);

starters/apps/qwikrouter-test/src/routes/(common)/loaders/prop/index.tsx

@@ -7,11 +7,22 @@ export const useTestLoader = routeLoader$(async () => {
 
 export default component$(() => {
   const testSignal = useTestLoader();
-  return <Homepage testSignal={testSignal} />;
+  return (
+    <>
+      <Homepage testSignal={testSignal} />
+      <HomepageUnwrapped testSignal={testSignal.value} />
+    </>
+  );
 });
 
 export const Homepage = component$(
   (props: { testSignal: Signal<{ test: string }> }) => {
     return <div id="prop">{props.testSignal.value.test}</div>;
   },
 );
+
+export const HomepageUnwrapped = component$(
+  (props: { testSignal: { test: string } }) => {
+    return <div id="prop-unwrapped">{props.testSignal.test}</div>;
+  },
+);

starters/e2e/qwikrouter/loaders.e2e.ts

@@ -123,6 +123,7 @@ test.describe("loaders", () => {
     test("should work loader result as component prop", async ({ page }) => {
       await page.goto("/qwikrouter-test/loaders/prop");
       await expect(page.locator("#prop")).toHaveText("test");
+      await expect(page.locator("#prop-unwrapped")).toHaveText("test");
     });
   }
 });