@klerick/json-api-nestjs 10.0.0-beta.1 → 10.0.0-beta.11

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

@@ -1,53 +1,13 @@
 import { z } from 'zod';
 export declare const zodPatchRelationship: z.ZodObject<{
-    data: z.ZodUnion<[z.ZodNullable<z.ZodEffects<z.ZodObject<{
+    data: z.ZodUnion<readonly [z.ZodNullable<z.ZodObject<{
         type: z.ZodString;
         id: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>>, z.ZodArray<z.ZodEffects<z.ZodObject<{
+    }, z.core.$strict>>, z.ZodArray<z.ZodObject<{
         type: z.ZodString;
         id: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, "many">]>;
-}, "strict", z.ZodTypeAny, {
-    data: {
-        id: string;
-        type: string;
-    } | {
-        id: string;
-        type: string;
-    }[] | null;
-}, {
-    data: {
-        id: string;
-        type: string;
-    } | {
-        id: string;
-        type: string;
-    }[] | null;
-}>;
+    }, z.core.$strict>>]>;
+}, z.core.$strict>;
 export type ZodPatchRelationship = typeof zodPatchRelationship;
 export type PatchRelationship = z.infer<ZodPatchRelationship>;
 export type PatchRelationshipData = PatchRelationship['data'];

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

@@ -4,8 +4,7 @@ exports.zodPatchRelationship = void 0;
 const zod_1 = require("zod");
 const zod_share_1 = require("../zod-share");
 exports.zodPatchRelationship = zod_1.z
-    .object({
+    .strictObject({
     data: zod_1.z.union([(0, zod_share_1.zodData)().nullable(), (0, zod_share_1.zodData)().array()]),
-})
-    .strict();
+});
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-input-patch-relationship-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-patch-relationship-schema/index.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,4CAAuC;AAE1B,QAAA,oBAAoB,GAAG,OAAC;KAClC,MAAM,CAAC;IACN,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,IAAA,mBAAO,GAAE,CAAC,QAAQ,EAAE,EAAE,IAAA,mBAAO,GAAE,CAAC,KAAK,EAAE,CAAC,CAAC;CACzD,CAAC;KACD,MAAM,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-patch-relationship-schema/index.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,4CAAuC;AAE1B,QAAA,oBAAoB,GAAG,OAAC;KAClC,YAAY,CAAC;IACZ,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,IAAA,mBAAO,GAAE,CAAC,QAAQ,EAAE,EAAE,IAAA,mBAAO,GAAE,CAAC,KAAK,EAAE,CAAC,CAAC;CACzD,CAAC,CAAC"}

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

@@ -1,17 +1,28 @@
 import { z, ZodObject, ZodOptional } from 'zod';
-import { ZodAttributes, ZodId, ZodRelationships, ZodType } from '../zod-share';
+import { ZodAttributes, ZodId, ZodRelationships, ZodType, Id, Attributes, Relationships } from '../zod-share';
 import { EntityParamMapService } from '../../service';
+import { ExtractJsonApiReadOnlyKeys, ExtractJsonApiImmutableKeys } from '../../../../types';
 type ZodPatchPatchShape<E extends object, IdKey extends string> = {
     id: ZodId;
     type: ZodType<string>;
     attributes: ZodOptional<ZodAttributes<E, IdKey, true>>;
     relationships: ZodOptional<ZodRelationships<E, IdKey, true>>;
 };
-type ZodInputPatchSchema<E extends object, IdKey extends string> = ZodObject<ZodPatchPatchShape<E, IdKey>, 'strict'>;
+type ZodInputPatchSchema<E extends object, IdKey extends string> = ZodObject<ZodPatchPatchShape<E, IdKey>, z.core.$strict>;
 type ZodInputPatchDataShape<E extends object, IdKey extends string> = {
     data: ZodInputPatchSchema<E, IdKey>;
 };
-export declare function zodPatch<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): ZodPatch<E, IdKey>;
-export type ZodPatch<E extends object, IdKey extends string> = ZodObject<ZodInputPatchDataShape<E, IdKey>, 'strict'>;
-export type PatchData<E extends object, IdKey extends string> = z.infer<ZodPatch<E, IdKey>>['data'];
+export declare function zodPatch<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>, readOnlyProps?: ExtractJsonApiReadOnlyKeys<E>[], immutableProps?: ExtractJsonApiImmutableKeys<E>[]): ZodPatch<E, IdKey>;
+export type ZodPatch<E extends object, IdKey extends string> = ZodObject<ZodInputPatchDataShape<E, IdKey>, z.core.$strict>;
+export type PatchDataRaw<E extends object, IdKey extends string> = z.infer<ZodPatch<E, IdKey>>['data'];
+type PatchAttributesType<E extends object, IdKey extends string> = Partial<Omit<Attributes<E, IdKey>, ExtractJsonApiReadOnlyKeys<E> | ExtractJsonApiImmutableKeys<E>>>;
+export type PatchData<E extends object, IdKey extends string> = {
+    id: Id;
+    type: string;
+    attributes?: PatchAttributesType<E, IdKey>;
+    relationships?: Relationships<E, IdKey, true>;
+};
+export type Patch<E extends object, IdKey extends string> = {
+    data: PatchData<E, IdKey>;
+};
 export {};

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

@@ -3,21 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zodPatch = zodPatch;
 const zod_1 = require("zod");
 const zod_share_1 = require("../zod-share");
-function getShape(entityParamMapService) {
+function getShape(entityParamMapService, readOnlyProps = [], immutableProps = []) {
     const shape = {
         id: (0, zod_share_1.zodId)(entityParamMapService.entityParaMap.primaryColumnType),
         type: (0, zod_share_1.zodType)(entityParamMapService.entityParaMap.typeName),
-        attributes: (0, zod_share_1.zodAttributes)(entityParamMapService, true).optional(),
+        attributes: (0, zod_share_1.zodAttributes)(entityParamMapService, true, readOnlyProps, immutableProps).optional(),
         relationships: (0, zod_share_1.zodRelationships)(entityParamMapService, true).optional(),
     };
-    return zod_1.z.object(shape).strict();
+    return zod_1.z.strictObject(shape);
 }
-function zodPatch(entityParamMapService) {
-    const shape = getShape(entityParamMapService);
-    return zod_1.z
-        .object({
+function zodPatch(entityParamMapService, readOnlyProps = [], immutableProps = []) {
+    const shape = getShape(entityParamMapService, readOnlyProps, immutableProps);
+    return zod_1.z.strictObject({
         data: shape,
-    })
-        .strict();
+    });
 }
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-input-patch-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-patch-schema/index.ts"],"names":[],"mappings":";;AA8CA,4BAUC;AAxDD,6BAAgD;AAChD,4CASsB;AAqBtB,SAAS,QAAQ,CACf,qBAAsD;IAEtD,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,IAAA,iBAAK,EACP,qBAAqB,CAAC,aAAa,CAAC,iBAA8B,CACnE;QACD,IAAI,EAAE,IAAA,mBAAO,EAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC3D,UAAU,EAAE,IAAA,yBAAa,EAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE;QACjE,aAAa,EAAE,IAAA,4BAAgB,EAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE;KACxE,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,SAAgB,QAAQ,CACtB,qBAAsD;IAEtD,MAAM,KAAK,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAE9C,OAAO,OAAC;SACL,MAAM,CAAC;QACN,IAAI,EAAE,KAAK;KACZ,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-input-patch-schema/index.ts"],"names":[],"mappings":";;AAmDA,4BAUC;AA7DD,6BAAgD;AAChD,4CAYsB;AAqBtB,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;QACD,IAAI,EAAE,IAAA,mBAAO,EAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC3D,UAAU,EAAE,IAAA,yBAAa,EAAC,qBAAqB,EAAE,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,QAAQ,EAAE;QAChG,aAAa,EAAE,IAAA,4BAAgB,EAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE;KACxE,CAAC;IAEF,OAAO,OAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAgB,QAAQ,CACtB,qBAAsD,EACtD,gBAAiD,EAAE,EACnD,iBAAmD,EAAE;IAErD,MAAM,KAAK,GAAG,QAAQ,CAAC,qBAAqB,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IAE7E,OAAO,OAAC,CAAC,YAAY,CAAC;QACpB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;AACL,CAAC"}

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

@@ -1,59 +1,13 @@
 import { z } from 'zod';
 export declare const zodPostRelationship: z.ZodObject<{
-    data: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
+    data: z.ZodUnion<readonly [z.ZodObject<{
         type: z.ZodString;
         id: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, z.ZodArray<z.ZodEffects<z.ZodObject<{
+    }, z.core.$strict>, z.ZodArray<z.ZodObject<{
         type: z.ZodString;
         id: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, {
-        id: string;
-        type: string;
-    }, {
-        id: string;
-        type: string;
-    }>, "atleastone">]>;
-}, "strict", z.ZodTypeAny, {
-    data: {
-        id: string;
-        type: string;
-    } | [{
-        id: string;
-        type: string;
-    }, ...{
-        id: string;
-        type: string;
-    }[]];
-}, {
-    data: {
-        id: string;
-        type: string;
-    } | [{
-        id: string;
-        type: string;
-    }, ...{
-        id: string;
-        type: string;
-    }[]];
-}>;
+    }, z.core.$strict>>]>;
+}, z.core.$strict>;
 export type ZodPostRelationship = typeof zodPostRelationship;
 export type PostRelationship = z.infer<ZodPostRelationship>;
 export type PostRelationshipData = PostRelationship['data'];

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

@@ -4,8 +4,7 @@ exports.zodPostRelationship = void 0;
 const zod_1 = require("zod");
 const zod_share_1 = require("../zod-share");
 exports.zodPostRelationship = zod_1.z
-    .object({
+    .strictObject({
     data: zod_1.z.union([(0, zod_share_1.zodData)(), (0, zod_share_1.zodData)().array().nonempty()]),
-})
-    .strict();
+});
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-input-post-relationship-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-relationship-schema/index.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,4CAAuC;AAE1B,QAAA,mBAAmB,GAAG,OAAC;KACjC,MAAM,CAAC;IACN,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,IAAA,mBAAO,GAAE,EAAE,IAAA,mBAAO,GAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;CACzD,CAAC;KACD,MAAM,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-post-relationship-schema/index.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,4CAAuC;AAE1B,QAAA,mBAAmB,GAAG,OAAC;KACjC,YAAY,CAAC;IACZ,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,IAAA,mBAAO,GAAE,EAAE,IAAA,mBAAO,GAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;CACzD,CAAC,CAAC"}

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

@@ -1,5 +1,6 @@
 import { z, ZodObject, ZodOptional } from 'zod';
-import { ZodId, ZodType, ZodAttributes, ZodRelationships } from '../zod-share';
+import { ExtractJsonApiReadOnlyKeys, ExtractJsonApiImmutableKeys } from '../../../../types';
+import { ZodId, ZodType, ZodAttributes, ZodRelationships, Id, Attributes, Relationships } from '../zod-share';
 import { EntityParamMapService } from '../../service';
 type ZodInputPostShape<E extends object, IdKey extends string> = {
     id: ZodOptional<ZodId>;
@@ -7,12 +8,21 @@ type ZodInputPostShape<E extends object, IdKey extends string> = {
     attributes: ZodAttributes<E, IdKey>;
     relationships: ZodOptional<ZodRelationships<E, IdKey>>;
 };
-type ZodInputPostSchema<E extends object, IdKey extends string> = ZodObject<ZodInputPostShape<E, IdKey>, 'strict'>;
+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>;
 };
-export declare function zodPost<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): ZodPost<E, IdKey>;
-export type ZodPost<E extends object, IdKey extends string> = ZodObject<ZodInputPostDataShape<E, IdKey>, 'strict'>;
-export type Post<E extends object, IdKey extends string> = z.infer<ZodPost<E, IdKey>>;
-export type PostData<E extends object, IdKey extends string> = Post<E, IdKey>['data'];
+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 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>;
+};
 export {};

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

@@ -3,24 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zodPost = zodPost;
 const zod_1 = require("zod");
 const zod_share_1 = require("../zod-share");
-function getShape(entityParamMapService) {
+function getShape(entityParamMapService, readOnlyProps = [], immutableProps = []) {
     const shape = {
         id: (0, zod_share_1.zodId)(entityParamMapService.entityParaMap.primaryColumnType).optional(),
         type: (0, zod_share_1.zodType)(entityParamMapService.entityParaMap.typeName),
-        attributes: (0, zod_share_1.zodAttributes)(entityParamMapService, false),
+        attributes: (0, zod_share_1.zodAttributes)(entityParamMapService, false, readOnlyProps, immutableProps),
         relationships: (0, zod_share_1.zodRelationships)(entityParamMapService, false).optional(),
     };
-    return zod_1.z.object(shape).strict();
+    return zod_1.z.strictObject(shape);
 }
-function zodDataShape(shape) {
-    return zod_1.z
-        .object({
-        data: shape,
-    })
-        .strict();
-}
-function zodPost(entityParamMapService) {
-    const shape = getShape(entityParamMapService);
-    return zodDataShape(shape);
+function zodPost(entityParamMapService, readOnlyProps = [], immutableProps = []) {
+    return zod_1.z.strictObject({
+        data: getShape(entityParamMapService, readOnlyProps, immutableProps),
+    });
 }
 //# 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":";;AAwDA,0BAMC;AA9DD,6BAAgD;AAGhD,4CASsB;AAmBtB,SAAS,QAAQ,CACf,qBAAsD;IAEtD,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,EAAC,qBAAqB,EAAE,KAAK,CAAC;QACvD,aAAa,EAAE,IAAA,4BAAgB,EAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE;KACzE,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,YAAY,CACnB,KAAmC;IAEnC,OAAO,OAAC;SACL,MAAM,CAAC;QACN,IAAI,EAAE,KAAK;KACZ,CAAC;SACD,MAAM,EAAE,CAAC;AACd,CAAC;AAED,SAAgB,OAAO,CACrB,qBAAsD;IAEtD,MAAM,KAAK,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAE9C,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
+{"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":";;AA6DA,0BAQC;AArED,6BAAgD;AAOhD,4CAYsB;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,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;KACrE,CAAC,CAAC;AACL,CAAC"}

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

@@ -1,30 +1,16 @@
 import { z } from 'zod';
+import { EntityParam } from '../../../../types';
 import { EntityParamMapService } from '../../service';
-export declare function zodFieldsInputQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): z.ZodEffects<z.ZodOptional<z.ZodEffects<z.ZodObject<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>, "strict", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>, any>[k]; } : never, z.baseObjectInputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>[k_1]; } : never>, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>, any> extends infer T_2 ? { [k in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>, any>[k]; } : never, z.baseObjectInputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>> extends infer T_3 ? { [k_1 in keyof T_3]: z.baseObjectInputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>[k_1]; } : never>>, (z.objectUtil.addQuestionMarks<z.baseObjectOutputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>, any> extends infer T_4 ? { [k in keyof T_4]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>, any>[k]; } : never) | null, (z.baseObjectInputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>> extends infer T_5 ? { [k_1 in keyof T_5]: z.baseObjectInputType<z.objectUtil.extendShape<{
-    target: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>;
-}, { [K in import("../../../../types").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] & PropertyKey]: z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | undefined, string | undefined>; }>>[k_1]; } : never) | undefined>;
+declare function getZodRules(): z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
+type ZodRule = ReturnType<typeof getZodRules>;
+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 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<{
+    target: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
+} & ZorRelationType<E, IdKey>, {}>> | null, z.core.$InferObjectOutput<{
+    target: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | undefined, string | undefined>>;
+} & ZorRelationType<E, IdKey>, {}> | 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

@@ -4,26 +4,32 @@ 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((input) => (input ? input.split(',') : undefined));
+        .transform(map_transform_to_json_shema_1.transformStringToArray);
 }
 function zodFieldsInputQuery(entityParamMapService) {
-    const target = zod_1.z.object({
-        target: getZodRules(),
-    });
-    const relation = entityParamMapService.entityParaMap.relations.reduce((acum, item) => ({
+    const { relations } = entityParamMapService.entityParaMap;
+    const relation = relations.reduce((acum, item) => ({
         ...acum,
         [item]: getZodRules(),
     }), {});
-    return target
-        .merge(zod_1.z.object(relation))
-        .strict((0, zod_utils_1.getValidationErrorForStrict)([
-        'target',
-        ...entityParamMapService.entityParaMap.relations,
-    ], 'Fields'))
+    return (zod_1.z
+        .strictObject({
+        target: getZodRules(),
+        ...relation,
+    }, {
+        error: (err) => err.code === 'unrecognized_keys'
+            ? (0, zod_utils_1.getValidationErrorForStrict)([
+                'target',
+                ...entityParamMapService.entityParaMap
+                    .relations,
+            ], 'Fields')
+            : err.message,
+    })
         .refine((0, zod_utils_1.nonEmptyObject)(), {
         message: 'Validation error: Need select field for target or relation',
     })
@@ -31,7 +37,8 @@ function zodFieldsInputQuery(entityParamMapService) {
         .transform((input) => {
         if (!input)
             return null;
-        const result = json_api_nestjs_shared_1.ObjectTyped.entries(input).reduce((acum, [key, value]) => {
+        const result = json_api_nestjs_shared_1.ObjectTyped.entries(input).reduce((acum, entries) => {
+            const [key, value] = entries;
             if (!value || value.length === 0)
                 return acum;
             return {
@@ -40,6 +47,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":";;AAgBA,kDA8CC;AA9DD,4EAA8D;AAC9D,6BAAwB;AAGxB,4CAA2E;AAG3E,SAAS,WAAW;IAClB,OAAO,OAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAClE,CAAC;AAID,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,MAAM,MAAM,GAAG,OAAC,CAAC,MAAM,CAAC;QACtB,MAAM,EAAE,WAAW,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CACnE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,WAAW,EAAE;KACrC,CAAC,EACF,EAEC,CACF,CAAC;IAEF,OAAO,MAAM;SACV,KAAK,CAAC,OAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACzB,MAAM,CACL,IAAA,uCAA2B,EACzB;QACE,QAAQ;QACR,GAAI,qBAAqB,CAAC,aAAa,CAAC,SAAsB;KAC/D,EACD,QAAQ,CACT,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,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACtE,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,EAAE,EAAkB,CAAC,CAAC;QAEvB,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"}
+{"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"}