@btst/stack 1.5.0 → 1.5.2

package/dist/packages/better-stack/src/plugins/blog/client/components/pages/new-post-page.internal.cjs

@@ -7,13 +7,13 @@ const postForms = require('../forms/post-forms.cjs');
 const pageHeader = require('../shared/page-header.cjs');
 const pageWrapper = require('../shared/page-wrapper.cjs');
 const index = require('../../localization/index.cjs');
-const useRouteLifecycle = require('../shared/use-route-lifecycle.cjs');
+const useRouteLifecycle = require('../../../../../../../ui/src/hooks/use-route-lifecycle.cjs');
 
 function NewPostPage() {
-  const { localization } = context.usePluginOverrides("blog", {
+  const overrides = context.usePluginOverrides("blog", {
     localization: index.BLOG_LOCALIZATION
   });
-  const { navigate } = context.usePluginOverrides("blog");
+  const { localization, navigate } = overrides;
   const basePath = context.useBasePath();
   useRouteLifecycle.useRouteLifecycle({
     routeName: "newPost",
@@ -21,9 +21,10 @@ function NewPostPage() {
       path: "/blog/new",
       isSSR: typeof window === "undefined"
     },
-    beforeRenderHook: (overrides, context) => {
-      if (overrides.onBeforeNewPostPageRendered) {
-        return overrides.onBeforeNewPostPageRendered(context);
+    overrides,
+    beforeRenderHook: (overrides2, context) => {
+      if (overrides2.onBeforeNewPostPageRendered) {
+        return overrides2.onBeforeNewPostPageRendered(context);
       }
       return true;
     }

package/dist/packages/better-stack/src/plugins/blog/client/components/pages/new-post-page.internal.mjs

@@ -5,13 +5,13 @@ import { AddPostForm } from '../forms/post-forms.mjs';
 import { PageHeader } from '../shared/page-header.mjs';
 import { PageWrapper } from '../shared/page-wrapper.mjs';
 import { BLOG_LOCALIZATION } from '../../localization/index.mjs';
-import { useRouteLifecycle } from '../shared/use-route-lifecycle.mjs';
+import { useRouteLifecycle } from '../../../../../../../ui/src/hooks/use-route-lifecycle.mjs';
 
 function NewPostPage() {
-  const { localization } = usePluginOverrides("blog", {
+  const overrides = usePluginOverrides("blog", {
     localization: BLOG_LOCALIZATION
   });
-  const { navigate } = usePluginOverrides("blog");
+  const { localization, navigate } = overrides;
   const basePath = useBasePath();
   useRouteLifecycle({
     routeName: "newPost",
@@ -19,9 +19,10 @@ function NewPostPage() {
       path: "/blog/new",
       isSSR: typeof window === "undefined"
     },
-    beforeRenderHook: (overrides, context) => {
-      if (overrides.onBeforeNewPostPageRendered) {
-        return overrides.onBeforeNewPostPageRendered(context);
+    overrides,
+    beforeRenderHook: (overrides2, context) => {
+      if (overrides2.onBeforeNewPostPageRendered) {
+        return overrides2.onBeforeNewPostPageRendered(context);
       }
       return true;
     }

package/dist/packages/better-stack/src/plugins/blog/client/components/pages/post-page.internal.cjs

@@ -14,14 +14,15 @@ const index = require('../../localization/index.cjs');
 const postNavigation = require('../shared/post-navigation.cjs');
 const recentPostsCarousel = require('../shared/recent-posts-carousel.cjs');
 const badge = require('../../../../../../../ui/src/components/badge.cjs');
-const useRouteLifecycle = require('../shared/use-route-lifecycle.cjs');
+const useRouteLifecycle = require('../../../../../../../ui/src/hooks/use-route-lifecycle.cjs');
 const onThisPage = require('../shared/on-this-page.cjs');
 
 function PostPage({ slug }) {
-  const { Image, localization } = context.usePluginOverrides("blog", {
+  const overrides = context.usePluginOverrides("blog", {
     Image: defaults.DefaultImage,
     localization: index.BLOG_LOCALIZATION
   });
+  const { Image, localization } = overrides;
   useRouteLifecycle.useRouteLifecycle({
     routeName: "post",
     context: {
@@ -29,9 +30,10 @@ function PostPage({ slug }) {
       params: { slug },
       isSSR: typeof window === "undefined"
     },
-    beforeRenderHook: (overrides, context) => {
-      if (overrides.onBeforePostPageRendered) {
-        return overrides.onBeforePostPageRendered(slug, context);
+    overrides,
+    beforeRenderHook: (overrides2, context) => {
+      if (overrides2.onBeforePostPageRendered) {
+        return overrides2.onBeforePostPageRendered(slug, context);
       }
       return true;
     }

package/dist/packages/better-stack/src/plugins/blog/client/components/pages/post-page.internal.mjs

@@ -12,14 +12,15 @@ import { BLOG_LOCALIZATION } from '../../localization/index.mjs';
 import { PostNavigation } from '../shared/post-navigation.mjs';
 import { RecentPostsCarousel } from '../shared/recent-posts-carousel.mjs';
 import { Badge } from '../../../../../../../ui/src/components/badge.mjs';
-import { useRouteLifecycle } from '../shared/use-route-lifecycle.mjs';
+import { useRouteLifecycle } from '../../../../../../../ui/src/hooks/use-route-lifecycle.mjs';
 import { OnThisPageSelect, OnThisPage } from '../shared/on-this-page.mjs';
 
 function PostPage({ slug }) {
-  const { Image, localization } = usePluginOverrides("blog", {
+  const overrides = usePluginOverrides("blog", {
     Image: DefaultImage,
     localization: BLOG_LOCALIZATION
   });
+  const { Image, localization } = overrides;
   useRouteLifecycle({
     routeName: "post",
     context: {
@@ -27,9 +28,10 @@ function PostPage({ slug }) {
       params: { slug },
       isSSR: typeof window === "undefined"
     },
-    beforeRenderHook: (overrides, context) => {
-      if (overrides.onBeforePostPageRendered) {
-        return overrides.onBeforePostPageRendered(slug, context);
+    overrides,
+    beforeRenderHook: (overrides2, context) => {
+      if (overrides2.onBeforePostPageRendered) {
+        return overrides2.onBeforePostPageRendered(slug, context);
       }
       return true;
     }

package/dist/packages/better-stack/src/plugins/blog/client/components/pages/tag-page.internal.cjs

@@ -9,19 +9,21 @@ const emptyList = require('../shared/empty-list.cjs');
 const blogHooks = require('../../hooks/blog-hooks.cjs');
 const index = require('../../localization/index.cjs');
 const context = require('@btst/stack/context');
-const useRouteLifecycle = require('../shared/use-route-lifecycle.cjs');
+const useRouteLifecycle = require('../../../../../../../ui/src/hooks/use-route-lifecycle.cjs');
 
 function TagPage({ tagSlug }) {
-  const { localization } = context.usePluginOverrides("blog", {
+  const overrides = context.usePluginOverrides("blog", {
     localization: index.BLOG_LOCALIZATION
   });
+  const { localization } = overrides;
   useRouteLifecycle.useRouteLifecycle({
     routeName: "tag",
     context: {
       path: `/blog/tag/${tagSlug}`,
       params: { tagSlug },
       isSSR: typeof window === "undefined"
-    }
+    },
+    overrides
   });
   const { tags } = blogHooks.useTags();
   const tag = tags?.find((t) => t.slug === tagSlug);

package/dist/packages/better-stack/src/plugins/blog/client/components/pages/tag-page.internal.mjs

@@ -7,19 +7,21 @@ import { EmptyList } from '../shared/empty-list.mjs';
 import { useTags, useSuspensePosts } from '../../hooks/blog-hooks.mjs';
 import { BLOG_LOCALIZATION } from '../../localization/index.mjs';
 import { usePluginOverrides } from '@btst/stack/context';
-import { useRouteLifecycle } from '../shared/use-route-lifecycle.mjs';
+import { useRouteLifecycle } from '../../../../../../../ui/src/hooks/use-route-lifecycle.mjs';
 
 function TagPage({ tagSlug }) {
-  const { localization } = usePluginOverrides("blog", {
+  const overrides = usePluginOverrides("blog", {
     localization: BLOG_LOCALIZATION
   });
+  const { localization } = overrides;
   useRouteLifecycle({
     routeName: "tag",
     context: {
       path: `/blog/tag/${tagSlug}`,
       params: { tagSlug },
       isSSR: typeof window === "undefined"
-    }
+    },
+    overrides
   });
   const { tags } = useTags();
   const tag = tags?.find((t) => t.slug === tagSlug);

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

@@ -182,12 +182,12 @@ function createTagLoader(tagSlug, config) {
         });
         const tagsQuery = queries.tags.list();
         await queryClient.prefetchQuery(tagsQuery);
-        if (hooks?.onLoadError) {
-          const queryState = queryClient.getQueryState(listQuery.queryKey);
-          if (queryState?.error) {
-            const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
-            await hooks.onLoadError(error, context);
-          }
+        const listState = queryClient.getQueryState(listQuery.queryKey);
+        const tagsState = queryClient.getQueryState(tagsQuery.queryKey);
+        const queryError = listState?.error || tagsState?.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) {

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

@@ -180,12 +180,12 @@ function createTagLoader(tagSlug, config) {
         });
         const tagsQuery = queries.tags.list();
         await queryClient.prefetchQuery(tagsQuery);
-        if (hooks?.onLoadError) {
-          const queryState = queryClient.getQueryState(listQuery.queryKey);
-          if (queryState?.error) {
-            const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
-            await hooks.onLoadError(error, context);
-          }
+        const listState = queryClient.getQueryState(listQuery.queryKey);
+        const tagsState = queryClient.getQueryState(tagsQuery.queryKey);
+        const queryError = listState?.error || tagsState?.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) {

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

@@ -6,9 +6,35 @@ const db = require('../db.cjs');
 const schemas = require('../schemas.cjs');
 const utils = require('../utils.cjs');
 
+function migrateToUnifiedSchema(jsonSchemaStr, fieldConfigStr) {
+  if (!fieldConfigStr) {
+    return jsonSchemaStr;
+  }
+  try {
+    const jsonSchema = JSON.parse(jsonSchemaStr);
+    const fieldConfig = JSON.parse(fieldConfigStr);
+    if (!jsonSchema.properties || typeof fieldConfig !== "object") {
+      return jsonSchemaStr;
+    }
+    for (const [key, config] of Object.entries(fieldConfig)) {
+      if (jsonSchema.properties[key] && typeof config === "object" && config !== null && "fieldType" in config) {
+        jsonSchema.properties[key].fieldType = config.fieldType;
+      }
+    }
+    return JSON.stringify(jsonSchema);
+  } catch {
+    return jsonSchemaStr;
+  }
+}
 function serializeContentType(ct) {
+  const needsMigration = !ct.autoFormVersion || ct.autoFormVersion < 2;
+  const migratedJsonSchema = needsMigration ? migrateToUnifiedSchema(ct.jsonSchema, ct.fieldConfig) : ct.jsonSchema;
   return {
-    ...ct,
+    id: ct.id,
+    name: ct.name,
+    slug: ct.slug,
+    description: ct.description,
+    jsonSchema: migratedJsonSchema,
     createdAt: ct.createdAt.toISOString(),
     updatedAt: ct.updatedAt.toISOString()
   };
@@ -30,7 +56,6 @@ function serializeContentItemWithType(item) {
 async function syncContentTypes(adapter, config) {
   for (const ct of config.contentTypes) {
     const jsonSchema = JSON.stringify(z.z.toJSONSchema(ct.schema));
-    const fieldConfig = ct.fieldConfig ? JSON.stringify(ct.fieldConfig) : null;
     const existing = await adapter.findOne({
       model: "contentType",
       where: [{ field: "slug", value: ct.slug, operator: "eq" }]
@@ -43,7 +68,9 @@ async function syncContentTypes(adapter, config) {
           name: ct.name,
           description: ct.description ?? null,
           jsonSchema,
-          fieldConfig,
+          fieldConfig: null,
+          // No longer used in version 2
+          autoFormVersion: 2,
           updatedAt: /* @__PURE__ */ new Date()
         }
       });
@@ -56,7 +83,9 @@ async function syncContentTypes(adapter, config) {
             slug: ct.slug,
             description: ct.description ?? null,
             jsonSchema,
-            fieldConfig,
+            fieldConfig: null,
+            // No longer used in version 2
+            autoFormVersion: 2,
             createdAt: /* @__PURE__ */ new Date(),
             updatedAt: /* @__PURE__ */ new Date()
           }

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

@@ -4,9 +4,35 @@ import { cmsSchema } from '../db.mjs';
 import { listContentQuerySchema } from '../schemas.mjs';
 import { slugify } from '../utils.mjs';
 
+function migrateToUnifiedSchema(jsonSchemaStr, fieldConfigStr) {
+  if (!fieldConfigStr) {
+    return jsonSchemaStr;
+  }
+  try {
+    const jsonSchema = JSON.parse(jsonSchemaStr);
+    const fieldConfig = JSON.parse(fieldConfigStr);
+    if (!jsonSchema.properties || typeof fieldConfig !== "object") {
+      return jsonSchemaStr;
+    }
+    for (const [key, config] of Object.entries(fieldConfig)) {
+      if (jsonSchema.properties[key] && typeof config === "object" && config !== null && "fieldType" in config) {
+        jsonSchema.properties[key].fieldType = config.fieldType;
+      }
+    }
+    return JSON.stringify(jsonSchema);
+  } catch {
+    return jsonSchemaStr;
+  }
+}
 function serializeContentType(ct) {
+  const needsMigration = !ct.autoFormVersion || ct.autoFormVersion < 2;
+  const migratedJsonSchema = needsMigration ? migrateToUnifiedSchema(ct.jsonSchema, ct.fieldConfig) : ct.jsonSchema;
   return {
-    ...ct,
+    id: ct.id,
+    name: ct.name,
+    slug: ct.slug,
+    description: ct.description,
+    jsonSchema: migratedJsonSchema,
     createdAt: ct.createdAt.toISOString(),
     updatedAt: ct.updatedAt.toISOString()
   };
@@ -28,7 +54,6 @@ function serializeContentItemWithType(item) {
 async function syncContentTypes(adapter, config) {
   for (const ct of config.contentTypes) {
     const jsonSchema = JSON.stringify(z.toJSONSchema(ct.schema));
-    const fieldConfig = ct.fieldConfig ? JSON.stringify(ct.fieldConfig) : null;
     const existing = await adapter.findOne({
       model: "contentType",
       where: [{ field: "slug", value: ct.slug, operator: "eq" }]
@@ -41,7 +66,9 @@ async function syncContentTypes(adapter, config) {
           name: ct.name,
           description: ct.description ?? null,
           jsonSchema,
-          fieldConfig,
+          fieldConfig: null,
+          // No longer used in version 2
+          autoFormVersion: 2,
           updatedAt: /* @__PURE__ */ new Date()
         }
       });
@@ -54,7 +81,9 @@ async function syncContentTypes(adapter, config) {
             slug: ct.slug,
             description: ct.description ?? null,
             jsonSchema,
-            fieldConfig,
+            fieldConfig: null,
+            // No longer used in version 2
+            autoFormVersion: 2,
             createdAt: /* @__PURE__ */ new Date(),
             updatedAt: /* @__PURE__ */ new Date()
           }

package/dist/packages/better-stack/src/plugins/cms/client/components/forms/content-form.cjs

@@ -5,142 +5,40 @@ const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
 const z = require('zod');
 const sonner = require('sonner');
-const index$1 = require('../../../../../../../ui/src/components/ui/auto-form/index.cjs');
+const index$1 = require('../../../../../../../ui/src/components/auto-form/index.cjs');
+const utils = require('../../../../../../../ui/src/components/auto-form/utils.cjs');
 const input = require('../../../../../../../ui/src/components/input.cjs');
 const label = require('../../../../../../../ui/src/components/label.cjs');
 const badge = require('../../../../../../../ui/src/components/badge.cjs');
 const context = require('@btst/stack/context');
-const utils = require('../../../utils.cjs');
+const utils$1 = require('../../../utils.cjs');
 const index = require('../../localization/index.cjs');
 const fileUpload = require('./file-upload.cjs');
 
-function jsonSchemaToZodWithCoercion(jsonSchema) {
-  const shape = {};
-  const properties = jsonSchema.properties || {};
-  const required = jsonSchema.required || [];
+function buildFieldConfigFromJsonSchema(jsonSchema, uploadImage, fieldComponents) {
+  const baseConfig = utils.buildFieldConfigFromJsonSchema(jsonSchema, fieldComponents);
+  const properties = jsonSchema.properties;
+  if (!properties) return baseConfig;
   for (const [key, prop] of Object.entries(properties)) {
-    let fieldSchema;
-    const typeValue = Array.isArray(prop.type) ? prop.type[0] : prop.type;
-    if (prop.enum && Array.isArray(prop.enum) && prop.enum.length > 0) {
-      const stringValues = prop.enum.filter(
-        (v) => typeof v === "string"
-      );
-      if (stringValues.length > 0) {
-        fieldSchema = z.z.enum(stringValues);
+    if (prop.fieldType === "file" && !fieldComponents?.["file"]) {
+      if (!uploadImage) {
+        baseConfig[key] = {
+          ...baseConfig[key],
+          fieldType: () => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-md border border-destructive bg-destructive/10 p-3 text-sm text-destructive", children: [
+            "File upload requires an ",
+            /* @__PURE__ */ jsxRuntime.jsx("code", { children: "uploadImage" }),
+            " function in CMS overrides."
+          ] })
+        };
       } else {
-        fieldSchema = z.z.string();
-      }
-    } else {
-      switch (typeValue) {
-        case "number":
-        case "integer": {
-          let numSchema = z.z.coerce.number();
-          if (prop.minimum !== void 0) {
-            numSchema = numSchema.min(prop.minimum);
-          }
-          if (prop.maximum !== void 0) {
-            numSchema = numSchema.max(prop.maximum);
-          }
-          fieldSchema = numSchema;
-          break;
-        }
-        case "boolean": {
-          fieldSchema = z.z.boolean();
-          if (prop.default !== void 0) {
-            fieldSchema = fieldSchema.default(
-              prop.default
-            );
-          }
-          break;
-        }
-        case "string": {
-          if (prop.format === "date" || prop.format === "date-time") {
-            fieldSchema = z.z.coerce.date();
-          } else {
-            let strSchema = z.z.string();
-            if (prop.minLength !== void 0) {
-              strSchema = strSchema.min(prop.minLength);
-            }
-            if (prop.maxLength !== void 0) {
-              strSchema = strSchema.max(prop.maxLength);
-            }
-            fieldSchema = strSchema;
-          }
-          break;
-        }
-        default: {
-          fieldSchema = z.z.string();
-        }
-      }
-    }
-    if (prop.default !== void 0 && typeValue !== "boolean") {
-      fieldSchema = fieldSchema.default(prop.default);
-    }
-    if (!required.includes(key)) {
-      fieldSchema = fieldSchema.optional();
-    }
-    shape[key] = fieldSchema;
-  }
-  return z.z.object(shape);
-}
-const BUILTIN_FIELD_TYPES = [
-  "checkbox",
-  "date",
-  "select",
-  "radio",
-  "switch",
-  "textarea",
-  "number",
-  "file",
-  "fallback"
-];
-function buildFieldConfigFromJsonSchema(jsonSchema, storedFieldConfig, uploadImage, fieldComponents) {
-  const fieldConfig = {};
-  const properties = jsonSchema.properties;
-  if (!properties) return fieldConfig;
-  for (const [key, value] of Object.entries(properties)) {
-    const config = {};
-    if (value.description) {
-      config.description = value.description;
-    }
-    if (value.placeholder) {
-      config.inputProps = {
-        placeholder: value.placeholder
-      };
-    }
-    if (storedFieldConfig?.[key]) {
-      const storedConfig = storedFieldConfig[key];
-      const fieldType = storedConfig.fieldType;
-      if (fieldType) {
-        if (fieldComponents?.[fieldType]) {
-          const CustomComponent = fieldComponents[fieldType];
-          config.fieldType = (props) => /* @__PURE__ */ jsxRuntime.jsx(CustomComponent, { ...props });
-        } else if (fieldType === "file") {
-          if (!uploadImage) {
-            config.fieldType = () => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-md border border-destructive bg-destructive/10 p-3 text-sm text-destructive", children: [
-              "File upload requires an ",
-              /* @__PURE__ */ jsxRuntime.jsx("code", { children: "uploadImage" }),
-              " function in CMS overrides."
-            ] });
-          } else {
-            config.fieldType = (props) => /* @__PURE__ */ jsxRuntime.jsx(fileUpload.CMSFileUpload, { ...props, uploadImage });
-          }
-        } else if (BUILTIN_FIELD_TYPES.includes(
-          fieldType
-        )) {
-          config.fieldType = fieldType;
-        } else {
-          console.warn(
-            `CMS: Unknown fieldType "${fieldType}" for field "${key}". Provide a component via fieldComponents override or use a built-in type.`
-          );
-        }
+        baseConfig[key] = {
+          ...baseConfig[key],
+          fieldType: (props) => /* @__PURE__ */ jsxRuntime.jsx(fileUpload.CMSFileUpload, { ...props, uploadImage })
+        };
       }
     }
-    if (Object.keys(config).length > 0) {
-      fieldConfig[key] = config;
-    }
   }
-  return fieldConfig;
+  return baseConfig;
 }
 function findSlugSourceField(jsonSchema) {
   const properties = jsonSchema.properties;
@@ -193,29 +91,16 @@ function ContentForm({
       return {};
     }
   }, [contentType.jsonSchema]);
-  const storedFieldConfig = React.useMemo(() => {
-    if (!contentType.fieldConfig) return void 0;
-    try {
-      return JSON.parse(contentType.fieldConfig);
-    } catch {
-      return void 0;
-    }
-  }, [contentType.fieldConfig]);
   const zodSchema = React.useMemo(() => {
     try {
-      return jsonSchemaToZodWithCoercion(jsonSchema);
+      return utils.fromJSONSchemaWithDates(jsonSchema);
     } catch {
       return z.z.object({});
     }
   }, [jsonSchema]);
   const fieldConfig = React.useMemo(
-    () => buildFieldConfigFromJsonSchema(
-      jsonSchema,
-      storedFieldConfig,
-      uploadImage,
-      fieldComponents
-    ),
-    [jsonSchema, storedFieldConfig, uploadImage, fieldComponents]
+    () => buildFieldConfigFromJsonSchema(jsonSchema, uploadImage, fieldComponents),
+    [jsonSchema, uploadImage, fieldComponents]
   );
   const slugSourceField = React.useMemo(
     () => findSlugSourceField(jsonSchema),
@@ -226,7 +111,7 @@ function ContentForm({
     if (!isEditing && !slugManuallyEdited && slugSourceField) {
       const sourceValue = values[slugSourceField];
       if (typeof sourceValue === "string" && sourceValue.trim()) {
-        setSlug(utils.slugify(sourceValue));
+        setSlug(utils$1.slugify(sourceValue));
       }
     }
   };