@btst/stack 2.4.0 → 2.5.1

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",

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

@@ -6,6 +6,7 @@ import { listFormsQuerySchema, createFormSchema, updateFormSchema, listSubmissio
 import { extractUserAgent, extractIpAddress, slugify } from '../utils.mjs';
 import { getFormSubmissions, getFormBySlug, getFormById, getAllForms, serializeForm, serializeFormSubmission, serializeFormSubmissionWithData } from './getters.mjs';
 import { FORM_QUERY_KEYS } from './query-key-defs.mjs';
+import { runHookWithShim } from '../../utils.mjs';
 
 function createFormBuilderPrefetchForRoute(adapter) {
   return async function prefetchForRoute(key, qc, params) {
@@ -96,10 +97,11 @@ const formBuilderBackendPlugin = (config = {}) => 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 runHookWithShim(
+            () => config.hooks.onBeforeListForms(context),
+            ctx.error,
+            "Access denied"
+          );
         }
         return getAllForms(adapter, { status, limit, offset });
       }
@@ -114,10 +116,11 @@ const formBuilderBackendPlugin = (config = {}) => 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 runHookWithShim(
+            () => config.hooks.onBeforeGetForm(slug, context),
+            ctx.error,
+            "Access denied"
+          );
         }
         const form = await getFormBySlug(adapter, slug);
         if (!form) {
@@ -136,10 +139,11 @@ const formBuilderBackendPlugin = (config = {}) => 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 runHookWithShim(
+            () => config.hooks.onBeforeGetForm(id, context),
+            ctx.error,
+            "Access denied"
+          );
         }
         const form = await adapter.findOne({
           model: "form",
@@ -190,15 +194,13 @@ const formBuilderBackendPlugin = (config = {}) => defineBackendPlugin({
           status: body.status
         };
         if (config.hooks?.onBeforeFormCreated) {
-          const result = await config.hooks.onBeforeFormCreated(
-            formInput,
-            context
+          const hookResult = await 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({
@@ -280,16 +282,13 @@ const formBuilderBackendPlugin = (config = {}) => defineBackendPlugin({
           status: body.status
         };
         if (config.hooks?.onBeforeFormUpdated) {
-          const result = await config.hooks.onBeforeFormUpdated(
-            id,
-            updateInput,
-            context
+          const hookResult = await 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 = {
@@ -341,13 +340,11 @@ const formBuilderBackendPlugin = (config = {}) => defineBackendPlugin({
           throw ctx.error(404, { message: "Form not found" });
         }
         if (config.hooks?.onBeforeFormDeleted) {
-          const canDelete = await config.hooks.onBeforeFormDeleted(
-            id,
-            context
+          await 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",
@@ -412,28 +409,33 @@ const formBuilderBackendPlugin = (config = {}) => 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({
@@ -482,13 +484,11 @@ const formBuilderBackendPlugin = (config = {}) => defineBackendPlugin({
           throw ctx.error(404, { message: "Form not found" });
         }
         if (config.hooks?.onBeforeListSubmissions) {
-          const canList = await config.hooks.onBeforeListSubmissions(
-            formId,
-            context
+          await runHookWithShim(
+            () => config.hooks.onBeforeListSubmissions(formId, context),
+            ctx.error,
+            "Access denied"
           );
-          if (!canList) {
-            throw ctx.error(403, { message: "Access denied" });
-          }
         }
         return getFormSubmissions(adapter, formId, { limit, offset });
       }
@@ -503,13 +503,11 @@ const formBuilderBackendPlugin = (config = {}) => defineBackendPlugin({
         const { formId, subId } = ctx.params;
         const context = createContext(ctx.headers);
         if (config.hooks?.onBeforeGetSubmission) {
-          const canGet = await config.hooks.onBeforeGetSubmission(
-            subId,
-            context
+          await 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",
@@ -539,13 +537,11 @@ const formBuilderBackendPlugin = (config = {}) => defineBackendPlugin({
           throw ctx.error(404, { message: "Submission not found" });
         }
         if (config.hooks?.onBeforeSubmissionDeleted) {
-          const canDelete = await config.hooks.onBeforeSubmissionDeleted(
-            subId,
-            context
+          await 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",

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

@@ -34,10 +34,10 @@ function createFormListLoader(config) {
       };
       try {
         if (hooks?.beforeLoadFormList) {
-          const canLoad = await hooks.beforeLoadFormList(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadFormList hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadFormList(context),
+            "Load prevented by beforeLoadFormList hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -96,10 +96,10 @@ function createFormBuilderLoader(id, config) {
       };
       try {
         if (hooks?.beforeLoadFormBuilder) {
-          const canLoad = await hooks.beforeLoadFormBuilder(id, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadFormBuilder hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadFormBuilder(id, context),
+            "Load prevented by beforeLoadFormBuilder hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -148,10 +148,10 @@ function createSubmissionsLoader(formId, config) {
       };
       try {
         if (hooks?.beforeLoadSubmissions) {
-          const canLoad = await hooks.beforeLoadSubmissions(formId, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadSubmissions hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadSubmissions(formId, context),
+            "Load prevented by beforeLoadSubmissions hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,

package/dist/packages/stack/src/plugins/form-builder/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 { createFormBuilderQueryKeys } from '../../../../../../plugins/form-builder/query-keys.mjs';
 
@@ -32,10 +32,10 @@ function createFormListLoader(config) {
       };
       try {
         if (hooks?.beforeLoadFormList) {
-          const canLoad = await hooks.beforeLoadFormList(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadFormList hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadFormList(context),
+            "Load prevented by beforeLoadFormList hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -94,10 +94,10 @@ function createFormBuilderLoader(id, config) {
       };
       try {
         if (hooks?.beforeLoadFormBuilder) {
-          const canLoad = await hooks.beforeLoadFormBuilder(id, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadFormBuilder hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadFormBuilder(id, context),
+            "Load prevented by beforeLoadFormBuilder hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -146,10 +146,10 @@ function createSubmissionsLoader(formId, config) {
       };
       try {
         if (hooks?.beforeLoadSubmissions) {
-          const canLoad = await hooks.beforeLoadSubmissions(formId, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadSubmissions hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadSubmissions(formId, context),
+            "Load prevented by beforeLoadSubmissions hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,