@rebasepro/server-mongo 0.21.1 → 0.22.0

package/dist/db/MongoConditionBuilder.d.ts

@@ -40,11 +40,18 @@ export declare class MongoConditionBuilder {
      */
     static buildLogicalConditions(logical: LogicalCondition | undefined): Filter<Document> | undefined;
     /**
-     * Build search conditions for text search
+     * Build search conditions for text search.
+     *
+     * Terms are split on whitespace and AND-ed, while the fields are OR-ed
+     * within each term: a person typing `sebastian melendez` into a search box
+     * means both words, and the two live in different fields, so matching the
+     * whole string per field finds nothing. See {@link splitSearchTerms}; the
+     * Postgres driver's fallback path answers the same way.
      *
      * @param searchString - Text to search for
      * @param properties - The collection's properties, searched for string fields
-     * @returns Array of MongoDB filter objects for text search
+     * @returns At most one MongoDB filter — callers OR what they get back, which
+     *   is right across fields and wrong across terms, so the AND is built here
      */
     static buildSearchConditions(searchString: string, properties: CollectionConfig["properties"]): Filter<Document>[];
     /**

package/dist/index.es.js

@@ -1,8 +1,8 @@
 import { MongoClient, ObjectId } from "mongodb";
 import { ANONYMOUS_USER_ID, EntityReference, ListLimitError, getCollectionDataPath, isAnonymousUid, resolveClientListLimit } from "@rebasepro/types";
-import { buildPropertyCallbacks, buildSdkData, callbackRefusal, checkOperation, normalizeDriverOrderBy, normalizeEmail, requireCallbackClient, securityRuleToConditions, toCallbackError, toFilterTuples, updateDateAutoValues } from "@rebasepro/common";
+import { assertBeforeQueryIsPostgresOnly, buildPropertyCallbacks, buildSdkData, callbackRefusal, checkOperation, normalizeDriverOrderBy, normalizeEmail, requireCallbackClient, securityRuleToConditions, toCallbackError, toFilterTuples, updateDateAutoValues } from "@rebasepro/common";
+import { mergeDeep, splitSearchTerms } from "@rebasepro/utils";
 import { ApiError, declaredErrorAnswer, logger } from "@rebasepro/server";
-import { mergeDeep } from "@rebasepro/utils";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -177,20 +177,31 @@ var MongoConditionBuilder = class MongoConditionBuilder {
 		return logical.type === "or" ? this.combineConditionsWithOr(parts) : this.combineConditionsWithAnd(parts);
 	}
 	/**
-	* Build search conditions for text search
+	* Build search conditions for text search.
+	*
+	* Terms are split on whitespace and AND-ed, while the fields are OR-ed
+	* within each term: a person typing `sebastian melendez` into a search box
+	* means both words, and the two live in different fields, so matching the
+	* whole string per field finds nothing. See {@link splitSearchTerms}; the
+	* Postgres driver's fallback path answers the same way.
 	*
 	* @param searchString - Text to search for
 	* @param properties - The collection's properties, searched for string fields
-	* @returns Array of MongoDB filter objects for text search
+	* @returns At most one MongoDB filter — callers OR what they get back, which
+	*   is right across fields and wrong across terms, so the AND is built here
 	*/
 	static buildSearchConditions(searchString, properties) {
 		if (!searchString) return [];
-		const orConditions = [];
-		const escapedSearch = escapeRegExp$1(searchString);
-		const searchRegex = new RegExp(escapedSearch, "i");
-		for (const [key, prop] of Object.entries(properties)) if (prop?.type === "string" || typeof prop === "string") orConditions.push({ [key]: { $regex: searchRegex } });
-		if (orConditions.length === 0) return [{ $text: { $search: searchString } }];
-		return orConditions;
+		const searchableFields = [];
+		for (const [key, prop] of Object.entries(properties)) if (prop?.type === "string" || typeof prop === "string") searchableFields.push(key);
+		if (searchableFields.length === 0) return [{ $text: { $search: searchString } }];
+		const terms = splitSearchTerms(searchString);
+		const perTerm = (terms.length > 0 ? terms : [searchString]).map((term) => {
+			const regex = new RegExp(escapeRegExp$1(term), "i");
+			return this.combineConditionsWithOr(searchableFields.map((field) => ({ [field]: { $regex: regex } })));
+		});
+		const combined = this.combineConditionsWithAnd(perTerm);
+		return combined ? [combined] : [];
 	}
 	/**
 	* Combine multiple conditions with AND operator
@@ -2976,7 +2987,10 @@ function createMongoBootstrapper(mongoConfig) {
 		async initializeDriver(config) {
 			const { collections } = config;
 			const registry = new MongoCollectionRegistry();
-			if (collections) collections.forEach((collection) => registry.register(collection));
+			if (collections) {
+				assertBeforeQueryIsPostgresOnly(collections);
+				collections.forEach((collection) => registry.register(collection));
+			}
 			const db = mongoConfig.connection;
 			const client = mongoConfig.client;
 			try {