ts-patch-mongoose 2.9.6 → 3.1.0

package/dist/index.mjs

@@ -1,18 +1,7 @@
-import isEmpty from 'lodash/isEmpty.js';
-import ms from 'ms';
 import mongoose, { Schema, model } from 'mongoose';
-import isArray from 'lodash/isArray.js';
 import jsonpatch from 'fast-json-patch';
-import chunk from 'lodash/chunk.js';
-import isFunction from 'lodash/isFunction.js';
-import omit from 'omit-deep';
 import EventEmitter from 'node:events';
-import cloneDeep from 'lodash/cloneDeep.js';
-import forEach from 'lodash/forEach.js';
-import isObjectLike from 'lodash/isObjectLike.js';
-import keys from 'lodash/keys.js';
 import { assign } from 'power-assign';
-import { satisfies } from 'semver';
 
 const HistorySchema = new Schema(
   {
@@ -59,6 +48,166 @@ HistorySchema.index({ collectionId: 1, version: -1 });
 HistorySchema.index({ op: 1, modelName: 1, collectionName: 1, collectionId: 1, reason: 1, version: 1 });
 const HistoryModel = model("History", HistorySchema, "history");
 
+const s = 1e3;
+const m = s * 60;
+const h = m * 60;
+const d = h * 24;
+const w = d * 7;
+const y = d * 365.25;
+const mo = y / 12;
+const UNITS = {
+  milliseconds: 1,
+  millisecond: 1,
+  msecs: 1,
+  msec: 1,
+  ms: 1,
+  seconds: s,
+  second: s,
+  secs: s,
+  sec: s,
+  s,
+  minutes: m,
+  minute: m,
+  mins: m,
+  min: m,
+  m,
+  hours: h,
+  hour: h,
+  hrs: h,
+  hr: h,
+  h,
+  days: d,
+  day: d,
+  d,
+  weeks: w,
+  week: w,
+  w,
+  months: mo,
+  month: mo,
+  mo,
+  years: y,
+  year: y,
+  yrs: y,
+  yr: y,
+  y
+};
+const unitPattern = Object.keys(UNITS).sort((a, b) => b.length - a.length).join("|");
+const RE = new RegExp(String.raw`^(-?(?:\d+)?\.?\d+)\s*(${unitPattern})?$`, "i");
+const ms = (val) => {
+  const str = String(val);
+  if (str.length > 100) return Number.NaN;
+  const match = RE.exec(str);
+  if (!match) return Number.NaN;
+  const n = Number.parseFloat(match[1] ?? "");
+  const type = (match[2] ?? "ms").toLowerCase();
+  return n * (UNITS[type] ?? 0);
+};
+
+const isArray = Array.isArray;
+const isEmpty = (value) => {
+  if (value == null) return true;
+  if (Array.isArray(value) || typeof value === "string") return value.length === 0;
+  if (value instanceof Map || value instanceof Set) return value.size === 0;
+  if (typeof value === "object") {
+    for (const key in value) {
+      if (Object.hasOwn(value, key)) return false;
+    }
+    return true;
+  }
+  return true;
+};
+const isFunction = (value) => {
+  return typeof value === "function";
+};
+const isObjectLike = (value) => {
+  return typeof value === "object" && value !== null;
+};
+const cloneArrayBuffer = (arrayBuffer) => {
+  const result = new ArrayBuffer(arrayBuffer.byteLength);
+  new Uint8Array(result).set(new Uint8Array(arrayBuffer));
+  return result;
+};
+const cloneImmutable = (value) => {
+  const tag = Object.prototype.toString.call(value);
+  switch (tag) {
+    case "[object Date]":
+      return /* @__PURE__ */ new Date(+value);
+    case "[object RegExp]": {
+      const re = value;
+      const cloned = new RegExp(re.source, re.flags);
+      cloned.lastIndex = re.lastIndex;
+      return cloned;
+    }
+    case "[object Error]": {
+      const err = value;
+      const cloned = new err.constructor(err.message);
+      if (err.stack) cloned.stack = err.stack;
+      return cloned;
+    }
+    case "[object ArrayBuffer]":
+      return cloneArrayBuffer(value);
+    case "[object DataView]": {
+      const dv = value;
+      const buffer = cloneArrayBuffer(dv.buffer);
+      return new DataView(buffer, dv.byteOffset, dv.byteLength);
+    }
+  }
+  if (ArrayBuffer.isView(value)) {
+    const ta = value;
+    const buffer = cloneArrayBuffer(ta.buffer);
+    return new value.constructor(buffer, ta.byteOffset, ta.length);
+  }
+  return void 0;
+};
+const cloneCollection = (value, seen) => {
+  if (value instanceof Map) {
+    const map = /* @__PURE__ */ new Map();
+    seen.set(value, map);
+    for (const [k, v] of value) map.set(k, cloneDeep(v, seen));
+    return map;
+  }
+  if (value instanceof Set) {
+    const set = /* @__PURE__ */ new Set();
+    seen.set(value, set);
+    for (const v of value) set.add(cloneDeep(v, seen));
+    return set;
+  }
+  if (Array.isArray(value)) {
+    const arr = new Array(value.length);
+    seen.set(value, arr);
+    for (let i = 0; i < value.length; i++) {
+      arr[i] = cloneDeep(value[i], seen);
+    }
+    return arr;
+  }
+  const result = typeof value.constructor === "function" ? Object.create(Object.getPrototypeOf(value)) : {};
+  seen.set(value, result);
+  for (const key of Object.keys(value)) {
+    result[key] = cloneDeep(value[key], seen);
+  }
+  return result;
+};
+const cloneDeep = (value, seen = /* @__PURE__ */ new WeakMap()) => {
+  if (value === null || typeof value !== "object") return value;
+  if (seen.has(value)) return seen.get(value);
+  const immutable = cloneImmutable(value);
+  if (immutable !== void 0) return immutable;
+  const record = value;
+  if (typeof record._bsontype === "string" && typeof record.toHexString === "function") {
+    return new value.constructor(record.toHexString());
+  }
+  if (typeof record.toJSON === "function") {
+    return JSON.parse(JSON.stringify(value));
+  }
+  return cloneCollection(value, seen);
+};
+const chunk = (array, size) => {
+  const result = [];
+  for (let i = 0; i < array.length; i += size) {
+    result.push(array.slice(i, i + size));
+  }
+  return result;
+};
 const isHookIgnored = (options) => {
   return options.ignoreHook === true || options.ignoreEvent === true && options.ignorePatchHistory === true;
 };
@@ -66,7 +215,7 @@ const toObjectOptions = {
   depopulate: true,
   virtuals: false
 };
-const setPatchHistoryTTL = async (ttl) => {
+const setPatchHistoryTTL = async (ttl, onError) => {
   const name = "createdAt_1_TTL";
   try {
     const indexes = await HistoryModel.collection.indexes();
@@ -75,7 +224,7 @@ const setPatchHistoryTTL = async (ttl) => {
       await HistoryModel.collection.dropIndex(name);
       return;
     }
-    const milliseconds = typeof ttl === "string" ? ms(ttl) : ttl;
+    const milliseconds = ms(ttl);
     if (milliseconds < 1e3 && existingIndex) {
       await HistoryModel.collection.dropIndex(name);
       return;
@@ -89,7 +238,8 @@ const setPatchHistoryTTL = async (ttl) => {
     }
     await HistoryModel.collection.createIndex({ createdAt: 1 }, { expireAfterSeconds, name });
   } catch (err) {
-    console.error("Couldn't create or update index for history collection", err);
+    const handler = onError ?? console.error;
+    handler(err);
   }
 };
 
@@ -97,64 +247,101 @@ class PatchEventEmitter extends EventEmitter {
 }
 const em = new PatchEventEmitter();
 
-function isPatchHistoryEnabled(opts, context) {
-  return !opts.patchHistoryDisabled && !context.ignorePatchHistory;
-}
-function getJsonOmit(opts, doc) {
-  const object = JSON.parse(JSON.stringify(doc));
-  if (opts.omit) {
-    return omit(object, opts.omit);
-  }
-  return object;
-}
-function getObjectOmit(opts, doc) {
-  if (opts.omit) {
-    return omit(isFunction(doc?.toObject) ? doc.toObject() : doc, opts.omit);
+const isPlainObject = (val) => {
+  if (Object.prototype.toString.call(val) !== "[object Object]") return false;
+  const prot = Object.getPrototypeOf(val);
+  return prot === null || prot === Object.prototype;
+};
+const isUnsafeKey = (key) => {
+  return key === "__proto__" || key === "constructor" || key === "prototype";
+};
+const classifyKeys = (omitKeys) => {
+  const topLevel = /* @__PURE__ */ new Set();
+  const nested = /* @__PURE__ */ new Map();
+  for (const key of omitKeys) {
+    const dotIdx = key.indexOf(".");
+    if (dotIdx === -1) {
+      topLevel.add(key);
+    } else {
+      const head = key.slice(0, dotIdx);
+      const tail = key.slice(dotIdx + 1);
+      if (!isUnsafeKey(head)) {
+        const existing = nested.get(head) ?? [];
+        existing.push(tail);
+        nested.set(head, existing);
+      }
+    }
   }
-  return doc;
-}
-async function getUser(opts, doc) {
-  if (isFunction(opts.getUser)) {
-    return await opts.getUser(doc);
+  return { topLevel, nested };
+};
+const omitDeep = (value, keys) => {
+  if (value === void 0) return {};
+  if (Array.isArray(value)) {
+    return value.map((item) => omitDeep(item, keys));
   }
-  return void 0;
-}
-async function getReason(opts, doc) {
-  if (isFunction(opts.getReason)) {
-    return await opts.getReason(doc);
+  if (!isPlainObject(value)) return value;
+  const omitKeys = typeof keys === "string" ? [keys] : keys;
+  if (!Array.isArray(omitKeys)) return value;
+  const { topLevel, nested } = classifyKeys(omitKeys);
+  const result = {};
+  for (const key of Object.keys(value)) {
+    if (topLevel.has(key)) continue;
+    const nestedKeys = nested.get(key);
+    result[key] = omitDeep(value[key], nestedKeys ?? omitKeys);
   }
-  return void 0;
-}
-async function getMetadata(opts, doc) {
-  if (isFunction(opts.getMetadata)) {
-    return await opts.getMetadata(doc);
+  return result;
+};
+
+const isPatchHistoryEnabled = (opts, context) => {
+  return !opts.patchHistoryDisabled && !context.ignorePatchHistory;
+};
+const applyOmit = (object, opts) => {
+  return opts.omit ? omitDeep(object, opts.omit) : object;
+};
+const replacer = (_key, value) => typeof value === "bigint" ? value.toString() : value;
+const getJsonOmit = (opts, doc) => {
+  return applyOmit(JSON.parse(JSON.stringify(doc, replacer)), opts);
+};
+const getObjectOmit = (opts, doc) => {
+  return applyOmit(isFunction(doc?.toObject) ? doc.toObject() : doc, opts);
+};
+const getOptionalField = async (fn, doc) => {
+  if (isFunction(fn)) {
+    return await fn(doc);
   }
   return void 0;
-}
-function getValue(item) {
+};
+const getUser = async (opts, doc) => getOptionalField(opts.getUser, doc);
+const getReason = async (opts, doc) => getOptionalField(opts.getReason, doc);
+const getMetadata = async (opts, doc) => getOptionalField(opts.getMetadata, doc);
+const getValue = (item) => {
   return item.status === "fulfilled" ? item.value : void 0;
-}
-async function getData(opts, doc) {
+};
+const getData = async (opts, doc) => {
   return Promise.allSettled([getUser(opts, doc), getReason(opts, doc), getMetadata(opts, doc)]).then(([user, reason, metadata]) => {
     return [getValue(user), getValue(reason), getValue(metadata)];
   });
-}
-function emitEvent(context, event, data) {
+};
+const emitEvent = (context, event, data) => {
   if (event && !context.ignoreEvent) {
-    em.emit(event, data);
+    try {
+      em.emit(event, data);
+    } catch {
+    }
   }
-}
-async function bulkPatch(opts, context, eventKey, docsKey) {
+};
+const bulkPatch = async (opts, context, eventKey, docsKey) => {
   const history = isPatchHistoryEnabled(opts, context);
   const event = opts[eventKey];
   const docs = context[docsKey];
   const key = eventKey === "eventCreated" ? "doc" : "oldDoc";
-  if (isEmpty(docs) || !event && !history) return;
+  if (isEmpty(docs) || !docs || !event && !history) return;
   const chunks = chunk(docs, 1e3);
-  for (const chunk2 of chunks) {
+  for (const batch of chunks) {
     const bulk = [];
-    for (const doc of chunk2) {
-      emitEvent(context, event, { [key]: doc });
+    for (const doc of batch) {
+      const omitted = getObjectOmit(opts, doc);
+      emitEvent(context, event, { [key]: omitted });
       if (history) {
         const [user, reason, metadata] = await getData(opts, doc);
         bulk.push({
@@ -164,7 +351,7 @@ async function bulkPatch(opts, context, eventKey, docsKey) {
               modelName: context.modelName,
               collectionName: context.collectionName,
               collectionId: doc._id,
-              doc: getObjectOmit(opts, doc),
+              doc: omitted,
               version: 0,
               ...user !== void 0 && { user },
               ...reason !== void 0 && { reason },
@@ -175,16 +362,17 @@ async function bulkPatch(opts, context, eventKey, docsKey) {
       }
     }
     if (history && !isEmpty(bulk)) {
+      const onError = opts.onError ?? console.error;
       await HistoryModel.bulkWrite(bulk, { ordered: false }).catch((error) => {
-        console.error(error.message);
+        onError(error);
       });
     }
   }
-}
-async function createPatch(opts, context) {
+};
+const createPatch = async (opts, context) => {
   await bulkPatch(opts, context, "eventCreated", "createdDocs");
-}
-async function updatePatch(opts, context, current, original) {
+};
+const updatePatch = async (opts, context, current, original) => {
   const history = isPatchHistoryEnabled(opts, context);
   const currentObject = getJsonOmit(opts, current);
   const originalObject = getJsonOmit(opts, original);
@@ -199,6 +387,7 @@ async function updatePatch(opts, context, current, original) {
       version = lastHistory.version + 1;
     }
     const [user, reason, metadata] = await getData(opts, current);
+    const onError = opts.onError ?? console.error;
     await HistoryModel.create({
       op: context.op,
       modelName: context.modelName,
@@ -209,12 +398,14 @@ async function updatePatch(opts, context, current, original) {
       ...user !== void 0 && { user },
       ...reason !== void 0 && { reason },
       ...metadata !== void 0 && { metadata }
+    }).catch((error) => {
+      onError(error);
     });
   }
-}
-async function deletePatch(opts, context) {
+};
+const deletePatch = async (opts, context) => {
   await bulkPatch(opts, context, "eventDeleted", "deletedDocs");
-}
+};
 
 const deleteMethods = ["remove", "findOneAndDelete", "findOneAndRemove", "findByIdAndDelete", "findByIdAndRemove", "deleteOne", "deleteMany"];
 const deleteHooksInitialize = (schema, opts) => {
@@ -225,8 +416,8 @@ const deleteHooksInitialize = (schema, opts) => {
     const filter = this.getFilter();
     this._context = {
       op: this.op,
-      modelName: opts.modelName ?? this.model.modelName,
-      collectionName: opts.collectionName ?? this.model.collection.collectionName,
+      modelName: opts.modelName ?? model.modelName,
+      collectionName: opts.collectionName ?? model.collection.collectionName,
       ignoreEvent: options.ignoreEvent,
       ignorePatchHistory: options.ignorePatchHistory
     };
@@ -242,12 +433,13 @@ const deleteHooksInitialize = (schema, opts) => {
       }
     }
     if (opts.preDelete && isArray(this._context.deletedDocs) && !isEmpty(this._context.deletedDocs)) {
-      await opts.preDelete(this._context.deletedDocs);
+      await opts.preDelete(cloneDeep(this._context.deletedDocs));
     }
   });
   schema.post(deleteMethods, { document: false, query: true }, async function() {
     const options = this.getOptions();
     if (isHookIgnored(options)) return;
+    if (!this._context) return;
     await deletePatch(opts, this._context);
   });
 };
@@ -275,15 +467,42 @@ const saveHooksInitialize = (schema, opts) => {
 };
 
 const updateMethods = ["update", "updateOne", "replaceOne", "updateMany", "findOneAndUpdate", "findOneAndReplace", "findByIdAndUpdate"];
+const trackChangedFields = (fields, updated, changed) => {
+  if (!fields) return;
+  for (const key of Object.keys(fields)) {
+    const root = key.split(".")[0];
+    changed.set(root, updated[root]);
+  }
+};
+const applyPullAll = (updated, fields, changed) => {
+  for (const [field, values] of Object.entries(fields)) {
+    const arr = updated[field];
+    if (Array.isArray(arr)) {
+      const filtered = arr.filter((item) => !values.some((v) => JSON.stringify(v) === JSON.stringify(item)));
+      updated[field] = filtered;
+      changed.set(field, filtered);
+    }
+  }
+};
 const assignUpdate = (document, update, commands) => {
   let updated = assign(document.toObject(toObjectOptions), update);
-  forEach(commands, (command) => {
+  const changedByCommand = /* @__PURE__ */ new Map();
+  for (const command of commands) {
+    const op = Object.keys(command)[0];
+    const fields = command[op];
     try {
       updated = assign(updated, command);
+      trackChangedFields(fields, updated, changedByCommand);
     } catch {
+      if (op === "$pullAll" && fields) {
+        applyPullAll(updated, fields, changedByCommand);
+      }
     }
-  });
+  }
   const doc = document.set(updated).toObject(toObjectOptions);
+  for (const [field, value] of changedByCommand) {
+    doc[field] = value;
+  }
   if (update.createdAt) doc.createdAt = update.createdAt;
   return doc;
 };
@@ -292,28 +511,27 @@ const splitUpdateAndCommands = (updateQuery) => {
   const commands = [];
   if (!isEmpty(updateQuery) && !isArray(updateQuery) && isObjectLike(updateQuery)) {
     update = cloneDeep(updateQuery);
-    const keysWithDollarSign = keys(update).filter((key) => key.startsWith("$"));
+    const keysWithDollarSign = Object.keys(update).filter((key) => key.startsWith("$"));
     if (!isEmpty(keysWithDollarSign)) {
-      forEach(keysWithDollarSign, (key) => {
+      for (const key of keysWithDollarSign) {
         commands.push({ [key]: update[key] });
         delete update[key];
-      });
+      }
     }
   }
   return { update, commands };
 };
 const updateHooksInitialize = (schema, opts) => {
-  schema.pre(updateMethods, async function() {
+  schema.pre(updateMethods, { document: false, query: true }, async function() {
     const options = this.getOptions();
     if (isHookIgnored(options)) return;
     const model = this.model;
     const filter = this.getFilter();
-    const count = await this.model.countDocuments(filter).exec();
     this._context = {
       op: this.op,
-      modelName: opts.modelName ?? this.model.modelName,
-      collectionName: opts.collectionName ?? this.model.collection.collectionName,
-      isNew: Boolean(options.upsert) && count === 0,
+      modelName: opts.modelName ?? model.modelName,
+      collectionName: opts.collectionName ?? model.collection.collectionName,
+      isNew: Boolean(options.upsert) && await model.countDocuments(filter).exec() === 0,
       ignoreEvent: options.ignoreEvent,
       ignorePatchHistory: options.ignorePatchHistory
     };
@@ -325,25 +543,20 @@ const updateHooksInitialize = (schema, opts) => {
       await updatePatch(opts, this._context, assignUpdate(doc, update, commands), origDoc);
     });
   });
-  schema.post(updateMethods, async function() {
+  schema.post(updateMethods, { document: false, query: true }, async function() {
     const options = this.getOptions();
     if (isHookIgnored(options)) return;
+    if (!this._context) return;
     if (!this._context.isNew) return;
     const model = this.model;
     const updateQuery = this.getUpdate();
     const { update, commands } = splitUpdateAndCommands(updateQuery);
-    let current = null;
     const filter = this.getFilter();
-    const combined = assignUpdate(model.hydrate({}), update, commands);
-    if (!isEmpty(update) && !current) {
-      current = await model.findOne(update).sort("desc").lean().exec();
-    }
-    if (!isEmpty(combined) && !current) {
-      current = await model.findOne(combined).sort("desc").lean().exec();
-    }
-    if (!isEmpty(filter) && !current) {
-      console.log("filter", filter);
-      current = await model.findOne(filter).sort("desc").lean().exec();
+    const candidates = [update, assignUpdate(model.hydrate({}), update, commands), filter];
+    let current = null;
+    for (const query of candidates) {
+      if (current || isEmpty(query)) continue;
+      current = await model.findOne(query).sort({ _id: -1 }).lean().exec();
     }
     if (current) {
       this._context.createdDocs = [current];
@@ -352,15 +565,16 @@ const updateHooksInitialize = (schema, opts) => {
   });
 };
 
-const isMongooseLessThan8 = satisfies(mongoose.version, "<8");
-const isMongooseLessThan7 = satisfies(mongoose.version, "<7");
-const isMongoose6 = satisfies(mongoose.version, "6");
+const major = Number.parseInt(mongoose.version, 10);
+const isMongooseLessThan8 = major < 8;
+const isMongooseLessThan7 = major < 7;
+const isMongoose6 = major === 6;
 if (isMongoose6) {
   mongoose.set("strictQuery", false);
 }
 
 const remove = isMongooseLessThan7 ? "remove" : "deleteOne";
-const patchHistoryPlugin = function plugin(schema, opts) {
+const patchHistoryPlugin = (schema, opts) => {
   saveHooksInitialize(schema, opts);
   updateHooksInitialize(schema, opts);
   deleteHooksInitialize(schema, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-patch-mongoose",
-  "version": "2.9.6",
+  "version": "3.1.0",
   "description": "Patch history & events for mongoose models",
   "author": "ilovepixelart",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "log"
   ],
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "dist",
@@ -71,28 +71,21 @@
     "release": "npm install && npm run biome && npm run type:check && npm run build && np --no-publish"
   },
   "dependencies": {
-    "@types/lodash": "4.17.24",
-    "@types/ms": "2.1.0",
-    "@types/semver": "7.7.1",
     "fast-json-patch": "3.1.1",
-    "lodash": "4.17.23",
-    "ms": "2.1.3",
-    "omit-deep": "0.3.0",
-    "power-assign": "0.2.10",
-    "semver": "7.7.4"
+    "power-assign": "0.2.10"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.4.4",
-    "@types/node": "25.3.0",
-    "@vitest/coverage-v8": "4.0.18",
+    "@biomejs/biome": "2.4.9",
+    "@types/node": "25.5.0",
+    "@vitest/coverage-v8": "4.1.2",
     "mongodb-memory-server": "11.0.1",
-    "mongoose": "9.2.2",
-    "open-cli": "8.0.0",
-    "pkgroll": "2.26.3",
+    "mongoose": "9.3.3",
+    "np": "11.0.2",
+    "open-cli": "9.0.0",
+    "pkgroll": "2.27.0",
     "simple-git-hooks": "2.13.1",
     "typescript": "5.9.3",
-    "vitest": "4.0.18",
-    "np": "11.0.2"
+    "vitest": "4.1.2"
   },
   "peerDependencies": {
     "mongoose": ">=6.6.0 < 10"
@@ -105,6 +98,7 @@
     "publish": false
   },
   "overrides": {
-    "esbuild": "0.25.0"
+    "tmp": "0.2.5",
+    "file-type": "21.3.2"
   }
 }