Merge pull request #7933 from QwikDev/v2-eager-deserialize

chore(serdes): eager deserialization

Author: wmertens

packages/qwik/src/core/client/dom-container.ts

@@ -1,11 +1,11 @@
 /** @file Public APIs for the SSR */
 
+// @ts-expect-error we don't have types for the preloader
+import { p as preload } from '@qwik.dev/core/preloader';
 import { assertTrue } from '../shared/error/assert';
 import { QError, qError } from '../shared/error/error';
 import { ERROR_CONTEXT, isRecoverable } from '../shared/error/error-handling';
-import { type QRLInternal } from '../shared/qrl/qrl-class';
 import type { QRL } from '../shared/qrl/qrl.public';
-import { ChoreType } from '../shared/util-chore-type';
 import { _SharedContainer } from '../shared/shared-container';
 import {
   getObjectById,
@@ -21,21 +21,21 @@ import {
   ELEMENT_SEQ,
   ELEMENT_SEQ_IDX,
   OnRenderProp,
+  QBackRefs,
   QBaseAttr,
   QContainerAttr,
   QContainerSelector,
   QCtxAttr,
   QInstanceAttr,
+  QLocaleAttr,
+  QManifestHashAttr,
   QScopedStyle,
   QSlotParent,
   QStyle,
   QStyleSelector,
-  QBackRefs,
   Q_PROPS_SEPARATOR,
   USE_ON_LOCAL_SEQ_IDX,
   getQFuncs,
-  QLocaleAttr,
-  QManifestHashAttr,
 } from '../shared/utils/markers';
 import { isSlotProp } from '../shared/utils/prop';
 import { qDev } from '../shared/utils/qdev';
@@ -55,6 +55,7 @@ import {
   type VNode,
   type VirtualVNode,
 } from './types';
+import { mapArray_get, mapArray_has, mapArray_set } from './util-mapArray';
 import {
   VNodeJournalOpCode,
   vnode_applyJournal,
@@ -72,7 +73,6 @@ import {
   vnode_setProp,
   type VNodeJournal,
 } from './vnode';
-import { mapArray_get, mapArray_has, mapArray_set } from './util-mapArray';
 
 /** @public */
 export function getDomContainer(element: Element | VNode): IClientContainer {
@@ -117,7 +117,7 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
   public $qFuncs$: Array<(...args: unknown[]) => unknown>;
   public $instanceHash$: string;
   public $forwardRefs$: Array<number> | null = null;
-  public $initialQRLsIndexes$: Array<number> | null = null;
+  public $initialQRLs$: Array<string> | null = null;
   public vNodeLocate: (id: string | Element) => VNode = (id) => vnode_locate(this.rootVNode, id);
 
   private $stateData$: unknown[];
@@ -359,15 +359,14 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
    * ```
    */
   private $scheduleInitialQRLs$(): void {
-    if (this.$initialQRLsIndexes$) {
-      for (const index of this.$initialQRLsIndexes$) {
-        this.$scheduler$(
-          ChoreType.QRL_RESOLVE,
-          null,
-          this.$getObjectById$(index) as QRLInternal<(...args: unknown[]) => unknown>
-        );
+    if (this.$initialQRLs$) {
+      for (const qrl of this.$initialQRLs$) {
+        const match = /#(.*)_([a-zA-Z0-9]+)(\[|$)/.exec(qrl);
+        if (match) {
+          preload(match[2], 0.3);
+        }
       }
-      this.$initialQRLsIndexes$ = null;
+      this.$initialQRLs$ = null;
     }
   }
 }

packages/qwik/src/core/client/types.ts

@@ -18,7 +18,6 @@ export interface ClientContainer extends Container {
   rootVNode: ElementVNode;
   $journal$: VNodeJournal;
   $forwardRefs$: Array<number> | null;
-  $initialQRLsIndexes$: Array<number> | null;
   $flushEpoch$: number;
   parseQRL<T = unknown>(qrl: string): QRL<T>;
   $setRawState$(id: number, vParent: ElementVNode | VirtualVNode): void;

packages/qwik/src/core/client/vnode.ts

@@ -1577,14 +1577,30 @@ function setEffectBackRefFromVNodeData(
   value: string | number,
   container: ClientContainer
 ) {
-  const deserializedSubMap = container.$getObjectById$(value);
   if (!(vParent as any)[_EFFECT_BACK_REF]) {
+    // get data lazily
+    // this is because effects back refs can point to vnodes which are not yet materialized
+    // (are after the current vnode)
     Object.defineProperty(vParent, _EFFECT_BACK_REF, {
-      value: deserializedSubMap,
+      get() {
+        const subMap = container.$getObjectById$(value);
+        (vParent as any)[_EFFECT_BACK_REF] = subMap;
+        return subMap;
+      },
+      set(value: unknown) {
+        Object.defineProperty(vParent, _EFFECT_BACK_REF, {
+          value,
+          writable: true,
+          enumerable: true,
+          configurable: true,
+        });
+      },
+      enumerable: true,
+      configurable: true,
     });
   } else {
-    const subMap = (vParent as any)[_EFFECT_BACK_REF] as Map<string, any>;
-    mergeMaps(subMap, deserializedSubMap);
+    const subMap = (vParent as any)[_EFFECT_BACK_REF];
+    mergeMaps(subMap, container.$getObjectById$(value));
   }
 }
 

packages/qwik/src/core/qwik.core.api.md

@@ -41,8 +41,6 @@ export interface ClientContainer extends Container {
     $flushEpoch$: number;
     // (undocumented)
     $forwardRefs$: Array<number> | null;
-    // (undocumented)
-    $initialQRLsIndexes$: Array<number> | null;
     // Warning: (ae-forgotten-export) The symbol "VNodeJournal" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
@@ -218,7 +216,7 @@ class DomContainer extends _SharedContainer implements ClientContainer {
     // (undocumented)
     $getObjectById$: (id: number | string) => unknown;
     // (undocumented)
-    $initialQRLsIndexes$: Array<number> | null;
+    $initialQRLs$: Array<string> | null;
     // (undocumented)
     $instanceHash$: string;
     // (undocumented)