@btst/stack 1.5.1 → 1.5.2

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));
       }
     }
   };

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

@@ -3,7 +3,8 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useEffect, useMemo } from 'react';
 import { z } from 'zod';
 import { toast } from 'sonner';
-import AutoForm, { AutoFormSubmit } from '../../../../../../../ui/src/components/ui/auto-form/index.mjs';
+import AutoForm, { AutoFormSubmit } from '../../../../../../../ui/src/components/auto-form/index.mjs';
+import { fromJSONSchemaWithDates, buildFieldConfigFromJsonSchema as buildFieldConfigFromJsonSchema$1 } from '../../../../../../../ui/src/components/auto-form/utils.mjs';
 import { Input } from '../../../../../../../ui/src/components/input.mjs';
 import { Label } from '../../../../../../../ui/src/components/label.mjs';
 import { Badge } from '../../../../../../../ui/src/components/badge.mjs';
@@ -12,133 +13,30 @@ import { slugify } from '../../../utils.mjs';
 import { CMS_LOCALIZATION } from '../../localization/index.mjs';
 import { CMSFileUpload } from './file-upload.mjs';
 
-function jsonSchemaToZodWithCoercion(jsonSchema) {
-  const shape = {};
-  const properties = jsonSchema.properties || {};
-  const required = jsonSchema.required || [];
+function buildFieldConfigFromJsonSchema(jsonSchema, uploadImage, fieldComponents) {
+  const baseConfig = buildFieldConfigFromJsonSchema$1(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.enum(stringValues);
+    if (prop.fieldType === "file" && !fieldComponents?.["file"]) {
+      if (!uploadImage) {
+        baseConfig[key] = {
+          ...baseConfig[key],
+          fieldType: () => /* @__PURE__ */ jsxs("div", { className: "rounded-md border border-destructive bg-destructive/10 p-3 text-sm text-destructive", children: [
+            "File upload requires an ",
+            /* @__PURE__ */ jsx("code", { children: "uploadImage" }),
+            " function in CMS overrides."
+          ] })
+        };
       } else {
-        fieldSchema = z.string();
-      }
-    } else {
-      switch (typeValue) {
-        case "number":
-        case "integer": {
-          let numSchema = 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.boolean();
-          if (prop.default !== void 0) {
-            fieldSchema = fieldSchema.default(
-              prop.default
-            );
-          }
-          break;
-        }
-        case "string": {
-          if (prop.format === "date" || prop.format === "date-time") {
-            fieldSchema = z.coerce.date();
-          } else {
-            let strSchema = 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.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.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__ */ jsx(CustomComponent, { ...props });
-        } else if (fieldType === "file") {
-          if (!uploadImage) {
-            config.fieldType = () => /* @__PURE__ */ jsxs("div", { className: "rounded-md border border-destructive bg-destructive/10 p-3 text-sm text-destructive", children: [
-              "File upload requires an ",
-              /* @__PURE__ */ jsx("code", { children: "uploadImage" }),
-              " function in CMS overrides."
-            ] });
-          } else {
-            config.fieldType = (props) => /* @__PURE__ */ jsx(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__ */ jsx(CMSFileUpload, { ...props, uploadImage })
+        };
       }
     }
-    if (Object.keys(config).length > 0) {
-      fieldConfig[key] = config;
-    }
   }
-  return fieldConfig;
+  return baseConfig;
 }
 function findSlugSourceField(jsonSchema) {
   const properties = jsonSchema.properties;
@@ -191,29 +89,16 @@ function ContentForm({
       return {};
     }
   }, [contentType.jsonSchema]);
-  const storedFieldConfig = useMemo(() => {
-    if (!contentType.fieldConfig) return void 0;
-    try {
-      return JSON.parse(contentType.fieldConfig);
-    } catch {
-      return void 0;
-    }
-  }, [contentType.fieldConfig]);
   const zodSchema = useMemo(() => {
     try {
-      return jsonSchemaToZodWithCoercion(jsonSchema);
+      return fromJSONSchemaWithDates(jsonSchema);
     } catch {
       return z.object({});
     }
   }, [jsonSchema]);
   const fieldConfig = useMemo(
-    () => buildFieldConfigFromJsonSchema(
-      jsonSchema,
-      storedFieldConfig,
-      uploadImage,
-      fieldComponents
-    ),
-    [jsonSchema, storedFieldConfig, uploadImage, fieldComponents]
+    () => buildFieldConfigFromJsonSchema(jsonSchema, uploadImage, fieldComponents),
+    [jsonSchema, uploadImage, fieldComponents]
   );
   const slugSourceField = useMemo(
     () => findSlugSourceField(jsonSchema),

package/dist/packages/better-stack/src/plugins/cms/client/components/forms/file-upload.cjs

@@ -8,8 +8,8 @@ const input = require('../../../../../../../ui/src/components/input.cjs');
 const button = require('../../../../../../../ui/src/components/button.cjs');
 const form = require('../../../../../../../ui/src/components/form.cjs');
 const lucideReact = require('lucide-react');
-const label = require('../../../../../../../ui/src/components/ui/auto-form/common/label.cjs');
-const tooltip = require('../../../../../../../ui/src/components/ui/auto-form/common/tooltip.cjs');
+const label = require('../../../../../../../ui/src/components/auto-form/common/label.cjs');
+const tooltip = require('../../../../../../../ui/src/components/auto-form/common/tooltip.cjs');
 
 function CMSFileUpload({
   label: label$1,

package/dist/packages/better-stack/src/plugins/cms/client/components/forms/file-upload.mjs

@@ -6,8 +6,8 @@ import { Input } from '../../../../../../../ui/src/components/input.mjs';
 import { Button } from '../../../../../../../ui/src/components/button.mjs';
 import { FormItem, FormControl, FormMessage } from '../../../../../../../ui/src/components/form.mjs';
 import { Loader2, Trash2 } from 'lucide-react';
-import AutoFormLabel from '../../../../../../../ui/src/components/ui/auto-form/common/label.mjs';
-import AutoFormTooltip from '../../../../../../../ui/src/components/ui/auto-form/common/tooltip.mjs';
+import AutoFormLabel from '../../../../../../../ui/src/components/auto-form/common/label.mjs';
+import AutoFormTooltip from '../../../../../../../ui/src/components/auto-form/common/tooltip.mjs';
 
 function CMSFileUpload({
   label,

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');