@btst/stack 1.5.0 → 1.5.2

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

@@ -22,15 +22,41 @@ const ContentEditorPageComponent = lazy(
 function createDashboardLoader(config) {
   return async () => {
     if (typeof window === "undefined") {
-      const { queryClient, apiBasePath, apiBaseURL, headers } = config;
-      const client = createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = createCMSQueryKeys(client, headers);
+      const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
+      const context = {
+        path: "/cms",
+        isSSR: true,
+        apiBaseURL,
+        apiBasePath,
+        headers
+      };
       try {
+        if (hooks?.beforeLoadDashboard) {
+          const canLoad = await hooks.beforeLoadDashboard(context);
+          if (!canLoad) {
+            throw new Error("Load prevented by beforeLoadDashboard hook");
+          }
+        }
+        const client = createApiClient({
+          baseURL: apiBaseURL,
+          basePath: apiBasePath
+        });
+        const queries = createCMSQueryKeys(client, headers);
         await queryClient.prefetchQuery(queries.cmsTypes.list());
-      } catch {
+        if (hooks?.afterLoadDashboard) {
+          await hooks.afterLoadDashboard(context);
+        }
+        const queryState = queryClient.getQueryState(
+          queries.cmsTypes.list().queryKey
+        );
+        if (queryState?.error && hooks?.onLoadError) {
+          const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
+          await hooks.onLoadError(error, context);
+        }
+      } catch (error) {
+        if (hooks?.onLoadError) {
+          await hooks.onLoadError(error, context);
+        }
       }
     }
   };
@@ -38,14 +64,28 @@ function createDashboardLoader(config) {
 function createContentListLoader(typeSlug, config) {
   return async () => {
     if (typeof window === "undefined") {
-      const { queryClient, apiBasePath, apiBaseURL, headers } = config;
-      const client = createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = createCMSQueryKeys(client, headers);
-      const limit = 20;
+      const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
+      const context = {
+        path: `/cms/${typeSlug}`,
+        params: { typeSlug },
+        isSSR: true,
+        apiBaseURL,
+        apiBasePath,
+        headers
+      };
       try {
+        if (hooks?.beforeLoadContentList) {
+          const canLoad = await hooks.beforeLoadContentList(typeSlug, context);
+          if (!canLoad) {
+            throw new Error("Load prevented by beforeLoadContentList hook");
+          }
+        }
+        const client = createApiClient({
+          baseURL: apiBaseURL,
+          basePath: apiBasePath
+        });
+        const queries = createCMSQueryKeys(client, headers);
+        const limit = 20;
         await queryClient.prefetchQuery(queries.cmsTypes.list());
         const listQuery = queries.cmsContent.list({
           typeSlug,
@@ -68,7 +108,22 @@ function createContentListLoader(typeSlug, config) {
           },
           initialPageParam: 0
         });
-      } catch {
+        if (hooks?.afterLoadContentList) {
+          await hooks.afterLoadContentList(typeSlug, context);
+        }
+        const typesState = queryClient.getQueryState(
+          queries.cmsTypes.list().queryKey
+        );
+        const listState = queryClient.getQueryState(listQuery.queryKey);
+        const queryError = typesState?.error || listState?.error;
+        if (queryError && hooks?.onLoadError) {
+          const error = queryError instanceof Error ? queryError : new Error(String(queryError));
+          await hooks.onLoadError(error, context);
+        }
+      } catch (error) {
+        if (hooks?.onLoadError) {
+          await hooks.onLoadError(error, context);
+        }
       }
     }
   };
@@ -76,13 +131,31 @@ function createContentListLoader(typeSlug, config) {
 function createContentEditorLoader(typeSlug, id, config) {
   return async () => {
     if (typeof window === "undefined") {
-      const { queryClient, apiBasePath, apiBaseURL, headers } = config;
-      const client = createApiClient({
-        baseURL: apiBaseURL,
-        basePath: apiBasePath
-      });
-      const queries = createCMSQueryKeys(client, headers);
+      const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
+      const context = {
+        path: id ? `/cms/${typeSlug}/${id}` : `/cms/${typeSlug}/new`,
+        params: id ? { typeSlug, id } : { typeSlug },
+        isSSR: true,
+        apiBaseURL,
+        apiBasePath,
+        headers
+      };
       try {
+        if (hooks?.beforeLoadContentEditor) {
+          const canLoad = await hooks.beforeLoadContentEditor(
+            typeSlug,
+            id,
+            context
+          );
+          if (!canLoad) {
+            throw new Error("Load prevented by beforeLoadContentEditor hook");
+          }
+        }
+        const client = createApiClient({
+          baseURL: apiBaseURL,
+          basePath: apiBasePath
+        });
+        const queries = createCMSQueryKeys(client, headers);
         const promises = [queryClient.prefetchQuery(queries.cmsTypes.list())];
         if (id) {
           promises.push(
@@ -90,7 +163,24 @@ function createContentEditorLoader(typeSlug, id, config) {
           );
         }
         await Promise.all(promises);
-      } catch {
+        if (hooks?.afterLoadContentEditor) {
+          await hooks.afterLoadContentEditor(typeSlug, id, context);
+        }
+        const typesState = queryClient.getQueryState(
+          queries.cmsTypes.list().queryKey
+        );
+        const itemState = id ? queryClient.getQueryState(
+          queries.cmsContent.detail(typeSlug, id).queryKey
+        ) : null;
+        const queryError = typesState?.error || itemState?.error;
+        if (queryError && hooks?.onLoadError) {
+          const error = queryError instanceof Error ? queryError : new Error(String(queryError));
+          await hooks.onLoadError(error, context);
+        }
+      } catch (error) {
+        if (hooks?.onLoadError) {
+          await hooks.onLoadError(error, context);
+        }
       }
     }
   };

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

@@ -27,6 +27,10 @@ const cmsSchema = db.createDbPlugin("cms", {
         type: "string",
         required: false
       },
+      autoFormVersion: {
+        type: "number",
+        required: false
+      },
       createdAt: {
         type: "date",
         defaultValue: () => /* @__PURE__ */ new Date()

package/dist/packages/better-stack/src/plugins/cms/db.mjs

@@ -25,6 +25,10 @@ const cmsSchema = createDbPlugin("cms", {
         type: "string",
         required: false
       },
+      autoFormVersion: {
+        type: "number",
+        required: false
+      },
       createdAt: {
         type: "date",
         defaultValue: () => /* @__PURE__ */ new Date()

package/dist/packages/better-stack/src/plugins/cms/schemas.cjs

@@ -23,7 +23,6 @@ const contentTypeResponseSchema = z.z.object({
   slug: z.z.string(),
   description: z.z.string().nullable().optional(),
   jsonSchema: z.z.string(),
-  fieldConfig: z.z.string().nullable().optional(),
   createdAt: z.z.string(),
   updatedAt: z.z.string()
 });

package/dist/packages/better-stack/src/plugins/cms/schemas.mjs

@@ -21,7 +21,6 @@ const contentTypeResponseSchema = z.object({
   slug: z.string(),
   description: z.string().nullable().optional(),
   jsonSchema: z.string(),
-  fieldConfig: z.string().nullable().optional(),
   createdAt: z.string(),
   updatedAt: z.string()
 });

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/common/label.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const form = require('../../../form.cjs');
-const utils = require('../../../../lib/utils.cjs');
+const form = require('../../form.cjs');
+const utils = require('../../../lib/utils.cjs');
 
 function AutoFormLabel({
   label,

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/common/label.mjs

@@ -1,6 +1,6 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
-import { FormLabel } from '../../../form.mjs';
-import { cn } from '../../../../lib/utils.mjs';
+import { FormLabel } from '../../form.mjs';
+import { cn } from '../../../lib/utils.mjs';
 
 function AutoFormLabel({
   label,

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/config.cjs

@@ -3,7 +3,6 @@
 const checkbox = require('./fields/checkbox.cjs');
 const date = require('./fields/date.cjs');
 const _enum = require('./fields/enum.cjs');
-const file = require('./fields/file.cjs');
 const input = require('./fields/input.cjs');
 const number = require('./fields/number.cjs');
 const radioGroup = require('./fields/radio-group.cjs');
@@ -18,7 +17,6 @@ const INPUT_COMPONENTS = {
   switch: _switch,
   textarea: textarea,
   number: number,
-  file: file,
   fallback: input
 };
 const DEFAULT_ZOD_HANDLERS = {

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/config.mjs

@@ -1,7 +1,6 @@
 import AutoFormCheckbox from './fields/checkbox.mjs';
 import AutoFormDate from './fields/date.mjs';
 import AutoFormEnum from './fields/enum.mjs';
-import AutoFormFile from './fields/file.mjs';
 import AutoFormInput from './fields/input.mjs';
 import AutoFormNumber from './fields/number.mjs';
 import AutoFormRadioGroup from './fields/radio-group.mjs';
@@ -16,7 +15,6 @@ const INPUT_COMPONENTS = {
   switch: AutoFormSwitch,
   textarea: AutoFormTextarea,
   number: AutoFormNumber,
-  file: AutoFormFile,
   fallback: AutoFormInput
 };
 const DEFAULT_ZOD_HANDLERS = {

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/array.cjs

@@ -1,43 +1,28 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const accordion = require('../../../accordion.cjs');
-const button = require('../../../button.cjs');
-const separator = require('../../../separator.cjs');
+const accordion = require('../../accordion.cjs');
+const button = require('../../button.cjs');
+const separator = require('../../separator.cjs');
 const lucideReact = require('lucide-react');
 const reactHookForm = require('react-hook-form');
-const z = require('zod');
 const utils = require('../utils.cjs');
 const object = require('./object.cjs');
 
-function _interopNamespaceCompat(e) {
-  if (e && typeof e === 'object' && 'default' in e) return e;
-  const n = Object.create(null);
-  if (e) {
-    for (const k in e) {
-      n[k] = e[k];
-    }
-  }
-  n.default = e;
-  return n;
-}
-
-const z__namespace = /*#__PURE__*/_interopNamespaceCompat(z);
-
-function isZodArray(item) {
-  return item instanceof z__namespace.ZodArray;
-}
-function isZodDefault(item) {
-  return item instanceof z__namespace.ZodDefault;
+function getDefType(schema) {
+  return schema._zod?.def?.type || "";
 }
 function getArrayElementType(item) {
   const def = item._zod?.def;
-  if (isZodArray(item)) {
+  const defType = getDefType(item);
+  if (defType === "array") {
     return def?.element || null;
   }
-  if (isZodDefault(item)) {
-    const innerDef = def?.innerType?._zod?.def;
-    return innerDef?.element || null;
+  if (["default", "optional", "nullable"].includes(defType)) {
+    const innerType = def?.innerType;
+    if (innerType) {
+      return getArrayElementType(innerType);
+    }
   }
   return null;
 }
@@ -48,11 +33,12 @@ function AutoFormArray({
   path = [],
   fieldConfig
 }) {
+  const fieldPath = path.join(".");
   const { fields, append, remove } = reactHookForm.useFieldArray({
     control: form.control,
-    name
+    name: fieldPath
   });
-  const title = utils.getSchemaDescription(item) ?? utils.beautifyObjectName(name);
+  const title = fieldConfig?.label ?? utils.beautifyObjectName(name);
   const itemDefType = getArrayElementType(item);
   return /* @__PURE__ */ jsxRuntime.jsxs(accordion.AccordionItem, { value: name, className: "border-none", children: [
     /* @__PURE__ */ jsxRuntime.jsx(accordion.AccordionTrigger, { children: title }),

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/array.mjs

@@ -1,27 +1,26 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { AccordionItem, AccordionTrigger, AccordionContent } from '../../../accordion.mjs';
-import { Button } from '../../../button.mjs';
-import { Separator } from '../../../separator.mjs';
+import { AccordionItem, AccordionTrigger, AccordionContent } from '../../accordion.mjs';
+import { Button } from '../../button.mjs';
+import { Separator } from '../../separator.mjs';
 import { Trash, Plus } from 'lucide-react';
 import { useFieldArray } from 'react-hook-form';
-import * as z from 'zod';
-import { getSchemaDescription, beautifyObjectName } from '../utils.mjs';
+import { beautifyObjectName } from '../utils.mjs';
 import AutoFormObject from './object.mjs';
 
-function isZodArray(item) {
-  return item instanceof z.ZodArray;
-}
-function isZodDefault(item) {
-  return item instanceof z.ZodDefault;
+function getDefType(schema) {
+  return schema._zod?.def?.type || "";
 }
 function getArrayElementType(item) {
   const def = item._zod?.def;
-  if (isZodArray(item)) {
+  const defType = getDefType(item);
+  if (defType === "array") {
     return def?.element || null;
   }
-  if (isZodDefault(item)) {
-    const innerDef = def?.innerType?._zod?.def;
-    return innerDef?.element || null;
+  if (["default", "optional", "nullable"].includes(defType)) {
+    const innerType = def?.innerType;
+    if (innerType) {
+      return getArrayElementType(innerType);
+    }
   }
   return null;
 }
@@ -32,11 +31,12 @@ function AutoFormArray({
   path = [],
   fieldConfig
 }) {
+  const fieldPath = path.join(".");
   const { fields, append, remove } = useFieldArray({
     control: form.control,
-    name
+    name: fieldPath
   });
-  const title = getSchemaDescription(item) ?? beautifyObjectName(name);
+  const title = fieldConfig?.label ?? beautifyObjectName(name);
   const itemDefType = getArrayElementType(item);
   return /* @__PURE__ */ jsxs(AccordionItem, { value: name, className: "border-none", children: [
     /* @__PURE__ */ jsx(AccordionTrigger, { children: title }),

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/checkbox.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const checkbox = require('../../../checkbox.cjs');
-const form = require('../../../form.cjs');
+const checkbox = require('../../checkbox.cjs');
+const form = require('../../form.cjs');
 const tooltip = require('../common/tooltip.cjs');
 const label = require('../common/label.cjs');
 

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/checkbox.mjs

@@ -1,6 +1,6 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { Checkbox } from '../../../checkbox.mjs';
-import { FormItem, FormControl } from '../../../form.mjs';
+import { Checkbox } from '../../checkbox.mjs';
+import { FormItem, FormControl } from '../../form.mjs';
 import AutoFormTooltip from '../common/tooltip.mjs';
 import AutoFormLabel from '../common/label.mjs';
 

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/date.cjs

@@ -1,18 +1,42 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const datePicker = require('../../../date-picker.cjs');
-const form = require('../../../form.cjs');
+const datePicker = require('../../date-picker.cjs');
+const form = require('../../form.cjs');
 const label = require('../common/label.cjs');
 const tooltip = require('../common/tooltip.cjs');
+const utils = require('../utils.cjs');
 
+function toDate(value) {
+  if (!value) return void 0;
+  if (value instanceof Date) return value;
+  if (typeof value === "string") {
+    const date = new Date(value);
+    return isNaN(date.getTime()) ? void 0 : date;
+  }
+  return void 0;
+}
 function AutoFormDate({
   label: label$1,
   isRequired,
   field,
   fieldConfigItem,
-  fieldProps
+  fieldProps,
+  zodItem
 }) {
+  const baseType = utils.getBaseType(zodItem);
+  const expectsDateObject = baseType === "ZodDate";
+  const handleChange = (date) => {
+    if (!date) {
+      field.onChange(void 0);
+      return;
+    }
+    if (expectsDateObject) {
+      field.onChange(date);
+    } else {
+      field.onChange(date.toISOString());
+    }
+  };
   return /* @__PURE__ */ jsxRuntime.jsxs(form.FormItem, { children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       label,
@@ -24,8 +48,8 @@ function AutoFormDate({
     /* @__PURE__ */ jsxRuntime.jsx(form.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(
       datePicker.DatePicker,
       {
-        date: field.value,
-        setDate: field.onChange,
+        date: toDate(field.value),
+        setDate: handleChange,
         ...fieldProps
       }
     ) }),

package/dist/packages/ui/src/components/auto-form/fields/date.mjs

@@ -0,0 +1,59 @@
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { DatePicker } from '../../date-picker.mjs';
+import { FormItem, FormControl, FormMessage } from '../../form.mjs';
+import AutoFormLabel from '../common/label.mjs';
+import AutoFormTooltip from '../common/tooltip.mjs';
+import { getBaseType } from '../utils.mjs';
+
+function toDate(value) {
+  if (!value) return void 0;
+  if (value instanceof Date) return value;
+  if (typeof value === "string") {
+    const date = new Date(value);
+    return isNaN(date.getTime()) ? void 0 : date;
+  }
+  return void 0;
+}
+function AutoFormDate({
+  label,
+  isRequired,
+  field,
+  fieldConfigItem,
+  fieldProps,
+  zodItem
+}) {
+  const baseType = getBaseType(zodItem);
+  const expectsDateObject = baseType === "ZodDate";
+  const handleChange = (date) => {
+    if (!date) {
+      field.onChange(void 0);
+      return;
+    }
+    if (expectsDateObject) {
+      field.onChange(date);
+    } else {
+      field.onChange(date.toISOString());
+    }
+  };
+  return /* @__PURE__ */ jsxs(FormItem, { children: [
+    /* @__PURE__ */ jsx(
+      AutoFormLabel,
+      {
+        label: fieldConfigItem?.label || label,
+        isRequired
+      }
+    ),
+    /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(
+      DatePicker,
+      {
+        date: toDate(field.value),
+        setDate: handleChange,
+        ...fieldProps
+      }
+    ) }),
+    /* @__PURE__ */ jsx(AutoFormTooltip, { fieldConfigItem }),
+    /* @__PURE__ */ jsx(FormMessage, {})
+  ] });
+}
+
+export { AutoFormDate as default };

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/enum.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const form = require('../../../form.cjs');
-const select = require('../../../select.cjs');
+const form = require('../../form.cjs');
+const select = require('../../select.cjs');
 const label = require('../common/label.cjs');
 const tooltip = require('../common/tooltip.cjs');
 const utils = require('../utils.cjs');

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/enum.mjs

@@ -1,6 +1,6 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { FormItem, FormControl, FormMessage } from '../../../form.mjs';
-import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '../../../select.mjs';
+import { FormItem, FormControl, FormMessage } from '../../form.mjs';
+import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '../../select.mjs';
 import AutoFormLabel from '../common/label.mjs';
 import AutoFormTooltip from '../common/tooltip.mjs';
 import { getBaseSchema } from '../utils.mjs';

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/input.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const form = require('../../../form.cjs');
-const input = require('../../../input.cjs');
+const form = require('../../form.cjs');
+const input = require('../../input.cjs');
 const label = require('../common/label.cjs');
 const tooltip = require('../common/tooltip.cjs');
 

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/input.mjs

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { FormItem, FormControl, FormMessage } from '../../../form.mjs';
-import { Input } from '../../../input.mjs';
+import { FormItem, FormControl, FormMessage } from '../../form.mjs';
+import { Input } from '../../input.mjs';
 import AutoFormLabel from '../common/label.mjs';
 import AutoFormTooltip from '../common/tooltip.mjs';
 

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/number.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const form = require('../../../form.cjs');
-const input = require('../../../input.cjs');
+const form = require('../../form.cjs');
+const input = require('../../input.cjs');
 const label = require('../common/label.cjs');
 const tooltip = require('../common/tooltip.cjs');
 

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/number.mjs

@@ -1,6 +1,6 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { FormItem, FormControl, FormMessage } from '../../../form.mjs';
-import { Input } from '../../../input.mjs';
+import { FormItem, FormControl, FormMessage } from '../../form.mjs';
+import { Input } from '../../input.mjs';
 import AutoFormLabel from '../common/label.mjs';
 import AutoFormTooltip from '../common/tooltip.mjs';
 

package/dist/packages/ui/src/components/{ui/auto-form → auto-form}/fields/object.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const accordion = require('../../../accordion.cjs');
-const form = require('../../../form.cjs');
+const accordion = require('../../accordion.cjs');
+const form = require('../../form.cjs');
 const reactHookForm = require('react-hook-form');
 const z = require('zod');
 const config = require('../config.cjs');
@@ -60,7 +60,7 @@ function AutoFormObject({
     let item = shape[name];
     item = handleIfZodNumber(item);
     const zodBaseType = utils.getBaseType(item);
-    const itemName = utils.getSchemaDescription(item) ?? utils.beautifyObjectName(name);
+    const itemName = utils.beautifyObjectName(name);
     const key = [...path, name].join(".");
     const {
       isHidden,
@@ -100,7 +100,10 @@ function AutoFormObject({
     }
     const fieldConfigItem = fieldConfig?.[name] ?? {};
     const zodInputProps = utils.zodToHtmlInputProps(item);
-    const isRequired = isRequiredByDependency || zodInputProps.required || fieldConfigItem.inputProps?.required || false;
+    let isRequired = isRequiredByDependency || zodInputProps.required || false;
+    if (fieldConfigItem.inputProps?.required !== void 0) {
+      isRequired = fieldConfigItem.inputProps.required;
+    }
     if (overrideOptions) {
       item = z__namespace.enum(overrideOptions);
     }