equipped 4.3.0 → 4.3.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.3.2](https://github.com/kevinand11/equipped/compare/v4.3.1...v4.3.2) (2024-02-21)
+
+### [4.3.1](https://github.com/kevinand11/equipped/compare/v4.3.0...v4.3.1) (2024-02-17)
+
 ## [4.3.0](https://github.com/kevinand11/equipped/compare/v4.2.10...v4.3.0) (2024-02-12)
 
 

package/lib/db/_instance.d.ts

@@ -3,14 +3,14 @@ import { DebeziumSetup } from './debezium';
 import { QueryParams, QueryResults } from './query';
 export declare abstract class Db {
     #private;
-    abstract change<Model, Entity extends BaseEntity>(collection: any, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model | null) => Entity | null): DbChange<Model, Entity>;
+    abstract change<Model, Entity extends BaseEntity<any>>(collection: any, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model | null) => Entity | null): DbChange<Model, Entity>;
     abstract query<Model>(collection: any, params: QueryParams): Promise<QueryResults<Model>>;
     protected _addToDbChanges(dbChange: DbChange<any, any>): this;
     startAllDbChanges(): Promise<void>;
     abstract start(): Promise<void>;
     abstract close(): Promise<void>;
 }
-export declare abstract class DbChange<Model, Entity extends BaseEntity> {
+export declare abstract class DbChange<Model, Entity extends BaseEntity<any>> {
     #private;
     constructor(callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model | null) => Entity | null);
     abstract start(): Promise<void>;

package/lib/db/mongoose/changes.d.ts

@@ -25,7 +25,7 @@
 import mongoose from 'mongoose';
 import { BaseEntity } from '../../structure';
 import { DbChange, DbChangeCallbacks } from '../_instance';
-export declare class MongoDbChange<Model, Entity extends BaseEntity> extends DbChange<Model, Entity> {
+export declare class MongoDbChange<Model, Entity extends BaseEntity<any>> extends DbChange<Model, Entity> {
     #private;
     constructor(model: mongoose.Model<Model>, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model | null) => Entity | null);
     start(): Promise<void>;

package/lib/db/mongoose/index.d.ts

@@ -32,7 +32,7 @@ export declare class MongoDb extends Db {
     get Schema(): typeof mongoose.Schema;
     get Id(): mongoose.Types.ObjectId;
     use(dbName?: string): mongoose.Connection;
-    change<Model, Entity extends BaseEntity>(model: mongoose.Model<Model>, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model | null) => Entity | null): MongoDbChange<Model, Entity>;
+    change<Model, Entity extends BaseEntity<any>>(model: mongoose.Model<Model>, callbacks: DbChangeCallbacks<Model, Entity>, mapper: (model: Model | null) => Entity | null): MongoDbChange<Model, Entity>;
     query<Model>(model: mongoose.Model<Model>, params: QueryParams): Promise<QueryResults<Model>>;
     start(): Promise<void>;
     close(): Promise<void>;

package/lib/listeners/emitter.d.ts

@@ -13,9 +13,9 @@ export declare class Listener {
     #private;
     constructor(socket: io.Server, callers: SocketCallers);
     start(): Promise<void>;
-    created(channels: string[], data: BaseEntity): Promise<void>;
-    updated(channels: string[], data: BaseEntity): Promise<void>;
-    deleted(channels: string[], data: BaseEntity): Promise<void>;
+    created(channels: string[], data: BaseEntity<any>): Promise<void>;
+    updated(channels: string[], data: BaseEntity<any>): Promise<void>;
+    deleted(channels: string[], data: BaseEntity<any>): Promise<void>;
     set callers(callers: SocketCallers);
     register(channel: string, onJoin?: OnJoinFn): this;
 }

package/lib/structure/baseEntity.d.ts

@@ -1,7 +1,9 @@
-export declare class BaseEntity {
+import { ClassPropertiesWrapper } from 'valleyed';
+export declare class BaseEntity<Keys extends Record<string, any>> extends ClassPropertiesWrapper<Keys> {
     hash: string;
     ignoreInJSON: string[];
     __type: string;
-    constructor();
-    toJSON(): this;
+    constructor(keys: Keys);
+    toJSON(includeIgnored?: boolean): Record<string, any>;
+    toString(): string;
 }

package/lib/structure/baseEntity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEntity = void 0;
+const valleyed_1 = require("valleyed");
 const utils_1 = require("../utils/utils");
 const deleteKeyFromObject = (obj, keys) => {
     if (obj === undefined || obj === null)
@@ -10,24 +11,22 @@ const deleteKeyFromObject = (obj, keys) => {
     const key = keys.pop() ?? '';
     return deleteKeyFromObject(obj[key], keys);
 };
-class BaseEntity {
-    constructor() {
+class BaseEntity extends valleyed_1.ClassPropertiesWrapper {
+    constructor(keys) {
+        super(keys);
         this.ignoreInJSON = [];
         this.__type = this.constructor.name;
         this.hash = utils_1.Random.string();
     }
-    toJSON() {
-        const json = Object.assign({}, this);
-        const proto = Object.getPrototypeOf(this);
-        Object.getOwnPropertyNames(proto)
-            .filter((k) => k !== 'constructor')
-            .forEach((key) => {
-            const value = this[key];
-            json[key] = value?.toJSON?.() ?? value;
-        });
-        this.ignoreInJSON.forEach((k) => deleteKeyFromObject(json, k.split('.').reverse()));
+    toJSON(includeIgnored = false) {
+        const json = super.toJSON();
+        if (!includeIgnored)
+            this.ignoreInJSON.forEach((k) => deleteKeyFromObject(json, k.split('.').reverse()));
         delete json.ignoreInJSON;
         return json;
     }
+    toString() {
+        return JSON.stringify(this.toJSON(true));
+    }
 }
 exports.BaseEntity = BaseEntity;

package/lib/validations/index.d.ts

@@ -103,6 +103,7 @@ export declare const Validation: {
     isTime: <T_9 extends Validate.Timeable>(error?: string | undefined) => Validate.Rule<T_9>;
     isLaterThan: <T_10 extends Validate.Timeable>(compare: Validate.Timeable, error?: string | undefined) => Validate.Rule<T_10>;
     isEarlierThan: <T_11 extends Validate.Timeable>(compare: Validate.Timeable, error?: string | undefined) => Validate.Rule<T_11>;
+    ClassPropertiesWrapper: typeof Validate.ClassPropertiesWrapper;
     Differ: typeof Validate.Differ;
     capitalize: (text: string) => string;
     stripHTML: (html: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "4.3.0",
+	"version": "4.3.2",
 	"private": false,
 	"description": "",
 	"main": "lib/index.js",
@@ -15,8 +15,8 @@
 	"author": "",
 	"license": "ISC",
 	"devDependencies": {
-		"@commitlint/cli": "^18.6.0",
-		"@commitlint/config-conventional": "^18.6.0",
+		"@commitlint/cli": "^18.6.1",
+		"@commitlint/config-conventional": "^18.6.2",
 		"@types/amqplib": "^0.10.4",
 		"@types/bcryptjs": "^2.4.6",
 		"@types/bull": "^3.15.9",
@@ -25,14 +25,14 @@
 		"@types/express-fileupload": "^1.4.4",
 		"@types/jsonwebtoken": "^9.0.5",
 		"@types/morgan": "^1.9.9",
-		"@types/node": "^20.11.17",
+		"@types/node": "^20.11.19",
 		"@types/pug": "^2.0.10",
 		"@types/supertest": "^6.0.2",
-		"@typescript-eslint/eslint-plugin": "^6.21.0",
-		"@typescript-eslint/parser": "^6.21.0",
+		"@typescript-eslint/eslint-plugin": "^7.0.1",
+		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.56.0",
 		"eslint-plugin-promise": "^6.1.1",
-		"husky": "^9.0.10",
+		"husky": "^9.0.11",
 		"standard-version": "^9.5.0",
 		"typescript": "^5.3.3"
 	},
@@ -46,7 +46,7 @@
 		"compression": "^1.7.4",
 		"cookie-parser": "^1.4.6",
 		"cors": "^2.8.5",
-		"dotenv": "^16.4.1",
+		"dotenv": "^16.4.4",
 		"express": "^4.18.2",
 		"express-fileupload": "^1.4.3",
 		"express-rate-limit": "^7.1.5",
@@ -55,7 +55,7 @@
 		"jsonwebtoken": "^9.0.2",
 		"jwks-rsa": "^3.1.0",
 		"kafkajs": "^2.2.4",
-		"mongoose": "^8.1.1",
+		"mongoose": "^8.1.3",
 		"mongoose-lean-defaults": "^2.2.1",
 		"mongoose-lean-getters": "^1.1.0",
 		"mongoose-lean-virtuals": "^0.9.1",
@@ -66,7 +66,7 @@
 		"redis": "^4.6.13",
 		"socket.io": "4.7.4",
 		"supertest": "^6.3.4",
-		"valleyed": "4.2.5"
+		"valleyed": "4.2.7"
 	},
 	"repository": {
 		"url": "git://github.com/kevinand11/equipped.git"