fix: valibot intersections (#5014)

* fix: valibot intersections

* Create famous-wombats-tan.md

Author: jack-allocate

.changeset/famous-wombats-tan.md

@@ -0,0 +1,5 @@
+---
+"@vee-validate/valibot": patch
+---
+
+fix: valibot intersections

packages/valibot/src/index.ts

@@ -25,6 +25,8 @@ import {
   LooseObjectSchema,
   getDotPath,
   Config,
+  IntersectSchema,
+  IntersectIssue,
 } from 'valibot';
 import { isIndex, isObject, merge, normalizeFormPath } from '../../shared';
 
@@ -134,6 +136,10 @@ function getSchemaForPath(
   path: string,
   schema: BaseSchema<unknown, unknown, BaseIssue<unknown>> | BaseSchemaAsync<unknown, unknown, BaseIssue<unknown>>,
 ): BaseSchema<unknown, unknown, BaseIssue<unknown>> | null {
+  if (isIntersectSchema(schema)) {
+    return schema.options.map(o => getSchemaForPath(path, o)).find(Boolean) ?? null;
+  }
+
   if (!isObjectSchema(schema)) {
     return null;
   }
@@ -151,6 +157,10 @@ function getSchemaForPath(
       return currentSchema;
     }
 
+    if (isIntersectSchema(currentSchema)) {
+      currentSchema = currentSchema.options.find(o => isObjectSchema(o) && o.entries[p]) ?? currentSchema;
+    }
+
     if (isObjectSchema(currentSchema)) {
       currentSchema = currentSchema.entries[p] || null;
       continue;
@@ -189,3 +199,12 @@ function isObjectSchema(
   | StrictObjectSchema<ObjectEntries, ErrorMessage<StrictObjectIssue> | undefined> {
   return isObject(schema) && 'entries' in schema;
 }
+
+function isIntersectSchema(
+  schema: BaseSchema<unknown, unknown, BaseIssue<unknown>> | BaseSchemaAsync<unknown, unknown, BaseIssue<unknown>>,
+): schema is IntersectSchema<
+  BaseSchema<unknown, unknown, BaseIssue<unknown>>[],
+  ErrorMessage<IntersectIssue> | undefined
+> {
+  return schema.type === 'intersect';
+}

packages/valibot/tests/valibot.spec.ts

@@ -568,6 +568,94 @@ test('reports required state for field-level schemas without a form context', as
   );
 });
 
+test('reports required state for schema intersections', async () => {
+  const metaSpy = vi.fn();
+  mountWithHoc({
+    setup() {
+      const schema = toTypedSchema(
+        v.intersect([
+          v.object({
+            req: v.string(),
+          }),
+          v.object({
+            nreq: v.optional(v.string()),
+          }),
+        ]),
+      );
+
+      useForm({
+        validationSchema: schema,
+      });
+
+      const { meta: req } = useField('req');
+      const { meta: nreq } = useField('nreq');
+
+      metaSpy({
+        req: req.required,
+        nreq: nreq.required,
+      });
+
+      return {
+        schema,
+      };
+    },
+    template: `<div></div>`,
+  });
+
+  await flushPromises();
+  await expect(metaSpy).toHaveBeenLastCalledWith(
+    expect.objectContaining({
+      req: true,
+      nreq: false,
+    }),
+  );
+});
+
+test('reports required state for schema intersections with nested fields', async () => {
+  const metaSpy = vi.fn();
+  mountWithHoc({
+    setup() {
+      const schema = toTypedSchema(
+        v.object({
+          fields: v.intersect([
+            v.object({
+              req: v.string(),
+            }),
+            v.object({
+              nreq: v.optional(v.string()),
+            }),
+          ]),
+        }),
+      );
+
+      useForm({
+        validationSchema: schema,
+      });
+
+      const { meta: req } = useField('fields.req');
+      const { meta: nreq } = useField('fields.nreq');
+
+      metaSpy({
+        req: req.required,
+        nreq: nreq.required,
+      });
+
+      return {
+        schema,
+      };
+    },
+    template: `<div></div>`,
+  });
+
+  await flushPromises();
+  await expect(metaSpy).toHaveBeenLastCalledWith(
+    expect.objectContaining({
+      req: true,
+      nreq: false,
+    }),
+  );
+});
+
 test('allows passing valibot config', async () => {
   let errors!: Ref<string[]>;
   const wrapper = mountWithHoc({