feat(json-api-nestjs): bump zod to v4

Author: klerick

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/pipes/input-operation.pipe.ts

@@ -5,7 +5,6 @@ import {
   PipeTransform,
 } from '@nestjs/common';
 import { KEY_MAIN_INPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
-import { errorMap } from 'zod-validation-error';
 import { ZodError } from 'zod';
 import { JSONValue } from '../../mixin/types';
 import { InputArray, ZodInputOperation } from '../utils';
@@ -19,9 +18,7 @@ export class InputOperationPipe
 
   transform(value: JSONValue): InputArray {
     try {
-      return this.zodInputOperation.parse(value, {
-        errorMap: errorMap,
-      })[KEY_MAIN_INPUT_SCHEMA];
+      return this.zodInputOperation.parse(value)[KEY_MAIN_INPUT_SCHEMA];
     } catch (e) {
       if (e instanceof ZodError) {
         throw new BadRequestException(e.issues);

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/service/swagger.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { ApiBody, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { generateSchema } from '@anatine/zod-openapi';
+import { z } from 'zod';
 import {
   ReferenceObject,
   SchemaObject,
@@ -34,7 +34,7 @@ export class SwaggerService implements OnModuleInit {
 
     ApiBody({
       description: `Json api schema for new atomic operatiom`,
-      schema: generateSchema(this.typeZodInputOperation) as
+      schema: z.toJSONSchema(this.typeZodInputOperation) as
         | SchemaObject
         | ReferenceObject,
       required: true,

libs/json-api/json-api-nestjs/src/lib/modules/atomic-operation/utils/zod/zod-helper.ts

@@ -14,7 +14,6 @@ import {
   ZodObject,
   ZodOptional,
   ZodString,
-  ZodType,
   ZodUnion,
 } from 'zod';
 import { kebabCase } from 'change-case-commonjs';
@@ -24,15 +23,8 @@ import { MapController } from '../../types';
 import { UnionToTuple } from '../../../../types';
 import { EntityParamMap } from '../../../mixin/types';
 
-const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
-type Literal = z.infer<typeof literalSchema>;
-type Json = Literal | { [key: string]: Json } | Json[];
 
-const jsonSchema: ZodType<Json> = z.lazy(() =>
-  z.union([literalSchema, z.array(jsonSchema), z.record(jsonSchema)])
-);
-
-const zodGeneralData = jsonSchema.nullable();
+const zodGeneralData = z.json().nullable();
 type ZodGeneral = typeof zodGeneralData;
 
 export type ZodAdd<T extends string> = ReturnType<typeof zodAdd<T>>;
@@ -117,8 +109,7 @@ export type ZodInputArray = ZodArray<
       tmpId: ZodOptional<ZodUnion<[ZodNumber, ZodString]>>;
     }>;
     data: ZodOptional<ZodGeneral>;
-  }>,
-  'atleastone'
+  }>
 >;
 
 export type ZodInputOperation<E extends object> = ReturnType<
@@ -159,13 +150,13 @@ export function zodInputOperation<E extends object>(
     if (hasOwnProperty('deleteOne')) {
       array.push(zodRemove(typeName));
     }
-    if (hasOwnProperty('postRelationship')) {
+    if (hasOwnProperty('postRelationship') && relations.length > 0) {
       array.push(zodOperationRel(typeName, relations, Operation.add));
     }
-    if (hasOwnProperty('deleteRelationship')) {
+    if (hasOwnProperty('deleteRelationship') && relations.length > 0) {
       array.push(zodOperationRel(typeName, relations, Operation.remove));
     }
-    if (hasOwnProperty('patchRelationship')) {
+    if (hasOwnProperty('patchRelationship') && relations.length > 0) {
       array.push(zodOperationRel(typeName, relations, Operation.update));
     }
   }

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/patch-input/patch-input.pipe.spec.ts

@@ -42,9 +42,7 @@ describe('PostInputPipe', () => {
       .mockReturnValue({ data: expectedData } as any);
 
     expect(pipe.transform(input)).toEqual(expectedData);
-    expect(mockSchema.parse).toHaveBeenCalledWith(input, {
-      errorMap: expect.any(Function),
-    });
+    expect(mockSchema.parse).toHaveBeenCalledWith(input);
   });
 
   it('should throw BadRequestException if ZodError occurs', () => {

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/patch-input/patch-input.pipe.ts

@@ -5,7 +5,6 @@ import {
   PipeTransform,
 } from '@nestjs/common';
 import { ZodError } from 'zod';
-import { errorMap } from 'zod-validation-error';
 
 import { JSONValue } from '../../types';
 import { PatchData, ZodPatch } from '../../zod';
@@ -18,9 +17,7 @@ export class PatchInputPipe<E extends object>
   private zodInputPatchSchema!: ZodPatch<E, 'id'>;
   transform(value: JSONValue): PatchData<E, 'id'> {
     try {
-      return this.zodInputPatchSchema.parse(value, {
-        errorMap: errorMap,
-      })['data'] as PatchData<E, 'id'>;
+      return this.zodInputPatchSchema.parse(value)['data'] as PatchData<E, 'id'>;
     } catch (e) {
       if (e instanceof ZodError) {
         throw new BadRequestException(e.issues);

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/patch-relationship/patch-relationship.pipe.ts

@@ -5,7 +5,6 @@ import {
   PipeTransform,
 } from '@nestjs/common';
 import { ZodError } from 'zod';
-import { errorMap } from 'zod-validation-error';
 
 import { JSONValue } from '../../types';
 import { PatchRelationshipData, ZodPatchRelationship } from '../../zod';
@@ -18,9 +17,7 @@ export class PatchRelationshipPipe
   private zodInputPatchRelationshipSchema!: ZodPatchRelationship;
   transform(value: JSONValue): PatchRelationshipData {
     try {
-      return this.zodInputPatchRelationshipSchema.parse(value, {
-        errorMap: errorMap,
-      })['data'];
+      return this.zodInputPatchRelationshipSchema.parse(value)['data'];
     } catch (e) {
       if (e instanceof ZodError) {
         throw new BadRequestException(e.issues);

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/post-input/post-input.pipe.spec.ts

@@ -41,9 +41,7 @@ describe('PostInputPipe', () => {
       .mockReturnValue({ data: expectedData } as any);
 
     expect(pipe.transform(input)).toEqual(expectedData);
-    expect(mockSchema.parse).toHaveBeenCalledWith(input, {
-      errorMap: expect.any(Function),
-    });
+    expect(mockSchema.parse).toHaveBeenCalledWith(input);
   });
 
   it('should throw BadRequestException if ZodError occurs', () => {

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/post-input/post-input.pipe.ts

@@ -5,7 +5,6 @@ import {
   PipeTransform,
 } from '@nestjs/common';
 import { ZodError } from 'zod';
-import { errorMap } from 'zod-validation-error';
 
 import { PostData, ZodPost } from '../../zod';
 import { ZOD_POST_SCHEMA } from '../../../../constants';
@@ -17,9 +16,7 @@ export class PostInputPipe<E extends object>
   @Inject(ZOD_POST_SCHEMA) private zodInputPostSchema!: ZodPost<E, 'id'>;
   transform(value: JSONValue): PostData<E, 'id'> {
     try {
-      return this.zodInputPostSchema.parse(value, {
-        errorMap: errorMap,
-      })['data'] as PostData<E, 'id'>;
+      return this.zodInputPostSchema.parse(value)['data'] as PostData<E, 'id'>;
     } catch (e) {
       if (e instanceof ZodError) {
         throw new BadRequestException(e.issues);

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/post-relationship/post-relationship.pipe.ts

@@ -5,7 +5,6 @@ import {
   PipeTransform,
 } from '@nestjs/common';
 import { ZodError } from 'zod';
-import { errorMap } from 'zod-validation-error';
 
 import { JSONValue } from '../../types';
 import { PostRelationshipData, ZodPostRelationship } from '../../zod';
@@ -18,9 +17,7 @@ export class PostRelationshipPipe
   private zodInputPostRelationshipSchema!: ZodPostRelationship;
   transform(value: JSONValue): PostRelationshipData {
     try {
-      return this.zodInputPostRelationshipSchema.parse(value, {
-        errorMap: errorMap,
-      })['data'];
+      return this.zodInputPostRelationshipSchema.parse(value)['data'];
     } catch (e) {
       if (e instanceof ZodError) {
         throw new BadRequestException(e.issues);

libs/json-api/json-api-nestjs/src/lib/modules/mixin/pipe/query-filed-on-include/query-filed-in-include.pipe.ts

@@ -34,8 +34,7 @@ export class QueryFiledInIncludePipe<E extends object>
     }
 
     if (fields) {
-      const { target: targetResourceFields, ...relationFields } = fields;
-      const selectRelationFields = ObjectTyped.keys(relationFields);
+      const selectRelationFields = ObjectTyped.keys(fields).filter( (key) => key !== 'target');
       const fieldsErrors = selectRelationFields
         .filter((i) => !includeSet.has(i.toString()))
         .map<ValidateQueryError>((i) => ({
@@ -48,8 +47,7 @@ export class QueryFiledInIncludePipe<E extends object>
     }
 
     if (sort) {
-      const { target: targetResourceSorts, ...relationSorts } = sort;
-      const selectRelationFields = ObjectTyped.keys(relationSorts);
+      const selectRelationFields = ObjectTyped.keys(sort).filter( (key) => key !== 'target');
       const fieldsErrors = selectRelationFields
         .filter((i) => !includeSet.has(i.toString()))
         .map<ValidateQueryError>((i) => ({