@klerick/json-api-nestjs 10.0.0-beta.8 → 10.0.0

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

@@ -1,20 +1,30 @@
 import { z, ZodObject, ZodOptional } from 'zod';
 import { ExtractJsonApiReadOnlyKeys, ExtractJsonApiImmutableKeys } from '../../../../types';
-import { ZodId, ZodType, ZodAttributes, ZodRelationships } from '../zod-share';
+import { ZodPrimaryKeyId, ZodType, ZodAttributes, ZodRelationships, Id, Attributes, Relationships, ZodMeta } from '../zod-share';
 import { EntityParamMapService } from '../../service';
 type ZodInputPostShape<E extends object, IdKey extends string> = {
-    id: ZodOptional<ZodId>;
+    id: ZodOptional<ZodPrimaryKeyId>;
     type: ZodType<string>;
-    attributes: ZodAttributes<PostEntity<E>, IdKey>;
+    attributes: ZodAttributes<E, IdKey>;
     relationships: ZodOptional<ZodRelationships<E, IdKey>>;
 };
 type ZodInputPostSchema<E extends object, IdKey extends string> = ZodObject<ZodInputPostShape<E, IdKey>, z.core.$strict>;
 type ZodInputPostDataShape<E extends object, IdKey extends string> = {
     data: ZodInputPostSchema<E, IdKey>;
+    meta: ZodMeta;
 };
 export declare function zodPost<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>, readOnlyProps?: ExtractJsonApiReadOnlyKeys<E>[], immutableProps?: ExtractJsonApiImmutableKeys<E>[]): ZodPost<E, IdKey>;
 export type ZodPost<E extends object, IdKey extends string> = ZodObject<ZodInputPostDataShape<E, IdKey>, z.core.$strict>;
-export type Post<E extends object, IdKey extends string> = z.infer<ZodPost<E, IdKey>>;
-type PostEntity<E> = E extends object ? Omit<E, ExtractJsonApiReadOnlyKeys<E> | ExtractJsonApiImmutableKeys<E>> & Partial<Pick<E, ExtractJsonApiImmutableKeys<E>>> : never;
-export type PostData<E extends object, IdKey extends string> = Post<E, IdKey>['data'];
+export type PostDataRaw<E extends object, IdKey extends string> = Post<E, IdKey>['data'];
+type PostAttributesType<E extends object, IdKey extends string> = Omit<Attributes<E, IdKey, false>, ExtractJsonApiReadOnlyKeys<E> | ExtractJsonApiImmutableKeys<E>> & Partial<Pick<Attributes<E, IdKey, false>, Extract<ExtractJsonApiImmutableKeys<E>, keyof Attributes<E, IdKey, false>>>>;
+export type PostData<E extends object, IdKey extends string> = {
+    id?: Id;
+    type: string;
+    attributes: PostAttributesType<E, IdKey>;
+    relationships?: Relationships<E, IdKey, false>;
+};
+export type Post<E extends object, IdKey extends string> = {
+    data: PostData<E, IdKey>;
+    meta?: Record<string, unknown>;
+};
 export {};

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

@@ -5,7 +5,7 @@ const zod_1 = require("zod");
 const zod_share_1 = require("../zod-share");
 function getShape(entityParamMapService, readOnlyProps = [], immutableProps = []) {
     const shape = {
-        id: (0, zod_share_1.zodId)(entityParamMapService.entityParaMap.primaryColumnType).optional(),
+        id: (0, zod_share_1.zodPrimaryKeyId)(entityParamMapService.entityParaMap.primaryColumnType).optional(),
         type: (0, zod_share_1.zodType)(entityParamMapService.entityParaMap.typeName),
         attributes: (0, zod_share_1.zodAttributes)(entityParamMapService, false, readOnlyProps, immutableProps),
         relationships: (0, zod_share_1.zodRelationships)(entityParamMapService, false).optional(),
@@ -15,16 +15,7 @@ function getShape(entityParamMapService, readOnlyProps = [], immutableProps = []
 function zodPost(entityParamMapService, readOnlyProps = [], immutableProps = []) {
     return zod_1.z.strictObject({
         data: getShape(entityParamMapService, readOnlyProps, immutableProps),
+        meta: zod_share_1.zodMeta,
     });
 }
-class Users {
-    id;
-    login;
-}
-class Test {
-    id;
-    name;
-    updatedAt = new Date();
-    createdBy;
-}
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-input-post-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-post-schema/index.ts"],"names":[],"mappings":";;AA2DA,0BAQC;AAnED,6BAAgD;AAQhD,4CASsB;AAoBtB,SAAS,QAAQ,CACf,qBAAsD,EACtD,gBAAiD,EAAE,EACnD,iBAAmD,EAAE;IAErD,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,IAAA,iBAAK,EACP,qBAAqB,CAAC,aAAa,CAAC,iBAA8B,CACnE,CAAC,QAAQ,EAAE;QACZ,IAAI,EAAE,IAAA,mBAAO,EAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC3D,UAAU,EAAE,IAAA,yBAAa,EACvB,qBAAqB,EACrB,KAAK,EACL,aAAa,EACb,cAAc,CACmC;QACnD,aAAa,EAAE,IAAA,4BAAgB,EAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE;KACzE,CAAC;IAEF,OAAO,OAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAgB,OAAO,CACrB,qBAAsD,EACtD,gBAAiD,EAAE,EACnD,iBAAmD,EAAE;IAErD,OAAO,OAAC,CAAC,YAAY,CAAC;QACpB,IAAI,EAAE,QAAQ,CAAC,qBAAqB,EAAE,aAAa,EAAE,cAAc,CAAC;KACrE,CAAC,CAAC;AACL,CAAC;AAqBD,MAAM,KAAK;IACT,EAAE,CAAU;IACZ,KAAK,CAAU;CAChB;AAGD,MAAM,IAAI;IACR,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,SAAS,GAAgC,IAAI,IAAI,EAAE,CAAC;IACpD,SAAS,CAAU;CACpB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-post-schema/index.ts"],"names":[],"mappings":";;AAgEA,0BASC;AAzED,6BAAgD;AAOhD,4CAcsB;AAqBtB,SAAS,QAAQ,CACf,qBAAsD,EACtD,gBAAiD,EAAE,EACnD,iBAAmD,EAAE;IAErD,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,IAAA,2BAAe,EACjB,qBAAqB,CAAC,aAAa,CAAC,iBAA8B,CACnE,CAAC,QAAQ,EAAE;QACZ,IAAI,EAAE,IAAA,mBAAO,EAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC3D,UAAU,EAAE,IAAA,yBAAa,EACvB,qBAAqB,EACrB,KAAK,EACL,aAAa,EACb,cAAc,CACf;QACD,aAAa,EAAE,IAAA,4BAAgB,EAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE;KACzE,CAAC;IAEF,OAAO,OAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAgB,OAAO,CACrB,qBAAsD,EACtD,gBAAiD,EAAE,EACnD,iBAAmD,EAAE;IAErD,OAAO,OAAC,CAAC,YAAY,CAAC;QACpB,IAAI,EAAE,QAAQ,CAAC,qBAAqB,EAAE,aAAa,EAAE,cAAc,CAAC;QACpE,IAAI,EAAE,mBAAO;KACd,CAAC,CAAC;AACL,CAAC"}

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

@@ -1,16 +1,19 @@
 import { z } from 'zod';
 import { EntityParam } from '../../../../types';
 import { EntityParamMapService } from '../../service';
-declare function getZodRules(): z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
-type ZodRule = ReturnType<typeof getZodRules>;
+export declare const zodFieldSelectRule: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
+export type ZodRule = z.infer<typeof zodFieldSelectRule>;
 type CastPropertyKey<T> = T extends PropertyKey ? T : never;
 type ZorRelationType<E extends object, IdKey extends string> = Record<CastPropertyKey<EntityParam<E, IdKey>['relations'][number]>, ZodRule>;
+export declare function zodFieldsInputQuerySwagger<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodOptional<z.ZodObject<{
+    target: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
+} & ZorRelationType<E, IdKey> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>>;
 export declare function zodFieldsInputQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodPipe<z.ZodOptional<z.ZodObject<{
     target: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
-} & ZorRelationType<E, IdKey>, z.core.$strict>>, z.ZodTransform<Awaited<z.core.$InferObjectOutput<{
+} & ZorRelationType<E, IdKey> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>>, z.ZodTransform<Awaited<z.core.$InferObjectOutput<{
     target: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
-} & ZorRelationType<E, IdKey>, {}>> | null, z.core.$InferObjectOutput<{
+} & ZorRelationType<E, IdKey> extends infer T_1 ? { -readonly [P in keyof T_1]: T_1[P]; } : never, {}>> | null, z.core.$InferObjectOutput<{
     target: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
-} & ZorRelationType<E, IdKey>, {}> | undefined>>;
+} & ZorRelationType<E, IdKey> extends infer T_2 ? { -readonly [P in keyof T_2]: T_2[P]; } : never, {}> | undefined>>;
 export type ZodFieldsInputQuery<E extends object, IdKey extends string> = z.infer<ReturnType<typeof zodFieldsInputQuery<E, IdKey>>>;
 export {};

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

@@ -1,25 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.zodFieldSelectRule = void 0;
+exports.zodFieldsInputQuerySwagger = zodFieldsInputQuerySwagger;
 exports.zodFieldsInputQuery = zodFieldsInputQuery;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const zod_1 = require("zod");
 const zod_utils_1 = require("../zod-utils");
 const map_transform_to_json_shema_1 = require("../map-transform-to-json-shema");
-function getZodRules() {
-    return zod_1.z
-        .string()
-        .optional()
-        .transform(map_transform_to_json_shema_1.transformStringToArray);
-}
-function zodFieldsInputQuery(entityParamMapService) {
+exports.zodFieldSelectRule = zod_1.z
+    .string()
+    .optional()
+    .transform(map_transform_to_json_shema_1.transformStringToArray)
+    .meta({ id: 'FieldSelectRule' });
+function zodFieldsInputQuerySwagger(entityParamMapService) {
     const { relations } = entityParamMapService.entityParaMap;
     const relation = relations.reduce((acum, item) => ({
         ...acum,
-        [item]: getZodRules(),
+        [item]: exports.zodFieldSelectRule,
     }), {});
-    return (zod_1.z
+    return zod_1.z
         .strictObject({
-        target: getZodRules(),
+        target: exports.zodFieldSelectRule,
         ...relation,
     }, {
         error: (err) => err.code === 'unrecognized_keys'
@@ -33,7 +34,10 @@ function zodFieldsInputQuery(entityParamMapService) {
         .refine((0, zod_utils_1.nonEmptyObject)(), {
         message: 'Validation error: Need select field for target or relation',
     })
-        .optional()
+        .optional();
+}
+function zodFieldsInputQuery(entityParamMapService) {
+    return zodFieldsInputQuerySwagger(entityParamMapService)
         .transform((input) => {
         if (!input)
             return null;
@@ -47,6 +51,6 @@ function zodFieldsInputQuery(entityParamMapService) {
             };
         }, {});
         return Object.keys(result).length > 0 ? result : null;
-    }));
+    });
 }
 //# sourceMappingURL=fields.js.map

package/src/lib/modules/mixin/zod/zod-input-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-input-query-schema/fields.ts"],"names":[],"mappings":";;AAmBA,kDA0DC;AA7ED,4EAA8D;AAC9D,6BAAwB;AAGxB,4CAA2E;AAE3E,gFAAwE;AAExE,SAAS,WAAW;IAClB,OAAO,OAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,SAAS,CAAC,oDAAsB,CAAC,CAAC;AACvC,CAAC;AAMD,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,MAAM,EAAC,SAAS,EAAC,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAExD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,WAAW,EAAE;KACrC,CAAC,EACF,EAA+B,CAChC,CAAC;IAEF,OAAO,CACL,OAAC;SACE,YAAY,CACX;QACE,MAAM,EAAE,WAAW,EAAE;QACrB,GAAG,QAAQ;KACZ,EACD;QACE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,GAAG,CAAC,IAAI,KAAK,mBAAmB;YAC9B,CAAC,CAAC,IAAA,uCAA2B,EAC3B;gBACE,QAAQ;gBACR,GAAI,qBAAqB,CAAC,aAAa;qBACpC,SAAsB;aAC1B,EACD,QAAQ,CACT;YACD,CAAC,CAAC,GAAG,CAAC,OAAO;KAClB,CACF;SACA,MAAM,CAAC,IAAA,0BAAc,GAAE,EAAE;QACxB,OAAO,EAAE,4DAA4D;KACtE,CAAC;SACD,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QACnB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,MAAM,GAAG,oCAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC9C,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAChB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,OAAiE,CAAC;YAEvF,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAE9C,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,GAAG,CAAC,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,EACD,EAAkB,CACnB,CAAC;QAEF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,CAAC,CAAC,CACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/fields.ts"],"names":[],"mappings":";;;AAkBA,gEAqCC;AAED,kDA0BC;AAnFD,4EAA8D;AAC9D,6BAAwB;AAGxB,4CAA2E;AAE3E,gFAAwE;AAE3D,QAAA,kBAAkB,GAAG,OAAC;KAChC,MAAM,EAAE;KACR,QAAQ,EAAE;KACV,SAAS,CAAC,oDAAsB,CAAC;KACjC,IAAI,CAAC,EAAE,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAC;AAMnC,SAAgB,0BAA0B,CACxC,qBAAsD;IAEtD,MAAM,EAAC,SAAS,EAAC,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAExD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,0BAAkB;KAC1C,CAAC,EACF,EAA+B,CAChC,CAAC;IAEF,OAAO,OAAC;SACL,YAAY,CACX;QACE,MAAM,EAAE,0BAAkB;QAC1B,GAAG,QAAQ;KACZ,EACD;QACE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,GAAG,CAAC,IAAI,KAAK,mBAAmB;YAC9B,CAAC,CAAC,IAAA,uCAA2B,EACzB;gBACE,QAAQ;gBACR,GAAI,qBAAqB,CAAC,aAAa;qBACpC,SAAsB;aAC1B,EACD,QAAQ,CACT;YACH,CAAC,CAAC,GAAG,CAAC,OAAO;KAClB,CACF;SACA,MAAM,CAAC,IAAA,0BAAc,GAAE,EAAE;QACxB,OAAO,EAAE,4DAA4D;KACtE,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,OAAO,0BAA0B,CAAC,qBAAqB,CAAC;SACrD,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QACnB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,MAAM,GAAG,oCAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC9C,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAChB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,OAGpB,CAAC;YAEF,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAE9C,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,GAAG,CAAC,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,EACD,EAAkB,CACnB,CAAC;QAEF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,CAAC,CAAC,CAAC;AACP,CAAC"}

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

@@ -9,7 +9,7 @@ type OutPutFilter = {
     relation: null | Record<string, Record<string, FilterType>>;
     target: null | Record<string, FilterType>;
 };
-declare function getZodRulesForFilterOperator(): z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+export declare const zodRulesForFilterOperator: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
     some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
@@ -22,14 +22,31 @@ declare function getZodRulesForFilterOperator(): z.ZodOptional<z.ZodUnion<readon
     regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
 }, z.core.$strict>]>>;
-export type ZodRulesForFilterOperator = ReturnType<typeof getZodRulesForFilterOperator>;
+export type ZodRulesForFilterOperator = typeof zodRulesForFilterOperator;
+export declare const zodRulesForRelation: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+    eq: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
+}, z.core.$strict>, z.ZodObject<{
+    ne: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
+}, z.core.$strict>]>>;
 type CastPropertyKey<T> = T extends PropertyKey ? T : never;
 export type ConcatRelationField<E extends object, IdKey extends string> = UnionToTuple<{
     [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`;
 }[keyof EntityRelationProps<E, IdKey>]>;
 export type ShapeArrayInput<E extends object, IdKey extends string> = EntityParam<E, IdKey>['props'] | EntityParam<E, IdKey>['relations'] | ConcatRelationField<E, IdKey>;
 export declare function shapeForArray<E extends object, Z extends ZodType, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList, zodSchema: Z): Record<CastPropertyKey<PropsList[number]>, Z>;
-export declare function zodFilterInputQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodPipe<z.ZodOptional<z.ZodObject<Record<CastPropertyKey<UnionToTuple<Exclude<keyof E, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>, import("ts-toolbelt/out/Union/Last").Last<Exclude<keyof E, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>>, [Exclude<keyof E, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+export declare function zodFilterInputQuerySwagger<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodOptional<z.ZodObject<{ [Id in IdKey]: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+    some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    like: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    ne: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+}, z.core.$strict>]>>; } & Record<CastPropertyKey<UnionToTuple<Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>, import("ts-toolbelt/out/Union/Last").Last<Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>>, [Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
     some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
@@ -45,7 +62,60 @@ export declare function zodFilterInputQuery<E extends object, IdKey extends stri
     eq: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
 }, z.core.$strict>, z.ZodObject<{
     ne: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
-}, z.core.$strict>]>>> & Record<CastPropertyKey<UnionToTuple<{ [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">], import("ts-toolbelt/out/Union/Last").Last<{ [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]>, [{ [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+}, z.core.$strict>]>>> & Record<CastPropertyKey<UnionToTuple<{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">], import("ts-toolbelt/out/Union/Last").Last<{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]>, [{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+    some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    like: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    ne: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+}, z.core.$strict>]>>> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strip>>;
+export declare function zodFilterInputQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodPipe<z.ZodOptional<z.ZodObject<{ [Id in IdKey]: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+    some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    like: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    ne: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+}, z.core.$strict>]>>; } & Record<CastPropertyKey<UnionToTuple<Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>, import("ts-toolbelt/out/Union/Last").Last<Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>>, [Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+    some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    like: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    ne: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+}, z.core.$strict>]>>> & Record<CastPropertyKey<UnionToTuple<import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>, import("ts-toolbelt/out/Union/Last").Last<import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>, [import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+    eq: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
+}, z.core.$strict>, z.ZodObject<{
+    ne: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
+}, z.core.$strict>]>>> & Record<CastPropertyKey<UnionToTuple<{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">], import("ts-toolbelt/out/Union/Last").Last<{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]>, [{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+    some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    gte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    like: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lt: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    lte: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    ne: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+    nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
+}, z.core.$strict>]>>> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strip>>, z.ZodTransform<OutPutFilter, z.core.$InferObjectOutput<{ [Id in IdKey]: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
     some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
@@ -57,7 +127,7 @@ export declare function zodFilterInputQuery<E extends object, IdKey extends stri
     ne: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     regexp: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     nin: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
-}, z.core.$strict>]>>> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strip>>, z.ZodTransform<OutPutFilter, z.core.$InferObjectOutput<Record<CastPropertyKey<UnionToTuple<Exclude<keyof E, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>, import("ts-toolbelt/out/Union/Last").Last<Exclude<keyof E, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>>, [Exclude<keyof E, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey>>] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+}, z.core.$strict>]>>; } & Record<CastPropertyKey<UnionToTuple<Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>, import("ts-toolbelt/out/Union/Last").Last<Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>>, [Exclude<Exclude<Extract<keyof E, string>, import("@klerick/json-api-nestjs-shared").RelationKeys<E, IdKey> | { [K in Extract<keyof E, string>]: E[K] extends Function ? K : never; }[Extract<keyof E, string>]>, IdKey>] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
     some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
@@ -73,7 +143,7 @@ export declare function zodFilterInputQuery<E extends object, IdKey extends stri
     eq: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
 }, z.core.$strict>, z.ZodObject<{
     ne: z.ZodPipe<z.ZodUnion<readonly [z.ZodLiteral<"null">, z.ZodNull]>, z.ZodTransform<null, "null" | null>>;
-}, z.core.$strict>]>>> & Record<CastPropertyKey<UnionToTuple<{ [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">], import("ts-toolbelt/out/Union/Last").Last<{ [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]>, [{ [K in keyof EntityRelationProps<E, IdKey>]: `${K & string}.${EntityRelationProps<E, IdKey>[K][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
+}, z.core.$strict>]>>> & Record<CastPropertyKey<UnionToTuple<{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">], import("ts-toolbelt/out/Union/Last").Last<{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]>, [{ [K_1 in keyof EntityRelationProps<E, IdKey>]: `${K_1}.${EntityRelationProps<E, IdKey>[K_1][number] & string}`; }[import("@klerick/json-api-nestjs-shared").RelationKeys<E, "id">]] extends [never] ? true : false>[number]>, z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>, z.ZodObject<{
     some: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     in: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;
     eq: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNull, z.ZodNumber]>, z.ZodTransform<string, string | number | null>>>;

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

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.zodRulesForRelation = exports.zodRulesForFilterOperator = void 0;
 exports.shapeForArray = shapeForArray;
+exports.zodFilterInputQuerySwagger = zodFilterInputQuerySwagger;
 exports.zodFilterInputQuery = zodFilterInputQuery;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const zod_1 = require("zod");
 const zod_utils_1 = require("../zod-utils");
+const map_transform_to_json_shema_1 = require("../map-transform-to-json-shema");
 const arrayOp = {
     [json_api_nestjs_shared_1.FilterOperand.in]: true,
     [json_api_nestjs_shared_1.FilterOperand.nin]: true,
@@ -31,7 +34,7 @@ function convertToFilterObject(value) {
 function getZodRulesForFilterOperator() {
     const filterConditional = zod_1.z
         .union([zod_1.z.string().refine((0, zod_utils_1.stringLongerThan)()), zod_1.z.null(), zod_1.z.number()])
-        .transform((r) => `${r}`);
+        .transform(map_transform_to_json_shema_1.transformFilterValueToString);
     const conditional = zod_1.z
         .object(json_api_nestjs_shared_1.ObjectTyped.values(json_api_nestjs_shared_1.FilterOperand).reduce((acum, item) => {
         acum[item] = filterConditional;
@@ -44,6 +47,8 @@ function getZodRulesForFilterOperator() {
     });
     return zod_1.z.union([filterConditional, conditional]).optional();
 }
+exports.zodRulesForFilterOperator = getZodRulesForFilterOperator()
+    .meta({ id: 'FilterOperatorRule' });
 function getZodRulesForRelation() {
     return zod_1.z
         .union([
@@ -51,19 +56,21 @@ function getZodRulesForRelation() {
             .object({
             [json_api_nestjs_shared_1.FilterOperand.eq]: zod_1.z
                 .union([zod_1.z.literal('null'), zod_1.z.null()])
-                .transform(() => null),
+                .transform(map_transform_to_json_shema_1.transformToNull),
         })
             .strict(),
         zod_1.z
             .object({
             [json_api_nestjs_shared_1.FilterOperand.ne]: zod_1.z
                 .union([zod_1.z.literal('null'), zod_1.z.null()])
-                .transform(() => null),
+                .transform(map_transform_to_json_shema_1.transformToNull),
         })
             .strict(),
     ])
         .optional();
 }
+exports.zodRulesForRelation = getZodRulesForRelation()
+    .meta({ id: 'FilterRelationRule' });
 function getTupleConcatRelationFields(relationList) {
     const result = [];
     for (const [key, val] of json_api_nestjs_shared_1.ObjectTyped.entries(relationList)) {
@@ -80,17 +87,32 @@ function shapeForArray(fields, zodSchema) {
         [item]: zodSchema,
     }), {});
 }
-function zodFilterInputQuery(entityParamMapService) {
-    const target = shapeForArray(entityParamMapService.entityParaMap.props, getZodRulesForFilterOperator());
-    const relations = shapeForArray(entityParamMapService.entityParaMap.relations, getZodRulesForRelation());
+function zodFilterInputQuerySwagger(entityParamMapService) {
+    const target = {
+        ...{
+            [entityParamMapService.entityParaMap.primaryColumnName]: exports.zodRulesForFilterOperator,
+        },
+        ...shapeForArray(entityParamMapService.entityParaMap.props, exports.zodRulesForFilterOperator),
+    };
+    const relations = shapeForArray(entityParamMapService.entityParaMap.relations, exports.zodRulesForRelation);
     const relationList = (0, zod_utils_1.getRelationProps)(entityParamMapService);
-    const relationFields = shapeForArray(getTupleConcatRelationFields(relationList), getZodRulesForFilterOperator());
-    return zod_1.z.object({
+    const relationPrimaryName = (0, zod_utils_1.getRelationPrimaryName)(entityParamMapService);
+    for (const [key, val] of json_api_nestjs_shared_1.ObjectTyped.entries(relationPrimaryName)) {
+        if (relationList[key].includes(val))
+            continue;
+        relationList[key].push(val);
+    }
+    const relationFields = shapeForArray(getTupleConcatRelationFields(relationList), exports.zodRulesForFilterOperator);
+    return zod_1.z
+        .object({
         ...target,
         ...relations,
-        ...relationFields
+        ...relationFields,
     })
-        .optional()
+        .optional();
+}
+function zodFilterInputQuery(entityParamMapService) {
+    return zodFilterInputQuerySwagger(entityParamMapService)
         .transform((data) => {
         if (!data) {
             return {

package/src/lib/modules/mixin/zod/zod-input-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-input-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-input-query-schema/filter.ts"],"names":[],"mappings":"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"}