@btst/stack 2.4.0 → 2.5.1

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({

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

@@ -23,10 +23,10 @@ function createPostsLoader(published, config) {
       };
       try {
         if (hooks?.beforeLoadPosts) {
-          const canLoad = await hooks.beforeLoadPosts({ published }, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadPosts hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadPosts({ published }, context),
+            "Load prevented by beforeLoadPosts hook"
+          );
         }
         const limit = 10;
         const client$1 = client.createApiClient({
@@ -47,14 +47,10 @@ function createPostsLoader(published, config) {
         await queryClient.prefetchQuery(tagsQuery);
         if (hooks?.afterLoadPosts) {
           const posts = queryClient.getQueryData(listQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadPosts(
-            posts,
-            { published },
-            context
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadPosts(posts, { published }, context),
+            "Load prevented by afterLoadPosts hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadPosts hook");
-          }
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error) {
@@ -90,10 +86,10 @@ function createPostLoader(slug, config, path) {
       };
       try {
         if (hooks?.beforeLoadPost) {
-          const canLoad = await hooks.beforeLoadPost(slug, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadPost hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadPost(slug, context),
+            "Load prevented by beforeLoadPost hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -104,10 +100,10 @@ function createPostLoader(slug, config, path) {
         await queryClient.prefetchQuery(postQuery);
         if (hooks?.afterLoadPost) {
           const post = queryClient.getQueryData(postQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadPost(post, slug, context);
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadPost hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadPost(post, slug, context),
+            "Load prevented by afterLoadPost hook"
+          );
         }
         const queryState = queryClient.getQueryState(postQuery.queryKey);
         if (queryState?.error) {
@@ -142,16 +138,16 @@ function createNewPostLoader(config) {
       };
       try {
         if (hooks?.beforeLoadNewPost) {
-          const canLoad = await hooks.beforeLoadNewPost(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadNewPost hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadNewPost(context),
+            "Load prevented by beforeLoadNewPost hook"
+          );
         }
         if (hooks?.afterLoadNewPost) {
-          const canContinue = await hooks.afterLoadNewPost(context);
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadNewPost hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadNewPost(context),
+            "Load prevented by afterLoadNewPost hook"
+          );
         }
       } catch (error) {
         if (hooks?.onLoadError) {

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

@@ -1,5 +1,5 @@
 import { jsx } from 'react/jsx-runtime';
-import { defineClientPlugin, createApiClient, isConnectionError } from '@btst/stack/plugins/client';
+import { defineClientPlugin, createApiClient, runClientHookWithShim, 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';
@@ -21,10 +21,10 @@ function createPostsLoader(published, config) {
       };
       try {
         if (hooks?.beforeLoadPosts) {
-          const canLoad = await hooks.beforeLoadPosts({ published }, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadPosts hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadPosts({ published }, context),
+            "Load prevented by beforeLoadPosts hook"
+          );
         }
         const limit = 10;
         const client = createApiClient({
@@ -45,14 +45,10 @@ function createPostsLoader(published, config) {
         await queryClient.prefetchQuery(tagsQuery);
         if (hooks?.afterLoadPosts) {
           const posts = queryClient.getQueryData(listQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadPosts(
-            posts,
-            { published },
-            context
+          await runClientHookWithShim(
+            () => hooks.afterLoadPosts(posts, { published }, context),
+            "Load prevented by afterLoadPosts hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadPosts hook");
-          }
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error) {
@@ -88,10 +84,10 @@ function createPostLoader(slug, config, path) {
       };
       try {
         if (hooks?.beforeLoadPost) {
-          const canLoad = await hooks.beforeLoadPost(slug, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadPost hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadPost(slug, context),
+            "Load prevented by beforeLoadPost hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -102,10 +98,10 @@ function createPostLoader(slug, config, path) {
         await queryClient.prefetchQuery(postQuery);
         if (hooks?.afterLoadPost) {
           const post = queryClient.getQueryData(postQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadPost(post, slug, context);
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadPost hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.afterLoadPost(post, slug, context),
+            "Load prevented by afterLoadPost hook"
+          );
         }
         const queryState = queryClient.getQueryState(postQuery.queryKey);
         if (queryState?.error) {
@@ -140,16 +136,16 @@ function createNewPostLoader(config) {
       };
       try {
         if (hooks?.beforeLoadNewPost) {
-          const canLoad = await hooks.beforeLoadNewPost(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadNewPost hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadNewPost(context),
+            "Load prevented by beforeLoadNewPost hook"
+          );
         }
         if (hooks?.afterLoadNewPost) {
-          const canContinue = await hooks.afterLoadNewPost(context);
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadNewPost hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.afterLoadNewPost(context),
+            "Load prevented by afterLoadNewPost hook"
+          );
         }
       } catch (error) {
         if (hooks?.onLoadError) {

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

@@ -9,6 +9,7 @@ const utils = require('../utils.cjs');
 const getters = require('./getters.cjs');
 const mutations = require('./mutations.cjs');
 const queryKeyDefs = require('./query-key-defs.cjs');
+const utils$1 = require('../../utils.cjs');
 
 async function syncContentTypes(adapter, config) {
   for (const ct of config.contentTypes) {
@@ -489,13 +490,11 @@ const cmsBackendPlugin = (config) => {
           }
           const processedData = validation.data;
           if (config.hooks?.onBeforeCreate) {
-            const result = await config.hooks.onBeforeCreate(
-              processedData,
-              context
+            await utils$1.runHookWithShim(
+              () => config.hooks.onBeforeCreate(processedData, context),
+              ctx.error,
+              "Create operation denied"
             );
-            if (result === false) {
-              throw ctx.error(403, { message: "Create operation denied" });
-            }
           }
           const item = await adapter.create({
             model: "contentItem",
@@ -599,14 +598,11 @@ const cmsBackendPlugin = (config) => {
           }
           const processedData = validatedData;
           if (config.hooks?.onBeforeUpdate && validatedData) {
-            const result = await config.hooks.onBeforeUpdate(
-              id,
-              validatedData,
-              context
+            await utils$1.runHookWithShim(
+              () => config.hooks.onBeforeUpdate(id, validatedData, context),
+              ctx.error,
+              "Update operation denied"
             );
-            if (result === false) {
-              throw ctx.error(403, { message: "Update operation denied" });
-            }
           }
           if (relationIds) {
             await syncRelations(adapter, id, relationIds);
@@ -657,10 +653,11 @@ const cmsBackendPlugin = (config) => {
             throw ctx.error(404, { message: "Content item not found" });
           }
           if (config.hooks?.onBeforeDelete) {
-            const canDelete = await config.hooks.onBeforeDelete(id, context);
-            if (!canDelete) {
-              throw ctx.error(403, { message: "Delete operation denied" });
-            }
+            await utils$1.runHookWithShim(
+              () => config.hooks.onBeforeDelete(id, context),
+              ctx.error,
+              "Delete operation denied"
+            );
           }
           await adapter.delete({
             model: "contentItem",

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

@@ -7,6 +7,7 @@ import { slugify } from '../utils.mjs';
 import { serializeContentType, getAllContentItems, serializeContentItemWithType, serializeContentItem, getContentItemById, getContentItemBySlug, getAllContentTypes } from './getters.mjs';
 import { createCMSContentItem } from './mutations.mjs';
 import { CMS_QUERY_KEYS } from './query-key-defs.mjs';
+import { runHookWithShim } from '../../utils.mjs';
 
 async function syncContentTypes(adapter, config) {
   for (const ct of config.contentTypes) {
@@ -487,13 +488,11 @@ const cmsBackendPlugin = (config) => {
           }
           const processedData = validation.data;
           if (config.hooks?.onBeforeCreate) {
-            const result = await config.hooks.onBeforeCreate(
-              processedData,
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeCreate(processedData, context),
+              ctx.error,
+              "Create operation denied"
             );
-            if (result === false) {
-              throw ctx.error(403, { message: "Create operation denied" });
-            }
           }
           const item = await adapter.create({
             model: "contentItem",
@@ -597,14 +596,11 @@ const cmsBackendPlugin = (config) => {
           }
           const processedData = validatedData;
           if (config.hooks?.onBeforeUpdate && validatedData) {
-            const result = await config.hooks.onBeforeUpdate(
-              id,
-              validatedData,
-              context
+            await runHookWithShim(
+              () => config.hooks.onBeforeUpdate(id, validatedData, context),
+              ctx.error,
+              "Update operation denied"
             );
-            if (result === false) {
-              throw ctx.error(403, { message: "Update operation denied" });
-            }
           }
           if (relationIds) {
             await syncRelations(adapter, id, relationIds);
@@ -655,10 +651,11 @@ const cmsBackendPlugin = (config) => {
             throw ctx.error(404, { message: "Content item not found" });
           }
           if (config.hooks?.onBeforeDelete) {
-            const canDelete = await config.hooks.onBeforeDelete(id, context);
-            if (!canDelete) {
-              throw ctx.error(403, { message: "Delete operation denied" });
-            }
+            await runHookWithShim(
+              () => config.hooks.onBeforeDelete(id, context),
+              ctx.error,
+              "Delete operation denied"
+            );
           }
           await adapter.delete({
             model: "contentItem",

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

@@ -34,10 +34,10 @@ function createDashboardLoader(config) {
       };
       try {
         if (hooks?.beforeLoadDashboard) {
-          const canLoad = await hooks.beforeLoadDashboard(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadDashboard hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadDashboard(context),
+            "Load prevented by beforeLoadDashboard hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -82,10 +82,10 @@ function createContentListLoader(typeSlug, config) {
       };
       try {
         if (hooks?.beforeLoadContentList) {
-          const canLoad = await hooks.beforeLoadContentList(typeSlug, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadContentList hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadContentList(typeSlug, context),
+            "Load prevented by beforeLoadContentList hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -154,14 +154,10 @@ function createContentEditorLoader(typeSlug, id, config) {
       };
       try {
         if (hooks?.beforeLoadContentEditor) {
-          const canLoad = await hooks.beforeLoadContentEditor(
-            typeSlug,
-            id,
-            context
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadContentEditor(typeSlug, id, context),
+            "Load prevented by beforeLoadContentEditor hook"
           );
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadContentEditor hook");
-          }
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,

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

@@ -1,6 +1,6 @@
 import { jsx } from 'react/jsx-runtime';
 import { lazy } from 'react';
-import { defineClientPlugin, createApiClient, isConnectionError } from '@btst/stack/plugins/client';
+import { defineClientPlugin, createApiClient, runClientHookWithShim, isConnectionError } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
 import { createCMSQueryKeys } from '../../../../../../plugins/cms/query-keys.mjs';
 
@@ -32,10 +32,10 @@ function createDashboardLoader(config) {
       };
       try {
         if (hooks?.beforeLoadDashboard) {
-          const canLoad = await hooks.beforeLoadDashboard(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadDashboard hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadDashboard(context),
+            "Load prevented by beforeLoadDashboard hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -80,10 +80,10 @@ function createContentListLoader(typeSlug, config) {
       };
       try {
         if (hooks?.beforeLoadContentList) {
-          const canLoad = await hooks.beforeLoadContentList(typeSlug, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadContentList hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadContentList(typeSlug, context),
+            "Load prevented by beforeLoadContentList hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -152,14 +152,10 @@ function createContentEditorLoader(typeSlug, id, config) {
       };
       try {
         if (hooks?.beforeLoadContentEditor) {
-          const canLoad = await hooks.beforeLoadContentEditor(
-            typeSlug,
-            id,
-            context
+          await runClientHookWithShim(
+            () => hooks.beforeLoadContentEditor(typeSlug, id, context),
+            "Load prevented by beforeLoadContentEditor hook"
           );
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadContentEditor hook");
-          }
         }
         const client = createApiClient({
           baseURL: apiBaseURL,