Improve Zod bridge - passing props (#1321)

vazco · May 24, 2024 · 75dbb94 · 75dbb94
1 parent e7d7785
commit 75dbb94
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/packages/uniforms-bridge-zod/__tests__/ZodBridge.ts b/packages/uniforms-bridge-zod/__tests__/ZodBridge.ts
@@ -1,3 +1,4 @@
+import { connectField } from 'uniforms';
 import { ZodBridge } from 'uniforms-bridge-zod';
 import {
   any,
@@ -447,6 +448,29 @@ describe('ZodBridge', () => {
       const bridge = new ZodBridge({ schema });
       expect(bridge.getProps('a')).toEqual({ label: 'A', required: true });
     });
+
+    it('works with uniforms props', () => {
+      const schema = object({ a: string().uniforms({ type: 'password' }) });
+      const bridge = new ZodBridge({ schema });
+      expect(bridge.getProps('a')).toEqual({
+        label: 'A',
+        required: true,
+        type: 'password',
+      });
+    });
+
+    it('works with uniforms props (component)', () => {
+      const field = jest.fn(() => null);
+      const Field = connectField(field);
+
+      const schema = object({ a: string().uniforms(Field) });
+      const bridge = new ZodBridge({ schema });
+      expect(bridge.getProps('a')).toEqual({
+        component: Field,
+        label: 'A',
+        required: true,
+      });
+    });
   });
 
   describe('#getSubfields', () => {

diff --git a/packages/uniforms-bridge-zod/src/ZodBridge.ts b/packages/uniforms-bridge-zod/src/ZodBridge.ts
@@ -155,6 +155,14 @@ export default class ZodBridge<T extends ZodRawShape> extends Bridge {
     };
 
     let field = this.getField(name);
+
+    const uniforms = field._uniforms;
+    if (typeof uniforms === 'function') {
+      props.component = uniforms;
+    } else {
+      Object.assign(props, uniforms);
+    }
+
     if (field instanceof ZodDefault) {
       field = field.removeDefault();
       props.required = false;

diff --git a/packages/uniforms-bridge-zod/src/register.ts b/packages/uniforms-bridge-zod/src/register.ts
@@ -1,4 +1,5 @@
-import { filterDOMProps } from 'uniforms';
+import { ConnectedField, filterDOMProps, UnknownObject } from 'uniforms';
+import { z, ZodTypeAny } from 'zod';
 
 // There's no possibility to retrieve them at runtime.
 declare module 'uniforms' {
@@ -9,3 +10,15 @@ declare module 'uniforms' {
 }
 
 filterDOMProps.register('minCount', 'maxCount');
+
+declare module 'zod' {
+  interface ZodType {
+    uniforms(uniforms: UnknownObject | ConnectedField<any>): ZodTypeAny;
+    _uniforms: UnknownObject | ConnectedField<any>;
+  }
+}
+
+z.ZodType.prototype.uniforms = function extend(uniforms) {
+  this._uniforms = uniforms;
+  return this;
+};