chore(mongo-adapter): Move update filter logic into the package (#36312)

Author: tassoevan

apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts

@@ -1,7 +1,7 @@
 import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { createPredicateFromFilter } from '@rocket.chat/mongo-adapter';
-import type { Filter } from '@rocket.chat/mongo-adapter';
+import type { Filter } from 'mongodb';
 
 import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
 import { RoomManager } from '../../../../client/lib/RoomManager';

apps/meteor/client/hooks/lists/useStreamUpdatesForMessageList.ts

@@ -1,7 +1,7 @@
 import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
-import type { FieldExpression, Filter } from '@rocket.chat/mongo-adapter';
 import { createPredicateFromFilter } from '@rocket.chat/mongo-adapter';
 import { useStream } from '@rocket.chat/ui-contexts';
+import type { Condition, Filter } from 'mongodb';
 import { useEffect } from 'react';
 
 import type { MessageList } from '../../lib/lists/MessageList';
@@ -10,7 +10,7 @@ type NotifyRoomRidDeleteMessageBulkEvent = {
 	rid: IMessage['rid'];
 	excludePinned: boolean;
 	ignoreDiscussion: boolean;
-	ts: FieldExpression<Date>;
+	ts: Condition<Date>;
 	users: string[];
 	ids?: string[]; // message ids have priority over ts
 	showDeletedStatus?: boolean;
@@ -36,7 +36,7 @@ const createDeleteCriteria = (params: NotifyRoomRidDeleteMessageBulkEvent): ((me
 		query['u.username'] = { $in: params.users };
 	}
 
-	return createPredicateFromFilter<IMessage>(query);
+	return createPredicateFromFilter(query);
 };
 
 export const useStreamUpdatesForMessageList = (messageList: MessageList, uid: IUser['_id'] | null, rid: IRoom['_id'] | null): void => {

apps/meteor/client/lib/cachedCollections/Cursor.ts

@@ -1,5 +1,6 @@
-import { createComparatorFromSort, createPredicateFromFilter, type Filter, type Sort } from '@rocket.chat/mongo-adapter';
+import { createComparatorFromSort, createPredicateFromFilter } from '@rocket.chat/mongo-adapter';
 import { Tracker } from 'meteor/tracker';
+import type { Filter, Sort } from 'mongodb';
 
 import { DiffSequence } from './DiffSequence';
 import { IdMap } from './IdMap';
@@ -8,7 +9,7 @@ import { MinimongoError } from './MinimongoError';
 import { ObserveHandle, ReactiveObserveHandle } from './ObserveHandle';
 import { OrderedDict } from './OrderedDict';
 import type { Query, OrderedQuery, UnorderedQuery } from './Query';
-import { _isPlainObject, clone, hasOwn } from './common';
+import { isPlainObject, clone, hasOwn } from './common';
 import type { OrderedObserver, UnorderedObserver } from './observers';
 
 type Transform<T> = ((doc: T) => any) | null | undefined;
@@ -83,7 +84,7 @@ export class Cursor<T extends { _id: string }, TOptions extends Options<T>> {
 		selector: Filter<T> | T['_id'],
 		options?: TOptions,
 	) {
-		this.predicate = createPredicateFromFilter(typeof selector === 'string' ? ({ _id: selector } as Filter<T>) : selector);
+		this.predicate = createPredicateFromFilter<T>(typeof selector === 'string' ? ({ _id: selector } as Filter<T>) : selector);
 		this.comparator = options?.sort ? createComparatorFromSort(options.sort) : null;
 		this.skip = options?.skip ?? 0;
 		this.limit = options?.limit;
@@ -253,7 +254,7 @@ export class Cursor<T extends { _id: string }, TOptions extends Options<T>> {
 
 			const transformed = Tracker.nonreactive(() => transform(doc));
 
-			if (!_isPlainObject(transformed)) {
+			if (!isPlainObject(transformed)) {
 				throw new MinimongoError('transform must return object');
 			}
 

apps/meteor/client/lib/cachedCollections/DiffSequence.ts

@@ -1,5 +1,5 @@
 import type { IdMap } from './IdMap';
-import { clone, entriesOf, hasOwn, isEqual } from './common';
+import { clone, entriesOf, hasOwn, equals } from './common';
 import type { Observer, OrderedObserver, UnorderedObserver } from './observers';
 
 function isObjEmpty(obj: Record<string, unknown>): boolean {
@@ -65,7 +65,7 @@ export class DiffSequence {
 		newResults.forEach((newDoc, id) => {
 			const oldDoc = oldResults.get(id);
 			if (oldDoc) {
-				if (observer.changed && !isEqual(oldDoc, newDoc as any)) {
+				if (observer.changed && !equals(oldDoc, newDoc as any)) {
 					const projectedNew = projectionFn(newDoc);
 					const projectedOld = projectionFn(oldDoc);
 					const changedFields = DiffSequence.makeChangedFields(projectedNew, projectedOld);
@@ -223,7 +223,7 @@ export class DiffSequence {
 				fields[key] = value;
 			},
 			both(key, leftValue, rightValue) {
-				if (!isEqual(leftValue, rightValue)) fields[key] = rightValue;
+				if (!equals(leftValue, rightValue)) fields[key] = rightValue;
 			},
 		});
 		return fields;

apps/meteor/client/lib/cachedCollections/LocalCollection.ts

@@ -1,21 +1,22 @@
-import { createPredicateFromFilter } from '@rocket.chat/mongo-adapter';
-import type { FieldExpression, Filter } from '@rocket.chat/mongo-adapter';
+import {
+	createDocumentMatcherFromFilter,
+	createPredicateFromFilter,
+	createTransformFromUpdateFilter,
+	createUpsertDocument,
+} from '@rocket.chat/mongo-adapter';
+import type { ArrayIndices } from '@rocket.chat/mongo-adapter';
 import { Meteor } from 'meteor/meteor';
-import type { CountDocumentsOptions } from 'mongodb';
+import type { CountDocumentsOptions, FilterOperators, Filter, UpdateFilter } from 'mongodb';
 import type { StoreApi, UseBoundStore } from 'zustand';
 
 import { Cursor } from './Cursor';
 import type { Options } from './Cursor';
 import { DiffSequence } from './DiffSequence';
 import type { IdMap } from './IdMap';
-import { Matcher } from './Matcher';
 import { MinimongoError } from './MinimongoError';
 import type { Query } from './Query';
 import { SynchronousQueue } from './SynchronousQueue';
-import type { UpdateFilter } from './Updater';
-import { Updater } from './Updater';
-import type { ArrayIndices } from './common';
-import { hasOwn, _selectorIsId, clone, assertHasValidFieldNames } from './common';
+import { clone, assertHasValidFieldNames } from './common';
 
 /**
  * Forked from Meteor's Mongo.Collection, this class implements a local collection over a Zustand store.
@@ -209,7 +210,7 @@ export class LocalCollection<T extends { _id: string }> {
 	}
 
 	private prepareRemove(selector: Filter<T>) {
-		const predicate = createPredicateFromFilter(selector);
+		const predicate = createPredicateFromFilter<T>(selector);
 		const remove = new Set<T>();
 
 		this._eachPossiblyMatchingDoc(selector, (doc) => {
@@ -430,7 +431,7 @@ export class LocalCollection<T extends { _id: string }> {
 		const callback = !_callback && typeof _options === 'function' ? _options : _callback;
 		const options = typeof _options === 'object' && _options !== null ? _options : {};
 
-		const matcher = new Matcher(selector);
+		const matchDocument = createDocumentMatcherFromFilter<T>(selector);
 
 		const queriesToOriginalResults = this.prepareUpdate(selector);
 
@@ -439,7 +440,7 @@ export class LocalCollection<T extends { _id: string }> {
 		let updateCount = 0;
 
 		await this._eachPossiblyMatchingDocAsync(selector, async (doc, id) => {
-			const queryResult = matcher.documentMatches(doc);
+			const queryResult = matchDocument(doc);
 
 			if (queryResult.result) {
 				this._saveOriginal(id, doc);
@@ -508,7 +509,7 @@ export class LocalCollection<T extends { _id: string }> {
 		const callback = !_callback && typeof _options === 'function' ? _options : _callback;
 		const options = typeof _options === 'object' && _options !== null ? _options : {};
 
-		const matcher = new Matcher(selector);
+		const matchDocument = createDocumentMatcherFromFilter(selector);
 
 		const queriesToOriginalResults = this.prepareUpdate(selector);
 
@@ -517,7 +518,7 @@ export class LocalCollection<T extends { _id: string }> {
 		let updateCount = 0;
 
 		this._eachPossiblyMatchingDoc(selector, (doc, id) => {
-			const queryResult = matcher.documentMatches(doc);
+			const queryResult = matchDocument(doc);
 
 			if (queryResult.result) {
 				this._saveOriginal(id, doc);
@@ -680,8 +681,8 @@ export class LocalCollection<T extends { _id: string }> {
 		const matchedBefore = this._getMatchedDocAndModify(doc);
 
 		const oldDoc = clone(doc);
-		const updater = new Updater(clone(mod));
-		doc = updater.modify(doc, { arrayIndices });
+		const updater = createTransformFromUpdateFilter(clone(mod));
+		doc = updater(doc, { arrayIndices });
 		this.store.setState((state) => {
 			const records = new Map(state.records);
 			records.set(doc._id, doc);
@@ -715,8 +716,8 @@ export class LocalCollection<T extends { _id: string }> {
 		const matchedBefore = this._getMatchedDocAndModify(doc);
 
 		const oldDoc = clone(doc);
-		const updater = new Updater(clone(mod));
-		doc = updater.modify(doc, { arrayIndices });
+		const updater = createTransformFromUpdateFilter(clone(mod));
+		doc = updater(doc, { arrayIndices });
 		this.store.setState((state) => {
 			const records = new Map(state.records);
 			records.set(doc._id, doc);
@@ -797,8 +798,7 @@ export class LocalCollection<T extends { _id: string }> {
 	}
 
 	private _createUpsertDocument(selector: Filter<T>, modifier: UpdateFilter<T>): T {
-		const updater = new Updater(modifier);
-		return updater.createUpsertDocument(selector);
+		return createUpsertDocument(selector, modifier);
 	}
 
 	private _findInOrderedResults(query: Query<T>, doc: T): number {
@@ -815,27 +815,27 @@ export class LocalCollection<T extends { _id: string }> {
 		throw new MinimongoError('object missing from query');
 	}
 
-	private _idsMatchedBySelector(selector: Filter<T> | T['_id']): T['_id'][] | null {
-		if (_selectorIsId(selector)) {
+	private _idsMatchedBySelector(selector: Filter<T> | T['_id']): readonly T['_id'][] | null {
+		if (typeof selector === 'string') {
 			return [selector];
 		}
 
 		if (!selector) {
 			return null;
 		}
 
-		if (hasOwn.call(selector, '_id')) {
-			if (_selectorIsId(selector._id)) {
+		if ('_id' in selector) {
+			if (typeof selector._id === 'string') {
 				return [selector._id];
 			}
 
 			if (
 				selector._id &&
-				Array.isArray((selector._id as FieldExpression<T['_id']>).$in) &&
-				(selector._id as FieldExpression<T['_id']>).$in?.length &&
-				(selector._id as FieldExpression<T['_id']>).$in?.every(_selectorIsId)
+				Array.isArray((selector._id as FilterOperators<T['_id']>).$in) &&
+				(selector._id as FilterOperators<T['_id']>).$in?.length &&
+				(selector._id as FilterOperators<T['_id']>).$in?.every((id) => typeof id === 'string')
 			) {
-				return (selector._id as FieldExpression<T['_id']>).$in!;
+				return (selector._id as FilterOperators<T['_id']>).$in!;
 			}
 
 			return null;