@atscript/moost-mongo 0.0.24 → 0.0.26

package/dist/index.cjs

@@ -226,16 +226,20 @@ var AsMongoController = class {
 		};
 	}
 	/**
-	* Prepares a MongoDB $search stage for text-based searching.
+	* Prepares a MongoDB $search stage for vector-based searching.
 	*
 	* @param searchTerm - The text string to search for. If not provided, no search is performed.
 	* @param indexName - The name of the Atlas Search index to use. If not provided, the default index is used.
-	* @returns A $search pipeline stage or an error string if the index is not found. Returns undefined if no searchTerm is provided.
-	*/ prepareSearch(searchTerm, indexName) {
-		if (!searchTerm) return undefined;
-		const index = this.asCollection.getSearchIndex(indexName);
-		if (!index) return indexName ? `Search index "${indexName}" does not exist` : "No search index found";
-		if (!index.key) return `Invalid index definition: missing index key`;
+	*/ async prepareVectorSearch(searchTerm, indexName) {
+		return `Embeddings for ${indexName} are not supported`;
+	}
+	/**
+	* Prepares a MongoDB $search stage for text-based searching.
+	*
+	* @param searchTerm - The text string to search for. If not provided, no search is performed.
+	* @param index - The Atlas Search index definition.
+	* @returns A $search pipeline stage.
+	*/ prepareTextSearch(searchTerm, index) {
 		return { $search: {
 			index: index.key,
 			text: {
@@ -245,6 +249,19 @@ var AsMongoController = class {
 		} };
 	}
 	/**
+	* Prepares a MongoDB $search stage for text-based searching.
+	*
+	* @param searchTerm - The text string to search for. If not provided, no search is performed.
+	* @param indexName - The name of the Atlas Search index to use. If not provided, the default index is used.
+	* @returns A $search pipeline stage or an error string if the index is not found. Returns undefined if no searchTerm is provided.
+	*/ async prepareSearch(searchTerm, indexName) {
+		if (!searchTerm) return undefined;
+		const index = this.asCollection.getSearchIndex(indexName);
+		if (!index) return indexName ? `Search index "${indexName}" does not exist` : "No search index found";
+		if (!index.key) return `Invalid index definition: missing index key`;
+		return index.type === "vector" ? await this.prepareVectorSearch(searchTerm, indexName) : this.prepareTextSearch(searchTerm, index);
+	}
+	/**
 	* **GET /query** – returns an array of documents or a count depending on
 	* presence of `$count` control.
 	*
@@ -256,7 +273,7 @@ var AsMongoController = class {
 		const error = await this.validateUrlql(parsed, "query");
 		if (error) return error;
 		if (parsed.controls.$count) return this.asCollection.collection.countDocuments(parsed.filter);
-		const search = this.prepareSearch(parsed.controls.$search, parsed.controls.$index);
+		const search = await this.prepareSearch(parsed.controls.$search, parsed.controls.$index);
 		if (typeof search === "string") return new __moostjs_event_http.HttpError(400, search);
 		const { projection, sort, limit, skip } = this.prepareQueryOptions(parsed.controls);
 		const pipeline = [];

package/dist/index.d.ts

@@ -124,6 +124,23 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
         limit: number | undefined;
         skip: number | undefined;
     };
+    /**
+     * Prepares a MongoDB $search stage for vector-based searching.
+     *
+     * @param searchTerm - The text string to search for. If not provided, no search is performed.
+     * @param indexName - The name of the Atlas Search index to use. If not provided, the default index is used.
+     */
+    protected prepareVectorSearch(searchTerm: string, indexName?: string): Promise<string | undefined | Document>;
+    /**
+     * Prepares a MongoDB $search stage for text-based searching.
+     *
+     * @param searchTerm - The text string to search for. If not provided, no search is performed.
+     * @param index - The Atlas Search index definition.
+     * @returns A $search pipeline stage.
+     */
+    protected prepareTextSearch(searchTerm: string, index: {
+        key: string;
+    }): Document;
     /**
      * Prepares a MongoDB $search stage for text-based searching.
      *
@@ -131,7 +148,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @param indexName - The name of the Atlas Search index to use. If not provided, the default index is used.
      * @returns A $search pipeline stage or an error string if the index is not found. Returns undefined if no searchTerm is provided.
      */
-    protected prepareSearch(searchTerm?: string, indexName?: string): string | undefined | Document;
+    protected prepareSearch(searchTerm?: string, indexName?: string): Promise<string | undefined | Document>;
     /**
      * **GET /query** – returns an array of documents or a count depending on
      * presence of `$count` control.

package/dist/index.mjs

@@ -202,16 +202,20 @@ var AsMongoController = class {
 		};
 	}
 	/**
-	* Prepares a MongoDB $search stage for text-based searching.
+	* Prepares a MongoDB $search stage for vector-based searching.
 	*
 	* @param searchTerm - The text string to search for. If not provided, no search is performed.
 	* @param indexName - The name of the Atlas Search index to use. If not provided, the default index is used.
-	* @returns A $search pipeline stage or an error string if the index is not found. Returns undefined if no searchTerm is provided.
-	*/ prepareSearch(searchTerm, indexName) {
-		if (!searchTerm) return undefined;
-		const index = this.asCollection.getSearchIndex(indexName);
-		if (!index) return indexName ? `Search index "${indexName}" does not exist` : "No search index found";
-		if (!index.key) return `Invalid index definition: missing index key`;
+	*/ async prepareVectorSearch(searchTerm, indexName) {
+		return `Embeddings for ${indexName} are not supported`;
+	}
+	/**
+	* Prepares a MongoDB $search stage for text-based searching.
+	*
+	* @param searchTerm - The text string to search for. If not provided, no search is performed.
+	* @param index - The Atlas Search index definition.
+	* @returns A $search pipeline stage.
+	*/ prepareTextSearch(searchTerm, index) {
 		return { $search: {
 			index: index.key,
 			text: {
@@ -221,6 +225,19 @@ var AsMongoController = class {
 		} };
 	}
 	/**
+	* Prepares a MongoDB $search stage for text-based searching.
+	*
+	* @param searchTerm - The text string to search for. If not provided, no search is performed.
+	* @param indexName - The name of the Atlas Search index to use. If not provided, the default index is used.
+	* @returns A $search pipeline stage or an error string if the index is not found. Returns undefined if no searchTerm is provided.
+	*/ async prepareSearch(searchTerm, indexName) {
+		if (!searchTerm) return undefined;
+		const index = this.asCollection.getSearchIndex(indexName);
+		if (!index) return indexName ? `Search index "${indexName}" does not exist` : "No search index found";
+		if (!index.key) return `Invalid index definition: missing index key`;
+		return index.type === "vector" ? await this.prepareVectorSearch(searchTerm, indexName) : this.prepareTextSearch(searchTerm, index);
+	}
+	/**
 	* **GET /query** – returns an array of documents or a count depending on
 	* presence of `$count` control.
 	*
@@ -232,7 +249,7 @@ var AsMongoController = class {
 		const error = await this.validateUrlql(parsed, "query");
 		if (error) return error;
 		if (parsed.controls.$count) return this.asCollection.collection.countDocuments(parsed.filter);
-		const search = this.prepareSearch(parsed.controls.$search, parsed.controls.$index);
+		const search = await this.prepareSearch(parsed.controls.$search, parsed.controls.$index);
 		if (typeof search === "string") return new HttpError(400, search);
 		const { projection, sort, limit, skip } = this.prepareQueryOptions(parsed.controls);
 		const pipeline = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-mongo",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Atscript Mongo for Moost.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -44,8 +44,8 @@
     "@moostjs/event-http": "^0.5.32",
     "mongodb": "^6.17.0",
     "moost": "^0.5.32",
-    "@atscript/mongo": "^0.0.24",
-    "@atscript/typescript": "^0.0.24"
+    "@atscript/mongo": "^0.0.26",
+    "@atscript/typescript": "^0.0.26"
   },
   "scripts": {
     "pub": "pnpm publish --access public",