Merge remote-tracking branch 'origin/dev' into v2

zenstackhq · Apr 6, 2024 · 17c5e5a · 17c5e5a
2 parents c78aee2 + 7d2114f
commit 17c5e5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/packages/schema/src/plugins/zod/utils/schema-gen.ts b/packages/schema/src/plugins/zod/utils/schema-gen.ts
@@ -100,6 +100,10 @@ export function makeFieldSchema(field: DataModelField, respectDefault = false) {
                 schema += `.toUpperCase()`;
                 break;
             }
+            case '@db.Uuid': {
+                schema += `.uuid()`;
+                break;
+            }
             case '@datetime': {
                 schema += `.datetime({ offset: true${message ? ', message: ' + JSON.stringify(message) : ''} })`;
                 break;

diff --git a/tests/integration/tests/plugins/zod.test.ts b/tests/integration/tests/plugins/zod.test.ts
@@ -2,6 +2,7 @@
 /// <reference types="@types/jest" />
 
 import { loadSchema } from '@zenstackhq/testtools';
+import { randomUUID } from 'crypto';
 import fs from 'fs';
 import path from 'path';
 
@@ -287,6 +288,7 @@ describe('Zod plugin tests', () => {
             o Int? @lt(1, 'must be less than 1')
             p Int? @lte(1, 'must be less than or equal to 1')
             q Int[]
+            r String? @db.Uuid
         }
         `;
 
@@ -347,6 +349,9 @@ describe('Zod plugin tests', () => {
 
         expect(schema.safeParse({ q: [1] }).success).toBeTruthy();
         expect(schema.safeParse({ q: ['abc'] }).success).toBeFalsy();
+
+        expect(schema.safeParse({ r: 'abc' }).success).toBeFalsy();
+        expect(schema.safeParse({ r: randomUUID() }).success).toBeTruthy();
     });
 
     it('refinement scalar fields', async () => {