@atscript/db-mongo 0.1.90 → 0.1.92

package/dist/index.cjs

@@ -2,8 +2,55 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_mongo_filter = require("./mongo-filter-AihWWQXp.cjs");
 let _atscript_db = require("@atscript/db");
 let mongodb = require("mongodb");
+//#region src/lib/projection-dedupe.ts
+function dedupeProjection(projection) {
+	const includeKeys = Object.keys(projection).filter((k) => projection[k] === 1);
+	if (includeKeys.length < 2) return projection;
+	const toRemove = /* @__PURE__ */ new Set();
+	for (const parent of includeKeys) {
+		const prefix = parent + ".";
+		for (const other of includeKeys) if (other !== parent && other.startsWith(prefix)) toRemove.add(other);
+	}
+	if (toRemove.size === 0) return projection;
+	const result = {};
+	for (const k of Object.keys(projection)) if (!toRemove.has(k)) result[k] = projection[k];
+	return result;
+}
+//#endregion
+//#region src/lib/mongo-errors.ts
+/**
+* Maps MongoDB projection-validation errors (31249, 31254) to `DbError("INVALID_QUERY")`
+* so moost-db's validation interceptor returns HTTP 400 instead of an opaque 500.
+* These codes always indicate malformed client `$select`, not a server fault.
+*/
+async function wrapInvalidQuery(fn) {
+	try {
+		return await fn();
+	} catch (error) {
+		if (error instanceof mongodb.MongoServerError && (error.code === 31249 || error.code === 31254)) throw new _atscript_db.DbError("INVALID_QUERY", [{
+			path: "$select",
+			message: error.message
+		}]);
+		throw error;
+	}
+}
+//#endregion
 //#region src/lib/collection-patcher.ts
 /**
+* True when a user value contains a `$`-prefixed string or object key — the
+* shapes aggregation `$set` would evaluate as field paths / operators instead
+* of treating as literal data. Caller must wrap such values in `{ $literal }`.
+*/
+function containsAggregationExpr(v) {
+	if (typeof v === "string") return v.startsWith("$");
+	if (Array.isArray(v)) return v.some(containsAggregationExpr);
+	if (v !== null && typeof v === "object") for (const k of Object.keys(v)) {
+		if (k.startsWith("$")) return true;
+		if (containsAggregationExpr(v[k])) return true;
+	}
+	return false;
+}
+/**
 * CollectionPatcher is a small helper that converts a *patch payload* produced
 * by Atscript into a shape that the official MongoDB driver understands – a
 * triple of `(filter, update, options)` to be fed to `collection.updateOne()`.
@@ -88,6 +135,7 @@ var CollectionPatcher = class {
 	_setLeaf(key, value) {
 		const fieldOp = (0, _atscript_db.getDbFieldOp)(value);
 		if (fieldOp) this._set(key, this._fieldOpExpr(key, fieldOp.op, fieldOp.value));
+		else if (containsAggregationExpr(value)) this._set(key, { $literal: value });
 		else this._set(key, value);
 	}
 	/**
@@ -492,7 +540,7 @@ function buildLookupInnerPipeline(withRel, requiredFields) {
 		for (const f of select) projection[f] = 1;
 		for (const f of requiredFields) projection[f] = 1;
 		if (!select.includes("_id") && !requiredFields.includes("_id")) projection["_id"] = 0;
-		pipeline.push({ $project: projection });
+		pipeline.push({ $project: dedupeProjection(projection) });
 	}
 	return pipeline;
 }
@@ -663,9 +711,12 @@ async function runSearchPipeline(host, stage, query, label, threshold) {
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
 	else pipeline.push({ $limit: 1e3 });
-	if (controls.$select) pipeline.push({ $project: controls.$select.asProjection });
+	if (controls.$select) {
+		const projection = controls.$select.asProjection;
+		if (projection) pipeline.push({ $project: dedupeProjection(projection) });
+	}
 	host._log(`aggregate (${label})`, pipeline);
-	return host.collection.aggregate(pipeline, host._getSessionOpts()).toArray();
+	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) {
@@ -680,7 +731,10 @@ async function runSearchWithCountPipeline(host, stage, query, label, threshold)
 	if (controls.$sort) dataStages.push({ $sort: controls.$sort });
 	if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 	if (controls.$limit) dataStages.push({ $limit: controls.$limit });
-	if (controls.$select) dataStages.push({ $project: controls.$select.asProjection });
+	if (controls.$select) {
+		const projection = controls.$select.asProjection;
+		if (projection) dataStages.push({ $project: dedupeProjection(projection) });
+	}
 	const pipeline = [
 		stage,
 		...preStages,
@@ -691,7 +745,7 @@ async function runSearchWithCountPipeline(host, stage, query, label, threshold)
 		} }
 	];
 	host._log(`aggregate (${label})`, pipeline);
-	const result = await host.collection.aggregate(pipeline, host._getSessionOpts()).toArray();
+	const result = await wrapInvalidQuery(() => host.collection.aggregate(pipeline, host._getSessionOpts()).toArray());
 	return {
 		data: result[0]?.data || [],
 		count: result[0]?.meta[0]?.count || 0
@@ -1252,12 +1306,12 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		if (query.controls?.$count) {
 			const pipeline = buildCountPipeline(query);
 			this._log("aggregate (count)", pipeline);
-			const result = await this.aggregatePipeline(pipeline).toArray();
+			const result = await wrapInvalidQuery(() => this.aggregatePipeline(pipeline).toArray());
 			return result.length > 0 ? result : [{ count: 0 }];
 		}
 		const pipeline = buildAggregatePipeline(query);
 		this._log("aggregate", pipeline);
-		return this.aggregatePipeline(pipeline).toArray();
+		return wrapInvalidQuery(() => this.aggregatePipeline(pipeline).toArray());
 	}
 	get idType() {
 		const idProp = this._table.type.type.props.get("_id");
@@ -1497,16 +1551,19 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		if (controls.$sort) dataStages.push({ $sort: controls.$sort });
 		if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 		if (controls.$limit) dataStages.push({ $limit: controls.$limit });
-		if (controls.$select) dataStages.push({ $project: controls.$select.asProjection });
+		if (controls.$select) {
+			const projection = controls.$select.asProjection;
+			if (projection) dataStages.push({ $project: dedupeProjection(projection) });
+		}
 		const pipeline = [{ $match: filter }, { $facet: {
 			data: dataStages,
 			meta: [{ $count: "count" }]
 		} }];
 		this._log("aggregate (findManyWithCount)", pipeline);
-		const result = await this.collection.aggregate(pipeline, {
+		const result = await wrapInvalidQuery(() => this.collection.aggregate(pipeline, {
 			...this._getCollationOpts(query),
 			...this._getSessionOpts()
-		}).toArray();
+		}).toArray());
 		return {
 			data: result[0]?.data || [],
 			count: result[0]?.meta[0]?.count || 0
@@ -1589,21 +1646,21 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		const filter = require_mongo_filter.buildMongoFilter(query.filter);
 		const opts = this._buildFindOptions(query.controls);
 		this._log("findOne", filter, opts);
-		return this.collection.findOne(filter, {
+		return wrapInvalidQuery(() => this.collection.findOne(filter, {
 			...opts,
 			...this._getCollationOpts(query),
 			...this._getSessionOpts()
-		});
+		}));
 	}
 	async findMany(query) {
 		const filter = require_mongo_filter.buildMongoFilter(query.filter);
 		const opts = this._buildFindOptions(query.controls);
 		this._log("findMany", filter, opts);
-		return this.collection.find(filter, {
+		return wrapInvalidQuery(() => this.collection.find(filter, {
 			...opts,
 			...this._getCollationOpts(query),
 			...this._getSessionOpts()
-		}).toArray();
+		}).toArray());
 	}
 	async count(query) {
 		const filter = require_mongo_filter.buildMongoFilter(query.filter);
@@ -1790,7 +1847,10 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		if (controls.$sort) opts.sort = controls.$sort;
 		if (controls.$limit) opts.limit = controls.$limit;
 		if (controls.$skip) opts.skip = controls.$skip;
-		if (controls.$select) opts.projection = controls.$select.asProjection;
+		if (controls.$select) {
+			const projection = controls.$select.asProjection;
+			if (projection) opts.projection = dedupeProjection(projection);
+		}
 		return opts;
 	}
 	/**

package/dist/index.mjs

@@ -1,8 +1,55 @@
 import { t as buildMongoFilter } from "./mongo-filter-BsocUQG3.mjs";
 import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace, computeInsights, getDbFieldOp, getKeyProps, resolveDesignType } from "@atscript/db";
 import { MongoClient, MongoServerError, ObjectId } from "mongodb";
+//#region src/lib/projection-dedupe.ts
+function dedupeProjection(projection) {
+	const includeKeys = Object.keys(projection).filter((k) => projection[k] === 1);
+	if (includeKeys.length < 2) return projection;
+	const toRemove = /* @__PURE__ */ new Set();
+	for (const parent of includeKeys) {
+		const prefix = parent + ".";
+		for (const other of includeKeys) if (other !== parent && other.startsWith(prefix)) toRemove.add(other);
+	}
+	if (toRemove.size === 0) return projection;
+	const result = {};
+	for (const k of Object.keys(projection)) if (!toRemove.has(k)) result[k] = projection[k];
+	return result;
+}
+//#endregion
+//#region src/lib/mongo-errors.ts
+/**
+* Maps MongoDB projection-validation errors (31249, 31254) to `DbError("INVALID_QUERY")`
+* so moost-db's validation interceptor returns HTTP 400 instead of an opaque 500.
+* These codes always indicate malformed client `$select`, not a server fault.
+*/
+async function wrapInvalidQuery(fn) {
+	try {
+		return await fn();
+	} catch (error) {
+		if (error instanceof MongoServerError && (error.code === 31249 || error.code === 31254)) throw new DbError("INVALID_QUERY", [{
+			path: "$select",
+			message: error.message
+		}]);
+		throw error;
+	}
+}
+//#endregion
 //#region src/lib/collection-patcher.ts
 /**
+* True when a user value contains a `$`-prefixed string or object key — the
+* shapes aggregation `$set` would evaluate as field paths / operators instead
+* of treating as literal data. Caller must wrap such values in `{ $literal }`.
+*/
+function containsAggregationExpr(v) {
+	if (typeof v === "string") return v.startsWith("$");
+	if (Array.isArray(v)) return v.some(containsAggregationExpr);
+	if (v !== null && typeof v === "object") for (const k of Object.keys(v)) {
+		if (k.startsWith("$")) return true;
+		if (containsAggregationExpr(v[k])) return true;
+	}
+	return false;
+}
+/**
 * CollectionPatcher is a small helper that converts a *patch payload* produced
 * by Atscript into a shape that the official MongoDB driver understands – a
 * triple of `(filter, update, options)` to be fed to `collection.updateOne()`.
@@ -87,6 +134,7 @@ var CollectionPatcher = class {
 	_setLeaf(key, value) {
 		const fieldOp = getDbFieldOp(value);
 		if (fieldOp) this._set(key, this._fieldOpExpr(key, fieldOp.op, fieldOp.value));
+		else if (containsAggregationExpr(value)) this._set(key, { $literal: value });
 		else this._set(key, value);
 	}
 	/**
@@ -491,7 +539,7 @@ function buildLookupInnerPipeline(withRel, requiredFields) {
 		for (const f of select) projection[f] = 1;
 		for (const f of requiredFields) projection[f] = 1;
 		if (!select.includes("_id") && !requiredFields.includes("_id")) projection["_id"] = 0;
-		pipeline.push({ $project: projection });
+		pipeline.push({ $project: dedupeProjection(projection) });
 	}
 	return pipeline;
 }
@@ -662,9 +710,12 @@ async function runSearchPipeline(host, stage, query, label, threshold) {
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
 	else pipeline.push({ $limit: 1e3 });
-	if (controls.$select) pipeline.push({ $project: controls.$select.asProjection });
+	if (controls.$select) {
+		const projection = controls.$select.asProjection;
+		if (projection) pipeline.push({ $project: dedupeProjection(projection) });
+	}
 	host._log(`aggregate (${label})`, pipeline);
-	return host.collection.aggregate(pipeline, host._getSessionOpts()).toArray();
+	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) {
@@ -679,7 +730,10 @@ async function runSearchWithCountPipeline(host, stage, query, label, threshold)
 	if (controls.$sort) dataStages.push({ $sort: controls.$sort });
 	if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 	if (controls.$limit) dataStages.push({ $limit: controls.$limit });
-	if (controls.$select) dataStages.push({ $project: controls.$select.asProjection });
+	if (controls.$select) {
+		const projection = controls.$select.asProjection;
+		if (projection) dataStages.push({ $project: dedupeProjection(projection) });
+	}
 	const pipeline = [
 		stage,
 		...preStages,
@@ -690,7 +744,7 @@ async function runSearchWithCountPipeline(host, stage, query, label, threshold)
 		} }
 	];
 	host._log(`aggregate (${label})`, pipeline);
-	const result = await host.collection.aggregate(pipeline, host._getSessionOpts()).toArray();
+	const result = await wrapInvalidQuery(() => host.collection.aggregate(pipeline, host._getSessionOpts()).toArray());
 	return {
 		data: result[0]?.data || [],
 		count: result[0]?.meta[0]?.count || 0
@@ -1251,12 +1305,12 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		if (query.controls?.$count) {
 			const pipeline = buildCountPipeline(query);
 			this._log("aggregate (count)", pipeline);
-			const result = await this.aggregatePipeline(pipeline).toArray();
+			const result = await wrapInvalidQuery(() => this.aggregatePipeline(pipeline).toArray());
 			return result.length > 0 ? result : [{ count: 0 }];
 		}
 		const pipeline = buildAggregatePipeline(query);
 		this._log("aggregate", pipeline);
-		return this.aggregatePipeline(pipeline).toArray();
+		return wrapInvalidQuery(() => this.aggregatePipeline(pipeline).toArray());
 	}
 	get idType() {
 		const idProp = this._table.type.type.props.get("_id");
@@ -1496,16 +1550,19 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		if (controls.$sort) dataStages.push({ $sort: controls.$sort });
 		if (controls.$skip) dataStages.push({ $skip: controls.$skip });
 		if (controls.$limit) dataStages.push({ $limit: controls.$limit });
-		if (controls.$select) dataStages.push({ $project: controls.$select.asProjection });
+		if (controls.$select) {
+			const projection = controls.$select.asProjection;
+			if (projection) dataStages.push({ $project: dedupeProjection(projection) });
+		}
 		const pipeline = [{ $match: filter }, { $facet: {
 			data: dataStages,
 			meta: [{ $count: "count" }]
 		} }];
 		this._log("aggregate (findManyWithCount)", pipeline);
-		const result = await this.collection.aggregate(pipeline, {
+		const result = await wrapInvalidQuery(() => this.collection.aggregate(pipeline, {
 			...this._getCollationOpts(query),
 			...this._getSessionOpts()
-		}).toArray();
+		}).toArray());
 		return {
 			data: result[0]?.data || [],
 			count: result[0]?.meta[0]?.count || 0
@@ -1588,21 +1645,21 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		const filter = buildMongoFilter(query.filter);
 		const opts = this._buildFindOptions(query.controls);
 		this._log("findOne", filter, opts);
-		return this.collection.findOne(filter, {
+		return wrapInvalidQuery(() => this.collection.findOne(filter, {
 			...opts,
 			...this._getCollationOpts(query),
 			...this._getSessionOpts()
-		});
+		}));
 	}
 	async findMany(query) {
 		const filter = buildMongoFilter(query.filter);
 		const opts = this._buildFindOptions(query.controls);
 		this._log("findMany", filter, opts);
-		return this.collection.find(filter, {
+		return wrapInvalidQuery(() => this.collection.find(filter, {
 			...opts,
 			...this._getCollationOpts(query),
 			...this._getSessionOpts()
-		}).toArray();
+		}).toArray());
 	}
 	async count(query) {
 		const filter = buildMongoFilter(query.filter);
@@ -1789,7 +1846,10 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		if (controls.$sort) opts.sort = controls.$sort;
 		if (controls.$limit) opts.limit = controls.$limit;
 		if (controls.$skip) opts.skip = controls.$skip;
-		if (controls.$select) opts.projection = controls.$select.asProjection;
+		if (controls.$select) {
+			const projection = controls.$select.asProjection;
+			if (projection) opts.projection = dedupeProjection(projection);
+		}
 		return opts;
 	}
 	/**

package/package.json

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