@klerick/json-api-nestjs 10.0.0-beta.5 → 10.0.0-beta.7

package/src/lib/modules/mixin/zod/zod-input-query-schema/index.js

@@ -1,22 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.zodFieldsInputQuery = void 0;
 exports.zodInputQuery = zodInputQuery;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const zod_1 = require("zod");
 const fields_1 = require("./fields");
+Object.defineProperty(exports, "zodFieldsInputQuery", { enumerable: true, get: function () { return fields_1.zodFieldsInputQuery; } });
 const filter_1 = require("./filter");
 const include_1 = require("./include");
 const sort_1 = require("./sort");
 const zod_share_1 = require("../zod-share");
 function zodInputQuery(entityParamMapService) {
     return zod_1.z
-        .object({
+        .strictObject({
         [json_api_nestjs_shared_1.QueryField.fields]: (0, fields_1.zodFieldsInputQuery)(entityParamMapService),
         [json_api_nestjs_shared_1.QueryField.filter]: (0, filter_1.zodFilterInputQuery)(entityParamMapService),
         [json_api_nestjs_shared_1.QueryField.include]: (0, include_1.zodIncludeInputQuery)(),
         [json_api_nestjs_shared_1.QueryField.sort]: (0, sort_1.zodSortInputQuery)(),
         [json_api_nestjs_shared_1.QueryField.page]: (0, zod_share_1.zodPageInputQuery)(),
-    })
-        .strict(`Query object should contain only allow params: "${Object.keys(json_api_nestjs_shared_1.QueryField).join('"."')}"`);
+    }, {
+        error: (err) => err.code === 'unrecognized_keys' ? `Query object should contain only allow params: "${Object.keys(json_api_nestjs_shared_1.QueryField).join('"."')}"` : err.message,
+    });
 }
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-input-query-schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/index.ts"],"names":[],"mappings":";;AAUA,sCAgBC;AA1BD,4EAA6D;AAC7D,6BAAwB;AAGxB,qCAA+C;AAC/C,qCAA+C;AAC/C,uCAAiD;AACjD,iCAA2C;AAC3C,4CAAiD;AAEjD,SAAgB,aAAa,CAC3B,qBAAsD;IAEtD,OAAO,OAAC;SACL,MAAM,CAAC;QACN,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,4BAAmB,EAAW,qBAAqB,CAAC;QACzE,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,4BAAmB,EAAW,qBAAqB,CAAC;QACzE,CAAC,mCAAU,CAAC,OAAO,CAAC,EAAE,IAAA,8BAAoB,GAAE;QAC5C,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,wBAAiB,GAAE;QACtC,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,6BAAiB,GAAE;KACvC,CAAC;SACD,MAAM,CACL,mDAAmD,MAAM,CAAC,IAAI,CAC5D,mCAAU,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CACjB,CAAC;AACN,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/index.ts"],"names":[],"mappings":";;;AAYA,sCAeC;AA3BD,4EAA6D;AAC7D,6BAAwB;AAGxB,qCAA+C;AAMvC,oGANC,4BAAmB,OAMD;AAL3B,qCAA+C;AAC/C,uCAAiD;AACjD,iCAA2C;AAC3C,4CAAiD;AAIjD,SAAgB,aAAa,CAC3B,qBAAsD;IAEtD,OAAO,OAAC;SACL,YAAY,CAAC;QACZ,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,4BAAmB,EAAW,qBAAqB,CAAC;QACzE,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,4BAAmB,EAAW,qBAAqB,CAAC;QACzE,CAAC,mCAAU,CAAC,OAAO,CAAC,EAAE,IAAA,8BAAoB,GAAE;QAC5C,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,wBAAiB,GAAE;QACtC,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,6BAAiB,GAAE;KACvC,EAAE;QACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,mDAAmD,MAAM,CAAC,IAAI,CAC/G,mCAAU,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO;KAC/B,CAAC,CAAC;AACP,CAAC"}

package/src/lib/modules/mixin/zod/zod-input-query-schema/sort.d.ts

@@ -1,3 +1,3 @@
 import { z } from 'zod';
-export declare function zodSortInputQuery(): z.ZodEffects<z.ZodOptional<z.ZodString>, Record<string, Record<string, "DESC" | "ASC">> | null, string | undefined>;
+export declare function zodSortInputQuery(): z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<Record<string, Record<string, "DESC" | "ASC">> | null, string | undefined>>;
 export type ZodSortInputQuery = z.infer<ReturnType<typeof zodSortInputQuery>>;

package/src/lib/modules/mixin/zod/zod-query-schema/fields.d.ts

@@ -1,15 +1,15 @@
 import { z } from 'zod';
 import { EntityParam, EntityRelationProps, NonEmptyStringTuple } from '../../../../types';
 import { EntityParamMapService } from '../../service';
-declare function getZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList): z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodEnum<z.Writeable<NonEmptyStringTuple<PropsList>>>, "atleastone">, [z.Writeable<NonEmptyStringTuple<PropsList>>[number], ...z.Writeable<NonEmptyStringTuple<PropsList>>[number][]], [z.Writeable<NonEmptyStringTuple<PropsList>>[number], ...z.Writeable<NonEmptyStringTuple<PropsList>>[number][]]>>;
+declare function getZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList): z.ZodOptional<z.ZodArray<z.ZodEnum<{ [k_1 in NonEmptyStringTuple<PropsList>[number]]: k_1; } extends infer T ? { [k in keyof T]: T[k]; } : never>>>;
 type ShapeArrayInput<E extends object, IdKey extends string> = EntityParam<E, IdKey>['props'] | EntityRelationProps<E, IdKey>[keyof EntityRelationProps<E, IdKey>];
 type ZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>> = ReturnType<typeof getZodFieldRule<E, IdKey, PropsList>>;
-type ZodFieldsShape<E extends object, IdKey extends string> = {
+export type ZodFieldsShape<E extends object, IdKey extends string> = {
     target: ZodFieldRule<E, IdKey, EntityParam<E, IdKey>['props']>;
 } & {
     [K in keyof EntityRelationProps<E, IdKey>]: ZodFieldRule<E, IdKey, EntityRelationProps<E, IdKey>[K]>;
 };
-export declare function zodFieldsQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodNullable<z.ZodEffects<z.ZodObject<ZodFieldsShape<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodFieldsShape<E, IdKey>>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodFieldsShape<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ZodFieldsShape<E, IdKey>> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<ZodFieldsShape<E, IdKey>>[k_1]; } : never>, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodFieldsShape<E, IdKey>>, any> extends infer T_2 ? { [k in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodFieldsShape<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ZodFieldsShape<E, IdKey>> extends infer T_3 ? { [k_1 in keyof T_3]: z.baseObjectInputType<ZodFieldsShape<E, IdKey>>[k_1]; } : never>>;
+export declare function zodFieldsQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodNullable<z.ZodObject<ZodFieldsShape<E, IdKey>, z.core.$strict>>;
 export type ZodFieldsQuery<E extends object, IdKey extends string> = ReturnType<typeof zodFieldsQuery<E, IdKey>>;
 export type FieldsQuery<E extends object, IdKey extends string> = z.infer<ZodFieldsQuery<E, IdKey>>;
 export {};

package/src/lib/modules/mixin/zod/zod-query-schema/fields.js

@@ -11,7 +11,7 @@ function getZodFieldRule(fields) {
         .array()
         .nonempty()
         .refine((0, zod_utils_1.uniqueArray)(), {
-        message: 'Field should be unique',
+        error: 'Field should be unique',
     })
         .optional();
 }
@@ -23,7 +23,11 @@ function getShapeFields(entityParamMapService) {
     }), {
         target: getZodFieldRule(entityParamMapService.entityParaMap.props),
     });
-    return zod_1.z.object(fieldShape).strict('Should be only target of relation');
+    return zod_1.z.strictObject(fieldShape, {
+        error: (err) => err.code === 'unrecognized_keys'
+            ? 'Should be only target of relation'
+            : err.message,
+    });
 }
 function zodFieldsQuery(entityParamMapService) {
     return getShapeFields(entityParamMapService)

package/src/lib/modules/mixin/zod/zod-query-schema/fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/fields.ts"],"names":[],"mappings":";;AAoEA,wCAQC;AA5ED,4EAA8D;AAC9D,6BAAmC;AAEnC,4CAA6E;AAQ7E,SAAS,eAAe,CAItB,MAAiB;IACjB,MAAM,WAAW,GAAmC,MAAa,CAAC;IAElE,OAAO,OAAC;SACL,IAAI,CAAC,WAAW,CAAC;SACjB,KAAK,EAAE;SACP,QAAQ,EAAE;SACV,MAAM,CAAC,IAAA,uBAAW,GAAE,EAAE;QACrB,OAAO,EAAE,wBAAwB;KAClC,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC;AAsBD,SAAS,cAAc,CACrB,qBAAsD;IAEtD,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC,qBAAqB,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACzD,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,GAAG,IAAI;QACP,CAAC,GAAkB,CAAC,EAAE,eAAe,CAAuB,GAAG,CAAC;KACjE,CAAC,EACF;QACE,MAAM,EAAE,eAAe,CACrB,qBAAqB,CAAC,aAAa,CAAC,KAAK,CAC1C;KAC0B,CAC9B,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,mCAAmC,CAAC,CAAC;AAC1E,CAAC;AAED,SAAgB,cAAc,CAC5B,qBAAsD;IAEtD,OAAO,cAAc,CAAC,qBAAqB,CAAC;SACzC,MAAM,CAAC,IAAA,0BAAc,GAAE,EAAE;QACxB,OAAO,EAAE,oDAAoD;KAC9D,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC"}
+{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/fields.ts"],"names":[],"mappings":";;AAyEA,wCAQC;AAjFD,4EAA8D;AAC9D,6BAAmC;AAEnC,4CAA6E;AAQ7E,SAAS,eAAe,CAItB,MAAiB;IACjB,MAAM,WAAW,GAAmC,MAAa,CAAC;IAElE,OAAO,OAAC;SACL,IAAI,CAAC,WAAW,CAAC;SACjB,KAAK,EAAE;SACP,QAAQ,EAAE;SACV,MAAM,CAAC,IAAA,uBAAW,GAAE,EAAE;QACrB,KAAK,EAAE,wBAAwB;KAChC,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC;AAsBD,SAAS,cAAc,CACrB,qBAAsD;IAEtD,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC,qBAAqB,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACzD,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,GAAG,IAAI;QACP,CAAC,GAAkB,CAAC,EAAE,eAAe,CAAuB,GAAG,CAAC;KACjE,CAAC,EACF;QACE,MAAM,EAAE,eAAe,CACrB,qBAAqB,CAAC,aAAa,CAAC,KAAK,CAC1C;KAC0B,CAC9B,CAAC;IAEF,OAAO,OAAC,CAAC,YAAY,CAAC,UAAU,EAAE;QAChC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,GAAG,CAAC,IAAI,KAAK,mBAAmB;YAC9B,CAAC,CAAC,mCAAmC;YACrC,CAAC,CAAC,GAAG,CAAC,OAAO;KAClB,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,cAAc,CAC5B,qBAAsD;IAEtD,OAAO,cAAc,CAAC,qBAAqB,CAAC;SACzC,MAAM,CAAC,IAAA,0BAAc,GAAE,EAAE;QACxB,OAAO,EAAE,oDAAoD;KAC9D,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC"}

package/src/lib/modules/mixin/zod/zod-query-schema/filter.d.ts

@@ -2,82 +2,26 @@ import { z, ZodOptional } from 'zod';
 import { EntityParamMapService } from '../../service';
 import { EntityParam, TypeField, TypeOfConstructor } from '../../../../types';
 declare const zodRuleForArrayField: z.ZodObject<{
-    some: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>, "atleastone">, [string | null, ...(string | null)[]], [string, ...string[]]>;
-}, "strict", z.ZodTypeAny, {
-    some: [string | null, ...(string | null)[]];
-}, {
-    some: [string, ...string[]];
-}>;
-declare const zodRuleFilterRelationSchema: z.ZodUnion<[z.ZodObject<{
-    eq: z.ZodUnion<[z.ZodLiteral<"null">, z.ZodEffects<z.ZodLiteral<null>, "null", null>]>;
-}, "strict", z.ZodTypeAny, {
-    eq: "null";
-}, {
-    eq: "null" | null;
-}>, z.ZodObject<{
-    ne: z.ZodUnion<[z.ZodLiteral<"null">, z.ZodEffects<z.ZodLiteral<null>, "null", null>]>;
-}, "strict", z.ZodTypeAny, {
-    ne: "null";
-}, {
-    ne: "null" | null;
-}>]>;
-declare function getZodRulesForField(type?: TypeField): z.ZodEffects<z.ZodObject<{
-    in: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>, "atleastone">, [string | null, ...(string | null)[]], [string, ...string[]]>>;
-    nin: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>, "atleastone">, [string | null, ...(string | null)[]], [string, ...string[]]>>;
-    eq: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    gt: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    gte: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    like: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    lt: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    lte: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    ne: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-    regexp: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodLiteral<"null">, null, "null">, z.ZodEffects<z.ZodString, string, string>]>>;
-}, "strict", z.ZodTypeAny, {
-    eq?: string | null | undefined;
-    gt?: string | null | undefined;
-    gte?: string | null | undefined;
-    like?: string | null | undefined;
-    lt?: string | null | undefined;
-    lte?: string | null | undefined;
-    ne?: string | null | undefined;
-    regexp?: string | null | undefined;
-    in?: [string | null, ...(string | null)[]] | undefined;
-    nin?: [string | null, ...(string | null)[]] | undefined;
-}, {
-    eq?: string | undefined;
-    gt?: string | undefined;
-    gte?: string | undefined;
-    like?: string | undefined;
-    lt?: string | undefined;
-    lte?: string | undefined;
-    ne?: string | undefined;
-    regexp?: string | undefined;
-    in?: [string, ...string[]] | undefined;
-    nin?: [string, ...string[]] | undefined;
-}>, {
-    eq?: string | null | undefined;
-    gt?: string | null | undefined;
-    gte?: string | null | undefined;
-    like?: string | null | undefined;
-    lt?: string | null | undefined;
-    lte?: string | null | undefined;
-    ne?: string | null | undefined;
-    regexp?: string | null | undefined;
-    in?: [string | null, ...(string | null)[]] | undefined;
-    nin?: [string | null, ...(string | null)[]] | undefined;
-}, {
-    eq?: string | undefined;
-    gt?: string | undefined;
-    gte?: string | undefined;
-    like?: string | undefined;
-    lt?: string | undefined;
-    lte?: string | undefined;
-    ne?: string | undefined;
-    regexp?: string | undefined;
-    in?: [string, ...string[]] | undefined;
-    nin?: [string, ...string[]] | undefined;
-}>;
-declare function getZodRulesForRelationShape<E extends object, IdKey extends string>(shape: FilterProps<E, IdKey>): z.ZodEffects<z.ZodOptional<z.ZodObject<FilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<FilterProps<E, IdKey>>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<FilterProps<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<FilterProps<E, IdKey>> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<FilterProps<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<FilterProps<E, IdKey>>, any> extends infer T_2 ? { [k in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<FilterProps<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<FilterProps<E, IdKey>> extends infer T_3 ? { [k_1 in keyof T_3]: z.baseObjectInputType<FilterProps<E, IdKey>>[k_1]; } : never) | undefined>;
+    some: z.ZodArray<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+}, z.core.$strict>;
+declare const zodRuleFilterRelationSchema: z.ZodUnion<readonly [z.ZodObject<{
+    eq: z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodPipe<z.ZodLiteral<null>, z.ZodTransform<"null", null>>]>;
+}, z.core.$strict>, z.ZodObject<{
+    ne: z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodPipe<z.ZodLiteral<null>, z.ZodTransform<"null", null>>]>;
+}, z.core.$strict>]>;
+declare function getZodRulesForField(type?: TypeField): z.ZodObject<{
+    in: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>>;
+    nin: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>>;
+    eq: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    gt: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    gte: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    like: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    lt: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    lte: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    ne: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+    regexp: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodLiteral<"null">, z.ZodTransform<null, "null">>, z.ZodString]>>;
+}, z.core.$strict>;
+declare function getZodRulesForRelationShape<E extends object, IdKey extends string>(shape: FilterProps<E, IdKey>): z.ZodOptional<z.ZodObject<FilterProps<E, IdKey> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>>;
 type ZodRuleForArrayField = typeof zodRuleForArrayField;
 type ZodRuleFilterRelationSchema = typeof zodRuleFilterRelationSchema;
 type ZodRulesForField = ReturnType<typeof getZodRulesForField>;
@@ -94,34 +38,10 @@ type TargetRelationShape<E extends object, IdKey extends string> = {
     [Props in EntityParam<E, IdKey>['relations'][number] & PropertyKey]: ZodOptional<ZodRuleFilterRelationSchema>;
 };
 type ResultTargetType<E extends object, IdKey extends string> = FilterProps<E, IdKey> & TargetRelationShape<E, IdKey>;
-export declare function zodFilterQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodEffects<z.ZodObject<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_2 ? { [k in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_3 ? { [k_1 in keyof T_3]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_4 ? { [k_2 in keyof T_4]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_5 ? { [k_3 in keyof T_5]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_6 ? { [k_2 in keyof T_6]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_7 ? { [k_3 in keyof T_7]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_17 ? { [k in keyof T_17]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_18 ? { [k_1 in keyof T_18]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_19 ? { [k in keyof T_19]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_20 ? { [k_1 in keyof T_20]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_21 ? { [k_2 in keyof T_21]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_22 ? { [k_3 in keyof T_22]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_23 ? { [k_2 in keyof T_23]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_24 ? { [k_3 in keyof T_24]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}>, any> extends infer T_8 ? { [k_4 in keyof T_8]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_9 ? { [k in keyof T_9]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_10 ? { [k_1 in keyof T_10]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_11 ? { [k in keyof T_11]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_12 ? { [k_1 in keyof T_12]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_13 ? { [k_2 in keyof T_13]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_14 ? { [k_3 in keyof T_14]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_15 ? { [k_2 in keyof T_15]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_16 ? { [k_3 in keyof T_16]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}>, any>[k_4]; } : never, z.baseObjectInputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_34 ? { [k in keyof T_34]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_35 ? { [k_1 in keyof T_35]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_36 ? { [k in keyof T_36]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_37 ? { [k_1 in keyof T_37]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_38 ? { [k_2 in keyof T_38]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_39 ? { [k_3 in keyof T_39]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_40 ? { [k_2 in keyof T_40]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_41 ? { [k_3 in keyof T_41]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}> extends infer T_25 ? { [k_5 in keyof T_25]: z.baseObjectInputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_26 ? { [k in keyof T_26]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_27 ? { [k_1 in keyof T_27]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_28 ? { [k in keyof T_28]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_29 ? { [k_1 in keyof T_29]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_30 ? { [k_2 in keyof T_30]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_31 ? { [k_3 in keyof T_31]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_32 ? { [k_2 in keyof T_32]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_33 ? { [k_3 in keyof T_33]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}>[k_5]; } : never>, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_51 ? { [k in keyof T_51]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_52 ? { [k_1 in keyof T_52]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_53 ? { [k in keyof T_53]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_54 ? { [k_1 in keyof T_54]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_55 ? { [k_2 in keyof T_55]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_56 ? { [k_3 in keyof T_56]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_57 ? { [k_2 in keyof T_57]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_58 ? { [k_3 in keyof T_58]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}>, any> extends infer T_42 ? { [k_4 in keyof T_42]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_43 ? { [k in keyof T_43]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_44 ? { [k_1 in keyof T_44]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_45 ? { [k in keyof T_45]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_46 ? { [k_1 in keyof T_46]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_47 ? { [k_2 in keyof T_47]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_48 ? { [k_3 in keyof T_48]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_49 ? { [k_2 in keyof T_49]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_50 ? { [k_3 in keyof T_50]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}>, any>[k_4]; } : never, z.baseObjectInputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_68 ? { [k in keyof T_68]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_69 ? { [k_1 in keyof T_69]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_70 ? { [k in keyof T_70]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_71 ? { [k_1 in keyof T_71]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_72 ? { [k_2 in keyof T_72]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_73 ? { [k_3 in keyof T_73]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_74 ? { [k_2 in keyof T_74]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_75 ? { [k_3 in keyof T_75]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}> extends infer T_59 ? { [k_5 in keyof T_59]: z.baseObjectInputType<{
-    target: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_60 ? { [k in keyof T_60]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_61 ? { [k_1 in keyof T_61]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any> extends infer T_62 ? { [k in keyof T_62]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ResultTargetType<E, IdKey>>, any>[k]; } : never) | undefined, (z.baseObjectInputType<ResultTargetType<E, IdKey>> extends infer T_63 ? { [k_1 in keyof T_63]: z.baseObjectInputType<ResultTargetType<E, IdKey>>[k_1]; } : never) | undefined>>;
-    relation: z.ZodNullable<z.ZodEffects<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_64 ? { [k_2 in keyof T_64]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never, z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_65 ? { [k_3 in keyof T_65]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any> extends infer T_66 ? { [k_2 in keyof T_66]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<RelationFilterProps<E, IdKey>>, any>[k_2]; } : never) | undefined, (z.baseObjectInputType<RelationFilterProps<E, IdKey>> extends infer T_67 ? { [k_3 in keyof T_67]: z.baseObjectInputType<RelationFilterProps<E, IdKey>>[k_3]; } : never) | undefined>>;
-}>[k_5]; } : never>;
+export declare function zodFilterQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodObject<{
+    target: z.ZodNullable<z.ZodOptional<z.ZodObject<ResultTargetType<E, IdKey>, z.core.$strict>>>;
+    relation: z.ZodNullable<z.ZodOptional<z.ZodObject<RelationFilterProps<E, IdKey>, z.core.$strict>>>;
+}, z.core.$strict>;
 export type ZodFilterQuery<E extends object, IdKey extends string> = ReturnType<typeof zodFilterQuery<E, IdKey>>;
 export type FilterQuery<E extends object, IdKey extends string> = z.infer<ZodFilterQuery<E, IdKey>>;
 export {};

package/src/lib/modules/mixin/zod/zod-query-schema/filter.js

@@ -8,14 +8,14 @@ const zod_utils_1 = require("../zod-utils");
 const zodRuleForString = zod_1.z.union([
     zod_1.z.literal('null').transform(() => null),
     zod_1.z.string().refine((0, zod_utils_1.stringLongerThan)(), {
-        message: 'String should be not empty',
+        error: 'String should be not empty',
     }),
 ]);
 const zodRuleStringArray = zodRuleForString
     .array()
     .nonempty()
     .refine((0, zod_utils_1.arrayItemStringLongerThan)(0), {
-    message: 'Array should be not empty',
+    error: 'Array should be not empty',
 });
 const zodNullRule = zod_1.z.union([
     zod_1.z.literal('null'),
@@ -41,7 +41,21 @@ function getZodRulesForField(type = types_1.TypeField.string) {
         ...acum,
         [val]: zodRuleForString
             .refine((0, zod_utils_1.stringMustBe)(type), {
-            message: `String should be as ${type}`,
+            error: `String should be as ${type}`,
+        })
+            .transform((r) => {
+            if (r === 'null' || r === null) {
+                return r;
+            }
+            switch (type) {
+                case types_1.TypeField.boolean:
+                    return Boolean(r);
+                case types_1.TypeField.number:
+                    return Number(r);
+                case types_1.TypeField.date:
+                    return new Date(r);
+            }
+            return r;
         })
             .optional(),
     }), {});
@@ -49,7 +63,7 @@ function getZodRulesForField(type = types_1.TypeField.string) {
         ...acum,
         [val]: zodRuleStringArray
             .refine((0, zod_utils_1.elementOfArrayMustBe)(type), {
-            message: `String should be as ${type}`,
+            error: `String element of array should be as ${type}`,
         })
             .optional(),
     }), {});
@@ -60,7 +74,7 @@ function getZodRulesForField(type = types_1.TypeField.string) {
     })
         .strict()
         .refine((0, zod_utils_1.oneOf)(Object.values(json_api_nestjs_shared_1.FilterOperand).filter((i) => i !== json_api_nestjs_shared_1.FilterOperand.some)), {
-        message: `Must have one of: "${Object.values(json_api_nestjs_shared_1.FilterOperand)
+        error: `Must have one of: "${Object.values(json_api_nestjs_shared_1.FilterOperand)
             .filter((i) => i !== json_api_nestjs_shared_1.FilterOperand.some)
             .join('","')}"`,
     });
@@ -93,14 +107,12 @@ function zodFilterQuery(entityParamMapService) {
     }, {});
     const targetShapeFilter = {
         target: zod_1.z
-            .object(targetResult)
-            .strict()
+            .strictObject(targetResult)
             .optional()
             .refine((0, zod_utils_1.nonEmptyObject)())
             .nullable(),
         relation: zod_1.z
-            .object(relationFilterProps)
-            .strict()
+            .strictObject(relationFilterProps)
             .optional()
             .refine((0, zod_utils_1.nonEmptyObject)())
             .nullable(),

package/src/lib/modules/mixin/zod/zod-query-schema/filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/filter.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/mixin/zod/zod-query-schema/include.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { EntityParamMapService } from '../../service';
 import { NonEmptyStringTuple } from '../../../../types';
-export declare function zodIncludeQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodNullable<z.ZodEffects<z.ZodArray<z.ZodEnum<z.Writeable<NonEmptyStringTuple<import("../../../../types").UnionToTuple<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>>, [import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>] extends [never] ? true : false>>>>, "atleastone">, [z.Writeable<NonEmptyStringTuple<import("../../../../types").UnionToTuple<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>>, [import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>] extends [never] ? true : false>>>[number], ...z.Writeable<NonEmptyStringTuple<import("../../../../types").UnionToTuple<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>>, [import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>] extends [never] ? true : false>>>[number][]], [z.Writeable<NonEmptyStringTuple<import("../../../../types").UnionToTuple<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>>, [import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>] extends [never] ? true : false>>>[number], ...z.Writeable<NonEmptyStringTuple<import("../../../../types").UnionToTuple<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>>, [import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>] extends [never] ? true : false>>>[number][]]>>;
+export declare function zodIncludeQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodNullable<z.ZodArray<z.ZodEnum<{ [k_1 in NonEmptyStringTuple<import("../../../../types").UnionToTuple<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>>, [import("dist/libs/json-api/json-api-nestjs-shared/cjs/src").RelationKeys<E, IdKey>] extends [never] ? true : false>>[number]]: k_1; } extends infer T ? { [k in keyof T]: T[k]; } : never>>>;
 export type ZodIncludeQuery<E extends object, IdKey extends string> = ReturnType<typeof zodIncludeQuery<E, IdKey>>;
 export type IncludeQuery<E extends object, IdKey extends string> = z.infer<ZodIncludeQuery<E, IdKey>>;

package/src/lib/modules/mixin/zod/zod-query-schema/include.js

@@ -10,7 +10,7 @@ function zodIncludeQuery(entityParamMapService) {
         .array()
         .nonempty()
         .refine((0, zod_utils_1.uniqueArray)(), {
-        message: 'Include should have unique relation',
+        error: 'Include should have unique relation',
     })
         .nullable();
 }

package/src/lib/modules/mixin/zod/zod-query-schema/include.js.map

@@ -1 +1 @@
-{"version":3,"file":"include.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/include.ts"],"names":[],"mappings":";;AAKA,0CAeC;AApBD,6BAAwB;AACxB,4CAA2C;AAI3C,SAAgB,eAAe,CAC7B,qBAAsD;IAEtD,MAAM,aAAa,GAEf,qBAAqB,CAAC,aAAa,CAAC,SAAgB,CAAC;IAEzD,OAAO,OAAC;SACL,IAAI,CAAC,aAAa,CAAC;SACnB,KAAK,EAAE;SACP,QAAQ,EAAE;SACV,MAAM,CAAC,IAAA,uBAAW,GAAE,EAAE;QACrB,OAAO,EAAE,qCAAqC;KAC/C,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC"}
+{"version":3,"file":"include.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/include.ts"],"names":[],"mappings":";;AAKA,0CAeC;AApBD,6BAAwB;AACxB,4CAA2C;AAI3C,SAAgB,eAAe,CAC7B,qBAAsD;IAEtD,MAAM,aAAa,GAEf,qBAAqB,CAAC,aAAa,CAAC,SAAgB,CAAC;IAEzD,OAAO,OAAC;SACL,IAAI,CAAC,aAAa,CAAC;SACnB,KAAK,EAAE;SACP,QAAQ,EAAE;SACV,MAAM,CAAC,IAAA,uBAAW,GAAE,EAAE;QACrB,KAAK,EAAE,qCAAqC;KAC7C,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC"}

package/src/lib/modules/mixin/zod/zod-query-schema/index.d.ts

@@ -14,9 +14,9 @@ type Shape<E extends object, IdKey extends string> = {
     [QueryField.sort]: ZodSortQuery<E, IdKey>;
     [QueryField.page]: ZodPageInputQuery;
 };
-export declare function zodQuery<E extends object, IdKey extends string = 'id'>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodObject<Shape<E, IdKey>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<Shape<E, IdKey>>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<Shape<E, IdKey>>, any>[k]; } : never, z.baseObjectInputType<Shape<E, IdKey>> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<Shape<E, IdKey>>[k_1]; } : never>;
-export type ZodQuery<E extends object, IdKey extends string> = ZodObject<Shape<E, IdKey>, 'strict'>;
-export type Query<E extends object, IdKey extends string> = z.infer<ZodObject<Shape<E, IdKey>, 'strict'>>;
-declare function zodQueryOne<E extends object, IdKey extends string = 'id'>(entityParamMapService: EntityParamMapService<E, IdKey>): ZodObject<Pick<Shape<E, IdKey>, QueryField.fields | QueryField.include>, 'strict'>;
+export declare function zodQuery<E extends object, IdKey extends string = 'id'>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodObject<Shape<E, IdKey>, z.core.$strict>;
+export type ZodQuery<E extends object, IdKey extends string> = ZodObject<Shape<E, IdKey>, z.core.$strict>;
+export type Query<E extends object, IdKey extends string> = z.infer<ZodObject<Shape<E, IdKey>, z.core.$strict>>;
+declare function zodQueryOne<E extends object, IdKey extends string = 'id'>(entityParamMapService: EntityParamMapService<E, IdKey>): ZodObject<Pick<Shape<E, IdKey>, QueryField.fields | QueryField.include>, z.core.$strict>;
 export type ZodQueryOne<E extends object, IdKey extends string> = ReturnType<typeof zodQueryOne<E, IdKey>>;
 export type QueryOne<E extends object, IdKey extends string> = z.infer<ZodQueryOne<E, IdKey>>;

package/src/lib/modules/mixin/zod/zod-query-schema/index.js

@@ -18,17 +18,16 @@ function getShape(entityParamMapService) {
     };
 }
 function getZodResultSchema(shape) {
-    return zod_1.z.object(shape).strict();
+    return zod_1.z.strictObject(shape);
 }
 function zodQuery(entityParamMapService) {
     return getZodResultSchema(getShape(entityParamMapService));
 }
 function zodQueryOne(entityParamMapService) {
     return zod_1.z
-        .object({
+        .strictObject({
         [json_api_nestjs_shared_1.QueryField.fields]: (0, fields_1.zodFieldsQuery)(entityParamMapService),
         [json_api_nestjs_shared_1.QueryField.include]: (0, include_1.zodIncludeQuery)(entityParamMapService),
-    })
-        .strict();
+    });
 }
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-query-schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/index.ts"],"names":[],"mappings":";;AAsCA,4BAIC;AA1CD,6BAAmC;AACnC,4EAA6D;AAE7D,qCAA0D;AAC1D,qCAA0D;AAC1D,uCAA6D;AAC7D,iCAA+D;AAC/D,4CAAoE;AAcpE,SAAS,QAAQ,CACf,qBAAsD;IAEtD,OAAO;QACL,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,uBAAc,EAAC,qBAAqB,CAAC;QAC1D,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,uBAAc,EAAC,qBAAqB,CAAC;QAC1D,CAAC,mCAAU,CAAC,OAAO,CAAC,EAAE,IAAA,yBAAe,EAAC,qBAAqB,CAAC;QAC5D,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,mBAAY,EAAC,qBAAqB,CAAC;QACtD,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,6BAAiB,GAAE;KACvC,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAsB;IAEtB,OAAO,OAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AAClC,CAAC;AACD,SAAgB,QAAQ,CACtB,qBAAsD;IAEtD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;AAC7D,CAAC;AAUD,SAAS,WAAW,CAClB,qBAAsD;IAKtD,OAAO,OAAC;SACL,MAAM,CAAC;QACN,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,uBAAc,EAAC,qBAAqB,CAAC;QAC1D,CAAC,mCAAU,CAAC,OAAO,CAAC,EAAE,IAAA,yBAAe,EAAC,qBAAqB,CAAC;KAC7D,CAAC;SACD,MAAM,EAAE,CAAC;AACd,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/index.ts"],"names":[],"mappings":";;AAsCA,4BAIC;AA1CD,6BAAmC;AACnC,4EAA6D;AAE7D,qCAA0D;AAC1D,qCAA0D;AAC1D,uCAA6D;AAC7D,iCAA+D;AAC/D,4CAAoE;AAcpE,SAAS,QAAQ,CACf,qBAAsD;IAEtD,OAAO;QACL,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,uBAAc,EAAC,qBAAqB,CAAC;QAC1D,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,uBAAc,EAAC,qBAAqB,CAAC;QAC1D,CAAC,mCAAU,CAAC,OAAO,CAAC,EAAE,IAAA,yBAAe,EAAC,qBAAqB,CAAC;QAC5D,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,mBAAY,EAAC,qBAAqB,CAAC;QACtD,CAAC,mCAAU,CAAC,IAAI,CAAC,EAAE,IAAA,6BAAiB,GAAE;KACvC,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAsB;IAEtB,OAAO,OAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AACD,SAAgB,QAAQ,CACtB,qBAAsD;IAEtD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;AAC7D,CAAC;AAUD,SAAS,WAAW,CAClB,qBAAsD;IAKtD,OAAO,OAAC;SACL,YAAY,CAAC;QACZ,CAAC,mCAAU,CAAC,MAAM,CAAC,EAAE,IAAA,uBAAc,EAAC,qBAAqB,CAAC;QAC1D,CAAC,mCAAU,CAAC,OAAO,CAAC,EAAE,IAAA,yBAAe,EAAC,qBAAqB,CAAC;KAC7D,CAAC,CAAC;AACP,CAAC"}

package/src/lib/modules/mixin/zod/zod-query-schema/sort.d.ts

@@ -1,8 +1,14 @@
 import { z } from 'zod';
 import { EntityParam, EntityRelationProps } from '../../../../types';
 import { EntityParamMapService } from '../../service';
-declare function getZodSortRule(): z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>;
-declare function getZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList, zodSchema: ZodSortRule): z.ZodOptional<z.ZodEffects<z.ZodObject<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }>, any>[k]; } : never, z.baseObjectInputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }>[k_1]; } : never>, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }>, any> extends infer T_2 ? { [k in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }>, any>[k]; } : never, z.baseObjectInputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }> extends infer T_3 ? { [k_1 in keyof T_3]: z.baseObjectInputType<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<["DESC", "ASC"]>>; }>[k_1]; } : never>>;
+declare function getZodSortRule(): z.ZodOptional<z.ZodEnum<{
+    DESC: "DESC";
+    ASC: "ASC";
+}>>;
+declare function getZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList, zodSchema: ZodSortRule): z.ZodOptional<z.ZodObject<{ [K in PropsList[number] & PropertyKey]: z.ZodOptional<z.ZodEnum<{
+    DESC: "DESC";
+    ASC: "ASC";
+}>>; } extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>>;
 type ShapeArrayInput<E extends object, IdKey extends string> = EntityParam<E, IdKey>['props'] | EntityRelationProps<E, IdKey>[keyof EntityRelationProps<E, IdKey>];
 type ZodSortRule = ReturnType<typeof getZodSortRule>;
 type ZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>> = ReturnType<typeof getZodFieldRule<E, IdKey, PropsList>>;
@@ -13,7 +19,9 @@ type ZodSortRelation<E extends object, IdKey extends string> = {
     [K in keyof EntityRelationProps<E, IdKey>]: ZodFieldRule<E, IdKey, EntityRelationProps<E, IdKey>[K]>;
 };
 type ZodSortShape<E extends object, IdKey extends string> = ZodSortTarget<E, IdKey> & ZodSortRelation<E, IdKey>;
-export declare function zodSortQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodNullable<z.ZodEffects<z.ZodObject<ZodSortShape<E, IdKey> extends infer T extends z.ZodRawShape ? { [k in keyof T]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodSortShape<E, IdKey> extends infer T_3 extends z.ZodRawShape ? { [k in keyof T_3]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never>, any> extends infer T_1 ? { [k_1 in keyof T_1]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodSortShape<E, IdKey> extends infer T_2 extends z.ZodRawShape ? { [k in keyof T_2]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never>, any>[k_1]; } : never, z.baseObjectInputType<ZodSortShape<E, IdKey> extends infer T_6 extends z.ZodRawShape ? { [k in keyof T_6]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never> extends infer T_4 ? { [k_2 in keyof T_4]: z.baseObjectInputType<ZodSortShape<E, IdKey> extends infer T_5 extends z.ZodRawShape ? { [k in keyof T_5]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never>[k_2]; } : never>, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodSortShape<E, IdKey> extends infer T_9 extends z.ZodRawShape ? { [k in keyof T_9]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never>, any> extends infer T_7 ? { [k_1 in keyof T_7]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ZodSortShape<E, IdKey> extends infer T_8 extends z.ZodRawShape ? { [k in keyof T_8]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never>, any>[k_1]; } : never, z.baseObjectInputType<ZodSortShape<E, IdKey> extends infer T_12 extends z.ZodRawShape ? { [k in keyof T_12]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never> extends infer T_10 ? { [k_2 in keyof T_10]: z.baseObjectInputType<ZodSortShape<E, IdKey> extends infer T_11 extends z.ZodRawShape ? { [k in keyof T_11]: z.ZodOptional<ZodSortShape<E, IdKey>[k]>; } : never>[k_2]; } : never>>;
+export declare function zodSortQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodNullable<z.ZodObject<ZodSortShape<E, IdKey> extends infer T extends Readonly<{
+    [k: string]: z.core.$ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+}> ? { [k in keyof T]: z.ZodOptional<T[k]>; } : never, z.core.$strict>>;
 export type ZodSortQuery<E extends object, IdKey extends string> = ReturnType<typeof zodSortQuery<E, IdKey>>;
 export type SortQuery<E extends object, IdKey extends string> = z.infer<ZodSortQuery<E, IdKey>>;
 export {};

package/src/lib/modules/mixin/zod/zod-query-schema/sort.js

@@ -24,7 +24,7 @@ function zodSortObject(entityParamMapService) {
     }), {
         target: getZodFieldRule(entityParamMapService.entityParaMap.props, zodSortRule),
     });
-    return zod_1.z.object(sortShape).strict();
+    return zod_1.z.strictObject(sortShape);
 }
 function zodSortQuery(entityParamMapService) {
     return zodSortObject(entityParamMapService)

package/src/lib/modules/mixin/zod/zod-query-schema/sort.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/sort.ts"],"names":[],"mappings":";;AAiFA,oCAOC;AAxFD,4EAA8D;AAC9D,6BAAmC;AAGnC,qDAAkD;AAClD,4CAAgE;AAGhE,SAAS,cAAc;IACrB,OAAO,OAAC,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,eAAe,CAItB,MAAiB,EAAE,SAAsB;IACzC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,SAAS;KACjC,CAAC,EACF,EAA6D,CAC9D,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5E,CAAC;AA8BD,SAAS,aAAa,CACpB,qBAAsD;IAEtD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC,qBAAqB,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxD,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,GAAG,IAAI;QACP,CAAC,GAAkB,CAAC,EAAE,eAAe,CACnC,GAAG,EACH,WAAW,CACZ;KACF,CAAC,EACF;QACE,MAAM,EAAE,eAAe,CACrB,qBAAqB,CAAC,aAAa,CAAC,KAAK,EACzC,WAAW,CACZ;KACwB,CAC5B,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;AACtC,CAAC;AAED,SAAgB,YAAY,CAC1B,qBAAsD;IAEtD,OAAO,aAAa,CAAC,qBAAqB,CAAC;SACxC,OAAO,EAAE;SACT,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC;SACxB,QAAQ,EAAE,CAAC;AAChB,CAAC"}
+{"version":3,"file":"sort.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-query-schema/sort.ts"],"names":[],"mappings":";;AAgFA,oCAOC;AAvFD,4EAA8D;AAC9D,6BAAmC;AAGnC,qDAAkD;AAClD,4CAAgE;AAGhE,SAAS,cAAc;IACrB,OAAO,OAAC,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,eAAe,CAItB,MAAiB,EAAE,SAAsB;IACzC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,SAAS;KACjC,CAAC,EACF,EAA6D,CAC9D,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5E,CAAC;AA8BD,SAAS,aAAa,CACpB,qBAAsD;IAEtD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC,qBAAqB,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxD,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,GAAG,IAAI;QACP,CAAC,GAAkB,CAAC,EAAE,eAAe,CACnC,GAAG,EACH,WAAW,CACZ;KACF,CAAC,EACF;QACE,MAAM,EAAE,eAAe,CACrB,qBAAqB,CAAC,aAAa,CAAC,KAAK,EACzC,WAAW,CACZ;KACwB,CAC5B,CAAC;IACF,OAAO,OAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;AAClC,CAAC;AAED,SAAgB,YAAY,CAC1B,qBAAsD;IAEtD,OAAO,aAAa,CAAC,qBAAqB,CAAC;SACxC,OAAO,EAAE;SACT,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC;SACxB,QAAQ,EAAE,CAAC;AAChB,CAAC"}

package/src/lib/modules/mixin/zod/zod-share/attributes.d.ts

@@ -2,17 +2,12 @@ import { z, ZodArray } from 'zod';
 import { EntityParam, TypeField } from '../../../../types';
 import { ResultSchema } from './type';
 import { EntityParamMapService } from '../../service';
-declare const literalSchema: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>;
-type Literal = z.infer<typeof literalSchema>;
-type Json = Literal | {
-    [key: string]: Json;
-} | Json[];
-export declare function getZodRulesForNumber<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodEffects<z.ZodNumber, number, unknown>, Null, isPatch>;
+export declare function getZodRulesForNumber<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodPipe<z.ZodTransform<number, unknown>, z.ZodNumber>, Null, isPatch>;
 declare function getZodRulesForString<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodString, Null, isPatch>;
-declare function getZodRulesForDate<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodDate, Null, isPatch>;
+declare function getZodRulesForDate<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): z.ZodPipe<z.ZodISODateTime, z.ZodTransform<Awaited<isPatch extends true ? Null extends true ? Date | null | undefined : Date | undefined : Null extends true ? Date | null | undefined : Date>, string>> | z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>, z.ZodTransform<Awaited<isPatch extends true ? Null extends true ? Date | null | undefined : Date | undefined : Null extends true ? Date | null | undefined : Date>, string | null | undefined>> | z.ZodPipe<z.ZodOptional<z.ZodISODateTime>, z.ZodTransform<Awaited<isPatch extends true ? Null extends true ? Date | null | undefined : Date | undefined : Null extends true ? Date | null | undefined : Date>, string | undefined>>;
 declare function getZodRulesForBoolean<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodBoolean, Null, isPatch>;
-declare function getZodSchemaForJson<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodType<Json, z.ZodTypeDef, Json>, Null, isPatch>;
-type ZodRulesResultArray<T extends TypeField, Null extends true | false, isPatch extends true | false> = ResultSchema<ZodArray<ZodRulesForType<T, false, false>, 'many'>, Null, isPatch>;
+declare function getZodSchemaForJson<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodJSONSchema, Null, isPatch>;
+type ZodRulesResultArray<T extends TypeField, Null extends true | false, isPatch extends true | false> = ResultSchema<ZodArray<ZodRulesForType<T, false, false>>, Null, isPatch>;
 declare function getZodRulesForArray<T extends TypeField, Null extends true | false, isPatch extends true | false>(propsField: T, isNullable: Null, isPatch: isPatch): ZodRulesResultArray<T, Null, isPatch>;
 type ZodRulesForArray<T extends TypeField, Null extends true | false, isPatch extends true | false> = ReturnType<typeof getZodRulesForArray<T, Null, isPatch>>;
 export type ZodRulesForType<T extends TypeField, Null extends true | false, isPatch extends true | false> = ReturnType<T extends TypeField.date ? typeof getZodRulesForDate<Null, isPatch> : T extends TypeField.boolean ? typeof getZodRulesForBoolean<Null, isPatch> : T extends TypeField.number ? typeof getZodRulesForNumber<Null, isPatch> : T extends TypeField.object ? typeof getZodSchemaForJson<Null, isPatch> : typeof getZodRulesForString<Null, isPatch>>;
@@ -25,7 +20,7 @@ type ZodRules<E extends object, IdKey extends string, P extends keyof E, IsArray
 export type ShapeAttributesType<E extends object, IdKey extends string, isPatch extends boolean> = {
     [K in keyof OmitPrimary<E, IdKey>]: ZodRules<E, IdKey, K, IsTypeArray<OmitPrimary<E, IdKey>[K]>, isPatch>;
 };
-export declare function zodAttributes<E extends object, IdKey extends string, S extends true | false = false>(entityParamMapService: EntityParamMapService<E, IdKey>, isPatch: S): z.ZodEffects<z.ZodObject<ShapeAttributesType<E, IdKey, S>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ShapeAttributesType<E, IdKey, S>>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ShapeAttributesType<E, IdKey, S>>, any>[k]; } : never, z.baseObjectInputType<ShapeAttributesType<E, IdKey, S>> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<ShapeAttributesType<E, IdKey, S>>[k_1]; } : never>, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ShapeAttributesType<E, IdKey, S>>, any> extends infer T_2 ? { [k in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ShapeAttributesType<E, IdKey, S>>, any>[k]; } : never, z.baseObjectInputType<ShapeAttributesType<E, IdKey, S>> extends infer T_3 ? { [k_1 in keyof T_3]: z.baseObjectInputType<ShapeAttributesType<E, IdKey, S>>[k_1]; } : never>;
+export declare function zodAttributes<E extends object, IdKey extends string, S extends true | false = false>(entityParamMapService: EntityParamMapService<E, IdKey>, isPatch: S): z.ZodObject<ShapeAttributesType<E, IdKey, S> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>;
 export type ZodAttributes<E extends object, IdKey extends string, K extends true | false = false> = ReturnType<typeof zodAttributes<E, IdKey, K>>;
 export type Attributes<E extends object, IdKey extends string, K extends true | false = false> = z.infer<ZodAttributes<E, IdKey, K>>;
 export {};

package/src/lib/modules/mixin/zod/zod-share/attributes.js

@@ -6,27 +6,22 @@ const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const zod_1 = require("zod");
 const types_1 = require("../../../../types");
 const zod_utils_1 = require("../zod-utils");
-const literalSchema = zod_1.z.union([zod_1.z.string(), zod_1.z.number(), zod_1.z.boolean(), zod_1.z.null()]);
+const map_transform_to_json_shema_1 = require("../map-transform-to-json-shema");
 function getZodRulesForNumber(isNullable, isPatch) {
     const schema = zod_1.z.preprocess((x) => Number(x), zod_1.z.number());
     return (0, zod_utils_1.setOptionalOrNot)(schema, isNullable, isPatch);
 }
 function getZodRulesForString(isNullable, isPatch) {
-    const schema = zod_1.z.string();
-    return (0, zod_utils_1.setOptionalOrNot)(schema, isNullable, isPatch);
+    return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.string(), isNullable, isPatch);
 }
 function getZodRulesForDate(isNullable, isPatch) {
-    const schema = zod_1.z.coerce.date();
-    return (0, zod_utils_1.setOptionalOrNot)(schema, isNullable, isPatch);
+    return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.iso.datetime(), isNullable, isPatch).transform((map_transform_to_json_shema_1.transformDateString));
 }
 function getZodRulesForBoolean(isNullable, isPatch) {
-    const schema = zod_1.z.boolean();
-    return (0, zod_utils_1.setOptionalOrNot)(schema, isNullable, isPatch);
+    return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.boolean(), isNullable, isPatch);
 }
 function getZodSchemaForJson(isNullable, isPatch) {
-    const tmpSchema = isNullable ? literalSchema.nullable() : literalSchema;
-    const schema = zod_1.z.lazy(() => zod_1.z.union([tmpSchema, zod_1.z.array(tmpSchema), zod_1.z.record(tmpSchema)]));
-    return (0, zod_utils_1.setOptionalOrNot)(schema, isNullable, isPatch);
+    return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.json(), isNullable, isPatch);
 }
 function getZodRulesForArray(propsField, isNullable, isPatch) {
     let schema;