chore(router): head is sync so can be entirely wrapped in withLocale()

Author: wmertens

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

@@ -21,54 +21,53 @@ export const resolveHead = (
   contentModules: ContentModule[],
   locale: string,
   defaults?: DocumentHeadValue
-) => {
-  const head = createDocumentHead(defaults);
-  const getData = ((loaderOrAction: LoaderInternal | ActionInternal) => {
-    const id = loaderOrAction.__id;
-    if (loaderOrAction.__brand === 'server_loader') {
-      if (!(id in endpoint.loaders)) {
-        throw new Error(
-          'You can not get the returned data of a loader that has not been executed for this request.'
-        );
+) =>
+  withLocale(locale, () => {
+    const head = createDocumentHead(defaults);
+    const getData = ((loaderOrAction: LoaderInternal | ActionInternal) => {
+      const id = loaderOrAction.__id;
+      if (loaderOrAction.__brand === 'server_loader') {
+        if (!(id in endpoint.loaders)) {
+          throw new Error(
+            'You can not get the returned data of a loader that has not been executed for this request.'
+          );
+        }
       }
-    }
-    const data = endpoint.loaders[id];
-    if (isPromise(data)) {
-      throw new Error('Loaders returning a promise can not be resolved for the head function.');
-    }
-    return data;
-  }) as any as ResolveSyncValue;
+      const data = endpoint.loaders[id];
+      if (isPromise(data)) {
+        throw new Error('Loaders returning a promise can not be resolved for the head function.');
+      }
+      return data;
+    }) as any as ResolveSyncValue;
 
-  const fns: Extract<ContentModuleHead, Function>[] = [];
-  for (const contentModule of contentModules) {
-    const contentModuleHead = contentModule?.head;
-    if (contentModuleHead) {
-      if (typeof contentModuleHead === 'function') {
-        // Functions are executed inner before outer
-        fns.unshift(contentModuleHead);
-      } else if (typeof contentModuleHead === 'object') {
-        // Objects are merged inner over outer
-        resolveDocumentHead(head, contentModuleHead);
+    const fns: Extract<ContentModuleHead, Function>[] = [];
+    for (const contentModule of contentModules) {
+      const contentModuleHead = contentModule?.head;
+      if (contentModuleHead) {
+        if (typeof contentModuleHead === 'function') {
+          // Functions are executed inner before outer
+          fns.unshift(contentModuleHead);
+        } else if (typeof contentModuleHead === 'object') {
+          // Objects are merged inner over outer
+          resolveDocumentHead(head, contentModuleHead);
+        }
       }
     }
-  }
-  if (fns.length) {
-    const headProps: DocumentHeadProps = {
-      head,
-      withLocale: (fn) => withLocale(locale, fn),
-      resolveValue: getData,
-      ...routeLocation,
-    };
+    if (fns.length) {
+      const headProps: DocumentHeadProps = {
+        head,
+        withLocale: (fn) => fn(),
+        resolveValue: getData,
+        ...routeLocation,
+      };
 
-    withLocale(locale, () => {
       for (const fn of fns) {
         resolveDocumentHead(head, fn(headProps));
       }
-    });
-  }
+    }
 
-  return head;
-};
+    return head;
+  });
 
 const resolveDocumentHead = (
   resolvedHead: Editable<ResolvedDocumentHead>,

packages/qwik-router/src/runtime/src/qwik-router.runtime.api.md

@@ -123,7 +123,7 @@ export interface DocumentHeadProps extends RouteLocation {
     readonly head: ResolvedDocumentHead;
     // (undocumented)
     readonly resolveValue: ResolveSyncValue;
-    // (undocumented)
+    // @deprecated (undocumented)
     readonly withLocale: <T>(fn: () => T) => T;
 }
 

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

@@ -221,6 +221,7 @@ export type DocumentScript = (
 /** @public */
 export interface DocumentHeadProps extends RouteLocation {
   readonly head: ResolvedDocumentHead;
+  /** @deprecated This is not necessary, it works correctly without */
   readonly withLocale: <T>(fn: () => T) => T;
   readonly resolveValue: ResolveSyncValue;
 }