@btst/stack 1.5.1 → 1.5.2

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/DayPicker.cjs

@@ -13,6 +13,7 @@ const getMonthOptions = require('./helpers/getMonthOptions.cjs');
 const getStyleForModifiers = require('./helpers/getStyleForModifiers.cjs');
 const getWeekdays = require('./helpers/getWeekdays.cjs');
 const getYearOptions = require('./helpers/getYearOptions.cjs');
+const noonDateLib = require('./noonDateLib.cjs');
 const UI = require('./UI.cjs');
 const useAnimation = require('./useAnimation.cjs');
 const useCalendar = require('./useCalendar.cjs');
@@ -92,15 +93,25 @@ function DayPicker(initialProps) {
     }
     const { components, formatters, labels, dateLib, locale, classNames } = React.useMemo(() => {
         const locale = { ...enUS.enUS, ...props.locale };
+        const weekStartsOn = props.broadcastCalendar ? 1 : props.weekStartsOn;
+        const noonOverrides = props.noonSafe && props.timeZone
+            ? noonDateLib.createNoonOverrides(props.timeZone, {
+                weekStartsOn,
+                locale,
+            })
+            : undefined;
+        const overrides = props.dateLib && noonOverrides
+            ? { ...noonOverrides, ...props.dateLib }
+            : (props.dateLib ?? noonOverrides);
         const dateLib = new DateLib.DateLib({
             locale,
-            weekStartsOn: props.broadcastCalendar ? 1 : props.weekStartsOn,
+            weekStartsOn,
             firstWeekContainsDate: props.firstWeekContainsDate,
             useAdditionalWeekYearTokens: props.useAdditionalWeekYearTokens,
             useAdditionalDayOfYearTokens: props.useAdditionalDayOfYearTokens,
             timeZone: props.timeZone,
             numerals: props.numerals,
-        }, props.dateLib);
+        }, overrides);
         return {
             dateLib,
             components: getComponents.getComponents(props.components),
@@ -119,6 +130,7 @@ function DayPicker(initialProps) {
         props.timeZone,
         props.numerals,
         props.dateLib,
+        props.noonSafe,
         props.components,
         props.formatters,
         props.labels,

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/DayPicker.mjs

@@ -11,6 +11,7 @@ import { getMonthOptions } from './helpers/getMonthOptions.mjs';
 import { getStyleForModifiers } from './helpers/getStyleForModifiers.mjs';
 import { getWeekdays } from './helpers/getWeekdays.mjs';
 import { getYearOptions } from './helpers/getYearOptions.mjs';
+import { createNoonOverrides } from './noonDateLib.mjs';
 import { UI, DayFlag, SelectionState } from './UI.mjs';
 import { useAnimation } from './useAnimation.mjs';
 import { useCalendar } from './useCalendar.mjs';
@@ -86,15 +87,25 @@ function DayPicker(initialProps) {
     }
     const { components, formatters, labels, dateLib, locale, classNames } = useMemo(() => {
         const locale = { ...enUS, ...props.locale };
+        const weekStartsOn = props.broadcastCalendar ? 1 : props.weekStartsOn;
+        const noonOverrides = props.noonSafe && props.timeZone
+            ? createNoonOverrides(props.timeZone, {
+                weekStartsOn,
+                locale,
+            })
+            : undefined;
+        const overrides = props.dateLib && noonOverrides
+            ? { ...noonOverrides, ...props.dateLib }
+            : (props.dateLib ?? noonOverrides);
         const dateLib = new DateLib({
             locale,
-            weekStartsOn: props.broadcastCalendar ? 1 : props.weekStartsOn,
+            weekStartsOn,
             firstWeekContainsDate: props.firstWeekContainsDate,
             useAdditionalWeekYearTokens: props.useAdditionalWeekYearTokens,
             useAdditionalDayOfYearTokens: props.useAdditionalDayOfYearTokens,
             timeZone: props.timeZone,
             numerals: props.numerals,
-        }, props.dateLib);
+        }, overrides);
         return {
             dateLib,
             components: getComponents(props.components),
@@ -113,6 +124,7 @@ function DayPicker(initialProps) {
         props.timeZone,
         props.numerals,
         props.dateLib,
+        props.noonSafe,
         props.components,
         props.formatters,
         props.labels,

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

@@ -0,0 +1,162 @@
+'use strict';
+
+const index = require('../../../../../@date-fns_tz@1.4.1/node_modules/@date-fns/tz/date/index.cjs');
+require('../../../../../@date-fns_tz@1.4.1/node_modules/@date-fns/tz/date/mini.cjs');
+const dateFns = require('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 index.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(index.TZDate.tz(timeZone));
+        },
+        newDate: (year, monthIndex, date) => {
+            return new index.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 index.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 index.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 index.TZDate(start.getFullYear(), 0, 1, 12, 0, 0, timeZone);
+            while (cursor.getFullYear() <= end.getFullYear()) {
+                years.push(new index.TZDate(cursor, timeZone));
+                cursor.setFullYear(cursor.getFullYear() + 1, 0, 1);
+            }
+            return years;
+        },
+        getWeek: (date, options) => {
+            const base = toCalendarDate(date);
+            return dateFns.getWeek(base, {
+                weekStartsOn: options?.weekStartsOn ?? fallbackWeekStartsOn,
+                firstWeekContainsDate: options?.firstWeekContainsDate ??
+                    locale?.options?.firstWeekContainsDate ??
+                    1,
+            });
+        },
+        getISOWeek: (date) => {
+            const base = toCalendarDate(date);
+            return dateFns.getISOWeek(base);
+        },
+        differenceInCalendarDays: (dateLeft, dateRight) => {
+            const left = toCalendarDate(dateLeft);
+            const right = toCalendarDate(dateRight);
+            return dateFns.differenceInCalendarDays(left, right);
+        },
+        differenceInCalendarMonths: (dateLeft, dateRight) => {
+            const left = toCalendarDate(dateLeft);
+            const right = toCalendarDate(dateRight);
+            return dateFns.differenceInCalendarMonths(left, right);
+        },
+    };
+}
+
+exports.createNoonOverrides = createNoonOverrides;

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

@@ -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()
           }