@atscript/moost-mongo 0.0.21 → 0.0.23

package/dist/index.cjs

@@ -297,9 +297,9 @@ else pipeline.push({ $limit: 1e3 });
 			meta: [{ $count: "count" }]
 		} });
 		const result = await this.asCollection.collection.aggregate(pipeline).toArray();
-		const totalDocuments = result[0].meta[0].count;
+		const totalDocuments = result[0]?.meta[0]?.count || 0;
 		return {
-			documents: result[0].documents,
+			documents: result[0]?.documents || [],
 			page,
 			size,
 			totalPages: Math.ceil(totalDocuments / size),
@@ -322,11 +322,11 @@ else pipeline.push({ $limit: 1e3 });
 		if (Object.keys(parsed.filter).length) return new __moostjs_event_http.HttpError(400, "Filtering is not allowed for \"one\" endpoint");
 		const error = await this.validateUrlql(parsed, "getOne");
 		if (error) return error;
-		if (idValidator?.validate(id, true)) return this.returnOne(this.asCollection.collection.find({ _id: this.asCollection.prepareId(id) }, this.prepareQueryOptions(parsed.controls)).toArray());
+		if (idValidator?.validate(id, true)) return this.returnOne(this.asCollection.collection.find(this.transformFilter({ _id: this.asCollection.prepareId(id) }), this.prepareQueryOptions(parsed.controls)).toArray());
 else if (this.asCollection.uniqueProps.size > 0) {
 			const filter = [];
 			for (const prop of this.asCollection.uniqueProps) filter.push({ [prop]: id });
-			return this.returnOne(this.asCollection.collection.find({ $or: filter }, this.prepareQueryOptions(parsed.controls)).toArray());
+			return this.returnOne(this.asCollection.collection.find(this.transformFilter({ $or: filter }), this.prepareQueryOptions(parsed.controls)).toArray());
 		}
 		if (idValidator) return new __atscript_typescript.ValidatorError(idValidator.errors);
 		return new __moostjs_event_http.HttpError(500, "Unknown error");
@@ -369,7 +369,7 @@ else return new __moostjs_event_http.HttpError(500, "Not saved");
 	*/ async replace(payload) {
 		const args = this.asCollection.prepareReplace(payload).toArgs();
 		const newData = await this.onWrite("replace", args[1], args[2]);
-		if (newData) return this.asCollection.collection.replaceOne(args[0], newData, args[2]);
+		if (newData) return this.asCollection.collection.replaceOne(this.transformFilter(args[0]), newData, args[2]);
 		return new __moostjs_event_http.HttpError(500, "Not saved");
 	}
 	/**
@@ -379,7 +379,7 @@ else return new __moostjs_event_http.HttpError(500, "Not saved");
 	*/ async update(payload) {
 		const args = this.asCollection.prepareUpdate(payload).toArgs();
 		const newData = await this.onWrite("update", args[1], args[2]);
-		if (newData) return this.asCollection.collection.updateOne(args[0], newData, args[2]);
+		if (newData) return this.asCollection.collection.updateOne(this.transformFilter(args[0]), newData, args[2]);
 		return new __moostjs_event_http.HttpError(500, "Not saved");
 	}
 	/**
@@ -390,7 +390,7 @@ else return new __moostjs_event_http.HttpError(500, "Not saved");
 		const opts = {};
 		id = await this.onRemove(id, opts);
 		if (id !== undefined) {
-			const result = await this.asCollection.collection.deleteOne({ _id: this.asCollection.prepareId(id) }, opts);
+			const result = await this.asCollection.collection.deleteOne(this.transformFilter({ _id: this.asCollection.prepareId(id) }), opts);
 			if (result.deletedCount < 1) throw new __moostjs_event_http.HttpError(404);
 			return result;
 		}

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { TConsoleBase, Moost } from 'moost';
 import { UrlqlQuery } from 'urlql';
 import { AsMongo, AsCollection } from '@atscript/mongo';
 import { TAtscriptAnnotatedTypeConstructor, ValidatorError } from '@atscript/typescript';
-import { Document, WithId, InsertOneResult, InsertManyResult, UpdateResult, DeleteResult, DeleteOptions, ObjectId, OptionalUnlessRequiredId, InsertOneOptions, BulkWriteOptions, WithoutId, ReplaceOptions, UpdateFilter, UpdateOptions } from 'mongodb';
+import { Document, Filter, WithId, InsertOneResult, InsertManyResult, UpdateResult, DeleteResult, DeleteOptions, ObjectId, OptionalUnlessRequiredId, InsertOneOptions, BulkWriteOptions, WithoutId, ReplaceOptions, UpdateFilter, UpdateOptions } from 'mongodb';
 
 /**
  * Generic **Moost** controller that exposes a full REST‑style CRUD surface over a
@@ -112,7 +112,7 @@ declare class AsMongoController<T extends TAtscriptAnnotatedTypeConstructor> {
      * @param filter - The original filter object.
      * @returns The transformed filter object (may return `Promise`).
      */
-    protected transformFilter(filter: Document): Document;
+    protected transformFilter(filter: Document): Filter<InstanceType<T>>;
     /**
      * Builds MongoDB `FindOptions` object out of URLQL controls.
      *

package/dist/index.mjs

@@ -273,9 +273,9 @@ else pipeline.push({ $limit: 1e3 });
 			meta: [{ $count: "count" }]
 		} });
 		const result = await this.asCollection.collection.aggregate(pipeline).toArray();
-		const totalDocuments = result[0].meta[0].count;
+		const totalDocuments = result[0]?.meta[0]?.count || 0;
 		return {
-			documents: result[0].documents,
+			documents: result[0]?.documents || [],
 			page,
 			size,
 			totalPages: Math.ceil(totalDocuments / size),
@@ -298,11 +298,11 @@ else pipeline.push({ $limit: 1e3 });
 		if (Object.keys(parsed.filter).length) return new HttpError(400, "Filtering is not allowed for \"one\" endpoint");
 		const error = await this.validateUrlql(parsed, "getOne");
 		if (error) return error;
-		if (idValidator?.validate(id, true)) return this.returnOne(this.asCollection.collection.find({ _id: this.asCollection.prepareId(id) }, this.prepareQueryOptions(parsed.controls)).toArray());
+		if (idValidator?.validate(id, true)) return this.returnOne(this.asCollection.collection.find(this.transformFilter({ _id: this.asCollection.prepareId(id) }), this.prepareQueryOptions(parsed.controls)).toArray());
 else if (this.asCollection.uniqueProps.size > 0) {
 			const filter = [];
 			for (const prop of this.asCollection.uniqueProps) filter.push({ [prop]: id });
-			return this.returnOne(this.asCollection.collection.find({ $or: filter }, this.prepareQueryOptions(parsed.controls)).toArray());
+			return this.returnOne(this.asCollection.collection.find(this.transformFilter({ $or: filter }), this.prepareQueryOptions(parsed.controls)).toArray());
 		}
 		if (idValidator) return new ValidatorError(idValidator.errors);
 		return new HttpError(500, "Unknown error");
@@ -345,7 +345,7 @@ else return new HttpError(500, "Not saved");
 	*/ async replace(payload) {
 		const args = this.asCollection.prepareReplace(payload).toArgs();
 		const newData = await this.onWrite("replace", args[1], args[2]);
-		if (newData) return this.asCollection.collection.replaceOne(args[0], newData, args[2]);
+		if (newData) return this.asCollection.collection.replaceOne(this.transformFilter(args[0]), newData, args[2]);
 		return new HttpError(500, "Not saved");
 	}
 	/**
@@ -355,7 +355,7 @@ else return new HttpError(500, "Not saved");
 	*/ async update(payload) {
 		const args = this.asCollection.prepareUpdate(payload).toArgs();
 		const newData = await this.onWrite("update", args[1], args[2]);
-		if (newData) return this.asCollection.collection.updateOne(args[0], newData, args[2]);
+		if (newData) return this.asCollection.collection.updateOne(this.transformFilter(args[0]), newData, args[2]);
 		return new HttpError(500, "Not saved");
 	}
 	/**
@@ -366,7 +366,7 @@ else return new HttpError(500, "Not saved");
 		const opts = {};
 		id = await this.onRemove(id, opts);
 		if (id !== undefined) {
-			const result = await this.asCollection.collection.deleteOne({ _id: this.asCollection.prepareId(id) }, opts);
+			const result = await this.asCollection.collection.deleteOne(this.transformFilter({ _id: this.asCollection.prepareId(id) }), opts);
 			if (result.deletedCount < 1) throw new HttpError(404);
 			return result;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-mongo",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Atscript Mongo for Moost.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -41,11 +41,11 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@moostjs/event-http": "^0.5.31",
+    "@moostjs/event-http": "^0.5.32",
     "mongodb": "^6.17.0",
-    "moost": "^0.5.31",
-    "@atscript/mongo": "^0.0.21",
-    "@atscript/typescript": "^0.0.21"
+    "moost": "^0.5.32",
+    "@atscript/mongo": "^0.0.23",
+    "@atscript/typescript": "^0.0.23"
   },
   "scripts": {
     "pub": "pnpm publish --access public",