add path arg to @@Validate and implement gencode (#1641)

zenstackhq · Aug 12, 2024 · 9017a13 · 9017a13
1 parent 9124d13
commit 9017a13
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 7 deletions.
diff --git a/packages/schema/src/plugins/zod/utils/schema-gen.ts b/packages/schema/src/plugins/zod/utils/schema-gen.ts
@@ -6,6 +6,7 @@ import {
     getAttributeArg,
     getAttributeArgLiteral,
     getLiteral,
+    getLiteralArray,
     isDataModelFieldReference,
     isFromStdlib,
 } from '@zenstackhq/sdk';
@@ -14,6 +15,7 @@ import {
     DataModelField,
     DataModelFieldAttribute,
     isDataModel,
+    isArrayExpr,
     isEnum,
     isInvocationExpr,
     isNumberLiteral,
@@ -221,7 +223,12 @@ export function makeValidationRefinements(model: DataModel) {
             }
 
             const messageArg = getAttributeArgLiteral<string>(attr, 'message');
-            const message = messageArg ? `, { message: ${JSON.stringify(messageArg)} }` : '';
+            const message = messageArg ? `message: ${JSON.stringify(messageArg)},` : '';
+
+            const pathArg = getAttributeArg(attr, 'path');
+            const path = pathArg && isArrayExpr(pathArg) ? `path: ['${getLiteralArray<string>(pathArg)?.join(`', '`)}'],` : '';
+
+            const options = `, { ${message} ${path} }`;
 
             try {
                 let expr = new TypeScriptExpressionTransformer({
@@ -235,7 +242,7 @@ export function makeValidationRefinements(model: DataModel) {
                     expr = `${expr} ?? true`;
                 }
 
-                return `.refine((value: any) => ${expr}${message})`;
+                return `.refine((value: any) => ${expr}${options})`;
             } catch (err) {
                 if (err instanceof TypeScriptExpressionTransformerError) {
                     throw new PluginError(name, err.message);

diff --git a/packages/schema/src/res/stdlib.zmodel b/packages/schema/src/res/stdlib.zmodel
@@ -633,7 +633,7 @@ attribute @lte(_ value: Int, _ message: String?) @@@targetField([IntField, Float
 /**
  * Validates the entity with a complex condition.
  */
-attribute @@validate(_ value: Boolean, _ message: String?) @@@validation
+attribute @@validate(_ value: Boolean, _ message: String?, _ path: String[]?) @@@validation
 
 /**
  * Validates length of a string field.

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/tests/plugins/zod.test.ts b/tests/integration/tests/plugins/zod.test.ts
@@ -458,6 +458,47 @@ describe('Zod plugin tests', () => {
         expect(schema.safeParse({ arr: [1, 2, 3] }).success).toBeTruthy();
     });
 
+    it('refinement with path', async () => {
+        const model = `
+        datasource db {
+            provider = 'postgresql'
+            url = env('DATABASE_URL')
+        }
+        
+        generator js {
+            provider = 'prisma-client-js'
+        }
+
+        plugin zod {
+            provider = "@core/zod"
+        }
+
+        model M {
+            id Int @id @default(autoincrement())
+            arr Int[]
+
+            @@validate(!isEmpty(arr), 'condition1', ['array'])
+            @@validate(has(arr, 1), 'condition2', ['arr'])
+            @@validate(hasEvery(arr, [1, 2]), 'condition3', ['arr', 'every'])
+            @@validate(hasSome(arr, [1, 2]), 'condition4', ['arr', 'some'])
+        }
+        `;
+
+        const { zodSchemas } = await loadSchema(model, { addPrelude: false, pushDb: false });
+
+        const schema = zodSchemas.models.MCreateSchema;
+        expect(schema.safeParse({}).error.issues[0].path).toEqual(['array']);
+        expect(schema.safeParse({ arr: [] }).error.issues[0].path).toEqual(['array']);
+        expect(schema.safeParse({ arr: [3] }).error.issues[0].path).toEqual(['arr']);
+        expect(schema.safeParse({ arr: [3] }).error.issues[1].path).toEqual(['arr', 'every']);
+        expect(schema.safeParse({ arr: [3] }).error.issues[2].path).toEqual(['arr', 'some']);
+        expect(schema.safeParse({ arr: [1] }).error.issues[0].path).toEqual(['arr', 'every']);
+        expect(schema.safeParse({ arr: [4] }).error.issues[0].path).toEqual(['arr']);
+        expect(schema.safeParse({ arr: [4] }).error.issues[1].path).toEqual(['arr', 'every']);
+        expect(schema.safeParse({ arr: [4] }).error.issues[2].path).toEqual(['arr', 'some']);
+        expect(schema.safeParse({ arr: [1, 2, 3] }).success).toBeTruthy();
+    })
+
     it('full-text search', async () => {
         const model = `
         datasource db {