@atscript/db-mongo 0.1.164 → 0.1.165

package/dist/index.cjs

@@ -1025,21 +1025,36 @@ function filterOptionsOf(host) {
 	return { collation: require_mongo_accumulator.collationOfAdapter(host) };
 }
 /**
-* Returns available search indexes as generic metadata for UI. The text
-* default is the `DEFAULT` entry (an alias of the index `search()` answers
-* with when none is named); the vector default is the first vector index.
+* Returns available search indexes as generic metadata for UI. Each index is
+* listed once, by its declared name; the text default (the index `search()`
+* answers with when none is named) carries `isDefault` and lists `DEFAULT` —
+* which also resolves — as an alias (since 0.1.165). Only an index without a
+* name of its own (a dynamic Atlas mapping) is listed as `DEFAULT`. The vector
+* default is the first vector index.
 */
+/** Classic `$text` relevance order: `textScore` descending, `_id` breaking ties (since 0.1.165). */
+const RELEVANCE_SORT = { $sort: {
+	_score: -1,
+	_id: 1
+} };
 function getSearchIndexesImpl(host) {
 	const result = [];
+	const indexes = host.getMongoSearchIndexes();
+	const textDefault = indexes.get(DEFAULT_INDEX_NAME);
+	let defaultListedByName = false;
+	for (const [name, index] of indexes) if (index === textDefault && name !== "DEFAULT") defaultListedByName = true;
 	let firstVector = true;
-	for (const [name, index] of host.getMongoSearchIndexes()) {
+	for (const [name, index] of indexes) {
 		const isVector = index.type === "vector";
+		const aliased = !isVector && index === textDefault && name !== "DEFAULT";
+		if (name === "DEFAULT" && defaultListedByName) continue;
 		result.push({
 			name,
+			...aliased ? { aliases: [DEFAULT_INDEX_NAME] } : {},
 			description: `${index.type} index`,
 			type: isVector ? "vector" : "text",
 			fields: searchIndexPaths(host, index),
-			isDefault: isVector ? firstVector : name === DEFAULT_INDEX_NAME
+			isDefault: isVector ? firstVector : index === textDefault
 		});
 		if (isVector) firstVector = false;
 	}
@@ -1514,7 +1529,7 @@ async function runSearchPipeline(host, stage, query, label, { threshold, classic
 	pipeline.push(...filterStages ?? require_mongo_accumulator.mongoFilterStages(query.filter, filterOptionsOf(host)));
 	const { stages: sorted, cleanup } = require_mongo_accumulator.sortStages(controls);
 	if (sorted.length > 0) pipeline.push(...sorted);
-	else if (classicText) pipeline.push({ $sort: { _score: -1 } });
+	else if (classicText) pipeline.push(RELEVANCE_SORT);
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
 	else pipeline.push({ $limit: 1e3 });
@@ -1544,7 +1559,7 @@ async function runSearchWithCountPipeline(host, stage, query, label, { threshold
 		preStages.push({ $match: { _score: { $gte: threshold } } });
 	} else if (classicText) preStages.push({ $addFields: { _score: { $meta: "textScore" } } });
 	const { stages: dataStages, cleanup } = require_mongo_accumulator.sortStages(controls);
-	if (dataStages.length === 0 && classicText) dataStages.push({ $sort: { _score: -1 } });
+	if (dataStages.length === 0 && classicText) dataStages.push(RELEVANCE_SORT);
 	if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 	if (controls.$limit) dataStages.push({ $limit: controls.$limit });
 	if (cleanup) dataStages.push(cleanup);
@@ -2791,7 +2806,7 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 					weights: Object.fromEntries(index.fields.filter((f) => f.weight && !f.integer).map((f) => [f.name, f.weight]))
 				};
 				if (index === defaultFulltext) defaultIndex = converted;
-				else if (!this._searchIndexesMap.has(index.name)) this._searchIndexesMap.set(index.name, converted);
+				if (!this._searchIndexesMap.has(index.name)) this._searchIndexesMap.set(index.name, converted);
 			}
 			for (const index of this._mongoIndexes.values()) switch (index.type) {
 				case "text":
@@ -3027,10 +3042,10 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	/** Rethrows a duplicate-key (11000) server error as `CONFLICT`, anything else as is. */
 	_mapConstraintError(error) {
-		if (error instanceof mongodb.MongoServerError && error.code === 11e3) throw new _atscript_db.DbError("CONFLICT", [{
-			path: error.keyPattern ? Object.keys(error.keyPattern)[0] ?? "" : "",
-			message: error.message
-		}]);
+		if (error instanceof mongodb.MongoServerError && error.code === 11e3) throw (0, _atscript_db.constraintViolation)("CONFLICT", {
+			columns: error.keyPattern ? Object.keys(error.keyPattern) : void 0,
+			name: error.message.match(/index: (\S+) dup key/)?.[1]
+		}, error.message);
 		throw error;
 	}
 	/** An update-shaped write under {@link _wrapDuplicateKeyError}, reduced to `TDbUpdateResult`. */
@@ -3226,11 +3241,13 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		};
 		const versionColumn = this._table.versionColumnPhysical;
 		const counters = this._table.onUpdateIncPhysical;
+		const keep = this._table.insertOnlyPhysical;
 		this._log("replaceOne", mongoFilter, data);
-		if (versionColumn !== void 0 || counters.length > 0) {
+		if (versionColumn !== void 0 || counters.length > 0 || keep.length > 0) {
 			const replacement = {};
 			for (const [key, value] of Object.entries(data)) replacement[key] = { $literal: value };
 			for (const col of counters) replacement[col] = incExpr(col, 1);
+			for (const col of keep) replacement[col] = `$${col}`;
 			if (versionColumn !== void 0) replacement[versionColumn] = { $add: [`$${versionColumn}`, 1] };
 			const pipeline = [{ $replaceWith: replacement }];
 			return this._wrapUpdate(() => this.collection.updateOne(mongoFilter, pipeline, this._getSessionOpts()));

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { a as buildMongoQuery, c as planStages, f as sortStages, g as queryNodeToExpr, h as orNull, i as buildMongoFilter, l as correlate, n as distinctCountExpr, o as collationOfAdapter, p as exprToMongo, r as REL_FILTER_TEMP_PREFIX, s as mongoFilterStages, t as buildAccumulator, u as hasNullsPlacement } from "./mongo-accumulator-DMPFOscc.mjs";
 import { t as dynamicSearchEncryptedMessage } from "./search-messages-mQSpJ4GD.mjs";
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, andFilters, bucketTimeZoneUnavailable, computeInsights, containsRelationFilter, createChangeRecorder, createFailureCollector, defaultFulltextIndex, geoIndexNotFoundMessage, getDbFieldOp, getKeyProps, getPath, isAtscriptDbView, isFieldRef, isPlainObject, isViewType, queryReadColumns, relationStaticFilter, resolveDesignType, searchIndexNotFoundMessage, searchTermInteger, tableNameOf, translateQueryTree, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, andFilters, bucketTimeZoneUnavailable, computeInsights, constraintViolation, containsRelationFilter, createChangeRecorder, createFailureCollector, defaultFulltextIndex, geoIndexNotFoundMessage, getDbFieldOp, getKeyProps, getPath, isAtscriptDbView, isFieldRef, isPlainObject, isViewType, queryReadColumns, relationStaticFilter, resolveDesignType, searchIndexNotFoundMessage, searchTermInteger, tableNameOf, translateQueryTree, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
 import { MongoBulkWriteError, MongoClient, MongoServerError, ObjectId } from "mongodb";
 import { resolveAggregateSearch } from "@atscript/db/agg";
 //#region src/lib/path-utils.ts
@@ -1024,21 +1024,36 @@ function filterOptionsOf(host) {
 	return { collation: collationOfAdapter(host) };
 }
 /**
-* Returns available search indexes as generic metadata for UI. The text
-* default is the `DEFAULT` entry (an alias of the index `search()` answers
-* with when none is named); the vector default is the first vector index.
+* Returns available search indexes as generic metadata for UI. Each index is
+* listed once, by its declared name; the text default (the index `search()`
+* answers with when none is named) carries `isDefault` and lists `DEFAULT` —
+* which also resolves — as an alias (since 0.1.165). Only an index without a
+* name of its own (a dynamic Atlas mapping) is listed as `DEFAULT`. The vector
+* default is the first vector index.
 */
+/** Classic `$text` relevance order: `textScore` descending, `_id` breaking ties (since 0.1.165). */
+const RELEVANCE_SORT = { $sort: {
+	_score: -1,
+	_id: 1
+} };
 function getSearchIndexesImpl(host) {
 	const result = [];
+	const indexes = host.getMongoSearchIndexes();
+	const textDefault = indexes.get(DEFAULT_INDEX_NAME);
+	let defaultListedByName = false;
+	for (const [name, index] of indexes) if (index === textDefault && name !== "DEFAULT") defaultListedByName = true;
 	let firstVector = true;
-	for (const [name, index] of host.getMongoSearchIndexes()) {
+	for (const [name, index] of indexes) {
 		const isVector = index.type === "vector";
+		const aliased = !isVector && index === textDefault && name !== "DEFAULT";
+		if (name === "DEFAULT" && defaultListedByName) continue;
 		result.push({
 			name,
+			...aliased ? { aliases: [DEFAULT_INDEX_NAME] } : {},
 			description: `${index.type} index`,
 			type: isVector ? "vector" : "text",
 			fields: searchIndexPaths(host, index),
-			isDefault: isVector ? firstVector : name === DEFAULT_INDEX_NAME
+			isDefault: isVector ? firstVector : index === textDefault
 		});
 		if (isVector) firstVector = false;
 	}
@@ -1513,7 +1528,7 @@ async function runSearchPipeline(host, stage, query, label, { threshold, classic
 	pipeline.push(...filterStages ?? mongoFilterStages(query.filter, filterOptionsOf(host)));
 	const { stages: sorted, cleanup } = sortStages(controls);
 	if (sorted.length > 0) pipeline.push(...sorted);
-	else if (classicText) pipeline.push({ $sort: { _score: -1 } });
+	else if (classicText) pipeline.push(RELEVANCE_SORT);
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
 	else pipeline.push({ $limit: 1e3 });
@@ -1543,7 +1558,7 @@ async function runSearchWithCountPipeline(host, stage, query, label, { threshold
 		preStages.push({ $match: { _score: { $gte: threshold } } });
 	} else if (classicText) preStages.push({ $addFields: { _score: { $meta: "textScore" } } });
 	const { stages: dataStages, cleanup } = sortStages(controls);
-	if (dataStages.length === 0 && classicText) dataStages.push({ $sort: { _score: -1 } });
+	if (dataStages.length === 0 && classicText) dataStages.push(RELEVANCE_SORT);
 	if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 	if (controls.$limit) dataStages.push({ $limit: controls.$limit });
 	if (cleanup) dataStages.push(cleanup);
@@ -2790,7 +2805,7 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 					weights: Object.fromEntries(index.fields.filter((f) => f.weight && !f.integer).map((f) => [f.name, f.weight]))
 				};
 				if (index === defaultFulltext) defaultIndex = converted;
-				else if (!this._searchIndexesMap.has(index.name)) this._searchIndexesMap.set(index.name, converted);
+				if (!this._searchIndexesMap.has(index.name)) this._searchIndexesMap.set(index.name, converted);
 			}
 			for (const index of this._mongoIndexes.values()) switch (index.type) {
 				case "text":
@@ -3026,10 +3041,10 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	}
 	/** Rethrows a duplicate-key (11000) server error as `CONFLICT`, anything else as is. */
 	_mapConstraintError(error) {
-		if (error instanceof MongoServerError && error.code === 11e3) throw new DbError("CONFLICT", [{
-			path: error.keyPattern ? Object.keys(error.keyPattern)[0] ?? "" : "",
-			message: error.message
-		}]);
+		if (error instanceof MongoServerError && error.code === 11e3) throw constraintViolation("CONFLICT", {
+			columns: error.keyPattern ? Object.keys(error.keyPattern) : void 0,
+			name: error.message.match(/index: (\S+) dup key/)?.[1]
+		}, error.message);
 		throw error;
 	}
 	/** An update-shaped write under {@link _wrapDuplicateKeyError}, reduced to `TDbUpdateResult`. */
@@ -3225,11 +3240,13 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		};
 		const versionColumn = this._table.versionColumnPhysical;
 		const counters = this._table.onUpdateIncPhysical;
+		const keep = this._table.insertOnlyPhysical;
 		this._log("replaceOne", mongoFilter, data);
-		if (versionColumn !== void 0 || counters.length > 0) {
+		if (versionColumn !== void 0 || counters.length > 0 || keep.length > 0) {
 			const replacement = {};
 			for (const [key, value] of Object.entries(data)) replacement[key] = { $literal: value };
 			for (const col of counters) replacement[col] = incExpr(col, 1);
+			for (const col of keep) replacement[col] = `$${col}`;
 			if (versionColumn !== void 0) replacement[versionColumn] = { $add: [`$${versionColumn}`, 1] };
 			const pipeline = [{ $replaceWith: replacement }];
 			return this._wrapUpdate(() => this.collection.updateOne(mongoFilter, pipeline, this._getSessionOpts()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.164",
+  "version": "0.1.165",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -46,19 +46,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.109",
-    "@atscript/typescript": "^0.1.109",
+    "@atscript/core": "^0.2.1",
+    "@atscript/typescript": "^0.2.1",
     "@uniqu/core": "^0.1.15",
     "mongodb": "^6.17.0",
     "mongodb-memory-server-core": "^10.0.0",
-    "unplugin-atscript": "^0.1.109"
+    "unplugin-atscript": "^0.2.1"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.109",
-    "@atscript/typescript": "^0.1.109",
+    "@atscript/core": "^0.2.1",
+    "@atscript/typescript": "^0.2.1",
     "@uniqu/core": "^0.1.15",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.164"
+    "@atscript/db": "^0.1.165"
   },
   "scripts": {
     "build": "vp pack",