@uniform-ts/core 0.0.1 → 0.0.3

package/dist/index.mjs

@@ -61,25 +61,30 @@ function introspectSchema(schema, name = "", parentPath = "") {
   let maxItems;
   try {
     if (kind === "string") {
-      type = "string";
-      const defFormat = def.format;
-      if (defFormat === "email") {
-        mergedMeta["inputType"] = "email";
-      } else if (defFormat === "url") {
-        mergedMeta["inputType"] = "url";
-      } else if (defFormat === "uuid") {
-        mergedMeta["inputType"] = "uuid";
+      if (mergedMeta.component === "select" && Array.isArray(mergedMeta.options) && mergedMeta.options.length > 0) {
+        type = "select";
+        options = mergedMeta.options;
       } else {
-        const checks = def.checks ?? [];
-        const hasFormat = (fmt) => checks.some(
-          (c) => c._zod.def.check === "string_format" && c._zod.def.format === fmt
-        );
-        if (hasFormat("email")) {
+        type = "string";
+        const defFormat = def.format;
+        if (defFormat === "email") {
           mergedMeta["inputType"] = "email";
-        } else if (hasFormat("url")) {
+        } else if (defFormat === "url") {
           mergedMeta["inputType"] = "url";
-        } else if (hasFormat("uuid")) {
+        } else if (defFormat === "uuid") {
           mergedMeta["inputType"] = "uuid";
+        } else {
+          const checks = def.checks ?? [];
+          const hasFormat = (fmt) => checks.some(
+            (c) => c._zod.def.check === "string_format" && c._zod.def.format === fmt
+          );
+          if (hasFormat("email")) {
+            mergedMeta["inputType"] = "email";
+          } else if (hasFormat("url")) {
+            mergedMeta["inputType"] = "url";
+          } else if (hasFormat("uuid")) {
+            mergedMeta["inputType"] = "uuid";
+          }
         }
       }
     } else if (kind === "number") {
@@ -116,15 +121,24 @@ function introspectSchema(schema, name = "", parentPath = "") {
         }
       }
     } else if (def.type === "union") {
-      type = "union";
       const unionDef = def;
+      const variants = unionDef.options;
       if ("discriminator" in unionDef) {
+        type = "union";
         discriminatorKey = unionDef.discriminator;
+        unionVariants = variants.map(
+          (variant, i) => introspectSchema(variant, String(i), path)
+        );
+      } else {
+        const collapsed = introspectSchema(variants[0], name, parentPath);
+        return {
+          ...collapsed,
+          name: path,
+          label,
+          meta: { ...collapsed.meta, ...mergedMeta },
+          schema: inner
+        };
       }
-      const variants = unionDef.options;
-      unionVariants = variants.map(
-        (variant, i) => introspectSchema(variant, String(i), path)
-      );
     }
   } catch {
     type = "unknown";
@@ -135,6 +149,7 @@ function introspectSchema(schema, name = "", parentPath = "") {
     label,
     required,
     meta: mergedMeta,
+    schema: inner,
     ...options !== void 0 && { options },
     ...children !== void 0 && { children },
     ...itemConfig !== void 0 && { itemConfig },
@@ -173,6 +188,7 @@ function parseDiscriminatedUnionMeta(schema) {
     label: deriveLabel(discriminatorKey),
     required: true,
     meta: {},
+    schema,
     options: discriminatorOptions
   };
   return {
@@ -360,9 +376,10 @@ function DefaultFormWrapper({ children }) {
 }
 function DefaultSectionWrapper({
   children,
-  title
+  title,
+  className
 }) {
-  return /* @__PURE__ */ jsxs("fieldset", { children: [
+  return /* @__PURE__ */ jsxs("fieldset", { className, children: [
     /* @__PURE__ */ jsx("legend", { children: title }),
     children
   ] });
@@ -473,7 +490,7 @@ function ScalarField({
           onChange: (value) => {
             const coerced = coerceValue(field.type, value, coercions);
             rhfField.onChange(coerced);
-            field.meta.onChange?.(coerced, formMethods);
+            void field.meta.onChange?.(coerced, formMethods);
           },
           onBlur: rhfField.onBlur,
           ref: rhfField.ref,
@@ -483,7 +500,9 @@ function ScalarField({
           error: fieldState.error?.message,
           required: field.required,
           disabled: field.meta.disabled || contextDisabled,
-          meta: field.meta
+          options: field.meta.options,
+          meta: field.meta,
+          schema: field.schema
         }
       )
     }
@@ -515,7 +534,7 @@ function BooleanField({
           value: rhfField.value ?? false,
           onChange: (value) => {
             rhfField.onChange(value);
-            field.meta.onChange?.(value, formMethods);
+            void field.meta.onChange?.(value, formMethods);
           },
           onBlur: rhfField.onBlur,
           ref: rhfField.ref,
@@ -525,7 +544,8 @@ function BooleanField({
           error: fieldState.error?.message,
           required: field.required,
           disabled: field.meta.disabled || rhfField.disabled || contextDisabled,
-          meta: field.meta
+          meta: field.meta,
+          schema: field.schema
         }
       )
     }
@@ -557,7 +577,7 @@ function SelectField({
           value: rhfField.value ?? "",
           onChange: (value) => {
             rhfField.onChange(value);
-            field.meta.onChange?.(value, formMethods);
+            void field.meta.onChange?.(value, formMethods);
           },
           onBlur: rhfField.onBlur,
           ref: rhfField.ref,
@@ -568,7 +588,8 @@ function SelectField({
           required: field.required,
           disabled: field.meta.disabled || contextDisabled,
           options: field.options,
-          meta: field.meta
+          meta: field.meta,
+          schema: field.schema
         }
       )
     }
@@ -1483,7 +1504,17 @@ function AutoForm(props) {
           if (section.title === null) {
             return /* @__PURE__ */ jsx(React3.Fragment, { children: renderedFields }, "__ungrouped");
           }
-          return /* @__PURE__ */ jsx(SectionWrapper, { title: section.title, children: renderedFields }, section.title);
+          const sectionConfig = layout?.sections?.[section.title];
+          const PerSectionWrapper = sectionConfig?.component ?? SectionWrapper;
+          return /* @__PURE__ */ jsx(
+            PerSectionWrapper,
+            {
+              title: section.title,
+              className: sectionConfig?.className,
+              children: renderedFields
+            },
+            section.title
+          );
         }),
         /* @__PURE__ */ jsx(
           SubmitButton,
@@ -1503,7 +1534,11 @@ function createAutoForm(config) {
       [props.components]
     );
     const mergedLayout = React3.useMemo(
-      () => ({ ...config.layout, ...props.layout }),
+      () => ({
+        ...config.layout,
+        ...props.layout,
+        sections: config.layout?.sections || props.layout?.sections ? { ...config.layout?.sections, ...props.layout?.sections } : void 0
+      }),
       [props.layout]
     );
     const mergedClassNames = React3.useMemo(