@btst/stack 2.7.0 → 2.8.1

package/dist/packages/stack/src/plugins/blog/client/hooks/blog-hooks.cjs

@@ -5,7 +5,6 @@ const client = require('@btst/stack/plugins/client');
 const reactQuery = require('@tanstack/react-query');
 const useDebounce = require('./use-debounce.cjs');
 const React = require('react');
-const reactIntersectionObserver = require('react-intersection-observer');
 const plugins_blog_queryKeys = require('../../../../../../../plugins/blog/query-keys.cjs');
 const context = require('@btst/stack/context');
 
@@ -342,27 +341,19 @@ function useNextPreviousPosts(createdAt, options = {}) {
     basePath: apiBasePath
   });
   const queries = plugins_blog_queryKeys.createBlogQueryKeys(client$1, headers);
-  const { ref, inView } = reactIntersectionObserver.useInView({
-    // start a little early so the data is ready as it scrolls in
-    rootMargin: "200px 0px",
-    // run once; keep data cached after
-    triggerOnce: true
-  });
   const dateValue = typeof createdAt === "string" ? new Date(createdAt) : createdAt;
   const baseQuery = queries.posts.nextPrevious(dateValue);
   const { data, isLoading, error, refetch } = reactQuery.useQuery({
     ...baseQuery,
     ...SHARED_QUERY_CONFIG,
-    enabled: (options.enabled ?? true) && inView && !!client$1
+    enabled: (options.enabled ?? true) && !!client$1
   });
   return {
     previousPost: data?.previous ?? null,
     nextPost: data?.next ?? null,
     isLoading,
     error,
-    refetch,
-    ref,
-    inView
+    refetch
   };
 }
 function useRecentPosts(options = {}) {
@@ -372,12 +363,6 @@ function useRecentPosts(options = {}) {
     basePath: apiBasePath
   });
   const queries = plugins_blog_queryKeys.createBlogQueryKeys(client$1, headers);
-  const { ref, inView } = reactIntersectionObserver.useInView({
-    // start a little early so the data is ready as it scrolls in
-    rootMargin: "200px 0px",
-    // run once; keep data cached after
-    triggerOnce: true
-  });
   const baseQuery = queries.posts.recent({
     limit: options.limit ?? 5,
     excludeSlug: options.excludeSlug
@@ -385,15 +370,13 @@ function useRecentPosts(options = {}) {
   const { data, isLoading, error, refetch } = reactQuery.useQuery({
     ...baseQuery,
     ...SHARED_QUERY_CONFIG,
-    enabled: (options.enabled ?? true) && inView && !!client$1
+    enabled: (options.enabled ?? true) && !!client$1
   });
   return {
     recentPosts: data ?? [],
     isLoading,
     error,
-    refetch,
-    ref,
-    inView
+    refetch
   };
 }
 

package/dist/packages/stack/src/plugins/blog/client/hooks/blog-hooks.mjs

@@ -3,7 +3,6 @@ import { createApiClient } from '@btst/stack/plugins/client';
 import { useInfiniteQuery, useSuspenseInfiniteQuery, useQuery, useSuspenseQuery, useQueryClient, useMutation } from '@tanstack/react-query';
 import { useDebounce } from './use-debounce.mjs';
 import { useRef, useEffect } from 'react';
-import { useInView } from 'react-intersection-observer';
 import { createBlogQueryKeys } from '../../../../../../../plugins/blog/query-keys.mjs';
 import { usePluginOverrides } from '@btst/stack/context';
 
@@ -340,27 +339,19 @@ function useNextPreviousPosts(createdAt, options = {}) {
     basePath: apiBasePath
   });
   const queries = createBlogQueryKeys(client, headers);
-  const { ref, inView } = useInView({
-    // start a little early so the data is ready as it scrolls in
-    rootMargin: "200px 0px",
-    // run once; keep data cached after
-    triggerOnce: true
-  });
   const dateValue = typeof createdAt === "string" ? new Date(createdAt) : createdAt;
   const baseQuery = queries.posts.nextPrevious(dateValue);
   const { data, isLoading, error, refetch } = useQuery({
     ...baseQuery,
     ...SHARED_QUERY_CONFIG,
-    enabled: (options.enabled ?? true) && inView && !!client
+    enabled: (options.enabled ?? true) && !!client
   });
   return {
     previousPost: data?.previous ?? null,
     nextPost: data?.next ?? null,
     isLoading,
     error,
-    refetch,
-    ref,
-    inView
+    refetch
   };
 }
 function useRecentPosts(options = {}) {
@@ -370,12 +361,6 @@ function useRecentPosts(options = {}) {
     basePath: apiBasePath
   });
   const queries = createBlogQueryKeys(client, headers);
-  const { ref, inView } = useInView({
-    // start a little early so the data is ready as it scrolls in
-    rootMargin: "200px 0px",
-    // run once; keep data cached after
-    triggerOnce: true
-  });
   const baseQuery = queries.posts.recent({
     limit: options.limit ?? 5,
     excludeSlug: options.excludeSlug
@@ -383,15 +368,13 @@ function useRecentPosts(options = {}) {
   const { data, isLoading, error, refetch } = useQuery({
     ...baseQuery,
     ...SHARED_QUERY_CONFIG,
-    enabled: (options.enabled ?? true) && inView && !!client
+    enabled: (options.enabled ?? true) && !!client
   });
   return {
     recentPosts: data ?? [],
     isLoading,
     error,
-    refetch,
-    ref,
-    inView
+    refetch
   };
 }
 

package/dist/packages/stack/src/plugins/comments/api/getters.cjs

@@ -0,0 +1,284 @@
+'use strict';
+
+async function resolveAuthors(authorIds, resolveUser) {
+  const unique = [...new Set(authorIds)];
+  const map = /* @__PURE__ */ new Map();
+  if (!resolveUser || unique.length === 0) {
+    for (const id of unique) {
+      map.set(id, { name: "[deleted]", avatarUrl: null });
+    }
+    return map;
+  }
+  await Promise.all(
+    unique.map(async (id) => {
+      try {
+        const result = await resolveUser(id);
+        map.set(id, {
+          name: result?.name ?? "[deleted]",
+          avatarUrl: result?.avatarUrl ?? null
+        });
+      } catch {
+        map.set(id, { name: "[deleted]", avatarUrl: null });
+      }
+    })
+  );
+  return map;
+}
+function enrichComment(comment, authorMap, likedCommentIds, replyCount = 0) {
+  const author = authorMap.get(comment.authorId) ?? {
+    name: "[deleted]",
+    avatarUrl: null
+  };
+  return {
+    id: comment.id,
+    resourceId: comment.resourceId,
+    resourceType: comment.resourceType,
+    parentId: comment.parentId ?? null,
+    authorId: comment.authorId,
+    resolvedAuthorName: author.name,
+    resolvedAvatarUrl: author.avatarUrl,
+    body: comment.body,
+    status: comment.status,
+    likes: comment.likes,
+    isLikedByCurrentUser: likedCommentIds.has(comment.id),
+    editedAt: comment.editedAt?.toISOString() ?? null,
+    createdAt: comment.createdAt.toISOString(),
+    updatedAt: comment.updatedAt.toISOString(),
+    replyCount
+  };
+}
+function buildBaseConditions(params) {
+  const conditions = [];
+  if (params.resourceId) {
+    conditions.push({
+      field: "resourceId",
+      value: params.resourceId,
+      operator: "eq"
+    });
+  }
+  if (params.resourceType) {
+    conditions.push({
+      field: "resourceType",
+      value: params.resourceType,
+      operator: "eq"
+    });
+  }
+  if (params.parentId !== void 0) {
+    const parentValue = params.parentId === null || params.parentId === "null" ? null : params.parentId;
+    conditions.push({ field: "parentId", value: parentValue, operator: "eq" });
+  }
+  if (params.authorId) {
+    conditions.push({
+      field: "authorId",
+      value: params.authorId,
+      operator: "eq"
+    });
+  }
+  return conditions;
+}
+async function listComments(adapter, params, resolveUser) {
+  const limit = params.limit ?? 20;
+  const offset = params.offset ?? 0;
+  const sortDirection = params.sort ?? "asc";
+  const omitStatusFilter = !!params.authorId && !params.status;
+  const statusFilter = omitStatusFilter ? null : params.status ?? "approved";
+  const baseConditions = buildBaseConditions(params);
+  let comments;
+  let total;
+  if (!omitStatusFilter && statusFilter === "approved" && params.currentUserId) {
+    const [ownPendingAll, approvedCount] = await Promise.all([
+      adapter.findMany({
+        model: "comment",
+        where: [
+          ...baseConditions,
+          { field: "status", value: "pending", operator: "eq" },
+          { field: "authorId", value: params.currentUserId, operator: "eq" }
+        ],
+        sortBy: { field: "createdAt", direction: sortDirection }
+      }),
+      adapter.count({
+        model: "comment",
+        where: [
+          ...baseConditions,
+          { field: "status", value: "approved", operator: "eq" }
+        ]
+      })
+    ]);
+    total = approvedCount + ownPendingAll.length;
+    if (ownPendingAll.length === 0) {
+      comments = await adapter.findMany({
+        model: "comment",
+        limit,
+        offset,
+        where: [
+          ...baseConditions,
+          { field: "status", value: "approved", operator: "eq" }
+        ],
+        sortBy: { field: "createdAt", direction: sortDirection }
+      });
+    } else {
+      const dateOp = sortDirection === "asc" ? "lt" : "gt";
+      const pendingWithPositions = await Promise.all(
+        ownPendingAll.map(async (p, i) => {
+          const approvedBefore = await adapter.count({
+            model: "comment",
+            where: [
+              ...baseConditions,
+              { field: "status", value: "approved", operator: "eq" },
+              {
+                field: "createdAt",
+                value: p.createdAt,
+                operator: dateOp
+              }
+            ]
+          });
+          return { comment: p, mergedPosition: approvedBefore + i };
+        })
+      );
+      const pendingInWindow = pendingWithPositions.filter(
+        ({ mergedPosition }) => mergedPosition >= offset && mergedPosition < offset + limit
+      );
+      const countPendingBeforeWindow = pendingWithPositions.filter(
+        ({ mergedPosition }) => mergedPosition < offset
+      ).length;
+      const approvedOffset = Math.max(0, offset - countPendingBeforeWindow);
+      const approvedLimit = limit - pendingInWindow.length;
+      const approvedPage = approvedLimit > 0 ? await adapter.findMany({
+        model: "comment",
+        limit: approvedLimit,
+        offset: approvedOffset,
+        where: [
+          ...baseConditions,
+          { field: "status", value: "approved", operator: "eq" }
+        ],
+        sortBy: { field: "createdAt", direction: sortDirection }
+      }) : [];
+      const merged = [
+        ...approvedPage,
+        ...pendingInWindow.map(({ comment }) => comment)
+      ];
+      merged.sort((a, b) => {
+        const diff = a.createdAt.getTime() - b.createdAt.getTime();
+        return sortDirection === "desc" ? -diff : diff;
+      });
+      comments = merged;
+    }
+  } else {
+    const where = [...baseConditions];
+    if (statusFilter !== null) {
+      where.push({
+        field: "status",
+        value: statusFilter,
+        operator: "eq"
+      });
+    }
+    const [found, count] = await Promise.all([
+      adapter.findMany({
+        model: "comment",
+        limit,
+        offset,
+        where,
+        sortBy: { field: "createdAt", direction: sortDirection }
+      }),
+      adapter.count({ model: "comment", where })
+    ]);
+    comments = found;
+    total = count;
+  }
+  const authorIds = comments.map((c) => c.authorId);
+  const authorMap = await resolveAuthors(authorIds, resolveUser);
+  const likedCommentIds = /* @__PURE__ */ new Set();
+  if (params.currentUserId && comments.length > 0) {
+    const commentIds = comments.map((c) => c.id);
+    const likes = await Promise.all(
+      commentIds.map(
+        (commentId) => adapter.findOne({
+          model: "commentLike",
+          where: [
+            { field: "commentId", value: commentId, operator: "eq" },
+            {
+              field: "authorId",
+              value: params.currentUserId,
+              operator: "eq"
+            }
+          ]
+        })
+      )
+    );
+    likes.forEach((like, i) => {
+      if (like) likedCommentIds.add(commentIds[i]);
+    });
+  }
+  const replyCounts = /* @__PURE__ */ new Map();
+  const isTopLevelQuery = params.parentId === null || params.parentId === "null";
+  if (isTopLevelQuery && comments.length > 0) {
+    await Promise.all(
+      comments.map(async (c) => {
+        const approvedCount = await adapter.count({
+          model: "comment",
+          where: [
+            { field: "parentId", value: c.id, operator: "eq" },
+            { field: "status", value: "approved", operator: "eq" }
+          ]
+        });
+        let ownPendingCount = 0;
+        if (params.currentUserId) {
+          ownPendingCount = await adapter.count({
+            model: "comment",
+            where: [
+              { field: "parentId", value: c.id, operator: "eq" },
+              { field: "status", value: "pending", operator: "eq" },
+              {
+                field: "authorId",
+                value: params.currentUserId,
+                operator: "eq"
+              }
+            ]
+          });
+        }
+        replyCounts.set(c.id, approvedCount + ownPendingCount);
+      })
+    );
+  }
+  const items = comments.map(
+    (c) => enrichComment(c, authorMap, likedCommentIds, replyCounts.get(c.id) ?? 0)
+  );
+  return { items, total, limit, offset };
+}
+async function getCommentById(adapter, id, resolveUser, currentUserId) {
+  const comment = await adapter.findOne({
+    model: "comment",
+    where: [{ field: "id", value: id, operator: "eq" }]
+  });
+  if (!comment) return null;
+  const authorMap = await resolveAuthors([comment.authorId], resolveUser);
+  const likedCommentIds = /* @__PURE__ */ new Set();
+  if (currentUserId) {
+    const like = await adapter.findOne({
+      model: "commentLike",
+      where: [
+        { field: "commentId", value: id, operator: "eq" },
+        { field: "authorId", value: currentUserId, operator: "eq" }
+      ]
+    });
+    if (like) likedCommentIds.add(id);
+  }
+  return enrichComment(comment, authorMap, likedCommentIds);
+}
+async function getCommentCount(adapter, params) {
+  const whereConditions = [
+    { field: "resourceId", value: params.resourceId, operator: "eq" },
+    { field: "resourceType", value: params.resourceType, operator: "eq" }
+  ];
+  const statusFilter = params.status ?? "approved";
+  whereConditions.push({
+    field: "status",
+    value: statusFilter,
+    operator: "eq"
+  });
+  return adapter.count({ model: "comment", where: whereConditions });
+}
+
+exports.getCommentById = getCommentById;
+exports.getCommentCount = getCommentCount;
+exports.listComments = listComments;

package/dist/packages/stack/src/plugins/comments/api/getters.mjs

@@ -0,0 +1,280 @@
+async function resolveAuthors(authorIds, resolveUser) {
+  const unique = [...new Set(authorIds)];
+  const map = /* @__PURE__ */ new Map();
+  if (!resolveUser || unique.length === 0) {
+    for (const id of unique) {
+      map.set(id, { name: "[deleted]", avatarUrl: null });
+    }
+    return map;
+  }
+  await Promise.all(
+    unique.map(async (id) => {
+      try {
+        const result = await resolveUser(id);
+        map.set(id, {
+          name: result?.name ?? "[deleted]",
+          avatarUrl: result?.avatarUrl ?? null
+        });
+      } catch {
+        map.set(id, { name: "[deleted]", avatarUrl: null });
+      }
+    })
+  );
+  return map;
+}
+function enrichComment(comment, authorMap, likedCommentIds, replyCount = 0) {
+  const author = authorMap.get(comment.authorId) ?? {
+    name: "[deleted]",
+    avatarUrl: null
+  };
+  return {
+    id: comment.id,
+    resourceId: comment.resourceId,
+    resourceType: comment.resourceType,
+    parentId: comment.parentId ?? null,
+    authorId: comment.authorId,
+    resolvedAuthorName: author.name,
+    resolvedAvatarUrl: author.avatarUrl,
+    body: comment.body,
+    status: comment.status,
+    likes: comment.likes,
+    isLikedByCurrentUser: likedCommentIds.has(comment.id),
+    editedAt: comment.editedAt?.toISOString() ?? null,
+    createdAt: comment.createdAt.toISOString(),
+    updatedAt: comment.updatedAt.toISOString(),
+    replyCount
+  };
+}
+function buildBaseConditions(params) {
+  const conditions = [];
+  if (params.resourceId) {
+    conditions.push({
+      field: "resourceId",
+      value: params.resourceId,
+      operator: "eq"
+    });
+  }
+  if (params.resourceType) {
+    conditions.push({
+      field: "resourceType",
+      value: params.resourceType,
+      operator: "eq"
+    });
+  }
+  if (params.parentId !== void 0) {
+    const parentValue = params.parentId === null || params.parentId === "null" ? null : params.parentId;
+    conditions.push({ field: "parentId", value: parentValue, operator: "eq" });
+  }
+  if (params.authorId) {
+    conditions.push({
+      field: "authorId",
+      value: params.authorId,
+      operator: "eq"
+    });
+  }
+  return conditions;
+}
+async function listComments(adapter, params, resolveUser) {
+  const limit = params.limit ?? 20;
+  const offset = params.offset ?? 0;
+  const sortDirection = params.sort ?? "asc";
+  const omitStatusFilter = !!params.authorId && !params.status;
+  const statusFilter = omitStatusFilter ? null : params.status ?? "approved";
+  const baseConditions = buildBaseConditions(params);
+  let comments;
+  let total;
+  if (!omitStatusFilter && statusFilter === "approved" && params.currentUserId) {
+    const [ownPendingAll, approvedCount] = await Promise.all([
+      adapter.findMany({
+        model: "comment",
+        where: [
+          ...baseConditions,
+          { field: "status", value: "pending", operator: "eq" },
+          { field: "authorId", value: params.currentUserId, operator: "eq" }
+        ],
+        sortBy: { field: "createdAt", direction: sortDirection }
+      }),
+      adapter.count({
+        model: "comment",
+        where: [
+          ...baseConditions,
+          { field: "status", value: "approved", operator: "eq" }
+        ]
+      })
+    ]);
+    total = approvedCount + ownPendingAll.length;
+    if (ownPendingAll.length === 0) {
+      comments = await adapter.findMany({
+        model: "comment",
+        limit,
+        offset,
+        where: [
+          ...baseConditions,
+          { field: "status", value: "approved", operator: "eq" }
+        ],
+        sortBy: { field: "createdAt", direction: sortDirection }
+      });
+    } else {
+      const dateOp = sortDirection === "asc" ? "lt" : "gt";
+      const pendingWithPositions = await Promise.all(
+        ownPendingAll.map(async (p, i) => {
+          const approvedBefore = await adapter.count({
+            model: "comment",
+            where: [
+              ...baseConditions,
+              { field: "status", value: "approved", operator: "eq" },
+              {
+                field: "createdAt",
+                value: p.createdAt,
+                operator: dateOp
+              }
+            ]
+          });
+          return { comment: p, mergedPosition: approvedBefore + i };
+        })
+      );
+      const pendingInWindow = pendingWithPositions.filter(
+        ({ mergedPosition }) => mergedPosition >= offset && mergedPosition < offset + limit
+      );
+      const countPendingBeforeWindow = pendingWithPositions.filter(
+        ({ mergedPosition }) => mergedPosition < offset
+      ).length;
+      const approvedOffset = Math.max(0, offset - countPendingBeforeWindow);
+      const approvedLimit = limit - pendingInWindow.length;
+      const approvedPage = approvedLimit > 0 ? await adapter.findMany({
+        model: "comment",
+        limit: approvedLimit,
+        offset: approvedOffset,
+        where: [
+          ...baseConditions,
+          { field: "status", value: "approved", operator: "eq" }
+        ],
+        sortBy: { field: "createdAt", direction: sortDirection }
+      }) : [];
+      const merged = [
+        ...approvedPage,
+        ...pendingInWindow.map(({ comment }) => comment)
+      ];
+      merged.sort((a, b) => {
+        const diff = a.createdAt.getTime() - b.createdAt.getTime();
+        return sortDirection === "desc" ? -diff : diff;
+      });
+      comments = merged;
+    }
+  } else {
+    const where = [...baseConditions];
+    if (statusFilter !== null) {
+      where.push({
+        field: "status",
+        value: statusFilter,
+        operator: "eq"
+      });
+    }
+    const [found, count] = await Promise.all([
+      adapter.findMany({
+        model: "comment",
+        limit,
+        offset,
+        where,
+        sortBy: { field: "createdAt", direction: sortDirection }
+      }),
+      adapter.count({ model: "comment", where })
+    ]);
+    comments = found;
+    total = count;
+  }
+  const authorIds = comments.map((c) => c.authorId);
+  const authorMap = await resolveAuthors(authorIds, resolveUser);
+  const likedCommentIds = /* @__PURE__ */ new Set();
+  if (params.currentUserId && comments.length > 0) {
+    const commentIds = comments.map((c) => c.id);
+    const likes = await Promise.all(
+      commentIds.map(
+        (commentId) => adapter.findOne({
+          model: "commentLike",
+          where: [
+            { field: "commentId", value: commentId, operator: "eq" },
+            {
+              field: "authorId",
+              value: params.currentUserId,
+              operator: "eq"
+            }
+          ]
+        })
+      )
+    );
+    likes.forEach((like, i) => {
+      if (like) likedCommentIds.add(commentIds[i]);
+    });
+  }
+  const replyCounts = /* @__PURE__ */ new Map();
+  const isTopLevelQuery = params.parentId === null || params.parentId === "null";
+  if (isTopLevelQuery && comments.length > 0) {
+    await Promise.all(
+      comments.map(async (c) => {
+        const approvedCount = await adapter.count({
+          model: "comment",
+          where: [
+            { field: "parentId", value: c.id, operator: "eq" },
+            { field: "status", value: "approved", operator: "eq" }
+          ]
+        });
+        let ownPendingCount = 0;
+        if (params.currentUserId) {
+          ownPendingCount = await adapter.count({
+            model: "comment",
+            where: [
+              { field: "parentId", value: c.id, operator: "eq" },
+              { field: "status", value: "pending", operator: "eq" },
+              {
+                field: "authorId",
+                value: params.currentUserId,
+                operator: "eq"
+              }
+            ]
+          });
+        }
+        replyCounts.set(c.id, approvedCount + ownPendingCount);
+      })
+    );
+  }
+  const items = comments.map(
+    (c) => enrichComment(c, authorMap, likedCommentIds, replyCounts.get(c.id) ?? 0)
+  );
+  return { items, total, limit, offset };
+}
+async function getCommentById(adapter, id, resolveUser, currentUserId) {
+  const comment = await adapter.findOne({
+    model: "comment",
+    where: [{ field: "id", value: id, operator: "eq" }]
+  });
+  if (!comment) return null;
+  const authorMap = await resolveAuthors([comment.authorId], resolveUser);
+  const likedCommentIds = /* @__PURE__ */ new Set();
+  if (currentUserId) {
+    const like = await adapter.findOne({
+      model: "commentLike",
+      where: [
+        { field: "commentId", value: id, operator: "eq" },
+        { field: "authorId", value: currentUserId, operator: "eq" }
+      ]
+    });
+    if (like) likedCommentIds.add(id);
+  }
+  return enrichComment(comment, authorMap, likedCommentIds);
+}
+async function getCommentCount(adapter, params) {
+  const whereConditions = [
+    { field: "resourceId", value: params.resourceId, operator: "eq" },
+    { field: "resourceType", value: params.resourceType, operator: "eq" }
+  ];
+  const statusFilter = params.status ?? "approved";
+  whereConditions.push({
+    field: "status",
+    value: statusFilter,
+    operator: "eq"
+  });
+  return adapter.count({ model: "comment", where: whereConditions });
+}
+
+export { getCommentById, getCommentCount, listComments };