fix: loaders serialization

Author: Varixo

packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts

@@ -30,6 +30,7 @@ import {
 import { getQwikRouterServerData } from './response-page';
 import type { QwikSerializer, RequestEvent, RequestEventBase, RequestHandler } from './types';
 import { IsQData, QDATA_JSON } from './user-response';
+import { _UNINITIALIZED } from '@qwik.dev/core/internal';
 
 export const resolveRequestHandlers = (
   serverPlugins: RouteModule[] | undefined,
@@ -594,7 +595,7 @@ export async function renderQData(requestEv: RequestEvent) {
   const loaders: Record<string, unknown> = {};
   for (const loaderId in allLoaders) {
     const loader = allLoaders[loaderId];
-    if (loader) {
+    if (loader !== _UNINITIALIZED) {
       loaders[loaderId] = loader;
     }
   }

packages/qwik-router/src/runtime/src/server-functions.ts

@@ -14,6 +14,7 @@ import {
   _getContextEvent,
   _serialize,
   _wrapStore,
+  _UNINITIALIZED,
 } from '@qwik.dev/core/internal';
 
 import * as v from 'valibot';
@@ -209,10 +210,12 @@ export const routeLoaderQrl = ((
     For more information check: https://qwik.dev/docs/re-exporting-loaders/`);
     }
     const data = untrack(() => state[id]);
-    if (!data && isBrowser) {
+    if (data === _UNINITIALIZED && isBrowser) {
       throw loadClientData(location.url, iCtx.$hostElement$, {
         loaderIds: [id],
-      }).then((data) => (state[id] = data?.loaders[id]));
+      }).then((data) => {
+        state[id] = data?.loaders[id];
+      });
     }
     return _wrapStore(state, id);
   }

packages/qwik/src/core/api.md

@@ -1589,6 +1589,9 @@ export interface Tracker {
     <T extends object, P extends keyof T>(obj: T, prop: P): T[P];
 }
 
+// @internal (undocumented)
+export const _UNINITIALIZED: unique symbol;
+
 // @public
 export const untrack: <T>(fn: () => T) => T;
 

packages/qwik/src/core/internal.ts

@@ -5,7 +5,7 @@ export { queueQRL as _run } from './client/queue-qrl';
 export { scheduleTask as _task } from './use/use-task';
 export { _wrapSignal, _wrapProp, _wrapStore } from './signal/signal-utils';
 export { _restProps } from './shared/utils/prop';
-export { _IMMUTABLE } from './shared/utils/constants';
+export { _IMMUTABLE, _UNINITIALIZED } from './shared/utils/constants';
 export { _CONST_PROPS, _VAR_PROPS } from './shared/utils/constants';
 export { _weakSerialize } from './shared/utils/serialize-utils';
 export { verifySerializable as _verifySerializable } from './shared/utils/serialize-utils';

packages/qwik/src/core/shared/shared-serialization.ts

@@ -51,7 +51,7 @@ import type { QRL } from './qrl/qrl.public';
 import { type NodePropData } from './scheduler';
 import { ChoreType } from './util-chore-type';
 import type { DeserializeContainer, HostElement, ObjToProxyMap } from './types';
-import { _CONST_PROPS, _VAR_PROPS } from './utils/constants';
+import { _CONST_PROPS, _UNINITIALIZED, _VAR_PROPS } from './utils/constants';
 import { isElement, isNode } from './utils/element';
 import { EMPTY_ARRAY, EMPTY_OBJ } from './utils/flyweight';
 import { ELEMENT_ID } from './utils/markers';
@@ -405,7 +405,7 @@ const inflate = (
       target = Object.fromEntries(
         objectKeys.map((v) =>
           // initialize values with null
-          [v, null]
+          [v, _UNINITIALIZED]
         )
       );
       break;
@@ -426,6 +426,7 @@ export const _constants = [
   EMPTY_OBJ,
   NEEDS_COMPUTATION,
   STORE_ALL_PROPS,
+  _UNINITIALIZED,
   Slot,
   Fragment,
   NaN,
@@ -445,6 +446,7 @@ const _constantNames = [
   'EMPTY_OBJ',
   'NEEDS_COMPUTATION',
   'STORE_ALL_PROPS',
+  '_UNINITIALIZED',
   'Slot',
   'Fragment',
   'NaN',
@@ -1134,6 +1136,8 @@ function serialize(serializationContext: SerializationContext): void {
       output(TypeIds.Constant, Constants.NEEDS_COMPUTATION);
     } else if (value === STORE_ALL_PROPS) {
       output(TypeIds.Constant, Constants.STORE_ALL_PROPS);
+    } else if (value === _UNINITIALIZED) {
+      output(TypeIds.Constant, Constants.UNINITIALIZED);
     } else {
       throw qError(QError.serializeErrorUnknownType, [typeof value]);
     }
@@ -1788,6 +1792,7 @@ export const enum Constants {
   EMPTY_OBJ,
   NEEDS_COMPUTATION,
   STORE_ALL_PROPS,
+  UNINITIALIZED,
   Slot,
   Fragment,
   NaN,

packages/qwik/src/core/shared/utils/constants.ts

@@ -5,3 +5,6 @@ export const _VAR_PROPS = Symbol('VAR');
 
 /** @internal @deprecated v1 compat */
 export const _IMMUTABLE = Symbol('IMMUTABLE');
+
+/** @internal */
+export const _UNINITIALIZED = Symbol('UNINITIALIZED');

scripts/qwik-router.ts

@@ -82,6 +82,7 @@ async function buildVite(config: BuildConfig) {
     'typescript',
     'vite-imagetools',
     'svgo',
+    '@qwik.dev/core',
   ];
 
   const swRegisterPath = join(config.srcQwikRouterDir, 'runtime', 'src', 'sw-register.ts');
@@ -102,7 +103,6 @@ async function buildVite(config: BuildConfig) {
     format: 'esm',
     external,
     alias: {
-      '@qwik.dev/core': 'noop',
       '@qwik.dev/core/optimizer': 'noop',
     },
     plugins: [serviceWorkerRegisterBuild(swRegisterCode)],

starters/e2e/qwikrouter/nav.e2e.ts

@@ -10,7 +10,7 @@ import {
   scrollTo,
 } from "./util.js";
 
-test.describe("actions", () => {
+test.describe("nav", () => {
   test.describe("mpa", () => {
     test.use({ javaScriptEnabled: false });
     tests();