@btst/stack 2.4.0 → 2.5.0

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,

package/dist/packages/stack/src/plugins/form-builder/api/plugin.cjs

@@ -8,6 +8,7 @@ const schemas = require('../schemas.cjs');
 const utils = require('../utils.cjs');
 const getters = require('./getters.cjs');
 const queryKeyDefs = require('./query-key-defs.cjs');
+const utils$1 = require('../../utils.cjs');
 
 function createFormBuilderPrefetchForRoute(adapter) {
   return async function prefetchForRoute(key, qc, params) {
@@ -98,10 +99,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         const { status, limit, offset } = ctx.query;
         const context = createContext(ctx.headers);
         if (config.hooks?.onBeforeListForms) {
-          const canList = await config.hooks.onBeforeListForms(context);
-          if (!canList) {
-            throw ctx.error(403, { message: "Access denied" });
-          }
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeListForms(context),
+            ctx.error,
+            "Access denied"
+          );
         }
         return getters.getAllForms(adapter, { status, limit, offset });
       }
@@ -116,10 +118,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         const { slug } = ctx.params;
         const context = createContext(ctx.headers);
         if (config.hooks?.onBeforeGetForm) {
-          const canGet = await config.hooks.onBeforeGetForm(slug, context);
-          if (!canGet) {
-            throw ctx.error(403, { message: "Access denied" });
-          }
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeGetForm(slug, context),
+            ctx.error,
+            "Access denied"
+          );
         }
         const form = await getters.getFormBySlug(adapter, slug);
         if (!form) {
@@ -138,10 +141,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         const { id } = ctx.params;
         const context = createContext(ctx.headers);
         if (config.hooks?.onBeforeGetForm) {
-          const canGet = await config.hooks.onBeforeGetForm(id, context);
-          if (!canGet) {
-            throw ctx.error(403, { message: "Access denied" });
-          }
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeGetForm(id, context),
+            ctx.error,
+            "Access denied"
+          );
         }
         const form = await adapter.findOne({
           model: "form",
@@ -192,15 +196,13 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
           status: body.status
         };
         if (config.hooks?.onBeforeFormCreated) {
-          const result = await config.hooks.onBeforeFormCreated(
-            formInput,
-            context
+          const hookResult = await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeFormCreated(formInput, context),
+            ctx.error,
+            "Create operation denied"
           );
-          if (result === false) {
-            throw ctx.error(403, { message: "Create operation denied" });
-          }
-          if (result && typeof result === "object") {
-            formInput = result;
+          if (hookResult && typeof hookResult === "object") {
+            formInput = hookResult;
           }
         }
         const form = await adapter.create({
@@ -282,16 +284,13 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
           status: body.status
         };
         if (config.hooks?.onBeforeFormUpdated) {
-          const result = await config.hooks.onBeforeFormUpdated(
-            id,
-            updateInput,
-            context
+          const hookResult = await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeFormUpdated(id, updateInput, context),
+            ctx.error,
+            "Update operation denied"
           );
-          if (result === false) {
-            throw ctx.error(403, { message: "Update operation denied" });
-          }
-          if (result && typeof result === "object") {
-            updateInput = result;
+          if (hookResult && typeof hookResult === "object") {
+            updateInput = hookResult;
           }
         }
         const updateData = {
@@ -343,13 +342,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
           throw ctx.error(404, { message: "Form not found" });
         }
         if (config.hooks?.onBeforeFormDeleted) {
-          const canDelete = await config.hooks.onBeforeFormDeleted(
-            id,
-            context
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeFormDeleted(id, context),
+            ctx.error,
+            "Delete operation denied"
           );
-          if (!canDelete) {
-            throw ctx.error(403, { message: "Delete operation denied" });
-          }
         }
         await adapter.delete({
           model: "formSubmission",
@@ -414,28 +411,33 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         }
         let finalData = data;
         if (config.hooks?.onBeforeSubmission) {
+          let hookResult;
+          let originalError;
           try {
-            const result = await config.hooks.onBeforeSubmission(
+            hookResult = await config.hooks.onBeforeSubmission(
               slug,
               data,
               submissionContext
             );
-            if (result === false) {
-              throw ctx.error(400, { message: "Submission rejected" });
-            }
-            if (result && typeof result === "object") {
-              finalData = result;
+            if (hookResult === false) {
+              originalError = new Error("Submission rejected");
             }
-          } catch (error) {
+          } catch (e) {
+            originalError = e instanceof Error ? e : new Error("Submission rejected");
+          }
+          if (originalError) {
             if (config.hooks?.onSubmissionError) {
               await config.hooks.onSubmissionError(
-                error,
+                originalError,
                 slug,
                 data,
                 submissionContext
               );
             }
-            throw error;
+            throw ctx.error(400, { message: originalError.message });
+          }
+          if (hookResult && typeof hookResult === "object") {
+            finalData = hookResult;
           }
         }
         const submission = await adapter.create({
@@ -484,13 +486,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
           throw ctx.error(404, { message: "Form not found" });
         }
         if (config.hooks?.onBeforeListSubmissions) {
-          const canList = await config.hooks.onBeforeListSubmissions(
-            formId,
-            context
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeListSubmissions(formId, context),
+            ctx.error,
+            "Access denied"
           );
-          if (!canList) {
-            throw ctx.error(403, { message: "Access denied" });
-          }
         }
         return getters.getFormSubmissions(adapter, formId, { limit, offset });
       }
@@ -505,13 +505,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         const { formId, subId } = ctx.params;
         const context = createContext(ctx.headers);
         if (config.hooks?.onBeforeGetSubmission) {
-          const canGet = await config.hooks.onBeforeGetSubmission(
-            subId,
-            context
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeGetSubmission(subId, context),
+            ctx.error,
+            "Access denied"
           );
-          if (!canGet) {
-            throw ctx.error(403, { message: "Access denied" });
-          }
         }
         const submission = await adapter.findOne({
           model: "formSubmission",
@@ -541,13 +539,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
           throw ctx.error(404, { message: "Submission not found" });
         }
         if (config.hooks?.onBeforeSubmissionDeleted) {
-          const canDelete = await config.hooks.onBeforeSubmissionDeleted(
-            subId,
-            context
+          await utils$1.runHookWithShim(
+            () => config.hooks.onBeforeSubmissionDeleted(subId, context),
+            ctx.error,
+            "Delete operation denied"
           );
-          if (!canDelete) {
-            throw ctx.error(403, { message: "Delete operation denied" });
-          }
         }
         await adapter.delete({
           model: "formSubmission",