@btst/stack 2.1.0 → 2.3.0

package/dist/packages/stack/src/plugins/blog/api/plugin.cjs

@@ -5,7 +5,58 @@ const z = require('zod');
 const db = require('../db.cjs');
 const utils = require('../utils.cjs');
 const schemas = require('../schemas.cjs');
+const getters = require('./getters.cjs');
+const queryKeyDefs = require('./query-key-defs.cjs');
+const serializers = require('./serializers.cjs');
 
+function createBlogPrefetchForRoute(adapter) {
+  return async function prefetchForRoute(key, qc, params) {
+    switch (key) {
+      case "posts":
+      case "drafts": {
+        const published = key === "posts";
+        const [result, tags] = await Promise.all([
+          getters.getAllPosts(adapter, { published, limit: 10 }),
+          getters.getAllTags(adapter)
+        ]);
+        qc.setQueryData(queryKeyDefs.BLOG_QUERY_KEYS.postsList({ published, limit: 10 }), {
+          pages: [result.items.map(serializers.serializePost)],
+          pageParams: [0]
+        });
+        qc.setQueryData(queryKeyDefs.BLOG_QUERY_KEYS.tagsList(), tags.map(serializers.serializeTag));
+        break;
+      }
+      case "post":
+      case "editPost": {
+        const slug = params?.slug ?? "";
+        if (slug) {
+          const post = await getters.getPostBySlug(adapter, slug);
+          qc.setQueryData(
+            queryKeyDefs.BLOG_QUERY_KEYS.postDetail(slug),
+            post ? serializers.serializePost(post) : null
+          );
+        }
+        break;
+      }
+      case "tag": {
+        const tagSlug = params?.tagSlug ?? "";
+        const [result, tags] = await Promise.all([
+          getters.getAllPosts(adapter, { published: true, limit: 10, tagSlug }),
+          getters.getAllTags(adapter)
+        ]);
+        qc.setQueryData(
+          queryKeyDefs.BLOG_QUERY_KEYS.postsList({ published: true, limit: 10, tagSlug }),
+          {
+            pages: [result.items.map(serializers.serializePost)],
+            pageParams: [0]
+          }
+        );
+        qc.setQueryData(queryKeyDefs.BLOG_QUERY_KEYS.tagsList(), tags.map(serializers.serializeTag));
+        break;
+      }
+    }
+  };
+}
 const PostListQuerySchema = z.z.object({
   slug: z.z.string().optional(),
   tagSlug: z.z.string().optional(),
@@ -25,6 +76,12 @@ const NextPreviousPostsQuerySchema = z.z.object({
 const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
   name: "blog",
   dbPlugin: db.blogSchema,
+  api: (adapter) => ({
+    getAllPosts: (params) => getters.getAllPosts(adapter, params),
+    getPostBySlug: (slug) => getters.getPostBySlug(adapter, slug),
+    getAllTags: () => getters.getAllTags(adapter),
+    prefetchForRoute: createBlogPrefetchForRoute(adapter)
+  }),
   routes: (adapter) => {
     const findOrCreateTags = async (tagInputs) => {
       if (tagInputs.length === 0) return [];
@@ -105,111 +162,9 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
               });
             }
           }
-          let tagFilterPostIds = null;
-          if (query.tagSlug) {
-            const tag = await adapter.findOne({
-              model: "tag",
-              where: [
-                {
-                  field: "slug",
-                  value: query.tagSlug,
-                  operator: "eq"
-                }
-              ]
-            });
-            if (!tag) {
-              return [];
-            }
-            const postTags = await adapter.findMany({
-              model: "postTag",
-              where: [
-                {
-                  field: "tagId",
-                  value: tag.id,
-                  operator: "eq"
-                }
-              ]
-            });
-            tagFilterPostIds = new Set(postTags.map((pt) => pt.postId));
-            if (tagFilterPostIds.size === 0) {
-              return [];
-            }
-          }
-          const whereConditions = [];
-          if (query.published !== void 0) {
-            whereConditions.push({
-              field: "published",
-              value: query.published,
-              operator: "eq"
-            });
-          }
-          if (query.slug) {
-            whereConditions.push({
-              field: "slug",
-              value: query.slug,
-              operator: "eq"
-            });
-          }
-          const posts = await adapter.findMany({
-            model: "post",
-            limit: query.query || query.tagSlug ? void 0 : query.limit ?? 10,
-            offset: query.query || query.tagSlug ? void 0 : query.offset ?? 0,
-            where: whereConditions,
-            sortBy: {
-              field: "createdAt",
-              direction: "desc"
-            },
-            join: {
-              postTag: true
-            }
-          });
-          const tagIds = /* @__PURE__ */ new Set();
-          for (const post of posts) {
-            if (post.postTag) {
-              for (const pt of post.postTag) {
-                tagIds.add(pt.tagId);
-              }
-            }
-          }
-          const tags = tagIds.size > 0 ? await adapter.findMany({
-            model: "tag"
-          }) : [];
-          const tagMap = /* @__PURE__ */ new Map();
-          for (const tag of tags) {
-            if (tagIds.has(tag.id)) {
-              tagMap.set(tag.id, tag);
-            }
-          }
-          let result = posts.map((post) => {
-            const postTags = (post.postTag || []).map((pt) => {
-              const tag = tagMap.get(pt.tagId);
-              return tag ? { ...tag } : void 0;
-            }).filter((tag) => tag !== void 0);
-            const { postTag: _, ...postWithoutJoin } = post;
-            return {
-              ...postWithoutJoin,
-              tags: postTags
-            };
-          });
-          if (tagFilterPostIds) {
-            result = result.filter((post) => tagFilterPostIds.has(post.id));
-          }
-          if (query.query) {
-            const searchLower = query.query.toLowerCase();
-            result = result.filter((post) => {
-              const titleMatch = post.title?.toLowerCase().includes(searchLower);
-              const contentMatch = post.content?.toLowerCase().includes(searchLower);
-              const excerptMatch = post.excerpt?.toLowerCase().includes(searchLower);
-              return titleMatch || contentMatch || excerptMatch;
-            });
-          }
-          if (query.tagSlug || query.query) {
-            const offset = query.offset ?? 0;
-            const limit = query.limit ?? 10;
-            result = result.slice(offset, offset + limit);
-          }
+          const result = await getters.getAllPosts(adapter, query);
           if (hooks?.onPostsRead) {
-            await hooks.onPostsRead(result, query, context);
+            await hooks.onPostsRead(result.items, query, context);
           }
           return result;
         } catch (error) {
@@ -552,9 +507,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         method: "GET"
       },
       async () => {
-        return await adapter.findMany({
-          model: "tag"
-        });
+        return await getters.getAllTags(adapter);
       }
     );
     return {

package/dist/packages/stack/src/plugins/blog/api/plugin.mjs

@@ -3,7 +3,58 @@ import { z } from 'zod';
 import { blogSchema } from '../db.mjs';
 import { slugify } from '../utils.mjs';
 import { createPostSchema, updatePostSchema } from '../schemas.mjs';
+import { getAllTags, getPostBySlug, getAllPosts } from './getters.mjs';
+import { BLOG_QUERY_KEYS } from './query-key-defs.mjs';
+import { serializePost, serializeTag } from './serializers.mjs';
 
+function createBlogPrefetchForRoute(adapter) {
+  return async function prefetchForRoute(key, qc, params) {
+    switch (key) {
+      case "posts":
+      case "drafts": {
+        const published = key === "posts";
+        const [result, tags] = await Promise.all([
+          getAllPosts(adapter, { published, limit: 10 }),
+          getAllTags(adapter)
+        ]);
+        qc.setQueryData(BLOG_QUERY_KEYS.postsList({ published, limit: 10 }), {
+          pages: [result.items.map(serializePost)],
+          pageParams: [0]
+        });
+        qc.setQueryData(BLOG_QUERY_KEYS.tagsList(), tags.map(serializeTag));
+        break;
+      }
+      case "post":
+      case "editPost": {
+        const slug = params?.slug ?? "";
+        if (slug) {
+          const post = await getPostBySlug(adapter, slug);
+          qc.setQueryData(
+            BLOG_QUERY_KEYS.postDetail(slug),
+            post ? serializePost(post) : null
+          );
+        }
+        break;
+      }
+      case "tag": {
+        const tagSlug = params?.tagSlug ?? "";
+        const [result, tags] = await Promise.all([
+          getAllPosts(adapter, { published: true, limit: 10, tagSlug }),
+          getAllTags(adapter)
+        ]);
+        qc.setQueryData(
+          BLOG_QUERY_KEYS.postsList({ published: true, limit: 10, tagSlug }),
+          {
+            pages: [result.items.map(serializePost)],
+            pageParams: [0]
+          }
+        );
+        qc.setQueryData(BLOG_QUERY_KEYS.tagsList(), tags.map(serializeTag));
+        break;
+      }
+    }
+  };
+}
 const PostListQuerySchema = z.object({
   slug: z.string().optional(),
   tagSlug: z.string().optional(),
@@ -23,6 +74,12 @@ const NextPreviousPostsQuerySchema = z.object({
 const blogBackendPlugin = (hooks) => defineBackendPlugin({
   name: "blog",
   dbPlugin: blogSchema,
+  api: (adapter) => ({
+    getAllPosts: (params) => getAllPosts(adapter, params),
+    getPostBySlug: (slug) => getPostBySlug(adapter, slug),
+    getAllTags: () => getAllTags(adapter),
+    prefetchForRoute: createBlogPrefetchForRoute(adapter)
+  }),
   routes: (adapter) => {
     const findOrCreateTags = async (tagInputs) => {
       if (tagInputs.length === 0) return [];
@@ -103,111 +160,9 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
               });
             }
           }
-          let tagFilterPostIds = null;
-          if (query.tagSlug) {
-            const tag = await adapter.findOne({
-              model: "tag",
-              where: [
-                {
-                  field: "slug",
-                  value: query.tagSlug,
-                  operator: "eq"
-                }
-              ]
-            });
-            if (!tag) {
-              return [];
-            }
-            const postTags = await adapter.findMany({
-              model: "postTag",
-              where: [
-                {
-                  field: "tagId",
-                  value: tag.id,
-                  operator: "eq"
-                }
-              ]
-            });
-            tagFilterPostIds = new Set(postTags.map((pt) => pt.postId));
-            if (tagFilterPostIds.size === 0) {
-              return [];
-            }
-          }
-          const whereConditions = [];
-          if (query.published !== void 0) {
-            whereConditions.push({
-              field: "published",
-              value: query.published,
-              operator: "eq"
-            });
-          }
-          if (query.slug) {
-            whereConditions.push({
-              field: "slug",
-              value: query.slug,
-              operator: "eq"
-            });
-          }
-          const posts = await adapter.findMany({
-            model: "post",
-            limit: query.query || query.tagSlug ? void 0 : query.limit ?? 10,
-            offset: query.query || query.tagSlug ? void 0 : query.offset ?? 0,
-            where: whereConditions,
-            sortBy: {
-              field: "createdAt",
-              direction: "desc"
-            },
-            join: {
-              postTag: true
-            }
-          });
-          const tagIds = /* @__PURE__ */ new Set();
-          for (const post of posts) {
-            if (post.postTag) {
-              for (const pt of post.postTag) {
-                tagIds.add(pt.tagId);
-              }
-            }
-          }
-          const tags = tagIds.size > 0 ? await adapter.findMany({
-            model: "tag"
-          }) : [];
-          const tagMap = /* @__PURE__ */ new Map();
-          for (const tag of tags) {
-            if (tagIds.has(tag.id)) {
-              tagMap.set(tag.id, tag);
-            }
-          }
-          let result = posts.map((post) => {
-            const postTags = (post.postTag || []).map((pt) => {
-              const tag = tagMap.get(pt.tagId);
-              return tag ? { ...tag } : void 0;
-            }).filter((tag) => tag !== void 0);
-            const { postTag: _, ...postWithoutJoin } = post;
-            return {
-              ...postWithoutJoin,
-              tags: postTags
-            };
-          });
-          if (tagFilterPostIds) {
-            result = result.filter((post) => tagFilterPostIds.has(post.id));
-          }
-          if (query.query) {
-            const searchLower = query.query.toLowerCase();
-            result = result.filter((post) => {
-              const titleMatch = post.title?.toLowerCase().includes(searchLower);
-              const contentMatch = post.content?.toLowerCase().includes(searchLower);
-              const excerptMatch = post.excerpt?.toLowerCase().includes(searchLower);
-              return titleMatch || contentMatch || excerptMatch;
-            });
-          }
-          if (query.tagSlug || query.query) {
-            const offset = query.offset ?? 0;
-            const limit = query.limit ?? 10;
-            result = result.slice(offset, offset + limit);
-          }
+          const result = await getAllPosts(adapter, query);
           if (hooks?.onPostsRead) {
-            await hooks.onPostsRead(result, query, context);
+            await hooks.onPostsRead(result.items, query, context);
           }
           return result;
         } catch (error) {
@@ -550,9 +505,7 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         method: "GET"
       },
       async () => {
-        return await adapter.findMany({
-          model: "tag"
-        });
+        return await getAllTags(adapter);
       }
     );
     return {

package/dist/packages/stack/src/plugins/blog/api/query-key-defs.cjs

@@ -0,0 +1,18 @@
+'use strict';
+
+function postsListDiscriminator(params) {
+  return {
+    query: params.query !== void 0 && params.query.trim() === "" ? void 0 : params.query,
+    limit: params.limit ?? 10,
+    published: params.published,
+    tagSlug: params.tagSlug
+  };
+}
+const BLOG_QUERY_KEYS = {
+  postsList: (params) => ["posts", "list", postsListDiscriminator(params)],
+  postDetail: (slug) => ["posts", "detail", slug],
+  tagsList: () => ["tags", "list", "tags"]
+};
+
+exports.BLOG_QUERY_KEYS = BLOG_QUERY_KEYS;
+exports.postsListDiscriminator = postsListDiscriminator;

package/dist/packages/stack/src/plugins/blog/api/query-key-defs.mjs

@@ -0,0 +1,15 @@
+function postsListDiscriminator(params) {
+  return {
+    query: params.query !== void 0 && params.query.trim() === "" ? void 0 : params.query,
+    limit: params.limit ?? 10,
+    published: params.published,
+    tagSlug: params.tagSlug
+  };
+}
+const BLOG_QUERY_KEYS = {
+  postsList: (params) => ["posts", "list", postsListDiscriminator(params)],
+  postDetail: (slug) => ["posts", "detail", slug],
+  tagsList: () => ["tags", "list", "tags"]
+};
+
+export { BLOG_QUERY_KEYS, postsListDiscriminator };

package/dist/packages/stack/src/plugins/blog/api/serializers.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+function serializeTag(tag) {
+  return {
+    ...tag,
+    createdAt: tag.createdAt.toISOString(),
+    updatedAt: tag.updatedAt.toISOString()
+  };
+}
+function serializePost(post) {
+  return {
+    ...post,
+    createdAt: post.createdAt.toISOString(),
+    updatedAt: post.updatedAt.toISOString(),
+    publishedAt: post.publishedAt?.toISOString(),
+    tags: post.tags.map(serializeTag)
+  };
+}
+
+exports.serializePost = serializePost;
+exports.serializeTag = serializeTag;

package/dist/packages/stack/src/plugins/blog/api/serializers.mjs

@@ -0,0 +1,18 @@
+function serializeTag(tag) {
+  return {
+    ...tag,
+    createdAt: tag.createdAt.toISOString(),
+    updatedAt: tag.updatedAt.toISOString()
+  };
+}
+function serializePost(post) {
+  return {
+    ...post,
+    createdAt: post.createdAt.toISOString(),
+    updatedAt: post.updatedAt.toISOString(),
+    publishedAt: post.publishedAt?.toISOString(),
+    tags: post.tags.map(serializeTag)
+  };
+}
+
+export { serializePost, serializeTag };

package/dist/packages/stack/src/plugins/blog/client/plugin.cjs

@@ -64,6 +64,11 @@ function createPostsLoader(published, config) {
           }
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -112,6 +117,11 @@ function createPostLoader(slug, config, path) {
           }
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -190,6 +200,11 @@ function createTagLoader(tagSlug, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -472,7 +487,7 @@ const blogClientPlugin = (config) => client.defineClientPlugin({
           published: "true"
         }
       });
-      const page = res.data ?? [];
+      const page = res.data?.items ?? [];
       posts.push(...page);
       if (page.length < limit) break;
       offset += limit;

package/dist/packages/stack/src/plugins/blog/client/plugin.mjs

@@ -1,5 +1,5 @@
 import { jsx } from 'react/jsx-runtime';
-import { defineClientPlugin, createApiClient } from '@btst/stack/plugins/client';
+import { defineClientPlugin, createApiClient, isConnectionError } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
 import { createBlogQueryKeys } from '../../../../../../plugins/blog/query-keys.mjs';
 import { HomePageComponent } from './components/pages/home-page.mjs';
@@ -62,6 +62,11 @@ function createPostsLoader(published, config) {
           }
         }
       } catch (error) {
+        if (isConnectionError(error)) {
+          console.warn(
+            "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -110,6 +115,11 @@ function createPostLoader(slug, config, path) {
           }
         }
       } catch (error) {
+        if (isConnectionError(error)) {
+          console.warn(
+            "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -188,6 +198,11 @@ function createTagLoader(tagSlug, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (isConnectionError(error)) {
+          console.warn(
+            "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -470,7 +485,7 @@ const blogClientPlugin = (config) => defineClientPlugin({
           published: "true"
         }
       });
-      const page = res.data ?? [];
+      const page = res.data?.items ?? [];
       posts.push(...page);
       if (page.length < limit) break;
       offset += limit;