Memoize one more

Author: SamyPesse

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

@@ -1,5 +1,11 @@
 import pMemoize from 'p-memoize';
 
+/**
+ * We wrap 'use cache' calls in a p-memoize function to avoid
+ * executing the function multiple times when doing concurrent calls.
+ *
+ * Hopefully one day this can be done directly by 'use cache'.
+ */
 export function memoize<F extends (...args: any[]) => any>(f: F): F {
     return pMemoize(f, {
         cacheKey: (args) => {

packages/gitbook/src/lib/openapi/fetch.ts

@@ -6,6 +6,7 @@ import type {
     OpenAPISchemasBlock,
     ResolveOpenAPIBlockArgs,
 } from '@/lib/openapi/types';
+import { memoize } from '@v2/lib/data/memoize';
 import { assert } from 'ts-essentials';
 import { resolveContentRef } from '../references';
 import { isV2 } from '../v2';
@@ -65,15 +66,15 @@ const fetchFilesystemV1 = cache({
     },
 });
 
-async function fetchFilesystemV2(url: string) {
+const fetchFilesystemV2 = memoize(async function fetchFilesystemV2(url: string) {
     'use cache';
 
     // TODO: add cache lifetime once we can use next.js 15 code here
 
     const response = await fetchFilesystemUncached(url);
 
     return response;
-}
+});
 
 async function fetchFilesystemUncached(
     url: string,