WIP: bugfix for empty page

apps/app/src/pages/[[...path]]/page-data-props.ts

@@ -145,6 +145,25 @@ export async function getPageDataForInitial(
     // type assertion
     assert(isIPageInfo(meta), 'meta should be IPageInfo when data is not null');
 
+    // Handle empty pages - return as not found to avoid serialization issues
+    if (page.isEmpty) {
+      return {
+        props: {
+          currentPathname,
+          isIdenticalPathPage: false,
+          pageWithMeta: {
+            data: null,
+            meta: {
+              isNotFound: true,
+              isForbidden: false,
+            },
+          } satisfies IDataWithMeta<null, IPageNotFoundInfo>,
+          skipSSR: false,
+          redirectFrom,
+        },
+      };
+    }
+
     // Add user to seen users
     if (user != null) {
       await page.seen(user);

apps/app/src/server/service/page/index.ts

@@ -416,10 +416,10 @@ class PageService implements IPageService {
 
     let page: HydratedDocument<PageDocument> | null;
     if (pageId != null) { // prioritized
-      page = await Page.findByIdAndViewer(pageId, user, null, includeEmpty);
+      page = await Page.findByIdAndViewer(pageId, user, null, true);
     }
     else {
-      page = await Page.findByPathAndViewer(path, user, null, true, includeEmpty);
+      page = await Page.findByPathAndViewer(path, user, null, true, true);
     }
 
     if (page == null) {
@@ -430,7 +430,18 @@ class PageService implements IPageService {
         meta: {
           isNotFound: true,
           isForbidden,
-        },
+        } satisfies IPageNotFoundInfo,
+      };
+    }
+
+    if (page.isEmpty && !includeEmpty) {
+      const isVisible = await Page.countByIdAndViewer(page._id, user, null, true);
+      return {
+        data: null,
+        meta: {
+          isNotFound: true,
+          isForbidden: !isVisible,
+        } satisfies IPageNotFoundInfo,
       };
     }