fix: handle head action changes

Author: Varixo

packages/qwik-router/src/runtime/src/head.ts

@@ -1,21 +1,23 @@
-import { withLocale } from '@qwik.dev/core';
+import { untrack, withLocale } from '@qwik.dev/core';
+import { _retryOnPromise } from '@qwik.dev/core/internal';
 import type {
   ContentModule,
   RouteLocation,
-  EndpointResponse,
   ResolvedDocumentHead,
   DocumentHeadProps,
   DocumentHeadValue,
-  ClientPageData,
   LoaderInternal,
   Editable,
   ResolveSyncValue,
   ActionInternal,
+  LoaderSignal,
+  ClientActionData,
 } from './types';
 import { isPromise } from './utils';
 
-export const resolveHead = (
-  endpoint: EndpointResponse | ClientPageData,
+export const resolveHead = async (
+  loaderState: Record<string, LoaderSignal<unknown>>,
+  action: ClientActionData | undefined,
   routeLocation: RouteLocation,
   contentModules: ContentModule[],
   locale: string,
@@ -25,13 +27,19 @@ export const resolveHead = (
   const getData = ((loaderOrAction: LoaderInternal | ActionInternal) => {
     const id = loaderOrAction.__id;
     if (loaderOrAction.__brand === 'server_loader') {
-      if (!(id in endpoint.loaders)) {
+      if (!(id in loaderState)) {
         throw new Error(
           'You can not get the returned data of a loader that has not been executed for this request.'
         );
       }
+    } else if (
+      action &&
+      action.id === loaderOrAction.__id &&
+      loaderOrAction.__brand === 'server_action'
+    ) {
+      return action.data;
     }
-    const data = endpoint.loaders[id];
+    const data = untrack(() => loaderState[id]?.value);
     if (isPromise(data)) {
       throw new Error('Loaders returning a promise can not be resolved for the head function.');
     }
@@ -48,9 +56,10 @@ export const resolveHead = (
     const contentModuleHead = contentModules[i] && contentModules[i].head;
     if (contentModuleHead) {
       if (typeof contentModuleHead === 'function') {
+        const contentModuleHeadResult = await _retryOnPromise(() => contentModuleHead(headProps));
         resolveDocumentHead(
           head,
-          withLocale(locale, () => contentModuleHead(headProps))
+          withLocale(locale, () => contentModuleHeadResult)
         );
       } else if (typeof contentModuleHead === 'object') {
         resolveDocumentHead(head, contentModuleHead);

packages/qwik-router/src/runtime/src/qwik-router-component.tsx

@@ -493,10 +493,14 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
         (routeInternal as any).untrackedValue = { type: navType, dest: trackUrl };
 
         // Needs to be done after routeLocation is updated
-        const resolvedHead = resolveHead(
-          clientPageData!,
+        const resolvedHead = await resolveHead(
+          loaderState,
+          clientPageData?.action,
+
           routeLocation,
+
           contentModules,
+
           locale,
           serverHead
         );
@@ -554,6 +558,12 @@ export const useQwikRouter = (props?: QwikRouterProps) => {
                 signal.invalidate();
               }
             }
+            // remove not existing loaders
+            for (const key of Object.keys(loaderState)) {
+              if (!(key in loadersObject)) {
+                delete loaderState[key];
+              }
+            }
           }
 
           const win = window as ClientSPAWindow;

packages/qwik/src/core/internal.ts

@@ -11,67 +11,67 @@ export type {
   QDocument as _QDocument,
   VNodeFlags as _VNodeFlags,
 } from './client/types';
+export {
+  mapApp_findIndx as _mapApp_findIndx,
+  mapArray_get as _mapArray_get,
+  mapArray_set as _mapArray_set,
+} from './client/util-mapArray';
+export {
+  vnode_ensureElementInflated as _vnode_ensureElementInflated,
+  vnode_getAttrKeys as _vnode_getAttrKeys,
+  vnode_getFirstChild as _vnode_getFirstChild,
+  vnode_getProps as _vnode_getProps,
+  vnode_isMaterialized as _vnode_isMaterialized,
+  vnode_isTextVNode as _vnode_isTextVNode,
+  vnode_isVirtualVNode as _vnode_isVirtualVNode,
+  vnode_toString as _vnode_toString,
+} from './client/vnode';
 export type {
   ElementVNode as _ElementVNode,
   TextVNode as _TextVNode,
   VirtualVNode as _VirtualVNode,
   VNode as _VNode,
 } from './client/vnode-impl';
-export {
-  vnode_toString as _vnode_toString,
-  vnode_getProps as _vnode_getProps,
-  vnode_isTextVNode as _vnode_isTextVNode,
-  vnode_isVirtualVNode as _vnode_isVirtualVNode,
-  vnode_getFirstChild as _vnode_getFirstChild,
-  vnode_isMaterialized as _vnode_isMaterialized,
-  vnode_ensureElementInflated as _vnode_ensureElementInflated,
-  vnode_getAttrKeys as _vnode_getAttrKeys,
-} from './client/vnode';
-export {
-  mapApp_findIndx as _mapApp_findIndx,
-  mapArray_get as _mapArray_get,
-  mapArray_set as _mapArray_set,
-} from './client/util-mapArray';
 
+export { _hasStoreEffects, isStore as _isStore } from './reactive-primitives/impl/store';
 export { _wrapProp, _wrapSignal } from './reactive-primitives/internal-api';
 export { SubscriptionData as _SubscriptionData } from './reactive-primitives/subscription-data';
 export { _EFFECT_BACK_REF } from './reactive-primitives/types';
-export { _hasStoreEffects } from './reactive-primitives/impl/store';
 export {
   isStringifiable as _isStringifiable,
   type Stringifiable as _Stringifiable,
 } from './shared-types';
 export {
+  _getConstProps,
+  _getVarProps,
   isJSXNode as _isJSXNode,
   _jsxC,
   _jsxQ,
   _jsxS,
   _jsxSorted,
   _jsxSplit,
-  _getVarProps,
-  _getConstProps,
 } from './shared/jsx/jsx-runtime';
 export { _fnSignal } from './shared/qrl/inlined-fn';
-export { _SharedContainer } from './shared/shared-container';
 export {
   _deserialize,
   dumpState as _dumpState,
   preprocessState as _preprocessState,
   _serializationWeakRef,
   _serialize,
 } from './shared/serdes/index';
-export { _CONST_PROPS, _IMMUTABLE, _VAR_PROPS, _UNINITIALIZED } from './shared/utils/constants';
+export { _SharedContainer } from './shared/shared-container';
+export { _CONST_PROPS, _IMMUTABLE, _UNINITIALIZED, _VAR_PROPS } from './shared/utils/constants';
 export { EMPTY_ARRAY as _EMPTY_ARRAY } from './shared/utils/flyweight';
+export { retryOnPromise as _retryOnPromise } from './shared/utils/promises';
 export { _restProps } from './shared/utils/prop';
 export { verifySerializable as _verifySerializable } from './shared/utils/serialize-utils';
 export { _walkJSX } from './ssr/ssr-render-jsx';
+export { _resolveContextWithoutSequentialScope } from './use/use-context';
 export {
+  _getContextContainer,
   _getContextElement,
   _getContextEvent,
-  _getContextContainer,
   _jsxBranch,
   _waitUntilRendered,
 } from './use/use-core';
-export { scheduleTask as _task, isTask as _isTask } from './use/use-task';
-export { isStore as _isStore } from './reactive-primitives/impl/store';
-export { _resolveContextWithoutSequentialScope } from './use/use-context';
+export { isTask as _isTask, scheduleTask as _task } from './use/use-task';

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

@@ -894,6 +894,9 @@ export type ResourceReturn<T> = ResourcePending<T> | ResourceResolved<T> | Resou
 // @internal (undocumented)
 export const _restProps: (props: PropsProxy, omit?: string[], target?: Props) => Props;
 
+// @internal
+export function _retryOnPromise<T>(fn: () => ValueOrPromise<T>, retryCount?: number): ValueOrPromise<T>;
+
 // @internal
 export const _run: (...args: unknown[]) => ValueOrPromise<unknown>;
 

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

@@ -96,7 +96,11 @@ export const delay = (timeout: number) => {
   });
 };
 
-/** Retries a function that throws a promise. */
+/**
+ * Retries a function that throws a promise.
+ *
+ * @internal
+ */
 export function retryOnPromise<T>(
   fn: () => ValueOrPromise<T>,
   retryCount: number = 0