npm - @klerick/json-api-nestjs - Versions diffs - 10.0.0-beta.9 → 10.0.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (148) hide show

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

@@ -1,7 +1,7 @@
 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.ZodArray<z.ZodEnum<{ [k_1 in NonEmptyStringTuple<PropsList>[number]]: k_1; } extends infer T ? { [k in keyof T]: T[k]; } : never>>>;
+declare function getZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList, id: IdKey): 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>>;
 export type ZodFieldsShape<E extends object, IdKey extends string> = {

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

@@ -4,8 +4,8 @@ exports.zodFieldsQuery = zodFieldsQuery;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const zod_1 = require("zod");
 const zod_utils_1 = require("../zod-utils");
-function getZodFieldRule(fields) {
-    const fieldsProps = fields;
+function getZodFieldRule(fields, id) {
+    const fieldsProps = [...fields, id];
     return zod_1.z
         .enum(fieldsProps)
         .array()
@@ -17,11 +17,12 @@ function getZodFieldRule(fields) {
 }
 function getShapeFields(entityParamMapService) {
     const relationList = (0, zod_utils_1.getRelationProps)(entityParamMapService);
+    const relationListPrimaryName = (0, zod_utils_1.getRelationPrimaryName)(entityParamMapService);
     const fieldShape = json_api_nestjs_shared_1.ObjectTyped.entries(relationList).reduce((acum, [key, val]) => ({
         ...acum,
-        [key]: getZodFieldRule(val),
+        [key]: getZodFieldRule(val, relationListPrimaryName[key]),
     }), {
-        target: getZodFieldRule(entityParamMapService.entityParaMap.props),
+        target: getZodFieldRule(entityParamMapService.entityParaMap.props, entityParamMapService.entityParaMap.primaryColumnName),
     });
     return zod_1.z.strictObject(fieldShape, {
         error: (err) => err.code === 'unrecognized_keys'

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

	@@ -1 +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":";;~~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"}
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":";;AA+EA,wCAQC;AAvFD,4EAA8D;AAC9D,6BAAmC;AAEnC,4CAKsB;AAQtB,SAAS,eAAe,CAItB,MAAiB,EAAE,EAAS;IAC5B,MAAM,WAAW,GAAmC,CAAC,GAAG,MAAM,EAAE,EAAE,CAAQ,CAAC;IAE3E,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;IAC7D,MAAM,uBAAuB,GAAG,IAAA,kCAAsB,EAAC,qBAAqB,CAAC,CAAC;IAC9E,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,EAAE,uBAAuB,CAAC,GAAG,CAAU,CAAC;KACxG,CAAC,EACF;QACE,MAAM,EAAE,eAAe,CACrB,qBAAqB,CAAC,aAAa,CAAC,KAAK,EACzC,qBAAqB,CAAC,aAAa,CAAC,iBAAiB,CACtD;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 CHANGED Viewed

@@ -33,14 +33,16 @@ type RelationFilterProps<E extends object, IdKey extends string> = {
 };
 export type FilterProps<E extends object, IdKey extends string> = {
     [Props in EntityParam<E, IdKey>['props'][number] & PropertyKey]: Props extends keyof E ? E[Props] extends TypeField.array ? ZodOptional<ZodRuleForArrayField> : ZodOptional<ZodRulesForField> : never;
+} & {
+    [id in EntityParam<E, IdKey>['primaryColumnName']]?: ZodOptional<ZodRulesForField>;
 };
 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.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>>>;
+    target: z.ZodNullable<z.ZodObject<ResultTargetType<E, IdKey> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>>;
+    relation: z.ZodNullable<z.ZodObject<RelationFilterProps<E, IdKey> extends infer T_1 ? { -readonly [P_1 in keyof T_1]: T_1[P_1]; } : never, 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>>;

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

@@ -82,15 +82,27 @@ function getZodRulesForField(type = types_1.TypeField.string) {
 function getZodRulesForRelationShape(shape) {
     return zod_1.z.object(shape).strict().optional().refine((0, zod_utils_1.nonEmptyObject)());
 }
+const zodRulesForFieldCache = new Map();
+function getZodRulesForFieldUsingCache(type) {
+    let rules = zodRulesForFieldCache.get(type);
+    if (rules) {
+        return rules;
+    }
+    rules = getZodRulesForField(type);
+    zodRulesForFieldCache.set(type, rules);
+    return rules;
+}
 function getFilterPropsShapeForEntity(entityParam) {
     return entityParam.props.reduce((acum, field) => {
         const propertyType = Reflect.get(entityParam.propsType, field);
         const value = propertyType === types_1.TypeField.array
             ? zodRuleForArrayField
-            : getZodRulesForField(propertyType);
+            : getZodRulesForFieldUsingCache(propertyType);
         Reflect.set(acum, field, value.optional());
         return acum;
-    }, {});
+    }, {
+        [entityParam.primaryColumnName]: getZodRulesForFieldUsingCache(entityParam.primaryColumnType).optional()
+    });
 }
 function zodFilterQuery(entityParamMapService) {
     const targetResult = entityParamMapService.entityParaMap.relations.reduce((acum, item) => ({
@@ -105,15 +117,14 @@ function zodFilterQuery(entityParamMapService) {
             [relName]: zodFilter.optional(),
         };
     }, {});
+    // Both keys are required: this schema guards what reaches the controller, and
+    // the input pipe always emits them -- its reducer starts from
+    // { relation: null, target: null }. A null value means "nothing filtered on
+    // this side"; a missing key means the query never went through the pipe.
     const targetShapeFilter = {
-        target: zod_1.z
-            .strictObject(targetResult)
-            .optional()
-            .refine((0, zod_utils_1.nonEmptyObject)())
-            .nullable(),
+        target: zod_1.z.strictObject(targetResult).refine((0, zod_utils_1.nonEmptyObject)()).nullable(),
         relation: zod_1.z
             .strictObject(relationFilterProps)
-            .optional()
             .refine((0, zod_utils_1.nonEmptyObject)())
             .nullable(),
     };

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

	@@ -1 +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":";;~~AAmMA~~,~~wCA+CC~~;~~AAlPD~~,4EAKyC;AACzC,6BAAqC;AAGrC,6CAA8E;AAC9E,4CAOsB;AAEtB,MAAM,gBAAgB,GAAG,OAAC,CAAC,KAAK,CAAC;IAC/B,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;IACvC,OAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,4BAAgB,GAAE,EAAE;QACpC,KAAK,EAAE,4BAA4B;KACpC,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,gBAAgB;KACxC,KAAK,EAAE;KACP,QAAQ,EAAE;KACV,MAAM,CAAC,IAAA,qCAAyB,EAAC,CAAC,CAAC,EAAE;IACpC,KAAK,EAAE,2BAA2B;CACnC,CAAC,CAAC;AAEL,MAAM,WAAW,GAAG,OAAC,CAAC,KAAK,CAAC;IAC1B,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjB,OAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAe,CAAC;CAClD,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,OAAC;KAC3B,MAAM,CAAC,EAAE,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,kBAAkB,EAAE,CAAC;KACpD,MAAM,EAAE,CAAC;AAEZ,MAAM,2BAA2B,GAAG,OAAC,CAAC,KAAK,CAAC;IAC1C,OAAC;SACE,MAAM,CAAC;QACN,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,WAAW;KAChC,CAAC;SACD,MAAM,EAAE;IACX,OAAC;SACE,MAAM,CAAC;QACN,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,WAAW;KAChC,CAAC;SACD,MAAM,EAAE;CACZ,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAAC,OAAkB,iBAAS,CAAC,MAAM;IAC7D,MAAM,WAAW,GAAG,oCAAW,CAAC,OAAO,CAAC,gDAAuB,CAAC,CAAC,MAAM,CACrE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,GAAG,IAAI;QACP,CAAC,GAAG,CAAC,EAAE,gBAAgB;aACpB,MAAM,CAAC,IAAA,wBAAY,EAAC,IAAI,CAAC,EAAE;YAC1B,KAAK,EAAE,uBAAuB,IAAI,EAAE;SACrC,CAAC;aACD,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC/B,OAAO,CAAC,CAAC;YACX,CAAC;YAED,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,iBAAS,CAAC,OAAO;oBACpB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;gBACpB,KAAK,iBAAS,CAAC,MAAM;oBACnB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;gBACnB,KAAK,iBAAS,CAAC,IAAI;oBACjB,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;YAED,OAAO,CAAC,CAAC;QACX,CAAC,CAAC;aACD,QAAQ,EAAE;KACd,CAAC,EACF,EAEC,CACF,CAAC;IAEF,MAAM,UAAU,GAAG,oCAAW,CAAC,OAAO,CAAC,+CAAsB,CAAC,CAAC,MAAM,CACnE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,GAAG,IAAI;QACP,CAAC,GAAG,CAAC,EAAE,kBAAkB;aACtB,MAAM,CAAC,IAAA,gCAAoB,EAAC,IAAI,CAAC,EAAE;YAClC,KAAK,EAAE,wCAAwC,IAAI,EAAE;SACtD,CAAC;aACD,QAAQ,EAAE;KACd,CAAC,EACF,EAEC,CACF,CAAC;IACF,OAAO,OAAC;SACL,MAAM,CAAC;QACN,GAAG,WAAW;QACd,GAAG,UAAU;KACd,CAAC;SACD,MAAM,EAAE;SACR,MAAM,CACL,IAAA,iBAAK,EACH,MAAM,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,sCAAa,CAAC,IAAI,CAAC,CACrE,EACD;QACE,KAAK,EAAE,sBAAsB,MAAM,CAAC,MAAM,CAAC,sCAAa,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,sCAAa,CAAC,IAAI,CAAC;aACvC,IAAI,CAAC,KAAK,CAAC,GAAG;KAClB,CACF,CAAC;AACN,CAAC;AAED,SAAS,2BAA2B,CAClC,KAA4B;IAE5B,OAAO,OAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC,CAAC;AACtE,CAAC;~~AAuDD~~,SAAS,4BAA4B,CACnC,WAAkC;IAElC,OAAO,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC9C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAC9B,WAAW,CAAC,SAAS,EACrB,KAAoB,CACrB,CAAC;QACF,MAAM,KAAK,GACT,YAAY,KAAK,iBAAS,CAAC,KAAK;YAC9B,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,~~mBAAmB~~,CAAC,YAAY,CAAC,CAAC;~~QAExC~~,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAoB,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,~~EAA2B~~,CAAC,CAAC;~~AAClC~~,CAAC;AAED,SAAgB,cAAc,CAC5B,qBAAsD;IAEtD,MAAM,YAAY,GAAG,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CACvE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,2BAA2B,CAAC,QAAQ,EAAE;KAC9D,CAAC,EACF,4BAA4B,CAC1B,qBAAqB,CAAC,aAAa,CACN,CAChC,CAAC;IAEF,MAAM,mBAAmB,GAAG,oCAAW,CAAC,OAAO,CAC7C,qBAAqB,CAAC,aAAa,CAAC,gBAAgB,CACrD,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE;QAIrC,MAAM,SAAS,GAAG,qBAAqB,CAAC,WAAW,CACjD,QAAQ,CAAC,WAAkB,CACF,CAAC;QAE5B,MAAM,SAAS,GAAG,2BAA2B,CAC3C,4BAA4B,CAAC,SAAS,CAAC,CACxC,CAAC;QAEF,OAAO;YACL,GAAG,IAAI;YACP,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE;SAChC,CAAC;IACJ,CAAC,EAAE,EAAmC,CAAC,CAAC;IAExC,MAAM,iBAAiB,GAAG;QACxB,MAAM,EAAE,OAAC~~;aACN~~,YAAY,CAAC,YAAY,CAAC~~;aAC1B~~,~~QAAQ~~,~~EAAE;aACV,~~MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC~~;aACxB~~,QAAQ,EAAE;~~QACb~~,QAAQ,EAAE,OAAC;aACR,YAAY,CAAC,mBAAmB,CAAC;aACjC,~~QAAQ,EAAE;aACV,~~MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC;aACxB,QAAQ,EAAE;KACd,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC,CAAC;AACvE,CAAC"}
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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"}

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

@@ -1,6 +1,13 @@
 import { z } from 'zod';
+import type { ZodNullable, ZodArray, ZodEnum } 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.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>>;
+type Relations<E extends object, IdKey extends string> = EntityParamMapService<E, IdKey>['entityParaMap']['relations'];
+type RelationsTuple<E extends object, IdKey extends string> = NonEmptyStringTuple<Relations<E, IdKey>>;
+type EnumLike<T extends readonly string[]> = {
+    [K in T[number]]: K;
+};
+export type ZodIncludeQuery<E extends object, IdKey extends string> = ZodNullable<ZodArray<ZodEnum<EnumLike<RelationsTuple<E, IdKey>>>>>;
+export declare function zodIncludeQuery<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): ZodIncludeQuery<E, IdKey>;
 export type IncludeQuery<E extends object, IdKey extends string> = z.infer<ZodIncludeQuery<E, IdKey>>;
+export {};

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

@@ -4,7 +4,8 @@ exports.zodIncludeQuery = zodIncludeQuery;
 const zod_1 = require("zod");
 const zod_utils_1 = require("../zod-utils");
 function zodIncludeQuery(entityParamMapService) {
-    const relationProps = entityParamMapService.entityParaMap.relations;
+    const relationProps = entityParamMapService
+        .entityParaMap.relations;
     return zod_1.z
         .enum(relationProps)
         .array()

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

	@@ -1 +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,KAAK,EAAE,qCAAqC;KAC7C,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC"}
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":";;AAwBA,0CAcC;AAtCD,6BAAwB;AAGxB,4CAA2C;AAqB3C,SAAgB,eAAe,CAC7B,qBAAsD;IAEtD,MAAM,aAAa,GAA6B,qBAAqB;SAClE,aAAa,CAAC,SAAqC,CAAC;IAEvD,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/sort.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ 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<{
+declare function getZodFieldRule<E extends object, IdKey extends string, PropsList extends ShapeArrayInput<E, IdKey>>(fields: PropsList, zodSchema: ZodSortRule, idKey: IdKey): z.ZodOptional<z.ZodObject<{ [K in (IdKey | 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>>;
@@ -21,7 +21,7 @@ type ZodSortRelation<E extends object, IdKey extends string> = {
 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.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>>;
+}> ? { -readonly [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 CHANGED Viewed

@@ -8,21 +8,22 @@ const zod_utils_1 = require("../zod-utils");
 function getZodSortRule() {
     return zod_1.z.enum(constants_1.SORT_TYPE).optional();
 }
-function getZodFieldRule(fields, zodSchema) {
+function getZodFieldRule(fields, zodSchema, idKey) {
     const targetShape = fields.reduce((acum, item) => ({
         ...acum,
         [item]: zodSchema,
-    }), {});
+    }), { [idKey]: zodSchema });
     return zod_1.z.object(targetShape).strict().refine((0, zod_utils_1.nonEmptyObject)()).optional();
 }
 function zodSortObject(entityParamMapService) {
     const zodSortRule = getZodSortRule();
     const relationList = (0, zod_utils_1.getRelationProps)(entityParamMapService);
+    const relationListPrimaryName = (0, zod_utils_1.getRelationPrimaryName)(entityParamMapService);
     const sortShape = json_api_nestjs_shared_1.ObjectTyped.entries(relationList).reduce((acum, [key, val]) => ({
         ...acum,
-        [key]: getZodFieldRule(val, zodSortRule),
+        [key]: getZodFieldRule(val, zodSortRule, relationListPrimaryName[key]),
     }), {
-        target: getZodFieldRule(entityParamMapService.entityParaMap.props, zodSortRule),
+        target: getZodFieldRule(entityParamMapService.entityParaMap.props, zodSortRule, entityParamMapService.entityParaMap.primaryColumnName),
     });
     return zod_1.z.strictObject(sortShape);
 }

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

	@@ -1 +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":";;~~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"}
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":";;AAuFA,oCAOC;AA9FD,4EAA8D;AAC9D,6BAAmC;AAGnC,qDAAkD;AAClD,4CAIsB;AAGtB,SAAS,cAAc;IACrB,OAAO,OAAC,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,eAAe,CAItB,MAAiB,EAAE,SAAsB,EAAE,KAAY;IACvD,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,EAAC,CAAC,KAAK,CAAC,EAAE,SAAS,EAAsE,CAC1F,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;IAC7D,MAAM,uBAAuB,GAAG,IAAA,kCAAsB,EAAC,qBAAqB,CAAC,CAAC;IAE9E,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,EACX,uBAAuB,CAAC,GAAG,CAAC,CAC7B;KACF,CAAC,EACF;QACE,MAAM,EAAE,eAAe,CACrB,qBAAqB,CAAC,aAAa,CAAC,KAAK,EACzC,WAAW,EACX,qBAAqB,CAAC,aAAa,CAAC,iBAAiB,CACtD;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 CHANGED Viewed

@@ -2,13 +2,19 @@ import { z, ZodArray } from 'zod';
 import { EntityParam, TypeField, ExtractJsonApiReadOnlyKeys, ExtractJsonApiImmutableKeys } from '../../../../types';
 import { ResultSchema } from './type';
 import { EntityParamMapService } from '../../service';
-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): 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.ZodJSONSchema, Null, isPatch>;
+declare function getZodRulesForNumberFunc<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodPreprocess<z.ZodNumber>, Null, isPatch>;
+declare const getZodRulesForNumber: typeof getZodRulesForNumberFunc;
+declare function getZodRulesForStringFunc<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodString, Null, isPatch>;
+declare const getZodRulesForString: typeof getZodRulesForStringFunc;
+declare function getZodRulesForDateFunc<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 const getZodRulesForDate: typeof getZodRulesForDateFunc;
+declare function getZodRulesForBooleanFunc<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodBoolean, Null, isPatch>;
+declare const getZodRulesForBoolean: typeof getZodRulesForBooleanFunc;
+declare function getZodSchemaForJsonFunc<Null extends true | false, isPatch extends true | false>(isNullable: Null, isPatch: isPatch): ResultSchema<z.ZodJSONSchema, Null, isPatch>;
+declare const getZodSchemaForJson: typeof getZodSchemaForJsonFunc;
 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>;
+declare function getZodRulesForArrayFunc<T extends TypeField, Null extends true | false, isPatch extends true | false>(propsField: T, isNullable: Null, isPatch: isPatch): ZodRulesResultArray<T, Null, isPatch>;
+declare const getZodRulesForArray: typeof getZodRulesForArrayFunc;
 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>>;
 export type IsNullableProps<E extends object, IdKey extends string, K extends keyof E> = K extends EntityParam<E, IdKey>['propsNullable'][number] ? true : false;

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

@@ -1,29 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getZodRulesForNumber = getZodRulesForNumber;
 exports.zodAttributes = zodAttributes;
 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 map_transform_to_json_shema_1 = require("../map-transform-to-json-shema");
-function getZodRulesForNumber(isNullable, isPatch) {
+function getZodRulesForNumberFunc(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 getZodRulesForNumber = (0, zod_utils_1.memoize)(getZodRulesForNumberFunc);
+function getZodRulesForStringFunc(isNullable, isPatch) {
     return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.string(), isNullable, isPatch);
 }
-function getZodRulesForDate(isNullable, isPatch) {
+const getZodRulesForString = (0, zod_utils_1.memoize)(getZodRulesForStringFunc);
+function getZodRulesForDateFunc(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 getZodRulesForDate = (0, zod_utils_1.memoize)(getZodRulesForDateFunc);
+function getZodRulesForBooleanFunc(isNullable, isPatch) {
     return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.boolean(), isNullable, isPatch);
 }
-function getZodSchemaForJson(isNullable, isPatch) {
+const getZodRulesForBoolean = (0, zod_utils_1.memoize)(getZodRulesForBooleanFunc);
+function getZodSchemaForJsonFunc(isNullable, isPatch) {
     return (0, zod_utils_1.setOptionalOrNot)(zod_1.z.json(), isNullable, isPatch);
 }
-function getZodRulesForArray(propsField, isNullable, isPatch) {
+const getZodSchemaForJson = (0, zod_utils_1.memoize)(getZodSchemaForJsonFunc);
+function getZodRulesForArrayFunc(propsField, isNullable, isPatch) {
     let schema;
     switch (propsField) {
         case types_1.TypeField.number:
@@ -40,6 +44,7 @@ function getZodRulesForArray(propsField, isNullable, isPatch) {
     }
     return (0, zod_utils_1.setOptionalOrNot)(schema.array(), isNullable, isPatch);
 }
+const getZodRulesForArray = (0, zod_utils_1.memoize)(getZodRulesForArrayFunc);
 function assertPropsIsarrayProps(paramMap, propsName) {
     return Reflect.get(paramMap.propsType, `${propsName}`) === types_1.TypeField.array;
 }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"attributes.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/attributes.ts"],"names":[],"mappings":";;~~AASA~~,~~oDAMC;AAiOD,~~sCAkCC;~~AAlRD~~,4EAA8D;AAC9D,6BAA2C;AAE3C,6CAAoH;AACpH,~~4CAAgE~~;~~AAGhE~~,gFAAqE;AAErE,~~SAAgB~~,~~oBAAoB~~,~~CAGlC~~,UAAgB,EAAE,OAAgB;IAClC,MAAM,MAAM,GAAG,OAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1D,OAAO,IAAA,4BAAgB,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAED,~~SAAS~~,oBAAoB,~~CAG3B~~,UAAgB,EAAE,OAAgB;IAClC,OAAO,IAAA,4BAAgB,EAAC,OAAC,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,~~kBAAkB~~,~~CAGzB~~,UAAgB,EAAE,OAAgB;IAClC,OAAO,IAAA,4BAAgB,EAAC,OAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,CAAA,iDAAkC,CAAA,CAAC,CAAC;AAC/G,CAAC;~~AAED~~,SAAS,~~qBAAqB~~,~~CAG5B~~,UAAgB,EAAE,OAAgB;IAClC,OAAO,IAAA,4BAAgB,EAAC,OAAC,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,~~mBAAmB~~,~~CAG1B~~,UAAgB,EAAE,OAAgB;IAClC,OAAO,IAAA,4BAAgB,EAAC,OAAC,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;~~AAQD~~,~~SAAS~~,mBAAmB,~~CAK1B~~,UAAa,EACb,UAAgB,EAChB,OAAgB;IAEhB,IAAI,MAAe,CAAC;IACpB,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,iBAAS,CAAC,MAAM;YACnB,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC5C,MAAM;QACR,KAAK,iBAAS,CAAC,IAAI;YACjB,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC1C,MAAM;QACR,KAAK,iBAAS,CAAC,OAAO;YACpB,MAAM,GAAG,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM;QACR;YACE,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,IAAA,4BAAgB,EAAC,MAAM,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,CAI1D,CAAC;AACJ,CAAC;~~AA6ED~~,SAAS,uBAAuB,CAC9B,QAA+B,EAC/B,SAAkB;IAElB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC,KAAK,iBAAS,CAAC,KAAK,CAAC;AAC7E,CAAC;AAED,SAAS,WAAW,CAMlB,QAA+B,EAC/B,SAAY,EACZ,OAAgB;IAEhB,uCAAuC;IACvC,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,uBAAuB,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAE1D,OAAO,mBAAmB,CAAC,cAAc,EAAE,UAAU,EAAE,OAAO,CAM7D,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAChD,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,iBAAS,CAAC,IAAI;YACjB,OAAO,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAM5C,CAAC;QACJ,KAAK,iBAAS,CAAC,OAAO;YACpB,OAAO,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAM/C,CAAC;QACJ,KAAK,iBAAS,CAAC,MAAM;YACnB,OAAO,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAM9C,CAAC;QACJ,KAAK,iBAAS,CAAC,MAAM;YACnB,OAAO,mBAAmB,CAAC,UAAU,EAAE,OAAO,CAM7C,CAAC;QACJ;YACE,OAAO,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAM9C,CAAC;IACN,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,iBAA6D,EAC7D,GAA0B;IAE1B,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,iBAAiB,CAAC,CAAC;AACjD,CAAC;AAED,SAAgB,aAAa,CAK3B,qBAAsD,EACtD,OAAU,EACV,gBAAiD,EAAE,EACnD,iBAAmD,EAAE;IAGrD,MAAM,SAAS,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAEtD,MAAM,YAAY,GAAG,OAAO;QAC1B,CAAC,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,cAAc,CAAC;QACvC,CAAC,CAAC,aAAa,CAAC;IAElB,MAAM,WAAW,GAAG,oCAAW,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAC9D,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACZ,IACE,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC;YACrD,CAAC,YAAY,CAAC,QAAQ,CAAC,GAA+C,CAAC,EACvE,CAAC;YACD,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAgD,CAAC,CAAC;YAC9F,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,IAAI,WAAW,CAAC,CAAC;YACnE,IAAI,CAAC,GAAG,CAAC,GAAG,MAAmE,CAAC;QAClF,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EACD,EAAsC,CACvC,CAAC;IAEF,OAAO,OAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,0BAAc,GAAE,CAAC,CAAC;AACjE,CAAC"}
1	+ {"version":3,"file":"attributes.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/attributes.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/mixin/zod/zod-share/id.d.ts CHANGED Viewed

@@ -3,3 +3,15 @@ import { TypeForId } from '../../../../types';
 export declare function zodId(typeId: TypeForId): z.ZodString;
 export type ZodId = ReturnType<typeof zodId>;
 export type Id = z.infer<ZodId>;
+/**
+ * JSON:API carries every id as a string, including ids of numeric primary keys.
+ * A client-supplied id ends up written straight onto the new entity, so it has
+ * to match the declared primary-key type: MikroORM 7 validates property types
+ * on flush and rejects a string written to a numeric key, where earlier
+ * versions coerced it silently.
+ *
+ * Only the resource's own id is converted. Relationship linkage ids keep their
+ * string form -- they travel a different path and are matched as strings.
+ */
+export declare function zodPrimaryKeyId(typeId: TypeForId): z.ZodString | z.ZodPipe<z.ZodString, z.ZodTransform<number, string>>;
+export type ZodPrimaryKeyId = ReturnType<typeof zodPrimaryKeyId>;

package/src/lib/modules/mixin/zod/zod-share/id.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zodId = zodId;
+exports.zodPrimaryKeyId = zodPrimaryKeyId;
 const zod_1 = require("zod");
 const types_1 = require("../../../../types");
 const reg = new RegExp('^-?\\d+$');
@@ -11,4 +12,20 @@ function zodId(typeId) {
     }
     return idSchema;
 }
+/**
+ * JSON:API carries every id as a string, including ids of numeric primary keys.
+ * A client-supplied id ends up written straight onto the new entity, so it has
+ * to match the declared primary-key type: MikroORM 7 validates property types
+ * on flush and rejects a string written to a numeric key, where earlier
+ * versions coerced it silently.
+ *
+ * Only the resource's own id is converted. Relationship linkage ids keep their
+ * string form -- they travel a different path and are matched as strings.
+ */
+function zodPrimaryKeyId(typeId) {
+    if (typeId === types_1.TypeField.number) {
+        return zodId(typeId).transform((value) => Number(value));
+    }
+    return zodId(typeId);
+}
 //# sourceMappingURL=id.js.map

package/src/lib/modules/mixin/zod/zod-share/id.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"id.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/id.ts"],"names":[],"mappings":";;AAKA,sBAOC;~~AAZD~~,6BAAwB;AACxB,6CAAyD;AAEzD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;AAEnC,SAAgB,KAAK,CAAC,MAAiB;IACrC,IAAI,QAAQ,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC;IAC1B,IAAI,MAAM,KAAK,iBAAS,CAAC,MAAM,EAAE,CAAC;QAChC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1	+ {"version":3,"file":"id.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/id.ts"],"names":[],"mappings":";;AAKA,sBAOC;AAeD,0CAMC;AAjCD,6BAAwB;AACxB,6CAAyD;AAEzD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;AAEnC,SAAgB,KAAK,CAAC,MAAiB;IACrC,IAAI,QAAQ,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC;IAC1B,IAAI,MAAM,KAAK,iBAAS,CAAC,MAAM,EAAE,CAAC;QAChC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAKD;;;;;;;;;GASG;AACH,SAAgB,eAAe,CAAC,MAAiB;IAC/C,IAAI,MAAM,KAAK,iBAAS,CAAC,MAAM,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC"}

package/src/lib/modules/mixin/zod/zod-share/index.d.ts CHANGED Viewed

@@ -4,3 +4,4 @@ export * from './type';
 export * from './attributes';
 export * from './rel-data';
 export * from './relationships';
+export * from './meta';

package/src/lib/modules/mixin/zod/zod-share/index.js CHANGED Viewed

@@ -7,4 +7,5 @@ tslib_1.__exportStar(require("./type"), exports);
 tslib_1.__exportStar(require("./attributes"), exports);
 tslib_1.__exportStar(require("./rel-data"), exports);
 tslib_1.__exportStar(require("./relationships"), exports);
+tslib_1.__exportStar(require("./meta"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/mixin/zod/zod-share/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,+CAAqB;AACrB,iDAAuB;AACvB,uDAA6B;AAC7B,qDAA2B;AAC3B,0DAAgC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,+CAAqB;AACrB,iDAAuB;AACvB,uDAA6B;AAC7B,qDAA2B;AAC3B,0DAAgC;AAChC,iDAAuB"}

package/src/lib/modules/mixin/zod/zod-share/meta.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+export declare const zodMeta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+export declare const zodMetaExtractor: z.ZodPipe<z.ZodObject<{
+    meta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, z.core.$loose>, z.ZodTransform<Record<string, unknown>, {
+    [x: string]: unknown;
+    meta?: Record<string, unknown> | undefined;
+}>>;
+export type ZodMeta = typeof zodMeta;
+export type ZodMetaExtractor = typeof zodMetaExtractor;
+export type Meta = z.infer<ZodMeta>;

package/src/lib/modules/mixin/zod/zod-share/meta.js ADDED Viewed

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.zodMetaExtractor = exports.zodMeta = void 0;
+const zod_1 = require("zod");
+exports.zodMeta = zod_1.z
+    .record(zod_1.z.string(), zod_1.z.unknown())
+    .optional()
+    .meta({ id: 'MetaObject' });
+exports.zodMetaExtractor = zod_1.z
+    .object({
+    meta: exports.zodMeta,
+})
+    .loose()
+    .transform((val) => val.meta ?? {});
+//# sourceMappingURL=meta.js.map

package/src/lib/modules/mixin/zod/zod-share/meta.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-share/meta.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,OAAO,GAAG,OAAC;KACrB,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC;KAC/B,QAAQ,EAAE;KACV,IAAI,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;AAEjB,QAAA,gBAAgB,GAAG,OAAC;KAC9B,MAAM,CAAC;IACN,IAAI,EAAE,eAAO;CACd,CAAC;KACD,KAAK,EAAE;KACP,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC"}

package/src/lib/modules/mixin/zod/zod-share/page.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 export declare function zodPageInputQuery(): z.ZodDefault<z.ZodObject<{
-    size: z.ZodDefault<z.ZodPipe<z.ZodTransform<number, unknown>, z.ZodNumber>>;
-    number: z.ZodDefault<z.ZodPipe<z.ZodTransform<number, unknown>, z.ZodNumber>>;
+    size: z.ZodDefault<z.ZodPreprocess<z.ZodNumber>>;
+    number: z.ZodDefault<z.ZodPreprocess<z.ZodNumber>>;
 }, z.core.$strict>>;
 export type ZodPageInputQuery = ReturnType<typeof zodPageInputQuery>;

package/src/lib/modules/mixin/zod/zod-utils.d.ts CHANGED Viewed

@@ -12,4 +12,6 @@ export declare const stringMustBe: (type?: TypeField) => (inputString: string |
 export declare const elementOfArrayMustBe: (type?: TypeField) => (inputArray: unknown[]) => boolean;
 export declare function guardIsKeyOfObject<R>(object: R, key: string | number | symbol): asserts key is keyof R;
 export declare function getRelationProps<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): EntityRelationProps<E, IdKey>;
+export declare function getRelationPrimaryName<E extends object, IdKey extends string>(entityParamMapService: EntityParamMapService<E, IdKey>): { [K in keyof EntityRelationProps<E, IdKey>]: IdKey; };
 export declare function setOptionalOrNot<Schema extends ZodType, Null extends true | false, isPatch extends true | false>(schema: Schema, isNullable: Null, isPatch: isPatch): ResultSchema<Schema, Null, isPatch>;
+export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;

package/src/lib/modules/mixin/zod/zod-utils.js CHANGED Viewed

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.elementOfArrayMustBe = exports.stringMustBe = exports.arrayItemStringLongerThan = exports.stringLongerThan = exports.oneOf = exports.getValidationErrorForStrict = exports.uniqueArray = exports.nonEmptyObject = void 0;
 exports.guardIsKeyOfObject = guardIsKeyOfObject;
 exports.getRelationProps = getRelationProps;
+exports.getRelationPrimaryName = getRelationPrimaryName;
 exports.setOptionalOrNot = setOptionalOrNot;
+exports.memoize = memoize;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const types_1 = require("../../../types");
 const nonEmptyObject = () => (object) => !!(typeof object === 'object' && object && Object.keys(object).length > 0);
@@ -61,6 +63,13 @@ function getRelationProps(entityParamMapService) {
         return acum;
     }, {});
 }
+function getRelationPrimaryName(entityParamMapService) {
+    return json_api_nestjs_shared_1.ObjectTyped.entries(entityParamMapService.entityParaMap.relationProperty).reduce((acum, [name, value]) => {
+        const relMap = entityParamMapService.getParamMap(value.entityClass);
+        Reflect.set(acum, name, relMap.primaryColumnName);
+        return acum;
+    }, {});
+}
 function setOptionalOrNot(schema, isNullable, isPatch) {
     if (isPatch) {
         return (isNullable ? schema.nullable() : schema).optional();
@@ -69,4 +78,15 @@ function setOptionalOrNot(schema, isNullable, isPatch) {
         return (isNullable ? schema.nullable().optional() : schema);
     }
 }
+function memoize(fn) {
+    const cache = new Map();
+    return ((...args) => {
+        const key = args.join('-'); // Для скаляров достаточно
+        if (cache.has(key))
+            return cache.get(key);
+        const result = fn(...args);
+        cache.set(key, result);
+        return result;
+    });
+}
 //# sourceMappingURL=zod-utils.js.map

package/src/lib/modules/mixin/zod/zod-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"zod-utils.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-utils.ts"],"names":[],"mappings":";;;AAkEA,gDAQC;AAED,4CAUC;AAED,4CAsBC;~~AA9GD~~,~~4EAA8D~~;~~AAI9D~~,~~0CAAgE~~;~~AAIzD~~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"}
1	+ {"version":3,"file":"zod-utils.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-utils.ts"],"names":[],"mappings":";;;AAkEA,gDAQC;AAED,4CAUC;AAED,wDAkBC;AAED,4CAsBC;AAED,0BASC;AA7ID,4EAA4E;AAI5E,0CAA+F;AAIxF,MAAM,cAAc,GACzB,GAAG,EAAE,CACH,CAAI,MAAS,EAAE,EAAE,CACf,CAAC,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAHpE,QAAA,cAAc,kBAGsD;AAE1E,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,CAAC;AAAlE,QAAA,WAAW,eAAuD;AAExE,MAAM,2BAA2B,GAAG,CACzC,KAAe,EACf,IAAyB,EACzB,EAAE,CACF,qBAAqB,IAAI,iCAAiC,KAAK,CAAC,IAAI,CAClE,KAAK,CACN,IAAI,CAAC;AANK,QAAA,2BAA2B,+BAMhC;AAED,MAAM,KAAK,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,CAAC,GAAQ,EAAE,EAAE;IACpD,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AANW,QAAA,KAAK,SAMhB;AAEK,MAAM,gBAAgB,GAC3B,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,CACb,CAAC,GAAW,EAAE,EAAE,CACd,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;AAHb,QAAA,gBAAgB,oBAGH;AAEnB,MAAM,yBAAyB,GACpC,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,CACb,CAAC,KAA2B,EAAE,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC;AALO,QAAA,yBAAyB,6BAKhC;AAEC,MAAM,YAAY,GACvB,CAAC,OAAkB,iBAAS,CAAC,MAAM,EAAE,EAAE,CACrC,CAAC,WAA0B,EAAE,EAAE;IAC7B,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACtC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,iBAAS,CAAC,OAAO;YACpB,OAAO,WAAW,KAAK,MAAM,IAAI,WAAW,KAAK,OAAO,CAAC;QAC3D,KAAK,iBAAS,CAAC,MAAM;YACnB,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC;QAC9B,KAAK,iBAAS,CAAC,IAAI;YACjB,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,KAAK,cAAc,CAAC;QAC7D;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC,CAAC;AAdO,QAAA,YAAY,gBAcnB;AAEC,MAAM,oBAAoB,GAC/B,CAAC,OAAkB,iBAAS,CAAC,MAAM,EAAE,EAAE,CACrC,CAAC,UAAqB,EAAE,EAAE;IACxB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC;AALO,QAAA,oBAAoB,wBAK3B;AAEN,SAAgB,kBAAkB,CAChC,MAAS,EACT,GAA6B;IAE7B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM;QAChE,OAAO,KAAK,CAAC,CAAC;IAEhB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;AACtC,CAAC;AAED,SAAgB,gBAAgB,CAC9B,qBAAsD;IAEtD,OAAO,oCAAW,CAAC,OAAO,CACxB,qBAAqB,CAAC,aAAa,CAAC,gBAAgB,CACrD,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,KAAK,CAAC,WAAkB,CAAC,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAmC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAgB,sBAAsB,CACpC,qBAAsD;IAGtD,OAAO,oCAAW,CAAC,OAAO,CACxB,qBAAqB,CAAC,aAAa,CAAC,gBAAgB,CACrD,CAAC,MAAM,CACN,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAC9C,KAAK,CAAC,WAAkB,CACzB,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC,EACD,EAEC,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAK9B,MAAc,EACd,UAAgB,EAChB,OAAgB;IAEhB,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAIxD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAIzD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,OAAO,CAAoC,EAAK;IAC9D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC/C,OAAO,CAAC,CAAC,GAAG,IAAmB,EAAiB,EAAE;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,0BAA0B;QACtD,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAC3B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAM,CAAC;AACV,CAAC"}

package/src/lib/types/entity-param.type.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Union, Object } from 'ts-toolbelt';
-import { PropertyKeys, RelationKeys, IsIterator, Constructor } from '@klerick/json-api-nestjs-shared';
+import { AttrKeys, RelationKeys, IsIterator, Constructor } from '@klerick/json-api-nestjs-shared';
 import { CastIteratorType, UnionToTuple, IsArray, CastArrayType } from './utils-type';
 type ExtractBaseType<T> = T extends Date ? Date : T extends boolean ? boolean : T extends number ? number : T extends string ? string : T extends null ? null : T extends undefined ? undefined : T extends (infer U)[] ? U[] : object;
 export declare enum TypeField {
@@ -14,15 +14,15 @@ export declare enum TypeField {
 export type TypeForId = Extract<TypeField, TypeField.number | TypeField.string>;
 type TypeProps<T> = T extends Date ? TypeField.date : T extends any[] ? TypeField.array : T extends object ? TypeField.object : T extends boolean ? TypeField.boolean : T extends number ? TypeField.number : T extends string ? TypeField.string : T extends undefined ? never : TypeField.object;
 export type PropertyWithType<E extends object, IdKey extends string = 'id'> = {
-    [K in PropertyKeys<E, IdKey>]: Exclude<E[K], null | undefined> extends never ? TypeField.null : TypeProps<ExtractBaseType<Exclude<E[K], null | undefined>>>;
+    [K in AttrKeys<E, IdKey>]: Exclude<E[K], null | undefined> extends never ? TypeField.null : TypeProps<ExtractBaseType<Exclude<E[K], null | undefined>>>;
 };
 export type ArrayProperty<E extends object, IdKey extends string = 'id'> = {
-    [K in PropertyKeys<E, IdKey>]: Exclude<E[K], null | undefined> extends never ? never : IsArray<Exclude<E[K], null | undefined>> extends 1 ? K : never;
-}[PropertyKeys<E, IdKey>];
+    [K in AttrKeys<E, IdKey>]: Exclude<E[K], null | undefined> extends never ? never : IsArray<Exclude<E[K], null | undefined>> extends 1 ? K : never;
+}[AttrKeys<E, IdKey>];
 export type ArrayPropertyType<E extends object, IdKey extends string = 'id'> = {
     [K in ArrayProperty<E, IdKey>]: TypeProps<CastArrayType<Exclude<E[K], null | undefined>>>;
 };
-export type NullableProperty<E extends object, IdKey extends string = 'id'> = Union.Intersect<Object.NullableKeys<E>, PropertyKeys<E, IdKey>>;
+export type NullableProperty<E extends object, IdKey extends string = 'id'> = Union.Intersect<Object.NullableKeys<E>, AttrKeys<E, IdKey>>;
 export type RelationProperty<E extends object, IdKey extends string = 'id'> = {
     [K in RelationKeys<E, IdKey>]: {
         entityClass: Constructor<CastIteratorType<E[K]>>;
@@ -32,7 +32,7 @@ export type RelationProperty<E extends object, IdKey extends string = 'id'> = {
 };
 type PrimaryType<E extends object, IdKey extends string = 'id'> = IdKey extends keyof E ? TypeProps<E[IdKey]> extends TypeField ? TypeProps<E[IdKey]> : TypeField.string : TypeField.string;
 export type EntityParam<E extends object, IdKey extends string = 'id'> = {
-    props: UnionToTuple<PropertyKeys<E, IdKey>>;
+    props: UnionToTuple<AttrKeys<E, IdKey>>;
     propsType: PropertyWithType<E, IdKey>;
     propsArrayType: ArrayPropertyType<E, IdKey>;
     propsNullable: UnionToTuple<NullableProperty<E, IdKey>>;
@@ -46,6 +46,6 @@ export type EntityParam<E extends object, IdKey extends string = 'id'> = {
 };
 type RelationType<E extends object, IdKey extends string, K extends keyof EntityParam<E, IdKey>['relationProperty']> = EntityParam<E, IdKey>['relationProperty'][K]['entityClass'] extends Constructor<infer T> ? Exclude<T, null> : never;
 export type EntityRelationProps<E extends object, IdKey extends string = 'id'> = {
-    [K in keyof EntityParam<E, IdKey>['relationProperty']]: UnionToTuple<PropertyKeys<RelationType<E, IdKey, K>>>;
+    [K in keyof EntityParam<E, IdKey>['relationProperty']]: UnionToTuple<AttrKeys<RelationType<E, IdKey, K>>>;
 };
 export {};

package/src/lib/types/module-options.types.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import { NestController, NestImport, NestProvider, PipeMixin } from './common-ty
 import { ExtractNestType, IfEquals } from './utils-type';
 type ModuleCommonParams = {
     entities: NonEmptyArray<EntityClass<AnyEntity>>;
+    excludeControllers?: EntityClass<AnyEntity>[];
     connectionName?: string;
     controllers?: NestController;
     providers?: NestProvider;

package/src/lib/utils/module-helper.js CHANGED Viewed

@@ -12,6 +12,7 @@ function prepareConfig(moduleParams) {
         providers: moduleParams['providers'] || [],
         controllers: moduleParams['controllers'] || [],
         entities: moduleParams['entities'],
+        excludeControllers: moduleParams['excludeControllers'] || [],
         options: {
             ...options,
             operationUrl: options['operationUrl'] || undefined,

package/src/lib/utils/module-helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"module-helper.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs/src/lib/utils/module-helper.ts"],"names":[],"mappings":";;AAcA,~~sCAuBC~~;AAED,sCAQC;~~AA/CD~~,2CAA8C;AAS9C,4CAGsB;AAEtB,SAAgB,aAAa,CAC3B,YAA+B;IAE/B,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,IAAK,EAAgC,CAAC;IAE7E,OAAO;QACL,cAAc,EAAE,YAAY,CAAC,gBAAgB,CAAC,IAAI,mCAAuB;QACzE,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE;QACtC,SAAS,EAAE,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE;QAC1C,WAAW,EAAE,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE;QAC9C,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;QAClC,OAAO,EAAE;YACP,GAAG,OAAO;YACV,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,SAAS;YAClD,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACrD,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YACzB,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,qBAAY;YAC/C,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;SACpC;QACD,KAAK,EAAE;YACL,qBAAqB,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;SACjH;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,MAA8B,EAC9B,WAA2B;IAE3B,OAAO,WAAW,CAAC,IAAI,CACrB,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,IAAI,CAAC,KAAK,MAAM,CAC1E,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"module-helper.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs/src/lib/utils/module-helper.ts"],"names":[],"mappings":";;AAcA,sCAwBC;AAED,sCAQC;AAhDD,2CAA8C;AAS9C,4CAGsB;AAEtB,SAAgB,aAAa,CAC3B,YAA+B;IAE/B,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,IAAK,EAAgC,CAAC;IAE7E,OAAO;QACL,cAAc,EAAE,YAAY,CAAC,gBAAgB,CAAC,IAAI,mCAAuB;QACzE,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE;QACtC,SAAS,EAAE,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE;QAC1C,WAAW,EAAE,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE;QAC9C,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;QAClC,kBAAkB,EAAE,YAAY,CAAC,oBAAoB,CAAC,IAAI,EAAE;QAC5D,OAAO,EAAE;YACP,GAAG,OAAO;YACV,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,SAAS;YAClD,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACrD,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YACzB,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,qBAAY;YAC/C,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;SACpC;QACD,KAAK,EAAE;YACL,qBAAqB,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;SACjH;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,MAA8B,EAC9B,WAA2B;IAE3B,OAAO,WAAW,CAAC,IAAI,CACrB,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,IAAI,CAAC,KAAK,MAAM,CAC1E,CAAC;AACJ,CAAC"}