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

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 10.0.0-beta.9 (2026-01-20)
+
+### 🚀 Features
+
+- **json-api-nestjs:** enhance Patch and Post schema handling, add utility for merging patch data and refine type definitions for attributes and relationships ([2887603](https://github.com/klerick/nestjs-json-api/commit/2887603))
+
+### ❤️ Thank You
+
+- Alex H
+
 ## 10.0.0-beta.8 (2026-01-19)
 
 ### 🚀 Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs",
-  "version": "10.0.0-beta.8",
+  "version": "10.0.0-beta.9",
   "type": "commonjs",
   "description": "JsonApi Plugin for NestJs",
   "keywords": [

package/src/index.d.ts

@@ -1,7 +1,7 @@
 export { JsonApiModule } from './lib/json-api.module';
 export { JsonBaseController } from './lib/modules/mixin/controllers/json-base.controller';
 export { JsonApi, InjectService, JsonApiReadOnly, JsonApiImmutable } from './lib/modules/mixin/decorators';
-export { entityForClass, excludeMethod, } from './lib/modules/mixin/helpers/utils';
+export { entityForClass, excludeMethod, patchInputData, } from './lib/modules/mixin/helpers/utils';
 export { PrepareParams, NestProvider, ValidateQueryError, UnionToTuple, EntityParam, TypeField, Params, JsonApiReadOnlyField, JsonApiImmutableField, } from './lib/types';
 export { JsonApiTransformerService, ErrorFormatService, EntityParamMapService } from './lib/modules/mixin/service';
 export { MODULE_OPTIONS_TOKEN, CONTROLLER_OPTIONS_TOKEN, ASC, DESC, FIND_ONE_ROW_ENTITY, CHECK_RELATION_NAME, RUN_IN_TRANSACTION_FUNCTION, ORM_SERVICE, ENTITY_PARAM_MAP, DEFAULT_PAGE_SIZE, DEFAULT_QUERY_PAGE, CURRENT_ENTITY, METHOD_NAME } from './lib/constants';

package/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.METHOD_NAME = exports.CURRENT_ENTITY = exports.DEFAULT_QUERY_PAGE = exports.DEFAULT_PAGE_SIZE = exports.ENTITY_PARAM_MAP = exports.ORM_SERVICE = exports.RUN_IN_TRANSACTION_FUNCTION = exports.CHECK_RELATION_NAME = exports.FIND_ONE_ROW_ENTITY = exports.DESC = exports.ASC = exports.CONTROLLER_OPTIONS_TOKEN = exports.MODULE_OPTIONS_TOKEN = exports.EntityParamMapService = exports.ErrorFormatService = exports.JsonApiTransformerService = exports.TypeField = exports.excludeMethod = exports.entityForClass = exports.JsonApiImmutable = exports.JsonApiReadOnly = exports.InjectService = exports.JsonApi = exports.JsonBaseController = exports.JsonApiModule = void 0;
+exports.METHOD_NAME = exports.CURRENT_ENTITY = exports.DEFAULT_QUERY_PAGE = exports.DEFAULT_PAGE_SIZE = exports.ENTITY_PARAM_MAP = exports.ORM_SERVICE = exports.RUN_IN_TRANSACTION_FUNCTION = exports.CHECK_RELATION_NAME = exports.FIND_ONE_ROW_ENTITY = exports.DESC = exports.ASC = exports.CONTROLLER_OPTIONS_TOKEN = exports.MODULE_OPTIONS_TOKEN = exports.EntityParamMapService = exports.ErrorFormatService = exports.JsonApiTransformerService = exports.TypeField = exports.patchInputData = exports.excludeMethod = exports.entityForClass = exports.JsonApiImmutable = exports.JsonApiReadOnly = exports.InjectService = exports.JsonApi = exports.JsonBaseController = exports.JsonApiModule = void 0;
 var json_api_module_1 = require("./lib/json-api.module");
 Object.defineProperty(exports, "JsonApiModule", { enumerable: true, get: function () { return json_api_module_1.JsonApiModule; } });
 var json_base_controller_1 = require("./lib/modules/mixin/controllers/json-base.controller");
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "JsonApiImmutable", { enumerable: true, get: func
 var utils_1 = require("./lib/modules/mixin/helpers/utils");
 Object.defineProperty(exports, "entityForClass", { enumerable: true, get: function () { return utils_1.entityForClass; } });
 Object.defineProperty(exports, "excludeMethod", { enumerable: true, get: function () { return utils_1.excludeMethod; } });
+Object.defineProperty(exports, "patchInputData", { enumerable: true, get: function () { return utils_1.patchInputData; } });
 var types_1 = require("./lib/types");
 Object.defineProperty(exports, "TypeField", { enumerable: true, get: function () { return types_1.TypeField; } });
 var service_1 = require("./lib/modules/mixin/service");

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/json-api/json-api-nestjs/src/index.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAA7C,gHAAA,aAAa,OAAA;AAEtB,6FAA0F;AAAjF,0HAAA,kBAAkB,OAAA;AAC3B,6DAA2G;AAAlG,qGAAA,OAAO,OAAA;AAAE,2GAAA,aAAa,OAAA;AAAE,6GAAA,eAAe,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAClE,2DAG2C;AAFzC,uGAAA,cAAc,OAAA;AACd,sGAAA,aAAa,OAAA;AAEf,qCAUqB;AAJnB,kGAAA,SAAS,OAAA;AAKX,uDAIqC;AAHnC,oHAAA,yBAAyB,OAAA;AACzB,6GAAA,kBAAkB,OAAA;AAClB,gHAAA,qBAAqB,OAAA;AAEvB,6CAcyB;AAbvB,iHAAA,oBAAoB,OAAA;AACpB,qHAAA,wBAAwB,OAAA;AACxB,gGAAA,GAAG,OAAA;AACH,iGAAA,IAAI,OAAA;AACJ,gHAAA,mBAAmB,OAAA;AACnB,gHAAA,mBAAmB,OAAA;AACnB,wHAAA,2BAA2B,OAAA;AAC3B,wGAAA,WAAW,OAAA;AACX,6GAAA,gBAAgB,OAAA;AAChB,8GAAA,iBAAiB,OAAA;AACjB,+GAAA,kBAAkB,OAAA;AAClB,2GAAA,cAAc,OAAA;AACd,wGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/json-api/json-api-nestjs/src/index.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAA7C,gHAAA,aAAa,OAAA;AAEtB,6FAA0F;AAAjF,0HAAA,kBAAkB,OAAA;AAC3B,6DAA2G;AAAlG,qGAAA,OAAO,OAAA;AAAE,2GAAA,aAAa,OAAA;AAAE,6GAAA,eAAe,OAAA;AAAE,8GAAA,gBAAgB,OAAA;AAClE,2DAI2C;AAHzC,uGAAA,cAAc,OAAA;AACd,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AAEhB,qCAUqB;AAJnB,kGAAA,SAAS,OAAA;AAKX,uDAIqC;AAHnC,oHAAA,yBAAyB,OAAA;AACzB,6GAAA,kBAAkB,OAAA;AAClB,gHAAA,qBAAqB,OAAA;AAEvB,6CAcyB;AAbvB,iHAAA,oBAAoB,OAAA;AACpB,qHAAA,wBAAwB,OAAA;AACxB,gGAAA,GAAG,OAAA;AACH,iGAAA,IAAI,OAAA;AACJ,gHAAA,mBAAmB,OAAA;AACnB,gHAAA,mBAAmB,OAAA;AACnB,wHAAA,2BAA2B,OAAA;AAC3B,wGAAA,WAAW,OAAA;AACX,6GAAA,gBAAgB,OAAA;AAChB,8GAAA,iBAAiB,OAAA;AACjB,+GAAA,kBAAkB,OAAA;AAClB,2GAAA,cAAc,OAAA;AACd,wGAAA,WAAW,OAAA"}

package/src/lib/modules/mixin/helpers/utils.d.ts

@@ -1,9 +1,11 @@
 import { EntityClass, AnyEntity } from '@klerick/json-api-nestjs-shared';
 import { MethodName } from '../types';
 import { Type } from '@nestjs/common/interfaces';
+import { PostData, PatchData, Attributes, PatchDataRaw, PostDataRaw } from '../zod';
 export declare const nameIt: (name: string, cls: new (...rest: unknown[]) => Record<never, unknown>) => {
     new (...arg: unknown[]): {};
 };
 export declare function getProviderName<Entity extends object>(entity: EntityClass<Entity>, name: string): string;
 export declare function excludeMethod(names: Array<Partial<MethodName>>): Array<MethodName>;
 export declare function entityForClass<T = any>(type: Type<T>): EntityClass<AnyEntity>;
+export declare function patchInputData<E extends object, IdKey extends string = 'id'>(data: PostData<E, IdKey> | PatchData<E, IdKey>, patch: Partial<Attributes<E, IdKey, true>>): PostData<E, IdKey> | PatchData<E, IdKey> extends PatchData<E, IdKey> ? PatchDataRaw<E, IdKey> : PostDataRaw<E, IdKey>;

package/src/lib/modules/mixin/helpers/utils.js

@@ -4,6 +4,7 @@ exports.nameIt = void 0;
 exports.getProviderName = getProviderName;
 exports.excludeMethod = excludeMethod;
 exports.entityForClass = entityForClass;
+exports.patchInputData = patchInputData;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const change_case_commonjs_1 = require("change-case-commonjs");
 const bindings_1 = require("../config/bindings");
@@ -27,4 +28,13 @@ function excludeMethod(names) {
 function entityForClass(type) {
     return Reflect.getMetadata(constants_1.JSON_API_DECORATOR_ENTITY, type);
 }
+function patchInputData(data, patch) {
+    return {
+        ...data,
+        attributes: {
+            ...data.attributes,
+            ...patch,
+        },
+    };
+}
 //# sourceMappingURL=utils.js.map

package/src/lib/modules/mixin/helpers/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/helpers/utils.ts"],"names":[],"mappings":";;;AA0BA,0CAMC;AAED,sCAUC;AAED,wCAEC;AAhDD,4EAKyC;AACzC,+DAAkD;AAIlD,iDAA8C;AAE9C,kDAA+D;AAExD,MAAM,MAAM,GAAG,CACpB,IAAY,EACZ,GAAuD,EACvD,EAAE,CACF,CAAC;IACC,CAAC,IAAI,CAAC,EAAE,KAAM,SAAQ,GAAG;QACvB,YAAY,GAAG,GAAc;YAC3B,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;QAChB,CAAC;KACF;CACF,CAAC,IAAI,CAAC,CAAC,CAAC;AAVE,QAAA,MAAM,UAUR;AAEX,SAAgB,eAAe,CAC7B,MAA2B,EAC3B,IAAY;IAEZ,MAAM,UAAU,GAAG,IAAA,sCAAa,EAAC,MAAM,CAAC,CAAC;IACzC,OAAO,GAAG,IAAA,iCAAU,EAAC,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,SAAgB,aAAa,CAC3B,KAAiC;IAEjC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAC5B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,EACzC,EAA0C,CAC3C,CAAC;IACF,OAAO,oCAAW,CAAC,IAAI,CAAC,mBAAQ,CAAC,CAAC,MAAM,CACtC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CACV,CAAC;AACzB,CAAC;AAED,SAAgB,cAAc,CAAU,IAAa;IACnD,OAAO,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,IAAI,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/helpers/utils.ts"],"names":[],"mappings":";;;AAiCA,0CAMC;AAED,sCAUC;AAED,wCAEC;AACD,wCAeC;AAvED,4EAKyC;AACzC,+DAAkD;AAIlD,iDAA8C;AAE9C,kDAA+D;AASxD,MAAM,MAAM,GAAG,CACpB,IAAY,EACZ,GAAuD,EACvD,EAAE,CACF,CAAC;IACC,CAAC,IAAI,CAAC,EAAE,KAAM,SAAQ,GAAG;QACvB,YAAY,GAAG,GAAc;YAC3B,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;QAChB,CAAC;KACF;CACF,CAAC,IAAI,CAAC,CAAC,CAAC;AAVE,QAAA,MAAM,UAUR;AAEX,SAAgB,eAAe,CAC7B,MAA2B,EAC3B,IAAY;IAEZ,MAAM,UAAU,GAAG,IAAA,sCAAa,EAAC,MAAM,CAAC,CAAC;IACzC,OAAO,GAAG,IAAA,iCAAU,EAAC,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,SAAgB,aAAa,CAC3B,KAAiC;IAEjC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAC5B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,EACzC,EAA0C,CAC3C,CAAC;IACF,OAAO,oCAAW,CAAC,IAAI,CAAC,mBAAQ,CAAC,CAAC,MAAM,CACtC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CACV,CAAC;AACzB,CAAC;AAED,SAAgB,cAAc,CAAU,IAAa;IACnD,OAAO,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,IAAI,CAAC,CAAC;AAC9D,CAAC;AACD,SAAgB,cAAc,CAC5B,IAA8C,EAC9C,KAA0C;IAI1C,OAAO;QACL,GAAG,IAAI;QACP,UAAU,EAAE;YACV,GAAG,IAAI,CAAC,UAAU;YAClB,GAAG,KAAK;SACT;KAGsB,CAAC;AAC5B,CAAC"}

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

@@ -1,5 +1,5 @@
 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> = {
@@ -14,6 +14,15 @@ type ZodInputPatchDataShape<E extends object, IdKey extends string> = {
 };
 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>;
-type PatchEntity<E extends object> = Omit<E, ExtractJsonApiReadOnlyKeys<E> | ExtractJsonApiImmutableKeys<E>>;
-export type PatchData<E extends object, IdKey extends string> = z.infer<ZodPatch<PatchEntity<E>, IdKey>>['data'];
+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.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":";;AAgDA,4BAUC;AA1DD,6BAAgD;AAChD,4CASsB;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"}
+{"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-schema/index.d.ts

@@ -1,11 +1,11 @@
 import { z, ZodObject, ZodOptional } from 'zod';
 import { ExtractJsonApiReadOnlyKeys, ExtractJsonApiImmutableKeys } from '../../../../types';
-import { ZodId, ZodType, ZodAttributes, ZodRelationships } from '../zod-share';
+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>;
     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>;
@@ -14,7 +14,15 @@ type ZodInputPostDataShape<E extends object, IdKey extends string> = {
 };
 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>;
+};
 export {};

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

@@ -17,14 +17,4 @@ function zodPost(entityParamMapService, readOnlyProps = [], immutableProps = [])
         data: getShape(entityParamMapService, readOnlyProps, immutableProps),
     });
 }
-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":";;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/types/entity-param.type.d.ts

@@ -1,6 +1,7 @@
 import { Union, Object } from 'ts-toolbelt';
 import { PropertyKeys, 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 {
     array = "array",
     date = "date",
@@ -11,15 +12,15 @@ export declare enum TypeField {
     null = "null"
 }
 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 : TypeField.object;
+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> extends never ? TypeField.null : TypeProps<Exclude<E[K], null>>;
+    [K in PropertyKeys<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> extends never ? never : IsArray<Exclude<E[K], null>> extends 1 ? K : never;
+    [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>];
 export type ArrayPropertyType<E extends object, IdKey extends string = 'id'> = {
-    [K in ArrayProperty<E, IdKey>]: TypeProps<CastArrayType<Exclude<E[K], null>>>;
+    [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 RelationProperty<E extends object, IdKey extends string = 'id'> = {

package/src/lib/types/entity-param.type.js

@@ -1,6 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeField = void 0;
+// import {
+//   JsonApiReadOnlyField,
+//   JsonApiImmutableField,
+// } from './json-api-read-only';
+// // Remove marker types from value type
+// type CleanMarkerTypes<T> = T extends JsonApiReadOnlyField &
+//   JsonApiImmutableField
+//   ? Omit<T, keyof JsonApiReadOnlyField | keyof JsonApiImmutableField>
+//   : T extends JsonApiReadOnlyField
+//   ? Omit<T, keyof JsonApiReadOnlyField>
+//   : T extends JsonApiImmutableField
+//   ? Omit<T, keyof JsonApiImmutableField>
+//   : T;
 var TypeField;
 (function (TypeField) {
     TypeField["array"] = "array";

package/src/lib/types/entity-param.type.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-param.type.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs/src/lib/types/entity-param.type.ts"],"names":[],"mappings":";;;AAcA,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,0BAAa,CAAA;IACb,8BAAiB,CAAA;IACjB,gCAAmB,CAAA;IACnB,8BAAiB,CAAA;IACjB,8BAAiB,CAAA;IACjB,0BAAa,CAAA;AACf,CAAC,EARW,SAAS,yBAAT,SAAS,QAQpB"}
+{"version":3,"file":"entity-param.type.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs/src/lib/types/entity-param.type.ts"],"names":[],"mappings":";;;AAyBA,WAAW;AACX,0BAA0B;AAC1B,2BAA2B;AAC3B,iCAAiC;AAEjC,yCAAyC;AACzC,8DAA8D;AAC9D,0BAA0B;AAC1B,wEAAwE;AACxE,qCAAqC;AACrC,0CAA0C;AAC1C,sCAAsC;AACtC,2CAA2C;AAC3C,SAAS;AAET,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,0BAAa,CAAA;IACb,8BAAiB,CAAA;IACjB,gCAAmB,CAAA;IACnB,8BAAiB,CAAA;IACjB,8BAAiB,CAAA;IACjB,0BAAa,CAAA;AACf,CAAC,EARW,SAAS,yBAAT,SAAS,QAQpB"}