resolve more things at the beginning

Author: conico974

packages/gitbook-v2/src/lib/data/prefetch.ts

@@ -1,7 +1,11 @@
 import { type PagePathParams, fetchPageData } from '@/components/SitePage';
 import type { VisitorAuthClaims } from '@/lib/adaptive';
 import type { AncestorRevisionPage } from '@/lib/pages';
-import { type ResolvedContentRef, resolveContentRef } from '@/lib/references';
+import {
+    type ResolveContentRefOptions,
+    type ResolvedContentRef,
+    resolveContentRef,
+} from '@/lib/references';
 import type { ContentRef, JSONDocument, RevisionPageDocument } from '@gitbook/api';
 import {
     type RouteLayoutParams,
@@ -10,7 +14,8 @@ import {
     getPagePathFromParams,
     getStaticSiteContext,
 } from '@v2/app/utils';
-import { cache } from 'react';
+import { identify } from 'object-identity';
+import { cache } from '../cache';
 import type { GitBookSiteContext } from '../context';
 import { getPageDocument } from './pages';
 
@@ -39,7 +44,10 @@ export interface PrefetchedPageData {
         };
     }>;
     document: Promise<JSONDocument | null>;
-    prefetchedRef: Promise<Map<ContentRef, Promise<ResolvedContentRef | null>>>;
+    getPrefetchedRef: (
+        ref?: ContentRef,
+        options?: ResolveContentRefOptions
+    ) => Promise<ResolvedContentRef | null>;
 }
 
 const cachedInitialDate = cache(() => Date.now());
@@ -107,14 +115,38 @@ export const prefetchedDocumentRef = (
     document: JSONDocument | null,
     context: GitBookSiteContext
 ) => {
-    const fetched = new Map<ContentRef, Promise<ResolvedContentRef | null>>();
+    const fetched = new Map<string, Promise<ResolvedContentRef | null>>();
     if (!document) return fetched;
 
     const traverseNodes = (nodes: any[]): void => {
         for (const node of nodes) {
             // We try prefetching as many references as possible.
             if (node.data?.ref) {
-                fetched.set(node.data.ref, resolveContentRef(node.data.ref, context));
+                fetched.set(identify(node.data.ref), resolveContentRef(node.data.ref, context));
+            }
+            // Handle prefetching of references for cards
+            if (node.data?.view && node.data.view.type === 'cards') {
+                const view = node.data.view;
+                const records = Object.entries(node.data.records || {});
+
+                records.forEach(async (record: [string, any]) => {
+                    const coverFile = view.coverDefinition
+                        ? record[1].values[view.coverDefinition]?.[0]
+                        : null;
+                    const targetRef = view.targetDefinition
+                        ? (record[1].values[view.targetDefinition] as ContentRef)
+                        : null;
+                    if (targetRef) {
+                        fetched.set(identify(targetRef), resolveContentRef(targetRef, context));
+                    }
+                    if (coverFile) {
+                        const fileRef = {
+                            kind: 'file' as const,
+                            file: coverFile,
+                        };
+                        fetched.set(identify(fileRef), resolveContentRef(fileRef, context));
+                    }
+                });
             }
             if (node.nodes && Array.isArray(node.nodes)) {
                 traverseNodes(node.nodes);
@@ -165,9 +197,24 @@ export const getPrefetchedDataFromPageParams = cache((params: RouteParams): Pref
         .finally(() => {
             console.log(`Finished prefetching references in ${Date.now() - startingDate}ms`);
         });
+
+    const getContentRef = async (
+        ref?: ContentRef,
+        options?: ResolveContentRefOptions
+    ): Promise<ResolvedContentRef | null> => {
+        if (!ref) {
+            return null;
+        }
+        if (options) {
+            const { context } = await staticSiteContext;
+            return resolveContentRef(ref, context, options);
+        }
+        return prefetchedRef.then((prefetched) => prefetched.get(identify(ref)) ?? null);
+    };
+
     return {
         pageData,
         document,
-        prefetchedRef,
+        getPrefetchedRef: getContentRef,
     };
 });

packages/gitbook/src/components/PageBody/PageBody.tsx

@@ -6,11 +6,7 @@ import { getSpaceLanguage } from '@/intl/server';
 import { t } from '@/intl/translate';
 import { hasFullWidthBlock, isNodeEmpty } from '@/lib/document';
 import type { AncestorRevisionPage } from '@/lib/pages';
-import {
-    type ResolveContentRefOptions,
-    type ResolvedContentRef,
-    resolveContentRef,
-} from '@/lib/references';
+import type { ResolveContentRefOptions, ResolvedContentRef } from '@/lib/references';
 import { tcls } from '@/lib/tailwind';
 import { DocumentView, DocumentViewSkeleton } from '../DocumentView';
 import { TrackPageViewEvent } from '../Insights';
@@ -27,7 +23,10 @@ export function PageBody(props: {
     page: RevisionPageDocument;
     ancestors: AncestorRevisionPage[];
     document: JSONDocument | null;
-    prefetchedRef?: Promise<Map<ContentRef, Promise<ResolvedContentRef | null>>>;
+    getContentRef: (
+        ref: ContentRef,
+        options?: ResolveContentRefOptions
+    ) => Promise<ResolvedContentRef | null>;
     withPageFeedback: boolean;
 }) {
     const { page, context, ancestors, document, withPageFeedback } = props;
@@ -39,19 +38,6 @@ export function PageBody(props: {
     const language = getSpaceLanguage(customization);
     const updatedAt = page.updatedAt ?? page.createdAt;
 
-    const getContentRef = async (
-        ref?: ContentRef,
-        options?: ResolveContentRefOptions
-    ): Promise<ResolvedContentRef | null> => {
-        if (!ref) {
-            return null;
-        }
-        if (options || !props.prefetchedRef) {
-            return resolveContentRef(ref, context, options);
-        }
-        return props.prefetchedRef.then((prefetched) => prefetched.get(ref) ?? null);
-    };
-
     return (
         <>
             <main
@@ -87,7 +73,7 @@ export function PageBody(props: {
                             context={{
                                 mode: 'default',
                                 contentContext: context,
-                                getContentRef: getContentRef,
+                                getContentRef: props.getContentRef,
                             }}
                         />
                     </React.Suspense>

packages/gitbook/src/components/SitePage/SitePage.tsx

@@ -1,4 +1,4 @@
-import { CustomizationHeaderPreset, CustomizationThemeMode } from '@gitbook/api';
+import { type ContentRef, CustomizationHeaderPreset, CustomizationThemeMode } from '@gitbook/api';
 import type { GitBookSiteContext } from '@v2/lib/context';
 import type { Metadata, Viewport } from 'next';
 import { notFound, redirect } from 'next/navigation';
@@ -9,6 +9,7 @@ import { PageBody, PageCover } from '@/components/PageBody';
 import { getPagePath } from '@/lib/pages';
 import { isPageIndexable, isSiteIndexable } from '@/lib/seo';
 
+import { type ResolveContentRefOptions, resolveContentRef } from '@/lib/references';
 import type { RouteParams } from '@v2/app/utils';
 import { getPageDocument } from '@v2/lib/data/pages';
 import { getPageDataWithFallback, getPrefetchedDataFromPageParams } from '@v2/lib/data/prefetch';
@@ -83,6 +84,13 @@ export async function SitePage(props: SitePageProps) {
         ? await prefetchedData.document
         : await getPageDocument(context, page);
 
+    const getContentRef = async (ref: ContentRef, options?: ResolveContentRefOptions) => {
+        if (prefetchedData) {
+            return prefetchedData.getPrefetchedRef(ref, options);
+        }
+        return resolveContentRef(ref, context, options);
+    };
+
     return (
         <PageContextProvider pageId={page.id} spaceId={context.space.id} title={page.title}>
             {withFullPageCover && page.cover ? (
@@ -104,7 +112,7 @@ export async function SitePage(props: SitePageProps) {
                     ancestors={ancestors}
                     document={document}
                     withPageFeedback={withPageFeedback}
-                    prefetchedRef={prefetchedData ? prefetchedData.prefetchedRef : undefined}
+                    getContentRef={getContentRef}
                 />
             </div>
             <React.Suspense fallback={null}>