@atscript/db-mongo 0.1.98 → 0.1.100

package/dist/index.cjs

@@ -630,15 +630,15 @@ function isVectorSearchableImpl(host) {
 }
 /** Text search via $search aggregation stage. */
 async function searchImpl(host, text, query, indexName) {
-	const stage = buildSearchStage(host, text, indexName);
-	if (!stage) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
-	return runSearchPipeline(host, stage, query, "search");
+	const plan = buildSearchStage(host, text, indexName);
+	if (!plan) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
+	return runSearchPipeline(host, plan.stage, query, "search", void 0, plan.classicText);
 }
 /** Text search with faceted count. */
 async function searchWithCountImpl(host, text, query, indexName) {
-	const stage = buildSearchStage(host, text, indexName);
-	if (!stage) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
-	return runSearchWithCountPipeline(host, stage, query, "searchWithCount");
+	const plan = buildSearchStage(host, text, indexName);
+	if (!plan) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
+	return runSearchWithCountPipeline(host, plan.stage, query, "searchWithCount", void 0, plan.classicText);
 }
 /** Vector search via $vectorSearch aggregation stage. */
 async function vectorSearchImpl(host, vector, query, indexName) {
@@ -656,18 +656,40 @@ function resolveThreshold(host, controls, indexName) {
 	if (queryThreshold !== void 0) return queryThreshold;
 	return host.getVectorThreshold(indexName);
 }
-/** Builds a MongoDB $search pipeline stage for text search. */
+/**
+* Builds the first pipeline stage for a text search and reports whether it is a
+* classic `$text` query (vs. an Atlas `$search`).
+*
+* Two distinct execution paths share the `search()` API:
+*  - **Classic text** (`@db.index.fulltext`, or an adapter-scanned `text`
+*    index): served by the collection's MongoDB text index via `$match $text`.
+*    Works on community MongoDB and Atlas alike.
+*  - **Atlas Search** (`search_text` / `dynamic_text`): served by `mongot` via
+*    `$search`, which can ONLY resolve Atlas Search indexes.
+*
+* Routing a classic index through `$search` (as this used to) is guaranteed to
+* fail at runtime — `$search` can't see a classic text index, and on community
+* MongoDB the stage is unsupported entirely — even though the table reports
+* `searchable: true`. The discriminator is the resolved index's `type`.
+*/
 function buildSearchStage(host, text, indexName) {
 	const index = host.getMongoSearchIndex(indexName);
 	if (!index) return;
 	if (index.type === "vector") throw new Error("Vector indexes cannot be used with text search. Use vectorSearch() instead.");
-	return { $search: {
-		index: index.key,
-		text: {
-			query: text,
-			path: { wildcard: "*" }
-		}
-	} };
+	if (index.type === "text") return {
+		stage: { $match: { $text: { $search: text } } },
+		classicText: true
+	};
+	return {
+		stage: { $search: {
+			index: index.key,
+			text: {
+				query: text,
+				path: { wildcard: "*" }
+			}
+		} },
+		classicText: false
+	};
 }
 /** Builds a $vectorSearch aggregation stage from a pre-computed vector. */
 function buildVectorSearchStage(host, vector, indexName, limit) {
@@ -698,16 +720,17 @@ function buildVectorSearchStage(host, vector, indexName, limit) {
 	} };
 }
 /** Runs a search/vector pipeline and returns results. Shared by search + vectorSearch. */
-async function runSearchPipeline(host, stage, query, label, threshold) {
+async function runSearchPipeline(host, stage, query, label, threshold, classicText = false) {
 	const filter = require_mongo_filter.buildMongoFilter(query.filter);
 	const controls = query.controls || {};
 	const pipeline = [stage];
 	if (threshold !== void 0) {
 		pipeline.push({ $addFields: { _score: { $meta: "vectorSearchScore" } } });
 		pipeline.push({ $match: { _score: { $gte: threshold } } });
-	}
+	} else if (classicText) pipeline.push({ $addFields: { _score: { $meta: "textScore" } } });
 	pipeline.push({ $match: filter });
 	if (controls.$sort) pipeline.push({ $sort: controls.$sort });
+	else if (classicText) pipeline.push({ $sort: { _score: -1 } });
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
 	else pipeline.push({ $limit: 1e3 });
@@ -719,16 +742,17 @@ async function runSearchPipeline(host, stage, query, label, threshold) {
 	return wrapInvalidQuery(() => host.collection.aggregate(pipeline, host._getSessionOpts()).toArray());
 }
 /** Runs a search/vector pipeline with $facet for count. Shared by searchWithCount + vectorSearchWithCount. */
-async function runSearchWithCountPipeline(host, stage, query, label, threshold) {
+async function runSearchWithCountPipeline(host, stage, query, label, threshold, classicText = false) {
 	const filter = require_mongo_filter.buildMongoFilter(query.filter);
 	const controls = query.controls || {};
 	const preStages = [];
 	if (threshold !== void 0) {
 		preStages.push({ $addFields: { _score: { $meta: "vectorSearchScore" } } });
 		preStages.push({ $match: { _score: { $gte: threshold } } });
-	}
+	} else if (classicText) preStages.push({ $addFields: { _score: { $meta: "textScore" } } });
 	const dataStages = [];
 	if (controls.$sort) dataStages.push({ $sort: controls.$sort });
+	else if (classicText) dataStages.push({ $sort: { _score: -1 } });
 	if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 	if (controls.$limit) dataStages.push({ $limit: controls.$limit });
 	if (controls.$select) {
@@ -1058,7 +1082,7 @@ async function syncIndexesImpl(host) {
 			mongoType = "text";
 			for (const f of index.fields) {
 				fields[f.name] = "text";
-				if (f.weight) weights[f.name] = f.weight;
+				weights[f.name] = f.weight ?? 1;
 			}
 		} else {
 			mongoType = index.type;
@@ -1504,11 +1528,6 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			const startValue = metadata.get("db.default.increment");
 			this._incrementFields.set(physicalName, typeof startValue === "number" ? startValue : void 0);
 		}
-		for (const index of metadata.get("db.index.fulltext") || []) {
-			const name = typeof index === "object" ? index.name || "" : "";
-			const weight = typeof index === "object" ? index.weight || 1 : 1;
-			this._addMongoIndexField("text", name, field, weight);
-		}
 		for (const index of metadata.get("db.mongo.search.text") || []) this._addFieldToSearchIndex("search_text", index.indexName, field, index.analyzer);
 		const vectorIndex = metadata.get("db.search.vector");
 		if (vectorIndex) {

package/dist/index.mjs

@@ -629,15 +629,15 @@ function isVectorSearchableImpl(host) {
 }
 /** Text search via $search aggregation stage. */
 async function searchImpl(host, text, query, indexName) {
-	const stage = buildSearchStage(host, text, indexName);
-	if (!stage) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
-	return runSearchPipeline(host, stage, query, "search");
+	const plan = buildSearchStage(host, text, indexName);
+	if (!plan) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
+	return runSearchPipeline(host, plan.stage, query, "search", void 0, plan.classicText);
 }
 /** Text search with faceted count. */
 async function searchWithCountImpl(host, text, query, indexName) {
-	const stage = buildSearchStage(host, text, indexName);
-	if (!stage) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
-	return runSearchWithCountPipeline(host, stage, query, "searchWithCount");
+	const plan = buildSearchStage(host, text, indexName);
+	if (!plan) throw new Error(indexName ? `Search index "${indexName}" not found` : "No search index available");
+	return runSearchWithCountPipeline(host, plan.stage, query, "searchWithCount", void 0, plan.classicText);
 }
 /** Vector search via $vectorSearch aggregation stage. */
 async function vectorSearchImpl(host, vector, query, indexName) {
@@ -655,18 +655,40 @@ function resolveThreshold(host, controls, indexName) {
 	if (queryThreshold !== void 0) return queryThreshold;
 	return host.getVectorThreshold(indexName);
 }
-/** Builds a MongoDB $search pipeline stage for text search. */
+/**
+* Builds the first pipeline stage for a text search and reports whether it is a
+* classic `$text` query (vs. an Atlas `$search`).
+*
+* Two distinct execution paths share the `search()` API:
+*  - **Classic text** (`@db.index.fulltext`, or an adapter-scanned `text`
+*    index): served by the collection's MongoDB text index via `$match $text`.
+*    Works on community MongoDB and Atlas alike.
+*  - **Atlas Search** (`search_text` / `dynamic_text`): served by `mongot` via
+*    `$search`, which can ONLY resolve Atlas Search indexes.
+*
+* Routing a classic index through `$search` (as this used to) is guaranteed to
+* fail at runtime — `$search` can't see a classic text index, and on community
+* MongoDB the stage is unsupported entirely — even though the table reports
+* `searchable: true`. The discriminator is the resolved index's `type`.
+*/
 function buildSearchStage(host, text, indexName) {
 	const index = host.getMongoSearchIndex(indexName);
 	if (!index) return;
 	if (index.type === "vector") throw new Error("Vector indexes cannot be used with text search. Use vectorSearch() instead.");
-	return { $search: {
-		index: index.key,
-		text: {
-			query: text,
-			path: { wildcard: "*" }
-		}
-	} };
+	if (index.type === "text") return {
+		stage: { $match: { $text: { $search: text } } },
+		classicText: true
+	};
+	return {
+		stage: { $search: {
+			index: index.key,
+			text: {
+				query: text,
+				path: { wildcard: "*" }
+			}
+		} },
+		classicText: false
+	};
 }
 /** Builds a $vectorSearch aggregation stage from a pre-computed vector. */
 function buildVectorSearchStage(host, vector, indexName, limit) {
@@ -697,16 +719,17 @@ function buildVectorSearchStage(host, vector, indexName, limit) {
 	} };
 }
 /** Runs a search/vector pipeline and returns results. Shared by search + vectorSearch. */
-async function runSearchPipeline(host, stage, query, label, threshold) {
+async function runSearchPipeline(host, stage, query, label, threshold, classicText = false) {
 	const filter = buildMongoFilter(query.filter);
 	const controls = query.controls || {};
 	const pipeline = [stage];
 	if (threshold !== void 0) {
 		pipeline.push({ $addFields: { _score: { $meta: "vectorSearchScore" } } });
 		pipeline.push({ $match: { _score: { $gte: threshold } } });
-	}
+	} else if (classicText) pipeline.push({ $addFields: { _score: { $meta: "textScore" } } });
 	pipeline.push({ $match: filter });
 	if (controls.$sort) pipeline.push({ $sort: controls.$sort });
+	else if (classicText) pipeline.push({ $sort: { _score: -1 } });
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
 	else pipeline.push({ $limit: 1e3 });
@@ -718,16 +741,17 @@ async function runSearchPipeline(host, stage, query, label, threshold) {
 	return wrapInvalidQuery(() => host.collection.aggregate(pipeline, host._getSessionOpts()).toArray());
 }
 /** Runs a search/vector pipeline with $facet for count. Shared by searchWithCount + vectorSearchWithCount. */
-async function runSearchWithCountPipeline(host, stage, query, label, threshold) {
+async function runSearchWithCountPipeline(host, stage, query, label, threshold, classicText = false) {
 	const filter = buildMongoFilter(query.filter);
 	const controls = query.controls || {};
 	const preStages = [];
 	if (threshold !== void 0) {
 		preStages.push({ $addFields: { _score: { $meta: "vectorSearchScore" } } });
 		preStages.push({ $match: { _score: { $gte: threshold } } });
-	}
+	} else if (classicText) preStages.push({ $addFields: { _score: { $meta: "textScore" } } });
 	const dataStages = [];
 	if (controls.$sort) dataStages.push({ $sort: controls.$sort });
+	else if (classicText) dataStages.push({ $sort: { _score: -1 } });
 	if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 	if (controls.$limit) dataStages.push({ $limit: controls.$limit });
 	if (controls.$select) {
@@ -1057,7 +1081,7 @@ async function syncIndexesImpl(host) {
 			mongoType = "text";
 			for (const f of index.fields) {
 				fields[f.name] = "text";
-				if (f.weight) weights[f.name] = f.weight;
+				weights[f.name] = f.weight ?? 1;
 			}
 		} else {
 			mongoType = index.type;
@@ -1503,11 +1527,6 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			const startValue = metadata.get("db.default.increment");
 			this._incrementFields.set(physicalName, typeof startValue === "number" ? startValue : void 0);
 		}
-		for (const index of metadata.get("db.index.fulltext") || []) {
-			const name = typeof index === "object" ? index.name || "" : "";
-			const weight = typeof index === "object" ? index.weight || 1 : 1;
-			this._addMongoIndexField("text", name, field, weight);
-		}
 		for (const index of metadata.get("db.mongo.search.text") || []) this._addFieldToSearchIndex("search_text", index.indexName, field, index.analyzer);
 		const vectorIndex = metadata.get("db.search.vector");
 		if (vectorIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.98",
+  "version": "0.1.100",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -46,17 +46,17 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.71",
-    "@atscript/typescript": "^0.1.71",
+    "@atscript/core": "^0.1.73",
+    "@atscript/typescript": "^0.1.73",
     "mongodb": "^6.17.0",
     "mongodb-memory-server-core": "^10.0.0",
-    "unplugin-atscript": "^0.1.71"
+    "unplugin-atscript": "^0.1.73"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.71",
-    "@atscript/typescript": "^0.1.71",
+    "@atscript/core": "^0.1.73",
+    "@atscript/typescript": "^0.1.73",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.98"
+    "@atscript/db": "^0.1.100"
   },
   "scripts": {
     "postinstall": "asc -f dts",