@btst/stack 2.4.0 → 2.5.0

package/dist/packages/stack/src/plugins/ai-chat/api/plugin.cjs

@@ -6,6 +6,7 @@ const db = require('../db.cjs');
 const schemas = require('../schemas.cjs');
 const getters = require('./getters.cjs');
 const pageTools = require('./page-tools.cjs');
+const utils = require('../../utils.cjs');
 
 const aiChatBackendPlugin = (config) => api.defineBackendPlugin({
   name: "ai-chat",
@@ -72,15 +73,11 @@ const aiChatBackendPlugin = (config) => api.defineBackendPlugin({
               role: msg.role,
               content: getMessageTextContent(msg)
             }));
-            const canChat = await config.hooks.onBeforeChat(
-              messagesForHook,
-              context
+            await utils.runHookWithShim(
+              () => config.hooks.onBeforeChat(messagesForHook, context),
+              ctx.error,
+              "Unauthorized: Cannot start chat"
             );
-            if (!canChat) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot start chat"
-              });
-            }
           }
           const firstMessage = uiMessages[0];
           if (!firstMessage) {
@@ -343,15 +340,14 @@ ${pageContext}` : "";
             });
           });
           if (config.hooks?.onBeforeCreateConversation) {
-            const canCreate = await config.hooks.onBeforeCreateConversation(
-              { id, title },
-              context
+            await utils.runHookWithShim(
+              () => config.hooks.onBeforeCreateConversation(
+                { id, title },
+                context
+              ),
+              ctx.error,
+              "Unauthorized: Cannot create conversation"
             );
-            if (!canCreate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot create conversation"
-              });
-            }
           }
           const newConv = await adapter.create({
             model: "conversation",
@@ -397,12 +393,11 @@ ${pageContext}` : "";
             });
           });
           if (config.hooks?.onBeforeListConversations) {
-            const canList = await config.hooks.onBeforeListConversations(context);
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list conversations"
-              });
-            }
+            await utils.runHookWithShim(
+              () => config.hooks.onBeforeListConversations(context),
+              ctx.error,
+              "Unauthorized: Cannot list conversations"
+            );
           }
           const whereConditions = [];
           if (userId) {
@@ -455,15 +450,11 @@ ${pageContext}` : "";
             });
           });
           if (config.hooks?.onBeforeGetConversation) {
-            const canGet = await config.hooks.onBeforeGetConversation(
-              id,
-              context
+            await utils.runHookWithShim(
+              () => config.hooks.onBeforeGetConversation(id, context),
+              ctx.error,
+              "Unauthorized: Cannot get conversation"
             );
-            if (!canGet) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot get conversation"
-              });
-            }
           }
           const conversations = await adapter.findMany({
             model: "conversation",
@@ -545,16 +536,15 @@ ${pageContext}` : "";
             });
           }
           if (config.hooks?.onBeforeUpdateConversation) {
-            const canUpdate = await config.hooks.onBeforeUpdateConversation(
-              id,
-              { title },
-              context
+            await utils.runHookWithShim(
+              () => config.hooks.onBeforeUpdateConversation(
+                id,
+                { title },
+                context
+              ),
+              ctx.error,
+              "Unauthorized: Cannot update conversation"
             );
-            if (!canUpdate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot update conversation"
-              });
-            }
           }
           const updated = await adapter.update({
             model: "conversation",
@@ -619,15 +609,11 @@ ${pageContext}` : "";
             });
           }
           if (config.hooks?.onBeforeDeleteConversation) {
-            const canDelete = await config.hooks.onBeforeDeleteConversation(
-              id,
-              context
+            await utils.runHookWithShim(
+              () => config.hooks.onBeforeDeleteConversation(id, context),
+              ctx.error,
+              "Unauthorized: Cannot delete conversation"
             );
-            if (!canDelete) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot delete conversation"
-              });
-            }
           }
           await adapter.delete({
             model: "conversation",

package/dist/packages/stack/src/plugins/ai-chat/api/plugin.mjs

@@ -4,6 +4,7 @@ import { aiChatSchema } from '../db.mjs';
 import { chatRequestSchema, createConversationSchema, updateConversationSchema } from '../schemas.mjs';
 import { getConversationById, getAllConversations } from './getters.mjs';
 import { BUILT_IN_PAGE_TOOL_SCHEMAS, BUILT_IN_PAGE_TOOL_ROUTE_ALLOWLIST } from './page-tools.mjs';
+import { runHookWithShim } from '../../utils.mjs';
 
 const aiChatBackendPlugin = (config) => defineBackendPlugin({
   name: "ai-chat",
@@ -70,15 +71,11 @@ const aiChatBackendPlugin = (config) => defineBackendPlugin({
               role: msg.role,
               content: getMessageTextContent(msg)
             }));
-            const canChat = await config.hooks.onBeforeChat(
-              messagesForHook,
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeChat(messagesForHook, context),
+              ctx.error,
+              "Unauthorized: Cannot start chat"
             );
-            if (!canChat) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot start chat"
-              });
-            }
           }
           const firstMessage = uiMessages[0];
           if (!firstMessage) {
@@ -341,15 +338,14 @@ ${pageContext}` : "";
             });
           });
           if (config.hooks?.onBeforeCreateConversation) {
-            const canCreate = await config.hooks.onBeforeCreateConversation(
-              { id, title },
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeCreateConversation(
+                { id, title },
+                context
+              ),
+              ctx.error,
+              "Unauthorized: Cannot create conversation"
             );
-            if (!canCreate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot create conversation"
-              });
-            }
           }
           const newConv = await adapter.create({
             model: "conversation",
@@ -395,12 +391,11 @@ ${pageContext}` : "";
             });
           });
           if (config.hooks?.onBeforeListConversations) {
-            const canList = await config.hooks.onBeforeListConversations(context);
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list conversations"
-              });
-            }
+            await runHookWithShim(
+              () => config.hooks.onBeforeListConversations(context),
+              ctx.error,
+              "Unauthorized: Cannot list conversations"
+            );
           }
           const whereConditions = [];
           if (userId) {
@@ -453,15 +448,11 @@ ${pageContext}` : "";
             });
           });
           if (config.hooks?.onBeforeGetConversation) {
-            const canGet = await config.hooks.onBeforeGetConversation(
-              id,
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeGetConversation(id, context),
+              ctx.error,
+              "Unauthorized: Cannot get conversation"
             );
-            if (!canGet) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot get conversation"
-              });
-            }
           }
           const conversations = await adapter.findMany({
             model: "conversation",
@@ -543,16 +534,15 @@ ${pageContext}` : "";
             });
           }
           if (config.hooks?.onBeforeUpdateConversation) {
-            const canUpdate = await config.hooks.onBeforeUpdateConversation(
-              id,
-              { title },
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeUpdateConversation(
+                id,
+                { title },
+                context
+              ),
+              ctx.error,
+              "Unauthorized: Cannot update conversation"
             );
-            if (!canUpdate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot update conversation"
-              });
-            }
           }
           const updated = await adapter.update({
             model: "conversation",
@@ -617,15 +607,11 @@ ${pageContext}` : "";
             });
           }
           if (config.hooks?.onBeforeDeleteConversation) {
-            const canDelete = await config.hooks.onBeforeDeleteConversation(
-              id,
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeDeleteConversation(id, context),
+              ctx.error,
+              "Unauthorized: Cannot delete conversation"
             );
-            if (!canDelete) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot delete conversation"
-              });
-            }
           }
           await adapter.delete({
             model: "conversation",

package/dist/packages/stack/src/plugins/ai-chat/client/plugin.cjs

@@ -22,10 +22,10 @@ function createConversationsLoader(config) {
       };
       try {
         if (hooks?.beforeLoadConversations) {
-          const canLoad = await hooks.beforeLoadConversations(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversations hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadConversations(context),
+            "Load prevented by beforeLoadConversations hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -38,13 +38,10 @@ function createConversationsLoader(config) {
           const conversations = queryClient.getQueryData(
             listQuery.queryKey
           ) || null;
-          const canContinue = await hooks.afterLoadConversations(
-            conversations,
-            context
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadConversations(conversations, context),
+            "Load prevented by afterLoadConversations hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversations hook");
-          }
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
@@ -73,10 +70,10 @@ function createConversationLoader(id, config) {
       };
       try {
         if (hooks?.beforeLoadConversation) {
-          const canLoad = await hooks.beforeLoadConversation(id, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversation hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadConversation(id, context),
+            "Load prevented by beforeLoadConversation hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -91,14 +88,10 @@ function createConversationLoader(id, config) {
         ]);
         if (hooks?.afterLoadConversation) {
           const conversation = queryClient.getQueryData(conversationQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadConversation(
-            conversation,
-            id,
-            context
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadConversation(conversation, id, context),
+            "Load prevented by afterLoadConversation hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversation hook");
-          }
         }
         const queryState = queryClient.getQueryState(
           conversationQuery.queryKey

package/dist/packages/stack/src/plugins/ai-chat/client/plugin.mjs

@@ -1,5 +1,5 @@
 import { jsx } from 'react/jsx-runtime';
-import { defineClientPlugin, createApiClient } from '@btst/stack/plugins/client';
+import { defineClientPlugin, runClientHookWithShim, createApiClient } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
 import { createAiChatQueryKeys } from '../../../../../../plugins/ai-chat/query-keys.mjs';
 import { ChatLayout } from './components/chat-layout.mjs';
@@ -20,10 +20,10 @@ function createConversationsLoader(config) {
       };
       try {
         if (hooks?.beforeLoadConversations) {
-          const canLoad = await hooks.beforeLoadConversations(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversations hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadConversations(context),
+            "Load prevented by beforeLoadConversations hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -36,13 +36,10 @@ function createConversationsLoader(config) {
           const conversations = queryClient.getQueryData(
             listQuery.queryKey
           ) || null;
-          const canContinue = await hooks.afterLoadConversations(
-            conversations,
-            context
+          await runClientHookWithShim(
+            () => hooks.afterLoadConversations(conversations, context),
+            "Load prevented by afterLoadConversations hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversations hook");
-          }
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
@@ -71,10 +68,10 @@ function createConversationLoader(id, config) {
       };
       try {
         if (hooks?.beforeLoadConversation) {
-          const canLoad = await hooks.beforeLoadConversation(id, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversation hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadConversation(id, context),
+            "Load prevented by beforeLoadConversation hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -89,14 +86,10 @@ function createConversationLoader(id, config) {
         ]);
         if (hooks?.afterLoadConversation) {
           const conversation = queryClient.getQueryData(conversationQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadConversation(
-            conversation,
-            id,
-            context
+          await runClientHookWithShim(
+            () => hooks.afterLoadConversation(conversation, id, context),
+            "Load prevented by afterLoadConversation hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversation hook");
-          }
         }
         const queryState = queryClient.getQueryState(
           conversationQuery.queryKey

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

@@ -3,11 +3,12 @@
 const api = require('@btst/stack/plugins/api');
 const z = require('zod');
 const db = require('../db.cjs');
-const utils = require('../utils.cjs');
+const utils$1 = 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');
+const utils = require('../../utils.cjs');
 
 function createBlogPrefetchForRoute(adapter) {
   return async function prefetchForRoute(key, qc, params) {
@@ -113,7 +114,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
       for (const tag of allTags) {
         tagMapBySlug.set(tag.slug, tag);
       }
-      const tagSlugs = tagsToFindOrCreate.map((tag) => utils.slugify(tag.name));
+      const tagSlugs = tagsToFindOrCreate.map((tag) => utils$1.slugify(tag.name));
       const foundTags = [];
       for (const slug of tagSlugs) {
         const tag = tagMapBySlug.get(slug);
@@ -126,7 +127,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         ...foundTags.map((tag) => tag.slug)
       ]);
       const tagsToCreate = tagsToFindOrCreate.filter(
-        (tag) => !existingSlugs.has(utils.slugify(tag.name))
+        (tag) => !existingSlugs.has(utils$1.slugify(tag.name))
       );
       const createdTags = [];
       for (const tag of tagsToCreate) {
@@ -135,7 +136,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
           model: "tag",
           data: {
             name: normalizedName,
-            slug: utils.slugify(normalizedName),
+            slug: utils$1.slugify(normalizedName),
             createdAt: /* @__PURE__ */ new Date(),
             updatedAt: /* @__PURE__ */ new Date()
           }
@@ -155,12 +156,11 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(query, context);
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
+            await utils.runHookWithShim(
+              () => hooks.onBeforeListPosts(query, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
+            );
           }
           const result = await getters.getAllPosts(adapter, query);
           if (hooks?.onPostsRead) {
@@ -188,19 +188,15 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeCreatePost) {
-            const canCreate = await hooks.onBeforeCreatePost(
-              ctx.body,
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeCreatePost(ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot create post"
             );
-            if (!canCreate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot create post"
-              });
-            }
           }
           const { tags, ...postData } = ctx.body;
           const tagNames = tags || [];
-          const slug = utils.slugify(postData.slug || postData.title);
+          const slug = utils$1.slugify(postData.slug || postData.title);
           if (!slug) {
             throw ctx.error(400, {
               message: "Invalid slug: must contain at least one alphanumeric character"
@@ -259,20 +255,15 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeUpdatePost) {
-            const canUpdate = await hooks.onBeforeUpdatePost(
-              ctx.params.id,
-              ctx.body,
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeUpdatePost(ctx.params.id, ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot update post"
             );
-            if (!canUpdate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot update post"
-              });
-            }
           }
           const { tags, slug: rawSlug, ...restPostData } = ctx.body;
           const tagNames = tags || [];
-          const slugified = rawSlug ? utils.slugify(rawSlug) : void 0;
+          const slugified = rawSlug ? utils$1.slugify(rawSlug) : void 0;
           if (rawSlug && !slugified) {
             throw ctx.error(400, {
               message: "Invalid slug: must contain at least one alphanumeric character"
@@ -364,15 +355,11 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeDeletePost) {
-            const canDelete = await hooks.onBeforeDeletePost(
-              ctx.params.id,
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeDeletePost(ctx.params.id, context),
+              ctx.error,
+              "Unauthorized: Cannot delete post"
             );
-            if (!canDelete) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot delete post"
-              });
-            }
           }
           await adapter.delete({
             model: "post",
@@ -401,15 +388,11 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(
-              { published: true },
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeListPosts({ published: true }, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
             );
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
           }
           const date = query.date;
           const previousPosts = await adapter.findMany({

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

@@ -6,6 +6,7 @@ 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';
+import { runHookWithShim } from '../../utils.mjs';
 
 function createBlogPrefetchForRoute(adapter) {
   return async function prefetchForRoute(key, qc, params) {
@@ -153,12 +154,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(query, context);
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
+            await runHookWithShim(
+              () => hooks.onBeforeListPosts(query, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
+            );
           }
           const result = await getAllPosts(adapter, query);
           if (hooks?.onPostsRead) {
@@ -186,15 +186,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeCreatePost) {
-            const canCreate = await hooks.onBeforeCreatePost(
-              ctx.body,
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeCreatePost(ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot create post"
             );
-            if (!canCreate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot create post"
-              });
-            }
           }
           const { tags, ...postData } = ctx.body;
           const tagNames = tags || [];
@@ -257,16 +253,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeUpdatePost) {
-            const canUpdate = await hooks.onBeforeUpdatePost(
-              ctx.params.id,
-              ctx.body,
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeUpdatePost(ctx.params.id, ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot update post"
             );
-            if (!canUpdate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot update post"
-              });
-            }
           }
           const { tags, slug: rawSlug, ...restPostData } = ctx.body;
           const tagNames = tags || [];
@@ -362,15 +353,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeDeletePost) {
-            const canDelete = await hooks.onBeforeDeletePost(
-              ctx.params.id,
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeDeletePost(ctx.params.id, context),
+              ctx.error,
+              "Unauthorized: Cannot delete post"
             );
-            if (!canDelete) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot delete post"
-              });
-            }
           }
           await adapter.delete({
             model: "post",
@@ -399,15 +386,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(
-              { published: true },
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeListPosts({ published: true }, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
             );
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
           }
           const date = query.date;
           const previousPosts = await adapter.findMany({