update query state

wcpos · Jul 11, 2024 · eb60d75 · eb60d75
1 parent f9e691f
commit eb60d75
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/src/query-state.ts b/src/query-state.ts
@@ -1,11 +1,11 @@
-import { orderBy } from 'natural-orderby';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
+import find from 'lodash/find';
 import forEach from 'lodash/forEach';
 import get from 'lodash/get';
-import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
+import { orderBy } from 'natural-orderby';
 import { ObservableResource } from 'observable-hooks';
 import {
 	BehaviorSubject,
@@ -18,8 +18,8 @@ import {
 } from 'rxjs';
 import { map, switchMap, distinctUntilChanged, debounceTime, tap, startWith } from 'rxjs/operators';
 
-import { SubscribableBase } from './subscribable-base';
 import { Search } from './search-state';
+import { SubscribableBase } from './subscribable-base';
 import { normalizeWhereClauses } from './utils';
 
 import type { RxCollection, RxDocument } from 'rxdb';
@@ -129,7 +129,7 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 
 		/**
 		 * Search service
-		 * 
+		 *
 		 * @TODO - we only need a full text search service for some collections and fields
 		 * @TODO - we have full text search, but we need partial string search as well
 		 */
@@ -138,9 +138,17 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 		/**
 		 * Set initial params
 		 */
-		forEach(initialParams.selector, (value, key) => {
-			this.whereClauses.push({ field: key, value });
-		});
+		if (initialParams.selector?.$and) {
+			forEach(initialParams.selector.$and, (condition) => {
+				forEach(condition, (value, key) => {
+					this.whereClauses.push({ field: key, value });
+				});
+			});
+		} else {
+			forEach(initialParams.selector, (value, key) => {
+				this.whereClauses.push({ field: key, value });
+			});
+		}
 		this.subjects.params.next(initialParams);
 
 		/**
@@ -338,7 +346,7 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 		const andClauses = this.whereClauses.map((clause) => ({
 			[clause.field]: clause.value,
 		}));
-		
+
 		if (andClauses.length > 0) {
 			selector = { $and: andClauses };
 		} else {
@@ -350,7 +358,7 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 		const newParams: QueryParams = {
 			...currentParams,
 			...additionalParams,
-			selector
+			selector,
 		};
 
 		// Update the BehaviorSubject
@@ -374,6 +382,18 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 	/**
 	 * Helper methods to see if $elemMatch is active
 	 */
+	findSelector(field: string): any {
+		const clause = find(this.whereClauses, { field });
+		return clause ? clause.value : undefined;
+	}
+
+	hasSelector(field: string, value: any): boolean {
+		const clause = find(this.whereClauses, { field, value });
+		return !!clause;
+	}
+
+	findElementSelectorID(field: string): any {}
+
 	findMetaDataSelector(key: string): any {
 		for (const clause of this.whereClauses) {
 			if (clause.field === 'meta_data' && clause.value?.$elemMatch) {
@@ -387,7 +407,10 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 	hasMetaDataSelector(key: string, value: any): boolean {
 		for (const clause of this.whereClauses) {
 			if (clause.field === 'meta_data' && clause.value?.$elemMatch) {
-				const match = find(clause.value.$elemMatch.$and || [clause.value.$elemMatch], { key, value });
+				const match = find(clause.value.$elemMatch.$and || [clause.value.$elemMatch], {
+					key,
+					value,
+				});
 				if (match) return true;
 			}
 		}
@@ -407,7 +430,10 @@ export class Query<T extends RxCollection> extends SubscribableBase {
 	hasAttributesSelector(name: string, option: any): boolean {
 		for (const clause of this.whereClauses) {
 			if (clause.field === 'attributes' && clause.value?.$elemMatch) {
-				const match = find(clause.value.$elemMatch.$and || [clause.value.$elemMatch], { name, option });
+				const match = find(clause.value.$elemMatch.$and || [clause.value.$elemMatch], {
+					name,
+					option,
+				});
 				if (match) return true;
 			}
 		}

diff --git a/src/search-dbs.ts b/src/search-dbs.ts
@@ -148,7 +148,7 @@ export async function maybeCreateSearchDB(collection, locale = '') {
 	/**
 	 * This is async, there is a small chance that the collection has been destroyed before the searchDB is created
 	 */
-	if(collection.destroyed) {
+	if (collection.destroyed) {
 		searchDBs.delete(key);
 		return searchDB;
 	}