feat(cursors): fix signal unit test

Varixo · Varixo · commit 9309a802015c · 2025-12-20T20:12:53.000+01:00
diff --git a/packages/qwik/src/core/reactive-primitives/impl/computed-signal-impl.ts b/packages/qwik/src/core/reactive-primitives/impl/computed-signal-impl.ts
@@ -3,7 +3,7 @@ import { assertFalse } from '../../shared/error/assert';
 import { QError, qError } from '../../shared/error/error';
 import type { Container } from '../../shared/types';
 import { isPromise, maybeThen, retryOnPromise } from '../../shared/utils/promises';
-import { tryGetInvokeContext } from '../../use/use-core';
+import { invoke, newInvokeContext, tryGetInvokeContext } from '../../use/use-core';
 import { scheduleEffects, throwIfQRLNotResolved } from '../utils';
 import { getSubscriber } from '../subscriber';
 import { SerializationSignalFlags, ComputeQRL, EffectSubscription } from '../types';
@@ -52,8 +52,10 @@ export class ComputedSignalImpl<T, S extends QRLInternal = ComputeQRL<T>>
 
   invalidate() {
     this.$flags$ |= SignalFlags.INVALID;
+    const ctx = newInvokeContext();
+    ctx.$container$ = this.$container$ || undefined;
     maybeThen(
-      retryOnPromise(() => this.$computeIfNeeded$()),
+      retryOnPromise(() => invoke.call(this, ctx, this.$computeIfNeeded$)),
       () => {
         if (this.$flags$ & SignalFlags.RUN_EFFECTS) {
           this.$flags$ &= ~SignalFlags.RUN_EFFECTS;
diff --git a/packages/qwik/src/core/reactive-primitives/impl/signal.unit.tsx b/packages/qwik/src/core/reactive-primitives/impl/signal.unit.tsx
@@ -1,6 +1,6 @@
 import { $, _wrapProp, isBrowser } from '@qwik.dev/core';
 import { createDocument } from '@qwik.dev/core/testing';
-import { afterEach, beforeEach, describe, expect, expectTypeOf, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, expectTypeOf, it, vi } from 'vitest';
 import { getDomContainer } from '../../client/dom-container';
 import { implicit$FirstArg } from '../../shared/qrl/implicit_dollar';
 import { inlinedQrl } from '../../shared/qrl/qrl';
@@ -28,6 +28,7 @@ import {
 import { getSubscriber } from '../subscriber';
 import { vnode_newVirtual, vnode_setProp } from '../../client/vnode-utils';
 import { ELEMENT_SEQ } from '../../shared/utils/markers';
+import type { ComputedSignalImpl } from './computed-signal-impl';
 
 class Foo {
   constructor(public val: number = 0) {}
@@ -111,10 +112,12 @@ describe('signal', () => {
   const log: any[] = [];
   const delayMap = new Map();
   let container: Container = null!;
+  let task: Task | null = null;
   beforeEach(() => {
     log.length = 0;
     const document = createDocument({ html: '<html><body q:container="paused"></body></html>' });
     container = getDomContainer(document.body);
+    task = null;
   });
 
   afterEach(async () => {
@@ -189,25 +192,39 @@ describe('signal', () => {
       await withContainer(async () => {
         const a = createSignal(true) as InternalSignal<boolean>;
         const b = createSignal(true) as InternalSignal<boolean>;
-        let signal!: InternalReadonlySignal<boolean>;
+        let signal!: ComputedSignalImpl<boolean>;
+
+        (globalThis as any).waitPromiseResolve = null;
+        const waitPromise = new Promise<void>((resolve) => {
+          (globalThis as any).waitPromiseResolve = resolve;
+        });
+
         await retryOnPromise(() =>
           effect$(async () => {
             signal =
               signal ||
               createComputedQrl(
                 delayQrl(
                   $(() => {
-                    return a.value || b.value;
+                    const val = a.value || b.value;
+                    if (!val) {
+                      // resolve promise after next macro task
+                      setTimeout(() => {
+                        (globalThis as any).waitPromiseResolve!();
+                      });
+                    }
+                    return val;
                   })
                 )
               );
-            const signalValue = await retryOnPromise(() => signal.value);
-            log.push(signalValue); // causes subscription
+            log.push(signal.value); // causes subscription
           })
         );
         expect(log).toEqual([true]);
         a.value = !a.untrackedValue;
         b.value = !b.untrackedValue;
+
+        await waitPromise;
         expect(log).toEqual([true, false]);
       });
     });
@@ -286,7 +303,7 @@ describe('signal', () => {
   function effectQrl(fnQrl: QRL<() => void>) {
     const qrl = fnQrl as QRLInternal<() => void>;
     const element: HostElement = vnode_newVirtual();
-    const task = new Task(0, 0, element, fnQrl as QRLInternal, undefined, null);
+    task = task || new Task(0, 0, element, fnQrl as QRLInternal, undefined, null);
     vnode_setProp(element, ELEMENT_SEQ, [task]);
     if (!qrl.resolved) {
       throw qrl.resolve();
