From 576338fa62d923c007e7816c248fdcd7109df1f1 Mon Sep 17 00:00:00 2001
From: Madeorsk <madeorsk@protonmail.com>
Date: Fri, 4 Oct 2024 17:33:09 +0200
Subject: [PATCH] Improve returned model type for deserialize function.

---
 README.md          |  2 +-
 package.json       |  2 +-
 src/Model/Model.ts | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index cc54130..0385eeb 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 </p>
 
 <p align="center">
-	<img alt="Version 3.0.1" src="https://img.shields.io/badge/version-3.0.1-blue" />
+	<img alt="Version 3.0.2" src="https://img.shields.io/badge/version-3.0.2-blue" />
 </p>
 
 ## Introduction
diff --git a/package.json b/package.json
index ce7280b..8a7e0cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sharkitek/core",
-	"version": "3.0.1",
+	"version": "3.0.2",
 	"description": "TypeScript library for well-designed model architectures.",
 	"keywords": [
 		"deserialization",
diff --git a/src/Model/Model.ts b/src/Model/Model.ts
index 0fd40f0..9253549 100644
--- a/src/Model/Model.ts
+++ b/src/Model/Model.ts
@@ -47,7 +47,7 @@ export type IdentifierType<Shape extends ModelShape, K extends keyof Shape> = Sh
 /**
  * Interface of a Sharkitek model definition.
  */
-export interface ModelDefinition<Shape extends ModelShape, IdentifierType>
+export interface ModelDefinition<Shape extends ModelShape, IdentifierType, ModelType extends Model<Shape, IdentifierType> = Model<Shape, IdentifierType>>
 {
 	/**
 	 * Get model identifier.
@@ -62,7 +62,7 @@ export interface ModelDefinition<Shape extends ModelShape, IdentifierType>
 	 * Deserialize the model.
 	 * @param obj Serialized object.
 	 */
-	deserialize(obj: SerializedModel<Shape>): Model<Shape, IdentifierType>;
+	deserialize(obj: SerializedModel<Shape>): ModelType;
 
 	/**
 	 * Find out if the model is new (never deserialized) or not.
@@ -93,15 +93,15 @@ export interface ModelDefinition<Shape extends ModelShape, IdentifierType>
  * @param shape Model shape definition.
  * @param identifier Identifier property name.
  */
-export function model<Shape extends ModelShape, Identifier extends keyof Shape = any>(
+export function model<ModelType extends Model<Shape, IdentifierType<Shape, Identifier>>, Shape extends ModelShape, Identifier extends keyof Shape = any>(
 	shape: Shape,
 	identifier?: Identifier,
-): ModelClass<Shape, Identifier>
+): ConstructorOf<ModelType>
 {
 	// Get shape entries.
 	const shapeEntries = Object.entries(shape) as [keyof Shape, UnknownDefinition][];
 
-	return class GenericModel implements ModelDefinition<Shape, IdentifierType<Shape, Identifier>>
+	return class GenericModel implements ModelDefinition<Shape, IdentifierType<Shape, Identifier>, ModelType>
 	{
 		constructor()
 		{
@@ -161,7 +161,7 @@ export function model<Shape extends ModelShape, Identifier extends keyof Shape =
 			return serializedObject as SerializedModel<Shape>; // Returning the serialized object.
 		}
 
-		deserialize(obj: SerializedModel<Shape>): Model<Shape, IdentifierType<Shape, Identifier>>
+		deserialize(obj: SerializedModel<Shape>): ModelType
 		{
 			this.forEachModelProperty((propertyName, propertyDefinition) => {
 				// For each defined model property, assigning its deserialized value.
@@ -173,7 +173,7 @@ export function model<Shape extends ModelShape, Identifier extends keyof Shape =
 
 			this._originalObject = obj; // The model is not a new one, but loaded from a deserialized one. Storing it.
 
-			return this as Model<Shape, IdentifierType<Shape, Identifier>>;
+			return this as unknown as ModelType;
 		}
 
 
@@ -232,5 +232,5 @@ export function model<Shape extends ModelShape, Identifier extends keyof Shape =
 			return diff; // Return the difference.
 		}
 
-	} as unknown as ModelClass<Shape, Identifier>;
+	} as unknown as ConstructorOf<ModelType>;
 }