ts-serializable 2.0.52 → 2.0.58

package/dist/classes/Serializable.d.ts

@@ -44,7 +44,7 @@ export declare class Serializable {
      * @returns {object}
      * @memberof Serializable
      */
-    toJSON(): object;
+    toJSON(): Record<string, unknown>;
     /**
      * Process exceptions from wrong types.
      * By default just print warning in console, but can by override for drop exception or logging to backend.

package/dist/classes/Serializable.js

@@ -1,13 +1,10 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
+/* eslint-disable no-prototype-builtins */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable complexity */
 /* eslint-disable max-lines-per-function */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/strict-boolean-expressions */
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable max-statements */
-/* eslint-disable @typescript-eslint/no-unsafe-call, no-prototype-builtins */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Serializable = void 0;
 const SerializationSettings_1 = require("../models/SerializationSettings");
@@ -81,12 +78,10 @@ class Serializable {
         for (const prop in fromJson) {
             // Json.hasOwnProperty(prop) - preserve for deserialization for other classes with methods
             if (fromJson.hasOwnProperty(prop) && this.hasOwnProperty(prop)) {
-                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, prop) || false) {
-                    // eslint-disable-next-line no-continue
-                    continue;
+                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, prop) !== true) {
+                    const toProp = this.getJsonPropertyName(prop);
+                    Reflect.set(toJson, toProp, Reflect.get(fromJson, prop));
                 }
-                const toProp = this.getJsonPropertyName(prop);
-                Reflect.set(toJson, toProp, Reflect.get(fromJson, prop));
             }
         }
         return toJson;
@@ -180,12 +175,11 @@ class Serializable {
                 acceptedType !== void 0 &&
                 !Array.isArray(acceptedType) &&
                 (acceptedType.prototype instanceof Serializable ||
-                    Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType)) &&
+                    Boolean(Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType))) &&
                 jsonValue !== null &&
                 jsonValue !== void 0 &&
                 typeof jsonValue === "object" && !Array.isArray(jsonValue)) {
                 const TypeConstructor = acceptedType;
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 return new TypeConstructor().fromJSON(jsonValue, settings);
             }
             else if ( // Instance any other class, not Serializable, for parse from other classes instance

package/dist/classes/Serializable.mjs

@@ -1,12 +1,9 @@
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
+/* eslint-disable no-prototype-builtins */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable complexity */
 /* eslint-disable max-lines-per-function */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/strict-boolean-expressions */
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable max-statements */
-/* eslint-disable @typescript-eslint/no-unsafe-call, no-prototype-builtins */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { SerializationSettings } from "../models/SerializationSettings";
 /**
  * Class how help you deserialize object to classes.
@@ -78,12 +75,10 @@ export class Serializable {
         for (const prop in fromJson) {
             // Json.hasOwnProperty(prop) - preserve for deserialization for other classes with methods
             if (fromJson.hasOwnProperty(prop) && this.hasOwnProperty(prop)) {
-                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, prop) || false) {
-                    // eslint-disable-next-line no-continue
-                    continue;
+                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, prop) !== true) {
+                    const toProp = this.getJsonPropertyName(prop);
+                    Reflect.set(toJson, toProp, Reflect.get(fromJson, prop));
                 }
-                const toProp = this.getJsonPropertyName(prop);
-                Reflect.set(toJson, toProp, Reflect.get(fromJson, prop));
             }
         }
         return toJson;
@@ -177,12 +172,11 @@ export class Serializable {
                 acceptedType !== void 0 &&
                 !Array.isArray(acceptedType) &&
                 (acceptedType.prototype instanceof Serializable ||
-                    Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType)) &&
+                    Boolean(Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType))) &&
                 jsonValue !== null &&
                 jsonValue !== void 0 &&
                 typeof jsonValue === "object" && !Array.isArray(jsonValue)) {
                 const TypeConstructor = acceptedType;
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 return new TypeConstructor().fromJSON(jsonValue, settings);
             }
             else if ( // Instance any other class, not Serializable, for parse from other classes instance

package/dist/decorators/JsonIgnore.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonIgnore = void 0;
 const jsonIgnore = () => (target, propertyKey) => {

package/dist/decorators/JsonIgnore.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 export const jsonIgnore = () => (target, propertyKey) => {
     Reflect.defineMetadata("ts-serializable:jsonIgnore", true, target, propertyKey);
 };

package/dist/decorators/JsonName.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonName = void 0;
 const jsonName = (jsonPropertyName) => (target, propertyKey) => {

package/dist/decorators/JsonName.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 export const jsonName = (jsonPropertyName) => (target, propertyKey) => {
     Reflect.defineMetadata("ts-serializable:jsonName", jsonPropertyName, target, propertyKey);
 };

package/dist/decorators/JsonObject.js

@@ -1,11 +1,4 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable max-statements */
-/* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonObject = void 0;
 const Serializable_1 = require("../classes/Serializable");

package/dist/decorators/JsonObject.mjs

@@ -1,10 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable max-statements */
-/* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
 import { Serializable } from "../classes/Serializable";
 export const jsonObject = (settings, extend) => (target) => {
     if (extend === true) {

package/dist/decorators/JsonProperty.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonProperty = void 0;
 const jsonProperty = (...args) => (target, propertyKey) => {

package/dist/decorators/JsonProperty.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 export const jsonProperty = (...args) => (target, propertyKey) => {
     Reflect.defineMetadata("ts-serializable:jsonTypes", args, target, propertyKey);
 };

package/dist/models/AcceptedType.d.ts

@@ -1,4 +1,4 @@
-export declare type AcceptedType = null | void | BooleanConstructor | NumberConstructor | StringConstructor | ObjectConstructor | (new (...args: (Object | null | void)[]) => object) | DateConstructor | SymbolConstructor;
+export declare type AcceptedType = null | void | BooleanConstructor | NumberConstructor | StringConstructor | ObjectConstructor | (new (...args: unknown[]) => object) | DateConstructor | SymbolConstructor;
 interface IRecursiveArray<T> extends Array<IRecursiveArray<T> | T> {
 }
 export declare type AcceptedTypes = AcceptedType | IRecursiveArray<AcceptedType>;

package/dist/models/AcceptedType.js

@@ -1,2 +1,5 @@
 "use strict";
+/* eslint-disable @typescript-eslint/sort-type-union-intersection-members */
+/* eslint-disable @typescript-eslint/no-invalid-void-type */
+/* eslint-disable @typescript-eslint/no-type-alias */
 Object.defineProperty(exports, "__esModule", { value: true });

package/dist/models/AcceptedType.mjs

@@ -1 +1,4 @@
+/* eslint-disable @typescript-eslint/sort-type-union-intersection-members */
+/* eslint-disable @typescript-eslint/no-invalid-void-type */
+/* eslint-disable @typescript-eslint/no-type-alias */
 export {};

package/package.json

@@ -1,20 +1,20 @@
 {
     "name": "ts-serializable",
-    "version": "2.0.52",
+    "version": "2.0.58",
     "description": "Serialization and deserializtion for classes",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",
     "typings": "./dist/index.d.ts",
     "dependencies": {},
     "devDependencies": {
-        "@labeg/code-style": "^2.0.31",
-        "@types/chai": "^4.3.0",
-        "@types/mocha": "^9.1.0",
+        "@labeg/code-style": "^2.0.34",
+        "@types/chai": "^4.3.1",
+        "@types/mocha": "^9.1.1",
         "chai": "^4.3.6",
-        "mocha": "^9.2.2",
+        "mocha": "^10.0.0",
         "reflect-metadata": "^0.1.13",
         "ts-node": "^10.7.0",
-        "typescript": "^4.6.2"
+        "typescript": "^4.6.4"
     },
     "scripts": {
         "cs:eslint": "eslint --fix -c .eslintrc.js --ext .tsx,.ts,.jsx,.js ./src/ ./tests/",

package/src/classes/Serializable.ts

@@ -1,12 +1,9 @@
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
+/* eslint-disable no-prototype-builtins */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable complexity */
 /* eslint-disable max-lines-per-function */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/strict-boolean-expressions */
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable max-statements */
-/* eslint-disable @typescript-eslint/no-unsafe-call, no-prototype-builtins */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import type {AcceptedTypes} from "../models/AcceptedType";
 import {SerializationSettings} from "../models/SerializationSettings";
@@ -104,21 +101,17 @@ export class Serializable {
      * @returns {object}
      * @memberof Serializable
      */
-    public toJSON (): object {
-        const fromJson: object = {...this};
-        const toJson: object = {};
+    public toJSON (): Record<string, unknown> {
+        const fromJson: this = {...this};
+        const toJson: Record<string, unknown> = {};
 
         for (const prop in fromJson) {
             // Json.hasOwnProperty(prop) - preserve for deserialization for other classes with methods
             if (fromJson.hasOwnProperty(prop) && this.hasOwnProperty(prop)) {
-                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, prop) || false) {
-                    // eslint-disable-next-line no-continue
-                    continue;
+                if (Reflect.getMetadata("ts-serializable:jsonIgnore", this.constructor.prototype, prop) !== true) {
+                    const toProp = this.getJsonPropertyName(prop);
+                    Reflect.set(toJson, toProp, Reflect.get(fromJson, prop));
                 }
-
-                const toProp = this.getJsonPropertyName(prop);
-
-                Reflect.set(toJson, toProp, Reflect.get(fromJson, prop));
             }
         }
 
@@ -187,7 +180,7 @@ export class Serializable {
                 acceptedType === Object &&
                 (typeof jsonValue === "object")
             ) {
-                return Object(jsonValue) as Object;
+                return Object(jsonValue);
             } else if (// Date
                 acceptedType === Date &&
                 (typeof jsonValue === "string" || jsonValue instanceof String || jsonValue instanceof Date)
@@ -227,7 +220,7 @@ export class Serializable {
                 !Array.isArray(acceptedType) &&
                 (
                     acceptedType.prototype instanceof Serializable ||
-                    Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType)
+                    Boolean(Reflect.getMetadata("ts-serializable:jsonObjectExtended", acceptedType))
                 ) &&
                 jsonValue !== null &&
                 jsonValue !== void 0 &&
@@ -235,7 +228,6 @@ export class Serializable {
             ) {
                 const TypeConstructor: new () => Serializable = acceptedType as new () => Serializable;
 
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 return new TypeConstructor().fromJSON(jsonValue, settings);
             } else if (// Instance any other class, not Serializable, for parse from other classes instance
                 acceptedType instanceof Function &&
@@ -248,7 +240,7 @@ export class Serializable {
         // Process wrong type and return default value
         this.onWrongType(prop, "is invalid", jsonValue);
 
-        return Reflect.get(this, prop) as Object | null | void;
+        return Reflect.get(this, prop);
     }
 
     protected getJsonPropertyName (thisProperty: string, settings?: Partial<SerializationSettings>): string {

package/src/decorators/JsonIgnore.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
-
 export const jsonIgnore = (): PropertyDecorator => (
     target: object,
     propertyKey: string | symbol

package/src/decorators/JsonName.ts

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
-
-
 export const jsonName = (jsonPropertyName: string): PropertyDecorator => (
     target: object,
     propertyKey: string | symbol

package/src/decorators/JsonObject.ts

@@ -1,11 +1,8 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable max-statements */
-/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-
+/* eslint-disable @typescript-eslint/unbound-method */
+/* eslint-disable max-statements */
 import type {SerializationSettings} from "../models/SerializationSettings";
 import {Serializable} from "../classes/Serializable";
 

package/src/decorators/JsonProperty.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
-
 import type {AcceptedTypes} from "./../models/AcceptedType";
 
 export const jsonProperty = (...args: AcceptedTypes[]): PropertyDecorator => (

package/src/models/AcceptedType.ts

@@ -1,14 +1,14 @@
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/sort-type-union-intersection-members */
 /* eslint-disable @typescript-eslint/no-invalid-void-type */
 /* eslint-disable @typescript-eslint/no-type-alias */
+
 export type AcceptedType = null |
 void |
 BooleanConstructor |
 NumberConstructor |
 StringConstructor |
 ObjectConstructor |
-(new (...args: (Object | null | void)[]) => object) |
+(new (...args: unknown[]) => object) |
 // Extended deserialization
 DateConstructor |
 SymbolConstructor; // Add ArrayBufferConstructor, MapConstructor, RegExpConstructor and many others...