feat: add toJSON function and refactor Serializable class to utilize it

Author: LabEG

src/classes/Serializable.ts

@@ -1,4 +1,4 @@
-/* eslint-disable no-prototype-builtins */
+
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import {deserializeProperty} from "../functions/DeserializeProperty.js";
@@ -7,6 +7,7 @@ import {SerializationSettings} from "../models/SerializationSettings.js";
 import {classToFormData} from "../functions/ClassToFormData.js";
 import {getPropertyName} from "../functions/GetPropertyName.js";
 import {fromJSON} from "../functions/FromJSON.js";
+import {toJSON} from "../functions/ToJSON.js";
 
 /**
  * Class that helps you deserialize objects to classes.
@@ -98,24 +99,7 @@ export class Serializable {
      * @memberof Serializable
      */
     public toJSON (): Record<string, unknown> {
-        const toJson: Record<string, unknown> = {};
-        const keys = Reflect.ownKeys(this);
-
-        for (const key of keys) {
-            if (typeof key === "symbol") {
-                // eslint-disable-next-line no-continue
-                continue;
-            }
-
-            if (this.hasOwnProperty(key)) {
-                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, key) !== true) {
-                    const toProp = this.getJsonPropertyName(key);
-                    Reflect.set(toJson, toProp, Reflect.get(this, key));
-                }
-            }
-        }
-
-        return toJson;
+        return toJSON(this);
     }
 
     /**

src/functions/DeserializeProperty.ts

@@ -1,6 +1,7 @@
 import {Serializable} from "../classes/Serializable";
 import {AcceptedTypes} from "../models/AcceptedType";
 import {SerializationSettings} from "../models/SerializationSettings";
+import {fromJSON} from "./FromJSON";
 import {onWrongType} from "./OnWrongType";
 
 /**
@@ -103,15 +104,22 @@ export const deserializeProperty = (
             !Array.isArray(acceptedType) &&
             (
                 acceptedType.prototype instanceof Serializable ||
-                Boolean(Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType))
+                acceptedType instanceof Function
             ) &&
             jsonValue !== null &&
             jsonValue !== void 0 &&
             typeof jsonValue === "object" && !Array.isArray(jsonValue)
         ) {
-            const TypeConstructor: new () => Serializable = acceptedType as new () => Serializable;
+            if (acceptedType.prototype instanceof Serializable) {
+                const TypeConstructor = acceptedType as new () => Serializable;
 
-            return new TypeConstructor().fromJSON(jsonValue, settings);
+                return new TypeConstructor().fromJSON(jsonValue, settings);
+            }
+
+            // Class without Serializable base class
+            const TypeConstructor = acceptedType as new () => object;
+
+            return fromJSON(new TypeConstructor(), jsonValue, settings);
         } else if (// Instance any other class, not Serializable, for parsing from other class instances
             acceptedType instanceof Function &&
             jsonValue instanceof acceptedType

src/functions/ToJSON.ts

@@ -0,0 +1,28 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable no-prototype-builtins */
+
+import {Serializable} from "../classes/Serializable";
+import {getPropertyName} from "./GetPropertyName";
+
+export const toJSON = (obj: Serializable | object): Record<string, unknown> => {
+    const toJson: Record<string, unknown> = {};
+    const keys = Reflect.ownKeys(obj);
+
+    for (const key of keys) {
+        if (typeof key === "symbol") {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+
+        if (obj.hasOwnProperty(key)) {
+            if (Reflect.getMetadata("ts-serializable:jsonIgnore", obj.constructor.prototype, key) !== true) {
+                const toProp = obj instanceof Serializable ?
+                    obj.getJsonPropertyName(key) :
+                    getPropertyName(obj, key);
+                Reflect.set(toJson, toProp, Reflect.get(obj, key));
+            }
+        }
+    }
+
+    return toJson;
+};