@btst/stack 1.2.2 → 1.3.0

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

@@ -26,53 +26,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
   name: "blog",
   dbPlugin: db.blogSchema,
   routes: (adapter) => {
-    const createTagCache = () => {
-      let cache = null;
-      return {
-        getAllTags: async () => {
-          if (!cache) {
-            cache = await adapter.findMany({
-              model: "tag"
-            });
-          }
-          return cache;
-        },
-        invalidate: () => {
-          cache = null;
-        },
-        addTag: (tag) => {
-          if (cache) {
-            cache.push(tag);
-          }
-        }
-      };
-    };
-    const createPostTagCache = () => {
-      let cache = null;
-      const getAllPostTags = async () => {
-        if (!cache) {
-          cache = await adapter.findMany({
-            model: "postTag"
-          });
-        }
-        return cache;
-      };
-      return {
-        getAllPostTags,
-        invalidate: () => {
-          cache = null;
-        },
-        getByTagId: async (tagId) => {
-          const allPostTags = await getAllPostTags();
-          return allPostTags.filter((pt) => pt.tagId === tagId);
-        },
-        getByPostId: async (postId) => {
-          const allPostTags = await getAllPostTags();
-          return allPostTags.filter((pt) => pt.postId === postId);
-        }
-      };
-    };
-    const findOrCreateTags = async (tagInputs, tagCache) => {
+    const findOrCreateTags = async (tagInputs) => {
       if (tagInputs.length === 0) return [];
       const normalizeTagName = (name) => {
         return name.trim();
@@ -95,7 +49,9 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
       if (tagsToFindOrCreate.length === 0) {
         return tagsWithIds;
       }
-      const allTags = await tagCache.getAllTags();
+      const allTags = await adapter.findMany({
+        model: "tag"
+      });
       const tagMapBySlug = /* @__PURE__ */ new Map();
       for (const tag of allTags) {
         tagMapBySlug.set(tag.slug, tag);
@@ -128,33 +84,9 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
           }
         });
         createdTags.push(newTag);
-        tagCache.addTag(newTag);
       }
       return [...tagsWithIds, ...foundTags, ...createdTags];
     };
-    const loadTagsForPosts = async (postIds, tagCache, postTagCache) => {
-      if (postIds.length === 0) return /* @__PURE__ */ new Map();
-      const allPostTags = await postTagCache.getAllPostTags();
-      const relevantPostTags = allPostTags.filter(
-        (pt) => postIds.includes(pt.postId)
-      );
-      const tagIds = [...new Set(relevantPostTags.map((pt) => pt.tagId))];
-      if (tagIds.length === 0) return /* @__PURE__ */ new Map();
-      const allTags = await tagCache.getAllTags();
-      const tagMap = /* @__PURE__ */ new Map();
-      for (const tag of allTags) {
-        tagMap.set(tag.id, tag);
-      }
-      const postTagsMap = /* @__PURE__ */ new Map();
-      for (const postTag of relevantPostTags) {
-        const tag = tagMap.get(postTag.tagId);
-        if (tag) {
-          const existing = postTagsMap.get(postTag.postId) || [];
-          postTagsMap.set(postTag.postId, [...existing, { ...tag }]);
-        }
-      }
-      return postTagsMap;
-    };
     const listPosts = api.createEndpoint(
       "/posts",
       {
@@ -164,8 +96,6 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
       async (ctx) => {
         const { query, headers } = ctx;
         const context = { query, headers };
-        const tagCache = createTagCache();
-        const postTagCache = createPostTagCache();
         try {
           if (hooks?.onBeforeListPosts) {
             const canList = await hooks.onBeforeListPosts(query, context);
@@ -177,12 +107,29 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
           }
           let tagFilterPostIds = null;
           if (query.tagSlug) {
-            const allTags = await tagCache.getAllTags();
-            const tag = allTags.find((t) => t.slug === query.tagSlug);
+            const tag = await adapter.findOne({
+              model: "tag",
+              where: [
+                {
+                  field: "slug",
+                  value: query.tagSlug,
+                  operator: "eq"
+                }
+              ]
+            });
             if (!tag) {
               return [];
             }
-            const postTags = await postTagCache.getByTagId(tag.id);
+            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 [];
@@ -211,17 +158,36 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
             sortBy: {
               field: "createdAt",
               direction: "desc"
+            },
+            join: {
+              postTag: true
             }
           });
-          const postTagsMap = await loadTagsForPosts(
-            posts.map((post) => post.id),
-            tagCache,
-            postTagCache
-          );
-          let result = posts.map((post) => ({
-            ...post,
-            tags: postTagsMap.get(post.id) || []
-          }));
+          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) => tagMap.get(pt.tagId)).filter((tag) => tag !== void 0);
+            const { postTag: _, ...postWithoutJoin } = post;
+            return {
+              ...postWithoutJoin,
+              tags: postTags
+            };
+          });
           if (tagFilterPostIds) {
             result = result.filter((post) => tagFilterPostIds.has(post.id));
           }
@@ -262,7 +228,6 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
           body: ctx.body,
           headers: ctx.headers
         };
-        const tagCache = createTagCache();
         try {
           if (hooks?.onBeforeCreatePost) {
             const canCreate = await hooks.onBeforeCreatePost(
@@ -288,7 +253,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
             }
           });
           if (tagNames.length > 0) {
-            const createdTags = await findOrCreateTags(tagNames, tagCache);
+            const createdTags = await findOrCreateTags(tagNames);
             await adapter.transaction(async (tx) => {
               for (const tag of createdTags) {
                 await tx.create({
@@ -328,7 +293,6 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
           params: ctx.params,
           headers: ctx.headers
         };
-        const tagCache = createTagCache();
         try {
           if (hooks?.onBeforeUpdatePost) {
             const canUpdate = await hooks.onBeforeUpdatePost(
@@ -386,7 +350,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
               });
             }
             if (tagNames.length > 0) {
-              const createdTags = await findOrCreateTags(tagNames, tagCache);
+              const createdTags = await findOrCreateTags(tagNames);
               for (const tag of createdTags) {
                 await tx.create({
                   model: "postTag",
@@ -436,15 +400,9 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
               });
             }
           }
-          await adapter.transaction(async (tx) => {
-            await tx.delete({
-              model: "postTag",
-              where: [{ field: "postId", value: ctx.params.id }]
-            });
-            await tx.delete({
-              model: "post",
-              where: [{ field: "id", value: ctx.params.id }]
-            });
+          await adapter.delete({
+            model: "post",
+            where: [{ field: "id", value: ctx.params.id }]
           });
           if (hooks?.onPostDeleted) {
             await hooks.onPostDeleted(ctx.params.id, context);
@@ -467,8 +425,6 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
       async (ctx) => {
         const { query, headers } = ctx;
         const context = { query, headers };
-        const tagCache = createTagCache();
-        const postTagCache = createPostTagCache();
         try {
           if (hooks?.onBeforeListPosts) {
             const canList = await hooks.onBeforeListPosts(
@@ -482,7 +438,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
             }
           }
           const date = query.date;
-          const previousPost = await adapter.findMany({
+          const previousPosts = await adapter.findMany({
             model: "post",
             limit: 1,
             where: [
@@ -500,9 +456,12 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
             sortBy: {
               field: "createdAt",
               direction: "desc"
+            },
+            join: {
+              postTag: true
             }
           });
-          const nextPost = await adapter.findMany({
+          const nextPosts = await adapter.findMany({
             model: "post",
             limit: 1,
             where: [
@@ -520,26 +479,42 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
             sortBy: {
               field: "createdAt",
               direction: "asc"
+            },
+            join: {
+              postTag: true
             }
           });
-          const postIds = [
-            ...previousPost?.[0] ? [previousPost[0].id] : [],
-            ...nextPost?.[0] ? [nextPost[0].id] : []
-          ];
-          const postTagsMap = await loadTagsForPosts(
-            postIds,
-            tagCache,
-            postTagCache
-          );
+          const tagIds = /* @__PURE__ */ new Set();
+          const allPosts = [...previousPosts, ...nextPosts];
+          for (const post of allPosts) {
+            if (post.postTag) {
+              for (const pt of post.postTag) {
+                tagIds.add(pt.tagId);
+              }
+            }
+          }
+          const tagMap = /* @__PURE__ */ new Map();
+          if (tagIds.size > 0) {
+            const tags = await adapter.findMany({
+              model: "tag"
+            });
+            for (const tag of tags) {
+              if (tagIds.has(tag.id)) {
+                tagMap.set(tag.id, tag);
+              }
+            }
+          }
+          const mapPostWithTags = (post) => {
+            const tags = (post.postTag || []).map((pt) => tagMap.get(pt.tagId)).filter((tag) => tag !== void 0);
+            const { postTag: _, ...postWithoutJoin } = post;
+            return {
+              ...postWithoutJoin,
+              tags
+            };
+          };
           return {
-            previous: previousPost?.[0] ? {
-              ...previousPost[0],
-              tags: postTagsMap.get(previousPost[0].id) || []
-            } : null,
-            next: nextPost?.[0] ? {
-              ...nextPost[0],
-              tags: postTagsMap.get(nextPost[0].id) || []
-            } : null
+            previous: previousPosts[0] ? mapPostWithTags(previousPosts[0]) : null,
+            next: nextPosts[0] ? mapPostWithTags(nextPosts[0]) : null
           };
         } catch (error) {
           if (hooks?.onListPostsError) {

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

@@ -24,53 +24,7 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
   name: "blog",
   dbPlugin: blogSchema,
   routes: (adapter) => {
-    const createTagCache = () => {
-      let cache = null;
-      return {
-        getAllTags: async () => {
-          if (!cache) {
-            cache = await adapter.findMany({
-              model: "tag"
-            });
-          }
-          return cache;
-        },
-        invalidate: () => {
-          cache = null;
-        },
-        addTag: (tag) => {
-          if (cache) {
-            cache.push(tag);
-          }
-        }
-      };
-    };
-    const createPostTagCache = () => {
-      let cache = null;
-      const getAllPostTags = async () => {
-        if (!cache) {
-          cache = await adapter.findMany({
-            model: "postTag"
-          });
-        }
-        return cache;
-      };
-      return {
-        getAllPostTags,
-        invalidate: () => {
-          cache = null;
-        },
-        getByTagId: async (tagId) => {
-          const allPostTags = await getAllPostTags();
-          return allPostTags.filter((pt) => pt.tagId === tagId);
-        },
-        getByPostId: async (postId) => {
-          const allPostTags = await getAllPostTags();
-          return allPostTags.filter((pt) => pt.postId === postId);
-        }
-      };
-    };
-    const findOrCreateTags = async (tagInputs, tagCache) => {
+    const findOrCreateTags = async (tagInputs) => {
       if (tagInputs.length === 0) return [];
       const normalizeTagName = (name) => {
         return name.trim();
@@ -93,7 +47,9 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
       if (tagsToFindOrCreate.length === 0) {
         return tagsWithIds;
       }
-      const allTags = await tagCache.getAllTags();
+      const allTags = await adapter.findMany({
+        model: "tag"
+      });
       const tagMapBySlug = /* @__PURE__ */ new Map();
       for (const tag of allTags) {
         tagMapBySlug.set(tag.slug, tag);
@@ -126,33 +82,9 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
           }
         });
         createdTags.push(newTag);
-        tagCache.addTag(newTag);
       }
       return [...tagsWithIds, ...foundTags, ...createdTags];
     };
-    const loadTagsForPosts = async (postIds, tagCache, postTagCache) => {
-      if (postIds.length === 0) return /* @__PURE__ */ new Map();
-      const allPostTags = await postTagCache.getAllPostTags();
-      const relevantPostTags = allPostTags.filter(
-        (pt) => postIds.includes(pt.postId)
-      );
-      const tagIds = [...new Set(relevantPostTags.map((pt) => pt.tagId))];
-      if (tagIds.length === 0) return /* @__PURE__ */ new Map();
-      const allTags = await tagCache.getAllTags();
-      const tagMap = /* @__PURE__ */ new Map();
-      for (const tag of allTags) {
-        tagMap.set(tag.id, tag);
-      }
-      const postTagsMap = /* @__PURE__ */ new Map();
-      for (const postTag of relevantPostTags) {
-        const tag = tagMap.get(postTag.tagId);
-        if (tag) {
-          const existing = postTagsMap.get(postTag.postId) || [];
-          postTagsMap.set(postTag.postId, [...existing, { ...tag }]);
-        }
-      }
-      return postTagsMap;
-    };
     const listPosts = createEndpoint(
       "/posts",
       {
@@ -162,8 +94,6 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
       async (ctx) => {
         const { query, headers } = ctx;
         const context = { query, headers };
-        const tagCache = createTagCache();
-        const postTagCache = createPostTagCache();
         try {
           if (hooks?.onBeforeListPosts) {
             const canList = await hooks.onBeforeListPosts(query, context);
@@ -175,12 +105,29 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
           }
           let tagFilterPostIds = null;
           if (query.tagSlug) {
-            const allTags = await tagCache.getAllTags();
-            const tag = allTags.find((t) => t.slug === query.tagSlug);
+            const tag = await adapter.findOne({
+              model: "tag",
+              where: [
+                {
+                  field: "slug",
+                  value: query.tagSlug,
+                  operator: "eq"
+                }
+              ]
+            });
             if (!tag) {
               return [];
             }
-            const postTags = await postTagCache.getByTagId(tag.id);
+            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 [];
@@ -209,17 +156,36 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
             sortBy: {
               field: "createdAt",
               direction: "desc"
+            },
+            join: {
+              postTag: true
             }
           });
-          const postTagsMap = await loadTagsForPosts(
-            posts.map((post) => post.id),
-            tagCache,
-            postTagCache
-          );
-          let result = posts.map((post) => ({
-            ...post,
-            tags: postTagsMap.get(post.id) || []
-          }));
+          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) => tagMap.get(pt.tagId)).filter((tag) => tag !== void 0);
+            const { postTag: _, ...postWithoutJoin } = post;
+            return {
+              ...postWithoutJoin,
+              tags: postTags
+            };
+          });
           if (tagFilterPostIds) {
             result = result.filter((post) => tagFilterPostIds.has(post.id));
           }
@@ -260,7 +226,6 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
           body: ctx.body,
           headers: ctx.headers
         };
-        const tagCache = createTagCache();
         try {
           if (hooks?.onBeforeCreatePost) {
             const canCreate = await hooks.onBeforeCreatePost(
@@ -286,7 +251,7 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
             }
           });
           if (tagNames.length > 0) {
-            const createdTags = await findOrCreateTags(tagNames, tagCache);
+            const createdTags = await findOrCreateTags(tagNames);
             await adapter.transaction(async (tx) => {
               for (const tag of createdTags) {
                 await tx.create({
@@ -326,7 +291,6 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
           params: ctx.params,
           headers: ctx.headers
         };
-        const tagCache = createTagCache();
         try {
           if (hooks?.onBeforeUpdatePost) {
             const canUpdate = await hooks.onBeforeUpdatePost(
@@ -384,7 +348,7 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
               });
             }
             if (tagNames.length > 0) {
-              const createdTags = await findOrCreateTags(tagNames, tagCache);
+              const createdTags = await findOrCreateTags(tagNames);
               for (const tag of createdTags) {
                 await tx.create({
                   model: "postTag",
@@ -434,15 +398,9 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
               });
             }
           }
-          await adapter.transaction(async (tx) => {
-            await tx.delete({
-              model: "postTag",
-              where: [{ field: "postId", value: ctx.params.id }]
-            });
-            await tx.delete({
-              model: "post",
-              where: [{ field: "id", value: ctx.params.id }]
-            });
+          await adapter.delete({
+            model: "post",
+            where: [{ field: "id", value: ctx.params.id }]
           });
           if (hooks?.onPostDeleted) {
             await hooks.onPostDeleted(ctx.params.id, context);
@@ -465,8 +423,6 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
       async (ctx) => {
         const { query, headers } = ctx;
         const context = { query, headers };
-        const tagCache = createTagCache();
-        const postTagCache = createPostTagCache();
         try {
           if (hooks?.onBeforeListPosts) {
             const canList = await hooks.onBeforeListPosts(
@@ -480,7 +436,7 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
             }
           }
           const date = query.date;
-          const previousPost = await adapter.findMany({
+          const previousPosts = await adapter.findMany({
             model: "post",
             limit: 1,
             where: [
@@ -498,9 +454,12 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
             sortBy: {
               field: "createdAt",
               direction: "desc"
+            },
+            join: {
+              postTag: true
             }
           });
-          const nextPost = await adapter.findMany({
+          const nextPosts = await adapter.findMany({
             model: "post",
             limit: 1,
             where: [
@@ -518,26 +477,42 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
             sortBy: {
               field: "createdAt",
               direction: "asc"
+            },
+            join: {
+              postTag: true
             }
           });
-          const postIds = [
-            ...previousPost?.[0] ? [previousPost[0].id] : [],
-            ...nextPost?.[0] ? [nextPost[0].id] : []
-          ];
-          const postTagsMap = await loadTagsForPosts(
-            postIds,
-            tagCache,
-            postTagCache
-          );
+          const tagIds = /* @__PURE__ */ new Set();
+          const allPosts = [...previousPosts, ...nextPosts];
+          for (const post of allPosts) {
+            if (post.postTag) {
+              for (const pt of post.postTag) {
+                tagIds.add(pt.tagId);
+              }
+            }
+          }
+          const tagMap = /* @__PURE__ */ new Map();
+          if (tagIds.size > 0) {
+            const tags = await adapter.findMany({
+              model: "tag"
+            });
+            for (const tag of tags) {
+              if (tagIds.has(tag.id)) {
+                tagMap.set(tag.id, tag);
+              }
+            }
+          }
+          const mapPostWithTags = (post) => {
+            const tags = (post.postTag || []).map((pt) => tagMap.get(pt.tagId)).filter((tag) => tag !== void 0);
+            const { postTag: _, ...postWithoutJoin } = post;
+            return {
+              ...postWithoutJoin,
+              tags
+            };
+          };
           return {
-            previous: previousPost?.[0] ? {
-              ...previousPost[0],
-              tags: postTagsMap.get(previousPost[0].id) || []
-            } : null,
-            next: nextPost?.[0] ? {
-              ...nextPost[0],
-              tags: postTagsMap.get(nextPost[0].id) || []
-            } : null
+            previous: previousPosts[0] ? mapPostWithTags(previousPosts[0]) : null,
+            next: nextPosts[0] ? mapPostWithTags(nextPosts[0]) : null
           };
         } catch (error) {
           if (hooks?.onListPostsError) {

package/dist/packages/better-stack/src/plugins/blog/db.cjs

@@ -77,11 +77,21 @@ const blogSchema = db.createDbPlugin("blog", {
     fields: {
       postId: {
         type: "string",
-        required: true
+        required: true,
+        references: {
+          model: "post",
+          field: "id",
+          onDelete: "cascade"
+        }
       },
       tagId: {
         type: "string",
-        required: true
+        required: true,
+        references: {
+          model: "tag",
+          field: "id",
+          onDelete: "cascade"
+        }
       }
     }
   }