ts-patch-mongoose 2.0.0 → 2.0.2

package/dist/esm/plugin.mjs

@@ -26,6 +26,9 @@ const deleteMethods = [
     'deleteOne',
     'deleteMany'
 ];
+function isHookIgnored(options) {
+    return options.ignoreHook === true || (options.ignoreEvent === true && options.ignorePatchHistory === true);
+}
 function splitUpdateAndCommands(updateQuery) {
     let update = {};
     const commands = [];
@@ -67,7 +70,7 @@ export const patchHistoryPlugin = function plugin(schema, opts) {
             await createPatch(opts, context);
         }
         else {
-            const original = await model.findById(current._id).exec();
+            const original = await model.findById(current._id).lean().exec();
             if (original) {
                 await updatePatch(opts, context, current, original);
             }
@@ -84,74 +87,82 @@ export const patchHistoryPlugin = function plugin(schema, opts) {
     });
     schema.pre(updateMethods, async function () {
         const options = this.getOptions();
-        if (options.ignoreHook)
+        if (isHookIgnored(options))
             return;
+        const model = this.model;
         const filter = this.getFilter();
         const count = await this.model.count(filter).exec();
         this._context = {
             op: this.op,
             modelName: opts.modelName ?? this.model.modelName,
             collectionName: opts.collectionName ?? this.model.collection.collectionName,
-            isNew: options.upsert && count === 0
+            isNew: options.upsert && count === 0,
+            ignoreEvent: options.ignoreEvent,
+            ignorePatchHistory: options.ignorePatchHistory
         };
         const updateQuery = this.getUpdate();
         const { update, commands } = splitUpdateAndCommands(updateQuery);
-        const cursor = this.model.find(filter).cursor();
+        const cursor = model.find(filter).lean().cursor();
         await cursor.eachAsync(async (doc) => {
-            const current = assignUpdate(doc.toObject(toObjectOptions), update, commands);
-            const original = doc.toObject(toObjectOptions);
-            await updatePatch(opts, this._context, current, original);
+            await updatePatch(opts, this._context, assignUpdate(doc, update, commands), doc);
         });
     });
     schema.post(updateMethods, async function () {
         const options = this.getOptions();
-        if (options.ignoreHook)
+        if (isHookIgnored(options))
             return;
         if (!this._context.isNew)
             return;
+        const model = this.model;
         const updateQuery = this.getUpdate();
         const { update, commands } = splitUpdateAndCommands(updateQuery);
         const filter = assignUpdate({}, update, commands);
         if (!_.isEmpty(filter)) {
-            const found = await this.model.findOne(update).exec();
-            if (found) {
-                const current = found.toObject(toObjectOptions);
+            const current = await model.findOne(update).lean().exec();
+            if (current) {
                 this._context.createdDocs = [current];
                 await createPatch(opts, this._context);
             }
         }
     });
+    schema.pre(remove, { document: true, query: false }, async function () {
+        const original = this.toObject(toObjectOptions);
+        if (opts.preDelete && !_.isEmpty(original)) {
+            await opts.preDelete([original]);
+        }
+    });
     schema.post(remove, { document: true, query: false }, async function () {
         const original = this.toObject(toObjectOptions);
         const model = this.constructor;
         const context = {
             op: 'delete',
             modelName: opts.modelName ?? model.modelName,
-            collectionName: opts.collectionName ?? model.collection.collectionName
+            collectionName: opts.collectionName ?? model.collection.collectionName,
+            deletedDocs: [original]
         };
-        if (opts.eventDeleted) {
-            em.emit(opts.eventDeleted, { oldDoc: original });
-        }
         await deletePatch(opts, context);
     });
     schema.pre(deleteMethods, { document: false, query: true }, async function () {
         const options = this.getOptions();
-        if (options.ignoreHook)
+        if (isHookIgnored(options))
             return;
+        const model = this.model;
         const filter = this.getFilter();
         this._context = {
             op: this.op,
             modelName: opts.modelName ?? this.model.modelName,
-            collectionName: opts.collectionName ?? this.model.collection.collectionName
+            collectionName: opts.collectionName ?? this.model.collection.collectionName,
+            ignoreEvent: options.ignoreEvent,
+            ignorePatchHistory: options.ignorePatchHistory
         };
         if (['remove', 'deleteMany'].includes(this._context.op) && !options.single) {
-            const docs = await this.model.find(filter).exec();
+            const docs = await model.find(filter).lean().exec();
             if (!_.isEmpty(docs)) {
                 this._context.deletedDocs = docs;
             }
         }
         else {
-            const doc = await this.model.findOne(filter).exec();
+            const doc = await model.findOne(filter).lean().exec();
             if (!_.isEmpty(doc)) {
                 this._context.deletedDocs = [doc];
             }
@@ -162,7 +173,7 @@ export const patchHistoryPlugin = function plugin(schema, opts) {
     });
     schema.post(deleteMethods, { document: false, query: true }, async function () {
         const options = this.getOptions();
-        if (options.ignoreHook)
+        if (isHookIgnored(options))
             return;
         await deletePatch(opts, this._context);
     });

package/dist/esm/types/interfaces/IContext.d.ts

@@ -6,6 +6,8 @@ interface IContext<T> {
     isNew?: boolean;
     createdDocs?: HydratedDocument<T>[];
     deletedDocs?: HydratedDocument<T>[];
+    ignoreEvent?: boolean;
+    ignorePatchHistory?: boolean;
 }
 export default IContext;
 //# sourceMappingURL=IContext.d.ts.map

package/dist/esm/types/interfaces/IContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IContext.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/IContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAEhD,UAAU,QAAQ,CAAC,CAAC;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,WAAW,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAA;IACnC,WAAW,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAA;CACpC;AAED,eAAe,QAAQ,CAAA"}
+{"version":3,"file":"IContext.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/IContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAEhD,UAAU,QAAQ,CAAC,CAAC;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,WAAW,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAA;IACnC,WAAW,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAA;IACnC,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAED,eAAe,QAAQ,CAAA"}

package/dist/esm/types/interfaces/IEvent.d.ts

@@ -0,0 +1,9 @@
+import type { Operation } from 'fast-json-patch';
+import type { HydratedDocument } from 'mongoose';
+interface IEvent<T> {
+    oldDoc?: HydratedDocument<T>;
+    doc?: HydratedDocument<T>;
+    patch?: Operation[];
+}
+export default IEvent;
+//# sourceMappingURL=IEvent.d.ts.map

package/dist/esm/types/interfaces/IEvent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IEvent.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/IEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAEhD,UAAU,MAAM,CAAC,CAAC;IAChB,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC5B,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IACzB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAA;CACpB;AAED,eAAe,MAAM,CAAA"}

package/dist/esm/types/patch.d.ts

@@ -1,4 +1,5 @@
 import type { HydratedDocument } from 'mongoose';
+import type IEvent from './interfaces/IEvent';
 import type IContext from './interfaces/IContext';
 import type IPluginOptions from './interfaces/IPluginOptions';
 import type { User, Reason, Metadata } from './interfaces/IPluginOptions';
@@ -11,6 +12,7 @@ export declare function getReason<T>(opts: IPluginOptions<T>): Promise<Reason |
 export declare function getMetadata<T>(opts: IPluginOptions<T>): Promise<Metadata | undefined>;
 export declare function getValue<T>(item: PromiseSettledResult<T>): T | undefined;
 export declare function getData<T>(opts: IPluginOptions<T>): Promise<[User | undefined, Reason | undefined, Metadata | undefined]>;
+export declare function emitEvent<T>(context: IContext<T>, event: string | undefined, data: IEvent<T>): void;
 export declare function bulkPatch<T>(opts: IPluginOptions<T>, context: IContext<T>, eventKey: 'eventCreated' | 'eventDeleted', docsKey: 'createdDocs' | 'deletedDocs'): Promise<void>;
 export declare function createPatch<T>(opts: IPluginOptions<T>, context: IContext<T>): Promise<void>;
 export declare function updatePatch<T>(opts: IPluginOptions<T>, context: IContext<T>, current: HydratedDocument<T>, original: HydratedDocument<T>): Promise<void>;

package/dist/esm/types/patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../../../src/patch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAS,MAAM,UAAU,CAAA;AAEvD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAKzE,wBAAgB,UAAU,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG;IAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CAAE,CAU9K;AAED,wBAAsB,OAAO,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAKpF;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAKxF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAK5F;AAED,wBAAgB,QAAQ,CAAE,CAAC,EAAG,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAE1E;AAED,wBAAsB,OAAO,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC,CAUhI;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,GAAG,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCnL;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAElG;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC/J;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAElG"}
+{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../../../src/patch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAS,MAAM,UAAU,CAAA;AAEvD,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AASzE,wBAAgB,UAAU,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG;IAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CAAE,CAU9K;AAED,wBAAsB,OAAO,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAKpF;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAKxF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAK5F;AAED,wBAAgB,QAAQ,CAAE,CAAC,EAAG,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAE1E;AAED,wBAAsB,OAAO,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC,CAUhI;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAG,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAIpG;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,GAAG,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCnL;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAElG;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAkC/J;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAElG"}

package/dist/esm/types/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAGA,OAAO,KAAK,EAAoB,KAAK,EAA2B,MAAM,EAA+D,MAAM,UAAU,CAAA;AAErJ,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAsE7D,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;CAAK,CAAA;AAQnC,eAAO,MAAM,kBAAkB,oOAAoE,IAoIlG,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAGA,OAAO,KAAK,EAAoB,KAAK,EAAyC,MAAM,EAA+D,MAAM,UAAU,CAAA;AAEnK,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AA0E7D,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;CAAK,CAAA;AAQnC,eAAO,MAAM,kBAAkB,oOAAoE,IA4IlG,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-patch-mongoose",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Patch history & events for mongoose models",
   "author": "Alex Eagle",
   "license": "MIT",
@@ -84,15 +84,15 @@
   "devDependencies": {
     "@shelf/jest-mongodb": "4.1.7",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.53",
-    "@swc/helpers": "0.5.0",
+    "@swc/core": "1.3.55",
+    "@swc/helpers": "0.5.1",
     "@swc/jest": "0.2.26",
     "@swc/register": "0.1.10",
     "@types/jest": "29.5.1",
     "@types/lodash": "4.14.194",
-    "@types/node": "18.16.0",
-    "@typescript-eslint/eslint-plugin": "5.59.0",
-    "@typescript-eslint/parser": "5.59.0",
+    "@types/node": "18.16.1",
+    "@typescript-eslint/eslint-plugin": "5.59.1",
+    "@typescript-eslint/parser": "5.59.1",
     "eslint": "8.39.0",
     "eslint-config-standard": "17.0.0",
     "eslint-plugin-import": "2.27.5",

package/src/interfaces/IContext.ts

@@ -7,6 +7,8 @@ interface IContext<T> {
   isNew?: boolean
   createdDocs?: HydratedDocument<T>[]
   deletedDocs?: HydratedDocument<T>[]
+  ignoreEvent?: boolean
+  ignorePatchHistory?: boolean
 }
 
 export default IContext

package/src/interfaces/IEvent.ts

@@ -0,0 +1,10 @@
+import type { Operation } from 'fast-json-patch'
+import type { HydratedDocument } from 'mongoose'
+
+interface IEvent<T> {
+  oldDoc?: HydratedDocument<T>
+  doc?: HydratedDocument<T>
+  patch?: Operation[]
+}
+
+export default IEvent

package/src/patch.ts

@@ -4,6 +4,7 @@ import jsonpatch from 'fast-json-patch'
 
 import type { HydratedDocument, Types } from 'mongoose'
 
+import type IEvent from './interfaces/IEvent'
 import type IContext from './interfaces/IContext'
 import type IPluginOptions from './interfaces/IPluginOptions'
 import type { User, Reason, Metadata } from './interfaces/IPluginOptions'
@@ -11,6 +12,10 @@ import type { User, Reason, Metadata } from './interfaces/IPluginOptions'
 import History from './models/History'
 import em from './em'
 
+function isPatchHistoryEnabled<T> (opts: IPluginOptions<T>, context: IContext<T>): boolean {
+  return !opts.patchHistoryDisabled && !context.ignorePatchHistory
+}
+
 export function getObjects<T> (opts: IPluginOptions<T>, current: HydratedDocument<T>, original: HydratedDocument<T>): { currentObject: Partial<T>, originalObject: Partial<T> } {
   let currentObject = JSON.parse(JSON.stringify(current)) as Partial<T>
   let originalObject = JSON.parse(JSON.stringify(original)) as Partial<T>
@@ -60,24 +65,30 @@ export async function getData<T> (opts: IPluginOptions<T>): Promise<[User | unde
     })
 }
 
+export function emitEvent<T> (context: IContext<T>, event: string | undefined, data: IEvent<T>): void {
+  if (event && !context.ignoreEvent) {
+    em.emit(event, data)
+  }
+}
+
 export async function bulkPatch<T> (opts: IPluginOptions<T>, context: IContext<T>, eventKey: 'eventCreated' | 'eventDeleted', docsKey: 'createdDocs' | 'deletedDocs'): Promise<void> {
+  const history = isPatchHistoryEnabled(opts, context)
   const event = opts[eventKey]
   const docs = context[docsKey]
   const key = eventKey === 'eventCreated' ? 'doc' : 'oldDoc'
 
-  if (_.isEmpty(docs) || (!event && opts.patchHistoryDisabled)) return
+  if (_.isEmpty(docs) || (!event && !history)) return
 
   const [user, reason, metadata] = await getData(opts)
 
   const chunks = _.chunk(docs, 1000)
-
   for await (const chunk of chunks) {
     const bulk = []
 
     for (const doc of chunk) {
-      if (event) em.emit(event, { [key]: doc })
+      emitEvent(context, event, { [key]: doc })
 
-      if (!opts.patchHistoryDisabled) {
+      if (history) {
         bulk.push({
           insertOne: {
             document: {
@@ -96,7 +107,7 @@ export async function bulkPatch<T> (opts: IPluginOptions<T>, context: IContext<T
       }
     }
 
-    if (!opts.patchHistoryDisabled) {
+    if (history) {
       await History.bulkWrite(bulk, { ordered: false })
     }
   }
@@ -107,41 +118,39 @@ export async function createPatch<T> (opts: IPluginOptions<T>, context: IContext
 }
 
 export async function updatePatch<T> (opts: IPluginOptions<T>, context: IContext<T>, current: HydratedDocument<T>, original: HydratedDocument<T>): Promise<void> {
-  const { currentObject, originalObject } = getObjects(opts, current, original)
+  const history = isPatchHistoryEnabled(opts, context)
 
+  const { currentObject, originalObject } = getObjects(opts, current, original)
   if (_.isEmpty(originalObject) || _.isEmpty(currentObject)) return
 
   const patch = jsonpatch.compare(originalObject, currentObject, true)
-
   if (_.isEmpty(patch)) return
 
-  if (opts.eventUpdated) {
-    em.emit(opts.eventUpdated, { oldDoc: original, doc: current, patch })
-  }
+  emitEvent(context, opts.eventUpdated, { oldDoc: original, doc: current, patch })
 
-  if (opts.patchHistoryDisabled) return
+  if (history) {
+    let version = 0
 
-  let version = 0
+    const lastHistory = await History.findOne({ collectionId: original._id as Types.ObjectId }).sort('-version').exec()
 
-  const lastHistory = await History.findOne({ collectionId: original._id as Types.ObjectId }).sort('-version').exec()
+    if (lastHistory && lastHistory.version >= 0) {
+      version = lastHistory.version + 1
+    }
 
-  if (lastHistory && lastHistory.version >= 0) {
-    version = lastHistory.version + 1
+    const [user, reason, metadata] = await getData(opts)
+
+    await History.create({
+      op: context.op,
+      modelName: context.modelName,
+      collectionName: context.collectionName,
+      collectionId: original._id as Types.ObjectId,
+      patch,
+      user,
+      reason,
+      metadata,
+      version
+    })
   }
-
-  const [user, reason, metadata] = await getData(opts)
-
-  await History.create({
-    op: context.op,
-    modelName: context.modelName,
-    collectionName: context.collectionName,
-    collectionId: original._id as Types.ObjectId,
-    patch,
-    user,
-    reason,
-    metadata,
-    version
-  })
 }
 
 export async function deletePatch<T> (opts: IPluginOptions<T>, context: IContext<T>): Promise<void> {

package/src/plugin.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { assign } from 'power-assign'
 
-import type { HydratedDocument, Model, MongooseQueryMiddleware, Schema, ToObjectOptions, UpdateQuery, UpdateWithAggregationPipeline } from 'mongoose'
+import type { HydratedDocument, Model, MongooseQueryMiddleware, QueryOptions, Schema, ToObjectOptions, UpdateQuery, UpdateWithAggregationPipeline } from 'mongoose'
 
 import type IPluginOptions from './interfaces/IPluginOptions'
 import type IContext from './interfaces/IContext'
@@ -38,6 +38,10 @@ const deleteMethods = [
   'deleteMany'
 ]
 
+function isHookIgnored<T> (options: QueryOptions<T>): boolean {
+  return options.ignoreHook === true || (options.ignoreEvent === true && options.ignorePatchHistory === true)
+}
+
 function splitUpdateAndCommands<T> (updateQuery: UpdateWithAggregationPipeline | UpdateQuery<T> | null): { update: UpdateQuery<T>, commands: Record<string, unknown>[] } {
   let update: UpdateQuery<T> = {}
   const commands: Record<string, unknown>[] = []
@@ -96,9 +100,9 @@ export const patchHistoryPlugin = function plugin<T> (schema: Schema<T>, opts: I
     if (this.isNew) {
       await createPatch(opts, context)
     } else {
-      const original = await model.findById(current._id).exec()
+      const original = await model.findById(current._id).lean().exec()
       if (original) {
-        await updatePatch(opts, context, current, original)
+        await updatePatch(opts, context, current, original as HydratedDocument<T>)
       }
     }
   })
@@ -116,8 +120,9 @@ export const patchHistoryPlugin = function plugin<T> (schema: Schema<T>, opts: I
 
   schema.pre(updateMethods as MongooseQueryMiddleware[], async function (this: IHookContext<T>) {
     const options = this.getOptions()
-    if (options.ignoreHook) return
+    if (isHookIgnored(options)) return
 
+    const model = this.model as Model<T>
     const filter = this.getFilter()
     const count = await this.model.count(filter).exec()
 
@@ -125,54 +130,58 @@ export const patchHistoryPlugin = function plugin<T> (schema: Schema<T>, opts: I
       op: this.op,
       modelName: opts.modelName ?? this.model.modelName,
       collectionName: opts.collectionName ?? this.model.collection.collectionName,
-      isNew: options.upsert && count === 0
+      isNew: options.upsert && count === 0,
+      ignoreEvent: options.ignoreEvent as boolean,
+      ignorePatchHistory: options.ignorePatchHistory as boolean
     }
 
     const updateQuery = this.getUpdate()
     const { update, commands } = splitUpdateAndCommands(updateQuery)
 
-    const cursor = this.model.find<HydratedDocument<T>>(filter).cursor()
-    await cursor.eachAsync(async (doc) => {
-      const current = assignUpdate(doc.toObject(toObjectOptions) as HydratedDocument<T>, update, commands)
-      const original = doc.toObject(toObjectOptions) as HydratedDocument<T>
-
-      await updatePatch(opts, this._context, current, original)
+    const cursor = model.find(filter).lean().cursor()
+    await cursor.eachAsync(async (doc: HydratedDocument<T>) => {
+      await updatePatch(opts, this._context, assignUpdate(doc, update, commands), doc)
     })
   })
 
   schema.post(updateMethods as MongooseQueryMiddleware[], async function (this: IHookContext<T>) {
     const options = this.getOptions()
-    if (options.ignoreHook) return
+    if (isHookIgnored(options)) return
 
     if (!this._context.isNew) return
 
+    const model = this.model as Model<T>
     const updateQuery = this.getUpdate()
     const { update, commands } = splitUpdateAndCommands(updateQuery)
 
     const filter = assignUpdate({} as HydratedDocument<T>, update, commands)
     if (!_.isEmpty(filter)) {
-      const found = await this.model.findOne<HydratedDocument<T>>(update).exec()
-      if (found) {
-        const current = found.toObject(toObjectOptions) as HydratedDocument<T>
-        this._context.createdDocs = [current]
+      const current = await model.findOne(update).lean().exec()
+      if (current) {
+        this._context.createdDocs = [current] as HydratedDocument<T>[]
 
         await createPatch(opts, this._context)
       }
     }
   })
 
+  schema.pre(remove, { document: true, query: false }, async function () {
+    const original = this.toObject(toObjectOptions) as HydratedDocument<T>
+
+    if (opts.preDelete && !_.isEmpty(original)) {
+      await opts.preDelete([original])
+    }
+  })
+
   schema.post(remove, { document: true, query: false }, async function (this: HydratedDocument<T>) {
-    const original = this.toObject(toObjectOptions)
+    const original = this.toObject(toObjectOptions) as HydratedDocument<T>
     const model = this.constructor as Model<T>
 
     const context: IContext<T> = {
       op: 'delete',
       modelName: opts.modelName ?? model.modelName,
-      collectionName: opts.collectionName ?? model.collection.collectionName
-    }
-
-    if (opts.eventDeleted) {
-      em.emit(opts.eventDeleted, { oldDoc: original })
+      collectionName: opts.collectionName ?? model.collection.collectionName,
+      deletedDocs: [original]
     }
 
     await deletePatch(opts, context)
@@ -180,25 +189,28 @@ export const patchHistoryPlugin = function plugin<T> (schema: Schema<T>, opts: I
 
   schema.pre(deleteMethods as MongooseQueryMiddleware[], { document: false, query: true }, async function (this: IHookContext<T>) {
     const options = this.getOptions()
-    if (options.ignoreHook) return
+    if (isHookIgnored(options)) return
 
+    const model = this.model as Model<T>
     const filter = this.getFilter()
 
     this._context = {
       op: this.op,
       modelName: opts.modelName ?? this.model.modelName,
-      collectionName: opts.collectionName ?? this.model.collection.collectionName
+      collectionName: opts.collectionName ?? this.model.collection.collectionName,
+      ignoreEvent: options.ignoreEvent as boolean,
+      ignorePatchHistory: options.ignorePatchHistory as boolean
     }
 
     if (['remove', 'deleteMany'].includes(this._context.op) && !options.single) {
-      const docs = await this.model.find<HydratedDocument<T>>(filter).exec()
+      const docs = await model.find(filter).lean().exec()
       if (!_.isEmpty(docs)) {
-        this._context.deletedDocs = docs
+        this._context.deletedDocs = docs as HydratedDocument<T>[]
       }
     } else {
-      const doc = await this.model.findOne<HydratedDocument<T>>(filter).exec()
+      const doc = await model.findOne(filter).lean().exec()
       if (!_.isEmpty(doc)) {
-        this._context.deletedDocs = [doc]
+        this._context.deletedDocs = [doc] as HydratedDocument<T>[]
       }
     }
 
@@ -209,7 +221,7 @@ export const patchHistoryPlugin = function plugin<T> (schema: Schema<T>, opts: I
 
   schema.post(deleteMethods as MongooseQueryMiddleware[], { document: false, query: true }, async function (this: IHookContext<T>) {
     const options = this.getOptions()
-    if (options.ignoreHook) return
+    if (isHookIgnored(options)) return
 
     await deletePatch(opts, this._context)
   })

package/tests/em.test.ts

@@ -1,3 +1,4 @@
+import { emitEvent } from '../src/patch'
 import { patchEventEmitter } from '../src/plugin'
 
 describe('em', () => {
@@ -13,4 +14,37 @@ describe('em', () => {
     patchEventEmitter.emit('test')
     expect(count).toBe(1)
   })
+
+  it('emitEvent', async () => {
+    const fn = jest.fn()
+    patchEventEmitter.on('test', fn)
+
+    const context = {
+      op: 'test',
+      modelName: 'Test',
+      collectionName: 'tests'
+    }
+
+    emitEvent(context, 'test', { doc: { name: 'test' } })
+    expect(fn).toHaveBeenCalledTimes(1)
+
+    patchEventEmitter.off('test', fn)
+  })
+
+  it('emitEvent ignore', async () => {
+    const fn = jest.fn()
+    patchEventEmitter.on('test', fn)
+
+    const context = {
+      ignoreEvent: true,
+      op: 'test',
+      modelName: 'Test',
+      collectionName: 'tests'
+    }
+
+    emitEvent(context, 'test', { doc: { name: 'test' } })
+    expect(fn).toHaveBeenCalledTimes(0)
+
+    patchEventEmitter.off('test', fn)
+  })
 })

package/tests/patch.test.ts

@@ -40,7 +40,7 @@ describe('patch tests', () => {
   })
 
   beforeEach(async () => {
-    await mongoose.connection.collection('tests').deleteMany({})
+    await mongoose.connection.collection('users').deleteMany({})
     await mongoose.connection.collection('patches').deleteMany({})
   })