Merge pull request #8175 from QwikDev/v2-fixes

wmertens · web-flow · commit 8ade957ecb25 · 2025-11-23T09:45:50.000+01:00
fix(core): qresume and serializer
diff --git a/packages/qwik/src/core/client/dom-container.ts b/packages/qwik/src/core/client/dom-container.ts
@@ -148,16 +148,16 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
     this.$setServerData$();
     element.setAttribute(QContainerAttr, QContainerValue.RESUMED);
     element.qContainer = this;
-    if (!qTest && element.isConnected) {
-      element.dispatchEvent(new CustomEvent('qresume', { bubbles: true }));
-    }
     const qwikStates = element.querySelectorAll('script[type="qwik/state"]');
     if (qwikStates.length !== 0) {
       const lastState = qwikStates[qwikStates.length - 1];
       this.$rawStateData$ = JSON.parse(lastState.textContent!);
       preprocessState(this.$rawStateData$, this);
       this.$stateData$ = wrapDeserializerProxy(this, this.$rawStateData$) as unknown[];
     }
+    if (!qTest && element.isConnected) {
+      element.dispatchEvent(new CustomEvent('qresume', { bubbles: true }));
+    }
   }
 
   $setRawState$(id: number, vParent: ElementVNode | VirtualVNode): void {
diff --git a/packages/qwik/src/core/shared/serdes/serdes.unit.ts b/packages/qwik/src/core/shared/serdes/serdes.unit.ts
@@ -1,17 +1,13 @@
 import { $, componentQrl, noSerialize } from '@qwik.dev/core';
 import { describe, expect, it, vi } from 'vitest';
-import { _createDeserializeContainer } from './serdes.public';
-import { _dumpState } from './dump-state';
-import { createSerializationContext } from './serialization-context';
-import { _typeIdNames } from './constants';
-import { TypeIds } from './constants';
 import { _fnSignal, _wrapProp } from '../../internal';
+import type { SerializerSignalImpl } from '../../reactive-primitives/impl/serializer-signal-impl';
 import { type SignalImpl } from '../../reactive-primitives/impl/signal-impl';
 import { createStore } from '../../reactive-primitives/impl/store';
 import { createAsyncComputedSignal } from '../../reactive-primitives/signal-api';
 import {
   createComputedQrl,
-  createSerializerQrl,
+  createSerializer$,
   createSignal,
   isSignal,
 } from '../../reactive-primitives/signal.public';
@@ -29,9 +25,12 @@ import { createQRL, type QRLInternal } from '../qrl/qrl-class';
 import { isQrl } from '../qrl/qrl-utils';
 import { EMPTY_ARRAY, EMPTY_OBJ } from '../utils/flyweight';
 import { retryOnPromise } from '../utils/promises';
-import { NoSerializeSymbol, SerializerSymbol, verifySerializable } from './verify';
-import { _constants } from './constants';
+import { _constants, _typeIdNames, TypeIds } from './constants';
+import { _dumpState } from './dump-state';
+import { _createDeserializeContainer } from './serdes.public';
+import { createSerializationContext } from './serialization-context';
 import { _serializationWeakRef } from './serialize';
+import { NoSerializeSymbol, SerializerSymbol, verifySerializable } from './verify';
 
 const DEBUG = false;
 
@@ -561,37 +560,65 @@ describe('shared-serialization', () => {
       `);
     });
     it(title(TypeIds.SerializerSignal), async () => {
-      const custom = createSerializerQrl(
-        inlinedQrl<{
-          serialize: (data: any | undefined) => any;
-          deserialize: (data: any) => any;
-          initial?: any;
-        }>(
-          {
-            deserialize: (n?: number) => new MyCustomSerializable(n || 3),
-            serialize: (obj) => obj.n,
-          },
-          'custom_createSerializer_qrl'
-        )
-      );
+      const plain = createSerializer$({
+        deserialize: (n?: number) => new MyCustomSerializable(n || 3),
+        serialize: (obj) => obj.n,
+      });
       // Force the value to be created
-      custom.value.inc();
-      const objs = await serialize(custom);
+      plain.value.inc();
+      const unread = createSerializer$({
+        deserialize: (n?: number) => new MyCustomSerializable(n || 3),
+        serialize: (obj) => obj.n,
+      });
+      const thunked = createSerializer$(() => ({
+        deserialize: (n?: number) => new MyCustomSerializable(n || 3),
+        serialize: (obj) => obj.n,
+      }));
+      const promised = createSerializer$(() => ({
+        deserialize: (n?: number) => new MyCustomSerializable(n || 3),
+        serialize: (obj) => obj.n,
+      })) as any as SerializerSignalImpl<number, MyCustomSerializable>;
+      promised.$computeQrl$.resolved = Promise.resolve(promised.$computeQrl$.resolved) as any;
+
+      const objs = await serialize([plain, unread, thunked, promised]);
       expect(_dumpState(objs)).toMatchInlineSnapshot(`
         "
-        0 ForwardRef 0
-        1 PreloadQRL "2 3"
-        2 {string} "mock-chunk"
-        3 {string} "custom_createSerializer_qrl"
-        4 SerializerSignal [
-          RootRef 1
+        0 Array [
+          SerializerSignal [
+            RootRef 1
+            Constant undefined
+            {number} 4
+          ]
+          SerializerSignal [
+            RootRef 2
+            Constant undefined
+            Constant NEEDS_COMPUTATION
+          ]
+          SerializerSignal [
+            RootRef 3
+            Constant undefined
+            Constant NEEDS_COMPUTATION
+          ]
+          ForwardRef 0
+        ]
+        1 PreloadQRL "5 6"
+        2 PreloadQRL "5 7"
+        3 PreloadQRL "5 8"
+        4 PreloadQRL "5 9"
+        5 {string} "mock-chunk"
+        6 {string} "describe_describe_it_plain_createSerializer_IrZN04alftE"
+        7 {string} "describe_describe_it_unread_createSerializer_oYdaCRjw9Q0"
+        8 {string} "describe_describe_it_thunked_createSerializer_ufw7hr9vFDo"
+        9 {string} "describe_describe_it_promised_createSerializer_YCkDOYPyCO0"
+        10 SerializerSignal [
+          RootRef 4
           Constant undefined
-          {number} 4
+          Constant NEEDS_COMPUTATION
         ]
-        5 ForwardRefs [
-          4
+        11 ForwardRefs [
+          10
         ]
-        (85 chars)"
+        (382 chars)"
       `);
     });
     it(title(TypeIds.AsyncComputedSignal), async () => {
diff --git a/packages/qwik/src/core/shared/serdes/serialize.ts b/packages/qwik/src/core/shared/serdes/serialize.ts
@@ -34,7 +34,7 @@ import { isQrl, isSyncQrl } from '../qrl/qrl-utils';
 import { _OWNER, _PROPS_HANDLER, _UNINITIALIZED } from '../utils/constants';
 import { EMPTY_ARRAY, EMPTY_OBJ } from '../utils/flyweight';
 import { ELEMENT_ID, ELEMENT_PROPS, QBackRefs } from '../utils/markers';
-import { isPromise } from '../utils/promises';
+import { isPromise, maybeThen } from '../utils/promises';
 import { fastSkipSerialize, SerializerSymbol } from './verify';
 import { Constants, TypeIds } from './constants';
 import { qrlToString } from './qrl-to-string';
@@ -386,20 +386,21 @@ export async function serialize(serializationContext: SerializationContext): Pro
     } else if (value instanceof SignalImpl) {
       if (value instanceof SerializerSignalImpl) {
         addPreloadQrl(value.$computeQrl$);
-        const forwardRefId = resolvePromise(
-          getCustomSerializerPromise(value, value.$untrackedValue$),
-          $addRoot$,
-          (resolved, resolvedValue) => {
+        const maybeValue = getCustomSerializerPromise(value, value.$untrackedValue$);
+        if (isPromise(maybeValue)) {
+          const forwardRefId = resolvePromise(maybeValue, $addRoot$, (resolved, resolvedValue) => {
             return new PromiseResult(
               TypeIds.SerializerSignal,
               resolved,
               resolvedValue,
               value.$effects$,
               value.$computeQrl$
             );
-          }
-        );
-        output(TypeIds.ForwardRef, forwardRefId);
+          });
+          output(TypeIds.ForwardRef, forwardRefId);
+        } else {
+          output(TypeIds.SerializerSignal, [value.$computeQrl$, value.$effects$, maybeValue]);
+        }
         return;
       }
 
@@ -606,7 +607,7 @@ export async function serialize(serializationContext: SerializationContext): Pro
   function resolvePromise(
     promise: Promise<unknown>,
     $addRoot$: (obj: unknown) => number,
-    classCreator: (resolved: boolean, resolvedValue: unknown) => PromiseResult
+    classCreator: (didResolve: boolean, resolvedValue: unknown) => PromiseResult
   ) {
     const forwardRefId = forwardRefsId++;
     promise
@@ -686,20 +687,27 @@ export class PromiseResult {
   ) {}
 }
 function getCustomSerializerPromise<T, S>(signal: SerializerSignalImpl<T, S>, value: any) {
-  return new Promise((resolve) => {
-    (signal.$computeQrl$ as QRLInternal<SerializerArg<T, S>>).resolve().then((arg) => {
+  return maybeThen(
+    (signal.$computeQrl$.resolved || signal.$computeQrl$.resolve()) as any as SerializerArg<
+      unknown,
+      unknown
+    >,
+    (arg) => {
       let data;
-      if ((arg as any).serialize) {
+      if (typeof arg === 'function') {
+        arg = arg();
+      }
+      if (arg.serialize) {
         data = (arg as any).serialize(value);
-      } else if (SerializerSymbol in value) {
+      } else if (typeof value === 'object' && SerializerSymbol in value) {
         data = (value as any)[SerializerSymbol](value);
       }
       if (data === undefined) {
         data = NEEDS_COMPUTATION;
       }
-      resolve(data);
-    });
-  });
+      return data;
+    }
+  );
 }
 
 const discoverValuesForVNodeData = (vnodeData: VNodeData, callback: (value: unknown) => void) => {
diff --git a/starters/apps/e2e/src/components/no-resume/no-resume.tsx b/starters/apps/e2e/src/components/no-resume/no-resume.tsx
@@ -7,6 +7,8 @@ export const NoResume = component$(() => {
       <div>This turns red on resume</div>
       <button
         document:onQResume$={() => {
+          // this should not crash
+          void sig.value;
           document.body.style.color = "red";
         }}
         onClick$={() => {
