@btst/stack 1.5.1 → 1.6.0

package/dist/node_modules/.pnpm/react-day-picker@9.13.0_react@19.2.0/node_modules/react-day-picker/dist/esm/noonDateLib.mjs

@@ -0,0 +1,160 @@
+import { TZDate } from '../../../../../@date-fns_tz@1.4.1/node_modules/@date-fns/tz/date/index.mjs';
+import '../../../../../@date-fns_tz@1.4.1/node_modules/@date-fns/tz/date/mini.mjs';
+import { differenceInCalendarMonths, differenceInCalendarDays, getISOWeek, getWeek } from 'date-fns';
+
+/**
+ * Creates `dateLib` overrides that keep all calendar math at noon in the target
+ * time zone. This avoids second-level offset changes (e.g., historical zones
+ * with +03:41:12) from pushing dates backward across midnight.
+ */
+function createNoonOverrides(timeZone, options = {}) {
+    const { weekStartsOn, locale } = options;
+    const fallbackWeekStartsOn = (weekStartsOn ??
+        locale?.options?.weekStartsOn ??
+        0);
+    // Keep all internal math anchored at noon in the target zone to avoid
+    // historical second-level offsets from crossing midnight.
+    const toNoonTZDate = (date) => {
+        const normalizedDate = typeof date === "number" || typeof date === "string"
+            ? new Date(date)
+            : date;
+        return new TZDate(normalizedDate.getFullYear(), normalizedDate.getMonth(), normalizedDate.getDate(), 12, 0, 0, timeZone);
+    };
+    // Convert a value into a host `Date` that represents the same calendar day
+    // as the target-zone noon. This is useful for helpers (e.g., date-fns week
+    // utilities) that expect local `Date` instances rather than `TZDate`s.
+    const toCalendarDate = (date) => {
+        const zoned = toNoonTZDate(date);
+        return new Date(zoned.getFullYear(), zoned.getMonth(), zoned.getDate(), 0, 0, 0, 0);
+    };
+    return {
+        today: () => {
+            return toNoonTZDate(TZDate.tz(timeZone));
+        },
+        newDate: (year, monthIndex, date) => {
+            return new TZDate(year, monthIndex, date, 12, 0, 0, timeZone);
+        },
+        startOfDay: (date) => {
+            return toNoonTZDate(date);
+        },
+        startOfWeek: (date, options) => {
+            const base = toNoonTZDate(date);
+            const weekStartsOnValue = (options?.weekStartsOn ??
+                fallbackWeekStartsOn);
+            const diff = (base.getDay() - weekStartsOnValue + 7) % 7;
+            base.setDate(base.getDate() - diff);
+            return base;
+        },
+        startOfISOWeek: (date) => {
+            const base = toNoonTZDate(date);
+            const diff = (base.getDay() - 1 + 7) % 7;
+            base.setDate(base.getDate() - diff);
+            return base;
+        },
+        startOfMonth: (date) => {
+            const base = toNoonTZDate(date);
+            base.setDate(1);
+            return base;
+        },
+        startOfYear: (date) => {
+            const base = toNoonTZDate(date);
+            base.setMonth(0, 1);
+            return base;
+        },
+        endOfWeek: (date, options) => {
+            const base = toNoonTZDate(date);
+            const weekStartsOnValue = (options?.weekStartsOn ??
+                fallbackWeekStartsOn);
+            const endDow = (weekStartsOnValue + 6) % 7;
+            const diff = (endDow - base.getDay() + 7) % 7;
+            base.setDate(base.getDate() + diff);
+            return base;
+        },
+        endOfISOWeek: (date) => {
+            const base = toNoonTZDate(date);
+            const diff = (7 - base.getDay()) % 7;
+            base.setDate(base.getDate() + diff);
+            return base;
+        },
+        endOfMonth: (date) => {
+            const base = toNoonTZDate(date);
+            base.setMonth(base.getMonth() + 1, 0);
+            return base;
+        },
+        endOfYear: (date) => {
+            const base = toNoonTZDate(date);
+            base.setMonth(11, 31);
+            return base;
+        },
+        eachMonthOfInterval: (interval) => {
+            const start = toNoonTZDate(interval.start);
+            const end = toNoonTZDate(interval.end);
+            const result = [];
+            const cursor = new TZDate(start.getFullYear(), start.getMonth(), 1, 12, 0, 0, timeZone);
+            const endKey = end.getFullYear() * 12 + end.getMonth();
+            while (cursor.getFullYear() * 12 + cursor.getMonth() <= endKey) {
+                result.push(new TZDate(cursor, timeZone));
+                cursor.setMonth(cursor.getMonth() + 1, 1);
+            }
+            return result;
+        },
+        // Normalize to noon once before arithmetic (avoid DST/midnight edge cases),
+        // mutate the same TZDate, and return it.
+        addDays: (date, amount) => {
+            const base = toNoonTZDate(date);
+            base.setDate(base.getDate() + amount);
+            return base;
+        },
+        addWeeks: (date, amount) => {
+            const base = toNoonTZDate(date);
+            base.setDate(base.getDate() + amount * 7);
+            return base;
+        },
+        addMonths: (date, amount) => {
+            const base = toNoonTZDate(date);
+            base.setMonth(base.getMonth() + amount);
+            return base;
+        },
+        addYears: (date, amount) => {
+            const base = toNoonTZDate(date);
+            base.setFullYear(base.getFullYear() + amount);
+            return base;
+        },
+        eachYearOfInterval: (interval) => {
+            const start = toNoonTZDate(interval.start);
+            const end = toNoonTZDate(interval.end);
+            const years = [];
+            const cursor = new TZDate(start.getFullYear(), 0, 1, 12, 0, 0, timeZone);
+            while (cursor.getFullYear() <= end.getFullYear()) {
+                years.push(new TZDate(cursor, timeZone));
+                cursor.setFullYear(cursor.getFullYear() + 1, 0, 1);
+            }
+            return years;
+        },
+        getWeek: (date, options) => {
+            const base = toCalendarDate(date);
+            return getWeek(base, {
+                weekStartsOn: options?.weekStartsOn ?? fallbackWeekStartsOn,
+                firstWeekContainsDate: options?.firstWeekContainsDate ??
+                    locale?.options?.firstWeekContainsDate ??
+                    1,
+            });
+        },
+        getISOWeek: (date) => {
+            const base = toCalendarDate(date);
+            return getISOWeek(base);
+        },
+        differenceInCalendarDays: (dateLeft, dateRight) => {
+            const left = toCalendarDate(dateLeft);
+            const right = toCalendarDate(dateRight);
+            return differenceInCalendarDays(left, right);
+        },
+        differenceInCalendarMonths: (dateLeft, dateRight) => {
+            const left = toCalendarDate(dateLeft);
+            const right = toCalendarDate(dateRight);
+            return differenceInCalendarMonths(left, right);
+        },
+    };
+}
+
+export { createNoonOverrides };

package/dist/node_modules/.pnpm/{react-day-picker@9.12.0_react@19.2.0 → react-day-picker@9.13.0_react@19.2.0}/node_modules/react-day-picker/dist/esm/utils/convertMatchersToTimeZone.cjs

@@ -1,17 +1,21 @@
 'use strict';
 
+require('../../../../../../@date-fns_tz@1.4.1/node_modules/@date-fns/tz/date/mini.cjs');
 const toTimeZone = require('./toTimeZone.cjs');
 const typeguards = require('./typeguards.cjs');
 
-function convertMatcher(matcher, timeZone) {
+function toZoneNoon(date, timeZone, noonSafe) {
+    return toTimeZone.toTimeZone(date, timeZone);
+}
+function convertMatcher(matcher, timeZone, noonSafe) {
     if (typeof matcher === "boolean" || typeof matcher === "function") {
         return matcher;
     }
     if (matcher instanceof Date) {
-        return toTimeZone.toTimeZone(matcher, timeZone);
+        return toZoneNoon(matcher, timeZone);
     }
     if (Array.isArray(matcher)) {
-        return matcher.map((value) => value instanceof Date ? toTimeZone.toTimeZone(value, timeZone) : value);
+        return matcher.map((value) => value instanceof Date ? toZoneNoon(value, timeZone) : value);
     }
     if (typeguards.isDateRange(matcher)) {
         return {
@@ -22,18 +26,18 @@ function convertMatcher(matcher, timeZone) {
     }
     if (typeguards.isDateInterval(matcher)) {
         return {
-            before: toTimeZone.toTimeZone(matcher.before, timeZone),
-            after: toTimeZone.toTimeZone(matcher.after, timeZone),
+            before: toZoneNoon(matcher.before, timeZone),
+            after: toZoneNoon(matcher.after, timeZone),
         };
     }
     if (typeguards.isDateAfterType(matcher)) {
         return {
-            after: toTimeZone.toTimeZone(matcher.after, timeZone),
+            after: toZoneNoon(matcher.after, timeZone),
         };
     }
     if (typeguards.isDateBeforeType(matcher)) {
         return {
-            before: toTimeZone.toTimeZone(matcher.before, timeZone),
+            before: toZoneNoon(matcher.before, timeZone),
         };
     }
     return matcher;
@@ -46,7 +50,7 @@ function convertMatcher(matcher, timeZone) {
  * @returns The converted matcher(s).
  * @group Utilities
  */
-function convertMatchersToTimeZone(matchers, timeZone) {
+function convertMatchersToTimeZone(matchers, timeZone, noonSafe) {
     if (!matchers) {
         return matchers;
     }

package/dist/node_modules/.pnpm/{react-day-picker@9.12.0_react@19.2.0 → react-day-picker@9.13.0_react@19.2.0}/node_modules/react-day-picker/dist/esm/utils/convertMatchersToTimeZone.mjs

@@ -1,15 +1,19 @@
+import '../../../../../../@date-fns_tz@1.4.1/node_modules/@date-fns/tz/date/mini.mjs';
 import { toTimeZone } from './toTimeZone.mjs';
 import { isDateRange, isDateInterval, isDateAfterType, isDateBeforeType } from './typeguards.mjs';
 
-function convertMatcher(matcher, timeZone) {
+function toZoneNoon(date, timeZone, noonSafe) {
+    return toTimeZone(date, timeZone);
+}
+function convertMatcher(matcher, timeZone, noonSafe) {
     if (typeof matcher === "boolean" || typeof matcher === "function") {
         return matcher;
     }
     if (matcher instanceof Date) {
-        return toTimeZone(matcher, timeZone);
+        return toZoneNoon(matcher, timeZone);
     }
     if (Array.isArray(matcher)) {
-        return matcher.map((value) => value instanceof Date ? toTimeZone(value, timeZone) : value);
+        return matcher.map((value) => value instanceof Date ? toZoneNoon(value, timeZone) : value);
     }
     if (isDateRange(matcher)) {
         return {
@@ -20,18 +24,18 @@ function convertMatcher(matcher, timeZone) {
     }
     if (isDateInterval(matcher)) {
         return {
-            before: toTimeZone(matcher.before, timeZone),
-            after: toTimeZone(matcher.after, timeZone),
+            before: toZoneNoon(matcher.before, timeZone),
+            after: toZoneNoon(matcher.after, timeZone),
         };
     }
     if (isDateAfterType(matcher)) {
         return {
-            after: toTimeZone(matcher.after, timeZone),
+            after: toZoneNoon(matcher.after, timeZone),
         };
     }
     if (isDateBeforeType(matcher)) {
         return {
-            before: toTimeZone(matcher.before, timeZone),
+            before: toZoneNoon(matcher.before, timeZone),
         };
     }
     return matcher;
@@ -44,7 +48,7 @@ function convertMatcher(matcher, timeZone) {
  * @returns The converted matcher(s).
  * @group Utilities
  */
-function convertMatchersToTimeZone(matchers, timeZone) {
+function convertMatchersToTimeZone(matchers, timeZone, noonSafe) {
     if (!matchers) {
         return matchers;
     }

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

@@ -2,13 +2,40 @@
 
 const api = require('@btst/stack/plugins/api');
 const z = require('zod');
+const schemaConverter = require('../../../../../ui/src/lib/schema-converter.cjs');
 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()
   };
@@ -29,8 +56,7 @@ 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 jsonSchema = JSON.stringify(schemaConverter.zodToFormSchema(ct.schema));
     const existing = await adapter.findOne({
       model: "contentType",
       where: [{ field: "slug", value: ct.slug, operator: "eq" }]
@@ -43,7 +69,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 +84,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()
           }
@@ -79,7 +109,7 @@ async function syncContentTypes(adapter, config) {
 }
 function getContentTypeZodSchema(contentType) {
   const jsonSchema = JSON.parse(contentType.jsonSchema);
-  return z.z.fromJSONSchema(jsonSchema);
+  return schemaConverter.formSchemaToZod(jsonSchema);
 }
 const cmsBackendPlugin = (config) => api.defineBackendPlugin({
   name: "cms",

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

@@ -1,12 +1,39 @@
 import { defineBackendPlugin, createEndpoint } from '@btst/stack/plugins/api';
 import { z } from 'zod';
+import { formSchemaToZod, zodToFormSchema } from '../../../../../ui/src/lib/schema-converter.mjs';
 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()
   };
@@ -27,8 +54,7 @@ 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 jsonSchema = JSON.stringify(zodToFormSchema(ct.schema));
     const existing = await adapter.findOne({
       model: "contentType",
       where: [{ field: "slug", value: ct.slug, operator: "eq" }]
@@ -41,7 +67,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 +82,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()
           }
@@ -77,7 +107,7 @@ async function syncContentTypes(adapter, config) {
 }
 function getContentTypeZodSchema(contentType) {
   const jsonSchema = JSON.parse(contentType.jsonSchema);
-  return z.fromJSONSchema(jsonSchema);
+  return formSchemaToZod(jsonSchema);
 }
 const cmsBackendPlugin = (config) => defineBackendPlugin({
   name: "cms",

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

@@ -5,142 +5,41 @@ 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 steppedAutoForm = require('../../../../../../../ui/src/components/auto-form/stepped-auto-form.cjs');
+const utils = require('../../../../../../../ui/src/components/auto-form/utils.cjs');
+const schemaConverter = require('../../../../../../../ui/src/lib/schema-converter.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();
-        }
+        baseConfig[key] = {
+          ...baseConfig[key],
+          fieldType: (props) => /* @__PURE__ */ jsxRuntime.jsx(fileUpload.CMSFileUpload, { ...props, uploadImage })
+        };
       }
     }
-    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.`
-          );
-        }
-      }
-    }
-    if (Object.keys(config).length > 0) {
-      fieldConfig[key] = config;
-    }
-  }
-  return fieldConfig;
+  return baseConfig;
 }
 function findSlugSourceField(jsonSchema) {
   const properties = jsonSchema.properties;
@@ -193,29 +92,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 schemaConverter.formSchemaToZod(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 +112,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));
       }
     }
   };
@@ -272,25 +158,24 @@ function ContentForm({
       /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground", children: localization.CMS_LABEL_SLUG_DESCRIPTION })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsx(
-      index$1.default,
+      steppedAutoForm.default,
       {
         formSchema: zodSchema,
         values: formData,
         onValuesChange: handleValuesChange,
         onSubmit: handleSubmit,
         fieldConfig,
-        children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 pt-4", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(index$1.AutoFormSubmit, { disabled: isSubmitting, children: isSubmitting ? localization.CMS_STATUS_SAVING : localization.CMS_BUTTON_SAVE }),
-          onCancel && /* @__PURE__ */ jsxRuntime.jsx(
-            "button",
-            {
-              type: "button",
-              onClick: onCancel,
-              className: "px-4 py-2 text-sm text-muted-foreground hover:text-foreground",
-              children: localization.CMS_BUTTON_CANCEL
-            }
-          )
-        ] })
+        isSubmitting,
+        submitButtonText: isSubmitting ? localization.CMS_STATUS_SAVING : localization.CMS_BUTTON_SAVE,
+        children: onCancel && /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            onClick: onCancel,
+            className: "px-4 py-2 text-sm text-muted-foreground hover:text-foreground",
+            children: localization.CMS_BUTTON_CANCEL
+          }
+        )
       }
     )
   ] });