Keep old methods

Author: gregberge

packages/gitbook/src/lib/api.ts

@@ -394,7 +394,40 @@ const getAPIContextId = async () => {
  * Get a revision by its ID.
  */
 export const getRevision = cache({
-    name: 'api.getRevision.v3',
+    name: 'api.getRevision.v2',
+    tag: (spaceId, revisionId) =>
+        getCacheTag({ tag: 'revision', space: spaceId, revision: revisionId }),
+    tagImmutable: true,
+    getKeySuffix: getAPIContextId,
+    get: async (
+        spaceId: string,
+        revisionId: string,
+        fetchOptions: GetRevisionOptions,
+        options: CacheFunctionOptions
+    ) => {
+        const apiCtx = await api();
+        const response = await apiCtx.client.spaces.getRevisionById(
+            spaceId,
+            revisionId,
+            {
+                metadata: fetchOptions.metadata,
+            },
+            {
+                ...noCacheFetchOptions,
+                signal: options.signal,
+            }
+        );
+
+        return cacheResponse(response, fetchOptions.metadata ? cacheTtl_7days : cacheTtl_1day);
+    },
+    getKeyArgs: (args) => [args[0], args[1]],
+});
+
+/**
+ * Get a revision by its ID and tags.
+ */
+export const getRevisionAndTags = cache({
+    name: 'api.getRevisionAndTags.v1',
     tag: (spaceId, revisionId, fetchOptions) =>
         // Temporary hack to make it work with OpenAPI on v1
         fetchOptions.tags?.[0] ??
@@ -439,7 +472,43 @@ export const getRevision = cache({
  * Get all the pages in a revision of a space.
  */
 export const getRevisionPages = cache({
-    name: 'api.getRevisionPages.v5',
+    name: 'api.getRevisionPages.v4',
+    tag: (spaceId, revisionId) =>
+        getCacheTag({ tag: 'revision', space: spaceId, revision: revisionId }),
+    tagImmutable: true,
+    getKeySuffix: getAPIContextId,
+    get: async (
+        spaceId: string,
+        revisionId: string,
+        fetchOptions: GetRevisionOptions,
+        options: CacheFunctionOptions
+    ) => {
+        const apiCtx = await api();
+        const response = await apiCtx.client.spaces.listPagesInRevisionById(
+            spaceId,
+            revisionId,
+            {
+                metadata: fetchOptions.metadata,
+            },
+            {
+                ...noCacheFetchOptions,
+                signal: options.signal,
+            }
+        );
+
+        return cacheResponse(response, {
+            ...(fetchOptions.metadata ? cacheTtl_7days : cacheTtl_1day),
+            data: response.data.pages,
+        });
+    },
+    getKeyArgs: (args) => [args[0], args[1]],
+});
+
+/**
+ * Get all the pages in a revision of a space.
+ */
+export const getRevisionPagesAndTags = cache({
+    name: 'api.getRevisionPages.v1',
     tag: (spaceId, revisionId, fetchOptions) =>
         // Temporary hack to make it work with OpenAPI on v1
         fetchOptions.tags?.[0] ??
@@ -663,7 +732,7 @@ export const getRevisionFile = batch<[string, string, string], RevisionFile | nu
             let files: Record<string, RevisionFile> = {};
 
             if (hasRevisionInMemory) {
-                const { revision } = await getRevision(spaceId, revisionId, { metadata: false });
+                const revision = await getRevision(spaceId, revisionId, { metadata: false });
                 files = {};
                 revision.files.forEach((file) => {
                     files[file.id] = file;
@@ -709,7 +778,7 @@ export const getReusableContent = async (
     });
 
     if (hasRevisionInMemory) {
-        const { revision } = await getRevision(spaceId, revisionId, { metadata: false });
+        const revision = await getRevision(spaceId, revisionId, { metadata: false });
         return (
             revision.reusableContents.find(
                 (reusableContent) => reusableContent.id === reusableContentId

packages/gitbook/src/lib/v1.ts

@@ -22,10 +22,10 @@ import {
     getLatestOpenAPISpecVersionContent,
     getPublishedContentSite,
     getReusableContent,
-    getRevision,
+    getRevisionAndTags,
     getRevisionFile,
     getRevisionPageByPath,
-    getRevisionPages,
+    getRevisionPagesAndTags,
     getSiteRedirectBySource,
     getSpace,
     getUserById,
@@ -135,21 +135,29 @@ async function getDataFetcherV1(): Promise<GitBookDataFetcher> {
 
         getRevision(params) {
             return wrapDataFetcherError(async () => {
-                const { revision, tags } = await getRevision(params.spaceId, params.revisionId, {
-                    metadata: params.metadata,
-                    computed: false,
-                });
+                const { revision, tags } = await getRevisionAndTags(
+                    params.spaceId,
+                    params.revisionId,
+                    {
+                        metadata: params.metadata,
+                        computed: false,
+                    }
+                );
 
                 if (
                     Object.values(revision.pages).some(
                         (page) => page.type === RevisionPageType.Computed
                     )
                 ) {
-                    const { revision } = await getRevision(params.spaceId, params.revisionId, {
-                        metadata: params.metadata,
-                        computed: true,
-                        tags,
-                    });
+                    const { revision } = await getRevisionAndTags(
+                        params.spaceId,
+                        params.revisionId,
+                        {
+                            metadata: params.metadata,
+                            computed: true,
+                            tags,
+                        }
+                    );
                     return revision;
                 }
 
@@ -200,17 +208,25 @@ async function getDataFetcherV1(): Promise<GitBookDataFetcher> {
 
         getRevisionPages(params) {
             return wrapDataFetcherError(async () => {
-                const { pages, tags } = await getRevisionPages(params.spaceId, params.revisionId, {
-                    metadata: params.metadata,
-                    computed: false,
-                });
+                const { pages, tags } = await getRevisionPagesAndTags(
+                    params.spaceId,
+                    params.revisionId,
+                    {
+                        metadata: params.metadata,
+                        computed: false,
+                    }
+                );
 
                 if (pages.some((page) => page.type === RevisionPageType.Computed)) {
-                    const { pages } = await getRevisionPages(params.spaceId, params.revisionId, {
-                        metadata: params.metadata,
-                        computed: true,
-                        tags,
-                    });
+                    const { pages } = await getRevisionPagesAndTags(
+                        params.spaceId,
+                        params.revisionId,
+                        {
+                            metadata: params.metadata,
+                            computed: true,
+                            tags,
+                        }
+                    );
 
                     return pages;
                 }