@forklaunch/core 0.2.22 → 0.2.24

package/lib/src/cache/interfaces/ttlCache.interface.d.ts

@@ -9,7 +9,7 @@ export interface TtlCache {
      * @param {TtlCacheRecord} cacheRecord - The cache record to put into the cache.
      * @returns {Promise<void>} - A promise that resolves when the record is put into the cache.
      */
-    putRecord(cacheRecord: TtlCacheRecord): Promise<void>;
+    putRecord<T>(cacheRecord: TtlCacheRecord<T>): Promise<void>;
     /**
      * Deletes a record from the cache.
      *
@@ -23,7 +23,7 @@ export interface TtlCache {
      * @param {string} cacheRecordKey - The key of the cache record to read.
      * @returns {Promise<TtlCacheRecord>} - A promise that resolves with the cache record.
      */
-    readRecord(cacheRecordKey: string): Promise<TtlCacheRecord>;
+    readRecord<T>(cacheRecordKey: string): Promise<TtlCacheRecord<T>>;
     /**
      * Peeks at a record in the cache to check if it exists.
      *

package/lib/src/cache/interfaces/ttlCache.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ttlCache.interface.d.ts","sourceRoot":"","sources":["../../../../src/cache/interfaces/ttlCache.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAE5D;;;;;OAKG;IACH,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD;;;;OAIG;IACH,kBAAkB,IAAI,MAAM,CAAC;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACrD"}
+{"version":3,"file":"ttlCache.interface.d.ts","sourceRoot":"","sources":["../../../../src/cache/interfaces/ttlCache.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;;;;OAKG;IACH,SAAS,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D;;;;;OAKG;IACH,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAElE;;;;;OAKG;IACH,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD;;;;OAIG;IACH,kBAAkB,IAAI,MAAM,CAAC;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACrD"}

package/lib/src/cache/redisTtlCache.d.ts

@@ -21,7 +21,7 @@ export declare class RedisTtlCache implements TtlCache {
      * @param {TtlCacheRecord} param0 - The cache record to put into the cache.
      * @returns {Promise<void>} - A promise that resolves when the record is put into the cache.
      */
-    putRecord({ key, value, ttlMilliseconds }: TtlCacheRecord): Promise<void>;
+    putRecord<T>({ key, value, ttlMilliseconds }: TtlCacheRecord<T>): Promise<void>;
     /**
      * Deletes a record from the Redis cache.
      *
@@ -36,7 +36,7 @@ export declare class RedisTtlCache implements TtlCache {
      * @returns {Promise<TtlCacheRecord>} - A promise that resolves with the cache record.
      * @throws {Error} - Throws an error if the record is not found.
      */
-    readRecord(cacheRecordKey: string): Promise<TtlCacheRecord>;
+    readRecord<T>(cacheRecordKey: string): Promise<TtlCacheRecord<T>>;
     /**
      * Lists the keys in the Redis cache that match a pattern prefix.
      *

package/lib/src/cache/redisTtlCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redisTtlCache.d.ts","sourceRoot":"","sources":["../../../src/cache/redisTtlCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAgB,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D;;;GAGG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAU1C,OAAO,CAAC,eAAe;IATzB,OAAO,CAAC,MAAM,CAAC;IAEf;;;;;OAKG;gBAEO,eAAe,EAAE,MAAM,EAC/B,cAAc,CAAC,EAAE,kBAAkB;IASrC;;;;;OAKG;IACG,SAAS,CAAC,EACd,GAAG,EACH,KAAK,EACL,eAAsC,EACvC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjC;;;;;OAKG;IACG,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzD;;;;;;OAMG;IACG,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAajE;;;;;OAKG;IACG,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzD;;;;;OAKG;IACG,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;OAIG;IACH,kBAAkB,IAAI,MAAM;CAG7B"}
+{"version":3,"file":"redisTtlCache.d.ts","sourceRoot":"","sources":["../../../src/cache/redisTtlCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAgB,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D;;;GAGG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAU1C,OAAO,CAAC,eAAe;IATzB,OAAO,CAAC,MAAM,CAAC;IAEf;;;;;OAKG;gBAEO,eAAe,EAAE,MAAM,EAC/B,cAAc,CAAC,EAAE,kBAAkB;IASrC;;;;;OAKG;IACG,SAAS,CAAC,CAAC,EAAE,EACjB,GAAG,EACH,KAAK,EACL,eAAsC,EACvC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMpC;;;;;OAKG;IACG,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzD;;;;;;OAMG;IACG,UAAU,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAavE;;;;;OAKG;IACG,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzD;;;;;OAKG;IACG,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;OAIG;IACH,kBAAkB,IAAI,MAAM;CAG7B"}

package/lib/src/cache/types/ttlCacheRecord.types.d.ts

@@ -6,9 +6,9 @@
  * @property {any} value - The value of the cache record.
  * @property {number} ttlMilliseconds - The time-to-live of the cache record in milliseconds.
  */
-export type TtlCacheRecord = {
+export type TtlCacheRecord<T> = {
     key: string;
-    value: unknown;
+    value: T;
     ttlMilliseconds: number;
 };
 //# sourceMappingURL=ttlCacheRecord.types.d.ts.map

package/lib/src/cache/types/ttlCacheRecord.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ttlCacheRecord.types.d.ts","sourceRoot":"","sources":["../../../../src/cache/types/ttlCacheRecord.types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC"}
+{"version":3,"file":"ttlCacheRecord.types.d.ts","sourceRoot":"","sources":["../../../../src/cache/types/ttlCacheRecord.types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,CAAC;IACT,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC"}

package/lib/src/dtoMapper/models/baseDtoMapper.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseDtoMapper.model.d.ts","sourceRoot":"","sources":["../../../../src/dtoMapper/models/baseDtoMapper.model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAE1E;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,EAAE,SAAS,kBAAkB,EACxD,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,CAAC,EAAE,EAAE,GACnB,CAAC,CAEH;AAED;;;;GAIG;AACH,8BAAsB,aAAa,CAAC,EAAE,SAAS,kBAAkB;IAC/D;;;;OAIG;IACH,GAAG,EAAG,EAAE,CAAC;IAET;;;;OAIG;IACH,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC,EAAE,CAAC,CAAC;IAEpD;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAG9B;IAEF;;;;OAIG;gBACS,eAAe,EAAE,EAAE;IAI/B;;;;;OAKG;IACH,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAUzB;IAED;;;;OAIG;IACH,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAEtB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,kBAAkB,EACtE,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,GAChC,CAAC,CAAC,QAAQ,CAAC;CAGf"}
+{"version":3,"file":"baseDtoMapper.model.d.ts","sourceRoot":"","sources":["../../../../src/dtoMapper/models/baseDtoMapper.model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAE1E;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,EAAE,SAAS,kBAAkB,EACxD,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,CAAC,EAAE,EAAE,GACnB,CAAC,CAEH;AAED;;;;GAIG;AACH,8BAAsB,aAAa,CAAC,EAAE,SAAS,kBAAkB;IAC/D;;;;OAIG;IACH,GAAG,EAAG,EAAE,CAAC;IAET;;;;OAIG;IACH,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAE3C;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC,EAAE,CAAC,CAAC;IAEpD;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAG9B;IAEF;;;;OAIG;gBACS,eAAe,EAAE,EAAE;IAI/B;;;;;OAKG;IACH,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EASzB;IAED;;;;OAIG;IACH,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAEtB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,kBAAkB,EACtE,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,GAChC,CAAC,CAAC,QAAQ,CAAC;CAGf"}

package/lib/src/dtoMapper/models/baseDtoMapper.model.js

@@ -48,8 +48,9 @@ export class BaseDtoMapper {
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
     set dto(_dto) {
-        if (!this.schemaValidator.validate(this.schemaValidator.schemify(this.schema), _dto)) {
-            throw new Error('Invalid DTO');
+        const parsedSchema = this.schemaValidator.parse(this.schemaValidator.schemify(this.schema), _dto);
+        if (!parsedSchema.ok) {
+            throw new Error(`Invalid DTO: ${parsedSchema.error}`);
         }
         this._dto = _dto;
     }

package/lib/src/dtoMapper/models/requestDtoMapper.model.d.ts

@@ -30,7 +30,7 @@ export declare abstract class RequestDtoMapper<Entity extends BaseEntity, SV ext
      * @param {this['_dto']} json - The JSON object.
      * @returns {this} - The instance of the RequestDtoMapper.
      */
-    fromJson(json: this['_dto']): this;
+    fromDto(json: this['_dto']): this;
     /**
      * Deserializes a JSON object to an entity.
      *
@@ -38,7 +38,7 @@ export declare abstract class RequestDtoMapper<Entity extends BaseEntity, SV ext
      * @param {...unknown[]} additionalArgs - Additional arguments.
      * @returns {Entity} - The entity.
      */
-    deserializeJsonToEntity(json: this['_dto'], ...additionalArgs: unknown[]): Entity;
+    deserializeDtoToEntity(json: this['_dto'], ...additionalArgs: Parameters<this['toEntity']>): Entity;
     /**
      * Creates an instance of a RequestDtoMapper from a JSON object.
      *
@@ -50,7 +50,7 @@ export declare abstract class RequestDtoMapper<Entity extends BaseEntity, SV ext
      * @param {JsonType} json - The JSON object.
      * @returns {T} - An instance of the T.
      */
-    static fromJson<T extends RequestDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator, JsonType extends T['_dto']>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, json: JsonType): T;
+    static fromDto<T extends RequestDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator, JsonType extends T['_dto']>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, json: JsonType): T;
     /**
      * Deserializes a JSON object to an entity.
      *
@@ -63,6 +63,6 @@ export declare abstract class RequestDtoMapper<Entity extends BaseEntity, SV ext
      * @param {...unknown[]} additionalArgs - Additional arguments.
      * @returns {T['_Entity']} - The entity.
      */
-    static deserializeJsonToEntity<T extends RequestDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator, JsonType extends T['_dto']>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, json: JsonType, ...additionalArgs: unknown[]): T['_Entity'];
+    static deserializeDtoToEntity<T extends RequestDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator, JsonType extends T['_dto']>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, json: JsonType, ...additionalArgs: Parameters<T['toEntity']>): T['_Entity'];
 }
 //# sourceMappingURL=requestDtoMapper.model.d.ts.map

package/lib/src/dtoMapper/models/requestDtoMapper.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestDtoMapper.model.d.ts","sourceRoot":"","sources":["../../../../src/dtoMapper/models/requestDtoMapper.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAEjE;;;;;;GAMG;AACH,8BAAsB,gBAAgB,CACpC,MAAM,SAAS,UAAU,EACzB,EAAE,SAAS,kBAAkB,CAC7B,SAAQ,aAAa,CAAC,EAAE,CAAC;IACzB;;;;OAIG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM;IAEvD;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI;IAalC;;;;;;OAMG;IACH,uBAAuB,CACrB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAClB,GAAG,cAAc,EAAE,OAAO,EAAE,GAC3B,MAAM;IAIT;;;;;;;;;;OAUG;IACH,MAAM,CAAC,QAAQ,CACb,CAAC,SAAS,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC1C,EAAE,SAAS,kBAAkB,EAC7B,QAAQ,SAAS,CAAC,CAAC,MAAM,CAAC,EAE1B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,IAAI,EAAE,QAAQ,GACb,CAAC;IAIJ;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,uBAAuB,CAC5B,CAAC,SAAS,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC1C,EAAE,SAAS,kBAAkB,EAC7B,QAAQ,SAAS,CAAC,CAAC,MAAM,CAAC,EAE1B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,IAAI,EAAE,QAAQ,EACd,GAAG,cAAc,EAAE,OAAO,EAAE,GAC3B,CAAC,CAAC,SAAS,CAAC;CAKhB"}
+{"version":3,"file":"requestDtoMapper.model.d.ts","sourceRoot":"","sources":["../../../../src/dtoMapper/models/requestDtoMapper.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAEjE;;;;;;GAMG;AACH,8BAAsB,gBAAgB,CACpC,MAAM,SAAS,UAAU,EACzB,EAAE,SAAS,kBAAkB,CAC7B,SAAQ,aAAa,CAAC,EAAE,CAAC;IACzB;;;;OAIG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM;IAEvD;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI;IAYjC;;;;;;OAMG;IACH,sBAAsB,CACpB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAClB,GAAG,cAAc,EAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAC9C,MAAM;IAIT;;;;;;;;;;OAUG;IACH,MAAM,CAAC,OAAO,CACZ,CAAC,SAAS,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC1C,EAAE,SAAS,kBAAkB,EAC7B,QAAQ,SAAS,CAAC,CAAC,MAAM,CAAC,EAC1B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,CAAC;IAI5E;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,sBAAsB,CAC3B,CAAC,SAAS,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC1C,EAAE,SAAS,kBAAkB,EAC7B,QAAQ,SAAS,CAAC,CAAC,MAAM,CAAC,EAE1B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,IAAI,EAAE,QAAQ,EACd,GAAG,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,GAC3C,CAAC,CAAC,SAAS,CAAC;CAKhB"}

package/lib/src/dtoMapper/models/requestDtoMapper.model.js

@@ -19,9 +19,10 @@ export class RequestDtoMapper extends BaseDtoMapper {
      * @param {this['_dto']} json - The JSON object.
      * @returns {this} - The instance of the RequestDtoMapper.
      */
-    fromJson(json) {
-        if (!this.schemaValidator.validate(this.schemaValidator.schemify(this.schema), json)) {
-            throw new Error('Invalid DTO');
+    fromDto(json) {
+        const parsedSchema = this.schemaValidator.parse(this.schemaValidator.schemify(this.schema), json);
+        if (!parsedSchema.ok) {
+            throw new Error(`Invalid DTO: ${parsedSchema.error}`);
         }
         this.dto = json;
         return this;
@@ -33,8 +34,8 @@ export class RequestDtoMapper extends BaseDtoMapper {
      * @param {...unknown[]} additionalArgs - Additional arguments.
      * @returns {Entity} - The entity.
      */
-    deserializeJsonToEntity(json, ...additionalArgs) {
-        return this.fromJson(json).toEntity(...additionalArgs);
+    deserializeDtoToEntity(json, ...additionalArgs) {
+        return this.fromDto(json).toEntity(...additionalArgs);
     }
     /**
      * Creates an instance of a RequestDtoMapper from a JSON object.
@@ -47,8 +48,8 @@ export class RequestDtoMapper extends BaseDtoMapper {
      * @param {JsonType} json - The JSON object.
      * @returns {T} - An instance of the T.
      */
-    static fromJson(schemaValidator, json) {
-        return construct(this, schemaValidator).fromJson(json);
+    static fromDto(schemaValidator, json) {
+        return construct(this, schemaValidator).fromDto(json);
     }
     /**
      * Deserializes a JSON object to an entity.
@@ -62,9 +63,9 @@ export class RequestDtoMapper extends BaseDtoMapper {
      * @param {...unknown[]} additionalArgs - Additional arguments.
      * @returns {T['_Entity']} - The entity.
      */
-    static deserializeJsonToEntity(schemaValidator, json, ...additionalArgs) {
+    static deserializeDtoToEntity(schemaValidator, json, ...additionalArgs) {
         return construct(this, schemaValidator)
-            .fromJson(json)
+            .fromDto(json)
             .toEntity(...additionalArgs);
     }
 }

package/lib/src/dtoMapper/models/responseDtoMapper.model.d.ts

@@ -31,7 +31,7 @@ export declare abstract class ResponseDtoMapper<Entity extends BaseEntity, SV ex
      * @returns {this['_dto']} - The JSON object.
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
-    toJson(): this['_dto'];
+    toDto(): this['_dto'];
     /**
      * Serializes an entity to a JSON object.
      *
@@ -39,7 +39,7 @@ export declare abstract class ResponseDtoMapper<Entity extends BaseEntity, SV ex
      * @returns {this['_dto']} - The JSON object.
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
-    serializeEntityToJson(entity: Entity): this['_dto'];
+    serializeEntityToDto(...[entity, ...additionalArgs]: Parameters<this['fromEntity']>): this['_dto'];
     /**
      * Populates entity mapper with DTO from an entity.
      *
@@ -50,7 +50,7 @@ export declare abstract class ResponseDtoMapper<Entity extends BaseEntity, SV ex
      * @param {T['_Entity']} entity - The entity to convert.
      * @returns {T} - An instance of the T.
      */
-    static fromEntity<T extends ResponseDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, entity: T['_Entity']): T;
+    static fromEntity<T extends ResponseDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, ...[entity, ...additionalArgs]: Parameters<T['fromEntity']>): T;
     /**
      * Serializes an entity to a JSON object.
      *
@@ -62,6 +62,6 @@ export declare abstract class ResponseDtoMapper<Entity extends BaseEntity, SV ex
      * @returns {T['_dto']} - The JSON object.
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
-    static serializeEntityToJson<T extends ResponseDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, entity: T['_Entity']): T['_dto'];
+    static serializeEntityToDto<T extends ResponseDtoMapper<BaseEntity, SV>, SV extends AnySchemaValidator, DtoType extends T['_dto']>(this: DtoMapperConstructor<T, SV>, schemaValidator: SV, ...[entity, ...additionalArgs]: Parameters<T['fromEntity']>): DtoType;
 }
 //# sourceMappingURL=responseDtoMapper.model.d.ts.map

package/lib/src/dtoMapper/models/responseDtoMapper.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"responseDtoMapper.model.d.ts","sourceRoot":"","sources":["../../../../src/dtoMapper/models/responseDtoMapper.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAEjE;;;;;;GAMG;AACH,8BAAsB,iBAAiB,CACrC,MAAM,SAAS,UAAU,EACzB,EAAE,SAAS,kBAAkB,CAC7B,SAAQ,aAAa,CAAC,EAAE,CAAC;IACzB;;;;OAIG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,IAAI;IAEvE;;;;;OAKG;IACH,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;IAYtB;;;;;;OAMG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAInD;;;;;;;;;OASG;IACH,MAAM,CAAC,UAAU,CACf,CAAC,SAAS,iBAAiB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC3C,EAAE,SAAS,kBAAkB,EAE7B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GACnB,CAAC;IAIJ;;;;;;;;;;OAUG;IACH,MAAM,CAAC,qBAAqB,CAC1B,CAAC,SAAS,iBAAiB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC3C,EAAE,SAAS,kBAAkB,EAE7B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GACnB,CAAC,CAAC,MAAM,CAAC;CAGb"}
+{"version":3,"file":"responseDtoMapper.model.d.ts","sourceRoot":"","sources":["../../../../src/dtoMapper/models/responseDtoMapper.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAEjE;;;;;;GAMG;AACH,8BAAsB,iBAAiB,CACrC,MAAM,SAAS,UAAU,EACzB,EAAE,SAAS,kBAAkB,CAC7B,SAAQ,aAAa,CAAC,EAAE,CAAC;IACzB;;;;OAIG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,IAAI;IAEvE;;;;;OAKG;IACH,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;IAWrB;;;;;;OAMG;IACH,oBAAoB,CAClB,GAAG,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAC7D,IAAI,CAAC,MAAM,CAAC;IAIf;;;;;;;;;OASG;IACH,MAAM,CAAC,UAAU,CACf,CAAC,SAAS,iBAAiB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC3C,EAAE,SAAS,kBAAkB,EAE7B,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,GAAG,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAC1D,CAAC;IAOJ;;;;;;;;;;OAUG;IACH,MAAM,CAAC,oBAAoB,CACzB,CAAC,SAAS,iBAAiB,CAAC,UAAU,EAAE,EAAE,CAAC,EAC3C,EAAE,SAAS,kBAAkB,EAC7B,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,EAEzB,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,EACjC,eAAe,EAAE,EAAE,EACnB,GAAG,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAC1D,OAAO;CAKX"}

package/lib/src/dtoMapper/models/responseDtoMapper.model.js

@@ -19,9 +19,10 @@ export class ResponseDtoMapper extends BaseDtoMapper {
      * @returns {this['_dto']} - The JSON object.
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
-    toJson() {
-        if (!this.schemaValidator.validate(this.schemaValidator.schemify(this.schema), this.dto)) {
-            throw new Error('Invalid DTO');
+    toDto() {
+        const parsedSchema = this.schemaValidator.parse(this.schemaValidator.schemify(this.schema), this.dto);
+        if (!parsedSchema.ok) {
+            throw new Error(`Invalid DTO: ${parsedSchema.error}`);
         }
         return this.dto;
     }
@@ -32,8 +33,8 @@ export class ResponseDtoMapper extends BaseDtoMapper {
      * @returns {this['_dto']} - The JSON object.
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
-    serializeEntityToJson(entity) {
-        return this.fromEntity(entity).toJson();
+    serializeEntityToDto(...[entity, ...additionalArgs]) {
+        return this.fromEntity(entity, ...additionalArgs).toDto();
     }
     /**
      * Populates entity mapper with DTO from an entity.
@@ -45,8 +46,8 @@ export class ResponseDtoMapper extends BaseDtoMapper {
      * @param {T['_Entity']} entity - The entity to convert.
      * @returns {T} - An instance of the T.
      */
-    static fromEntity(schemaValidator, entity) {
-        return construct(this, schemaValidator).fromEntity(entity);
+    static fromEntity(schemaValidator, ...[entity, ...additionalArgs]) {
+        return construct(this, schemaValidator).fromEntity(entity, ...additionalArgs);
     }
     /**
      * Serializes an entity to a JSON object.
@@ -59,7 +60,9 @@ export class ResponseDtoMapper extends BaseDtoMapper {
      * @returns {T['_dto']} - The JSON object.
      * @throws {Error} - Throws an error if the DTO is invalid.
      */
-    static serializeEntityToJson(schemaValidator, entity) {
-        return construct(this, schemaValidator).serializeEntityToJson(entity);
+    static serializeEntityToDto(schemaValidator, ...[entity, ...additionalArgs]) {
+        return construct(this, schemaValidator)
+            .fromEntity(entity, ...additionalArgs)
+            .toDto();
     }
 }

package/lib/tests/dtoMapper.test.js

@@ -26,7 +26,7 @@ class TestRequestDtoMapper extends RequestDtoMapper {
         name: string,
         age: number
     };
-    toEntity(...additionalArgs) {
+    toEntity(arg1, arg2) {
         const entity = new TestEntity();
         entity.id = this.dto.id;
         entity.name = this.dto.name;
@@ -40,7 +40,7 @@ class TestResponseDtoMapper extends ResponseDtoMapper {
         name: string,
         age: number
     };
-    fromEntity(entity) {
+    fromEntity(entity, arg1, arg2) {
         this.dto = {
             id: entity.id,
             name: entity.name,
@@ -54,10 +54,13 @@ function extractNonTimeBasedEntityFields(entity) {
     entity.updatedAt = new Date(0);
     return entity;
 }
+function genericDtoWrapperFunction(dto) {
+    return dto;
+}
 describe('request dtoMapper tests', () => {
     let TestRequestDM;
     beforeAll(() => {
-        TestRequestDM = new TestRequestDtoMapper(SchemaValidator());
+        TestRequestDM = new TestRequestDtoMapper(SV);
     });
     test('schema static and constructed equality', async () => {
         expect(TestRequestDM.schema).toEqual(TestRequestDtoMapper.schema());
@@ -68,8 +71,8 @@ describe('request dtoMapper tests', () => {
             name: 'test',
             age: 1
         };
-        const responseDM = TestRequestDM.fromJson(json);
-        const staticDM = TestRequestDtoMapper.fromJson(SchemaValidator(), json);
+        const responseDM = TestRequestDM.fromDto(json);
+        const staticDM = TestRequestDtoMapper.fromDto(SV, json);
         const expectedDto = {
             id: '123',
             name: 'test',
@@ -85,9 +88,9 @@ describe('request dtoMapper tests', () => {
             name: 'test',
             age: 1
         };
-        const entity = extractNonTimeBasedEntityFields(TestRequestDM.deserializeJsonToEntity(json));
-        const objectEntity = extractNonTimeBasedEntityFields(TestRequestDM.fromJson(json).toEntity());
-        const staticEntity = extractNonTimeBasedEntityFields(TestRequestDtoMapper.deserializeJsonToEntity(SchemaValidator(), json));
+        const entity = extractNonTimeBasedEntityFields(TestRequestDM.deserializeDtoToEntity(json, 'arg1'));
+        const objectEntity = extractNonTimeBasedEntityFields(TestRequestDM.fromDto(json).toEntity('arg1'));
+        const staticEntity = extractNonTimeBasedEntityFields(TestRequestDtoMapper.deserializeDtoToEntity(SV, json, 'arg1', 'arg2'));
         let expectedEntity = new TestEntity();
         expectedEntity.id = '123';
         expectedEntity.name = 'test';
@@ -107,16 +110,15 @@ describe('request dtoMapper tests', () => {
             name: 'test'
         };
         // @ts-expect-error
-        expect(() => TestRequestDM.fromJson(json)).toThrow();
-        expect(() => 
+        expect(() => TestRequestDM.fromDto(json)).toThrow();
         // @ts-expect-error
-        TestRequestDtoMapper.fromJson(new TypeboxSchemaValidator(), json)).toThrow();
+        expect(() => TestRequestDtoMapper.fromDto(SV, json)).toThrow();
     });
 });
 describe('response dtoMapper tests', () => {
     let TestResponseDM;
     beforeAll(() => {
-        TestResponseDM = new TestResponseDtoMapper(SchemaValidator());
+        TestResponseDM = new TestResponseDtoMapper(SV);
     });
     test('schema static and constructed equality', async () => {
         expect(TestResponseDM.schema).toEqual(TestResponseDtoMapper.schema());
@@ -126,8 +128,8 @@ describe('response dtoMapper tests', () => {
         entity.id = '123';
         entity.name = 'test';
         entity.age = 1;
-        const responseDM = TestResponseDM.fromEntity(entity);
-        const staticDM = TestResponseDtoMapper.fromEntity(SchemaValidator(), entity);
+        const responseDM = TestResponseDM.fromEntity(entity, 'arg1');
+        const staticDM = TestResponseDtoMapper.fromEntity(SV, entity, 'arg1');
         const expectedDto = {
             id: '123',
             name: 'test',
@@ -142,9 +144,9 @@ describe('response dtoMapper tests', () => {
         entity.id = '123';
         entity.name = 'test';
         entity.age = 1;
-        const json = TestResponseDM.serializeEntityToJson(entity);
-        const objectJson = TestResponseDM.fromEntity(entity).toJson();
-        const staticJson = TestResponseDtoMapper.serializeEntityToJson(SchemaValidator(), entity);
+        const json = genericDtoWrapperFunction(TestResponseDM.serializeEntityToDto(entity, 'arg1'));
+        const objectJson = genericDtoWrapperFunction(TestResponseDM.fromEntity(entity, 'arg1').toDto());
+        const staticJson = genericDtoWrapperFunction(TestResponseDtoMapper.serializeEntityToDto(SV, entity, 'arg1', 'arg2'));
         const expectedJson = {
             id: '123',
             name: 'test',
@@ -162,7 +164,7 @@ describe('response dtoMapper tests', () => {
         const entity = new TestEntity();
         entity.id = '123';
         entity.name = 'test';
-        expect(() => TestResponseDM.fromEntity(entity).toJson()).toThrow();
-        expect(() => TestResponseDtoMapper.fromEntity(SchemaValidator(), entity).toJson()).toThrow();
+        expect(() => TestResponseDM.fromEntity(entity, 'arg1').toDto()).toThrow();
+        expect(() => TestResponseDtoMapper.fromEntity(SV, entity, 'arg1', 'arg2').toDto()).toThrow();
     });
 });