@classytic/mongokit 3.4.0 → 3.4.2

package/dist/{validation-chain.plugin-Ow6EUIoo.mjs → validation-chain.plugin-Cp5X5IZu.mjs}

@@ -1,7 +1,7 @@
 import { a as warn, i as debug, n as parseDuplicateKeyError, t as createError } from "./error-Bpbi_NKo.mjs";
-import { _ as LookupBuilder, a as getById, d as create, f as createMany, g as distinct, i as exists, l as deleteById, m as upsert, o as getByQuery, r as count, s as getOrCreate, t as update } from "./update-DXwVh6M1.mjs";
-import { t as PaginationEngine } from "./PaginationEngine-PLyDhrO7.mjs";
-import { a as byIdKey, c as listQueryKey, l as modelPattern, o as byQueryKey, r as getFieldsForUser, u as versionKey } from "./field-selection-CalOB7yM.mjs";
+import { _ as LookupBuilder, a as getById, d as create, f as createMany, g as distinct, i as exists, l as deleteById, m as upsert, o as getByQuery, r as count, s as getOrCreate, t as update } from "./update-DGKMmBgG.mjs";
+import { t as PaginationEngine } from "./PaginationEngine-nY04eGUM.mjs";
+import { a as byIdKey, c as listQueryKey, l as modelPattern, o as byQueryKey, r as getFieldsForUser, u as versionKey } from "./field-selection-reyDRzXf.mjs";
 import mongoose from "mongoose";
 //#region src/plugins/aggregate-helpers.plugin.ts
 /**
@@ -30,14 +30,14 @@ function aggregateHelpersPlugin() {
 					count: { $sum: 1 }
 				} }, { $sort: { count: -1 } }];
 				if (options.limit) pipeline.push({ $limit: options.limit });
-				return this.aggregate.call(this, pipeline, options);
+				return this.aggregate(pipeline, options);
 			});
 			const aggregateOperation = async function(field, operator, resultKey, query = {}, options = {}) {
 				const pipeline = [{ $match: query }, { $group: {
 					_id: null,
 					[resultKey]: { [operator]: `$${field}` }
 				} }];
-				return (await this.aggregate.call(this, pipeline, options))[0]?.[resultKey] || 0;
+				return (await this.aggregate(pipeline, options))[0]?.[resultKey] || 0;
 			};
 			/**
 			* Sum field values
@@ -501,7 +501,7 @@ function batchOperationsPlugin() {
 			* Update multiple documents
 			*/
 			repo.registerMethod("updateMany", async function(query, data, options = {}) {
-				const context = await this._buildContext.call(this, "updateMany", {
+				const context = await this._buildContext("updateMany", {
 					query,
 					data,
 					...options
@@ -526,7 +526,7 @@ function batchOperationsPlugin() {
 						context,
 						error
 					});
-					throw this._handleError.call(this, error);
+					throw this._handleError(error);
 				}
 			});
 			/**
@@ -544,7 +544,7 @@ function batchOperationsPlugin() {
 			* ]);
 			*/
 			repo.registerMethod("bulkWrite", async function(operations, options = {}) {
-				const context = await this._buildContext.call(this, "bulkWrite", {
+				const context = await this._buildContext("bulkWrite", {
 					operations,
 					...options
 				});
@@ -575,14 +575,14 @@ function batchOperationsPlugin() {
 						context,
 						error
 					});
-					throw this._handleError.call(this, error);
+					throw this._handleError(error);
 				}
 			});
 			/**
 			* Delete multiple documents
 			*/
 			repo.registerMethod("deleteMany", async function(query, options = {}) {
-				const context = await this._buildContext.call(this, "deleteMany", {
+				const context = await this._buildContext("deleteMany", {
 					query,
 					...options
 				});
@@ -611,7 +611,7 @@ function batchOperationsPlugin() {
 						context,
 						error
 					});
-					throw this._handleError.call(this, error);
+					throw this._handleError(error);
 				}
 			});
 		}
@@ -1105,6 +1105,13 @@ var AggregationBuilder = class AggregationBuilder {
 };
 //#endregion
 //#region src/Repository.ts
+function ensureLookupProjectionIncludesCursorFields(projection, sort) {
+	if (!projection || !sort) return projection;
+	if (!Object.values(projection).some((value) => value === 1)) return projection;
+	const nextProjection = { ...projection };
+	for (const field of [...Object.keys(sort), "_id"]) nextProjection[field] = 1;
+	return nextProjection;
+}
 /**
 * Plugin phase priorities (lower = runs first)
 * Policy hooks (multi-tenant, soft-delete, validation) MUST run before cache
@@ -1156,7 +1163,7 @@ var Repository = class {
 	*/
 	on(event, listener, options) {
 		if (!this._hooks.has(event)) this._hooks.set(event, []);
-		const hooks = this._hooks.get(event);
+		const hooks = this._hooks.get(event) ?? [];
 		const priority = options?.priority ?? HOOK_PRIORITY.DEFAULT;
 		hooks.push({
 			listener,
@@ -1413,32 +1420,49 @@ var Repository = class {
 			session: options.session,
 			hint: context.hint ?? params.hint,
 			maxTimeMS: context.maxTimeMS ?? params.maxTimeMS,
-			readPreference: context.readPreference ?? options.readPreference ?? params.readPreference
+			readPreference: context.readPreference ?? options.readPreference ?? params.readPreference,
+			collation: context.collation ?? params.collation
 		};
-		const lookups = params.lookups;
+		const lookups = context.lookups ?? params.lookups;
 		if (lookups && lookups.length > 0) try {
 			const lookupResult = await this.lookupPopulate({
 				filters: query,
 				lookups,
 				sort: paginationOptions.sort,
-				page: page || 1,
+				page: useKeyset ? void 0 : page || 1,
+				after: useKeyset ? after : void 0,
 				limit,
 				select: paginationOptions.select,
 				session: options.session,
-				readPreference: paginationOptions.readPreference
+				readPreference: paginationOptions.readPreference,
+				collation: paginationOptions.collation,
+				countStrategy: context.countStrategy ?? params.countStrategy
 			});
-			const totalPages = Math.ceil((lookupResult.total ?? 0) / (lookupResult.limit ?? limit));
-			const currentPage = lookupResult.page ?? 1;
-			const result = {
-				method: "offset",
+			let result;
+			if (lookupResult.next !== void 0) result = {
+				method: "keyset",
 				docs: lookupResult.data,
-				page: currentPage,
 				limit: lookupResult.limit ?? limit,
-				total: lookupResult.total ?? 0,
-				pages: totalPages,
-				hasNext: currentPage < totalPages,
-				hasPrev: currentPage > 1
+				hasMore: lookupResult.hasMore ?? false,
+				next: lookupResult.next ?? null
 			};
+			else {
+				const total = lookupResult.total ?? 0;
+				const resultLimit = lookupResult.limit ?? limit;
+				const totalPages = Math.ceil(total / resultLimit);
+				const currentPage = lookupResult.page ?? 1;
+				const hasNext = lookupResult.hasMore !== void 0 ? lookupResult.hasMore : currentPage < totalPages;
+				result = {
+					method: "offset",
+					docs: lookupResult.data,
+					page: currentPage,
+					limit: resultLimit,
+					total,
+					pages: totalPages,
+					hasNext,
+					hasPrev: currentPage > 1
+				};
+			}
 			await this._emitHook("after:getAll", {
 				context,
 				result
@@ -1741,42 +1765,121 @@ var Repository = class {
 	async lookupPopulate(options) {
 		const context = await this._buildContext("lookupPopulate", options);
 		try {
-			const builder = new AggregationBuilder();
+			const MAX_LOOKUPS = 10;
+			const lookups = context.lookups ?? options.lookups;
+			if (lookups.length > MAX_LOOKUPS) throw createError(400, `Too many lookups (${lookups.length}). Maximum is ${MAX_LOOKUPS}.`);
 			const filters = context.filters ?? options.filters;
-			if (filters && Object.keys(filters).length > 0) builder.match(filters);
-			builder.multiLookup(options.lookups);
 			const sort = context.sort ?? options.sort;
-			if (sort) builder.sort(this._parseSort(sort));
-			const page = context.page ?? options.page ?? 1;
 			const limit = context.limit ?? options.limit ?? this._pagination.config.defaultLimit ?? 20;
-			const skip = (page - 1) * limit;
-			const SAFE_LIMIT = 1e3;
-			const SAFE_MAX_OFFSET = 1e4;
-			if (limit > SAFE_LIMIT) warn(`[mongokit] Large limit (${limit}) in lookupPopulate. $facet results must be <16MB. Consider using smaller limits or stream-based pagination for large datasets.`);
-			if (skip > SAFE_MAX_OFFSET) warn(`[mongokit] Large offset (${skip}) in lookupPopulate. $facet with high offsets can exceed 16MB. For deep pagination, consider using keyset/cursor-based pagination instead.`);
-			const dataStages = [{ $skip: skip }, { $limit: limit }];
+			const readPref = context.readPreference ?? options.readPreference;
+			const session = context.session ?? options.session;
+			const collation = context.collation ?? options.collation;
+			const after = context.after ?? options.after;
+			const pageFromContext = context.page ?? options.page;
+			const isKeyset = !!after || !pageFromContext && !!sort;
+			const countStrategy = context.countStrategy ?? options.countStrategy ?? "exact";
 			const selectSpec = context.select ?? options.select;
+			let projection;
 			if (selectSpec) {
-				let projection;
 				if (typeof selectSpec === "string") {
 					projection = {};
-					const fields = selectSpec.split(",").map((f) => f.trim());
-					for (const field of fields) if (field.startsWith("-")) projection[field.substring(1)] = 0;
+					for (const field of selectSpec.split(",").map((f) => f.trim())) if (field.startsWith("-")) projection[field.substring(1)] = 0;
 					else projection[field] = 1;
 				} else if (Array.isArray(selectSpec)) {
 					projection = {};
 					for (const field of selectSpec) if (field.startsWith("-")) projection[field.substring(1)] = 0;
 					else projection[field] = 1;
-				} else projection = selectSpec;
-				dataStages.push({ $project: projection });
+				} else projection = { ...selectSpec };
+				if (Object.values(projection).some((v) => v === 1)) for (const lookup of lookups) {
+					const asField = lookup.as || lookup.from;
+					if (!(asField in projection)) projection[asField] = 1;
+				}
 			}
-			builder.facet({
-				metadata: [{ $count: "total" }],
-				data: dataStages
-			});
-			const pipeline = builder.build();
-			const aggregation = this.Model.aggregate(pipeline).session(options.session || null);
-			const readPref = context.readPreference ?? options.readPreference;
+			const appendLookupStages = (pipeline) => {
+				pipeline.push(...LookupBuilder.multiple(lookups));
+				for (const lookup of lookups) if (lookup.single) {
+					const asField = lookup.as || lookup.from;
+					pipeline.push({ $addFields: { [asField]: { $ifNull: [`$${asField}`, null] } } });
+				}
+				const finalProjection = ensureLookupProjectionIncludesCursorFields(projection, isKeyset && sort ? this._parseSort(sort) : void 0);
+				if (finalProjection) pipeline.push({ $project: finalProjection });
+			};
+			if (isKeyset && sort) {
+				const parsedSort = this._parseSort(sort);
+				const { validateKeysetSort } = await import("./sort-C-BJEWUZ.mjs").then((n) => n.n);
+				const { encodeCursor, resolveCursorFilter } = await import("./cursor-CHToazHy.mjs").then((n) => n.t);
+				const { getPrimaryField } = await import("./sort-C-BJEWUZ.mjs").then((n) => n.n);
+				const normalizedSort = validateKeysetSort(parsedSort);
+				const cursorVersion = this._pagination.config.cursorVersion ?? 1;
+				const matchFilters = after ? resolveCursorFilter(after, normalizedSort, cursorVersion, { ...filters || {} }) : { ...filters || {} };
+				if (projection) {
+					if (Object.values(projection).some((v) => v === 1)) {
+						for (const sortField of Object.keys(normalizedSort)) if (!(sortField in projection)) projection[sortField] = 1;
+					}
+				}
+				const pipeline = [];
+				if (Object.keys(matchFilters).length > 0) pipeline.push({ $match: matchFilters });
+				pipeline.push({ $sort: normalizedSort });
+				pipeline.push({ $limit: limit + 1 });
+				appendLookupStages(pipeline);
+				const aggregation = this.Model.aggregate(pipeline).session(session || null);
+				if (collation) aggregation.collation(collation);
+				if (readPref) aggregation.read(readPref);
+				const docs = await aggregation;
+				const hasMore = docs.length > limit;
+				if (hasMore) docs.pop();
+				const primaryField = getPrimaryField(normalizedSort);
+				const nextCursor = hasMore && docs.length > 0 ? encodeCursor(docs[docs.length - 1], primaryField, normalizedSort, cursorVersion) : null;
+				await this._emitHook("after:lookupPopulate", {
+					context,
+					result: docs
+				});
+				return {
+					data: docs,
+					total: 0,
+					limit,
+					next: nextCursor,
+					hasMore
+				};
+			}
+			const page = pageFromContext ?? 1;
+			const skip = (page - 1) * limit;
+			if (skip > 1e4) warn(`[mongokit] Large offset (${skip}) in lookupPopulate. Consider using keyset pagination: getAll({ sort, after, limit, lookups })`);
+			const dataPipeline = [];
+			if (filters && Object.keys(filters).length > 0) dataPipeline.push({ $match: filters });
+			if (sort) dataPipeline.push({ $sort: this._parseSort(sort) });
+			if (countStrategy === "none") {
+				dataPipeline.push({ $skip: skip }, { $limit: limit + 1 });
+				appendLookupStages(dataPipeline);
+				const aggregation = this.Model.aggregate(dataPipeline).session(session || null);
+				if (collation) aggregation.collation(collation);
+				if (readPref) aggregation.read(readPref);
+				const docs = await aggregation;
+				const hasNext = docs.length > limit;
+				if (hasNext) docs.pop();
+				await this._emitHook("after:lookupPopulate", {
+					context,
+					result: docs
+				});
+				return {
+					data: docs,
+					total: 0,
+					page,
+					limit,
+					hasMore: hasNext
+				};
+			}
+			dataPipeline.push({ $skip: skip }, { $limit: limit });
+			appendLookupStages(dataPipeline);
+			const countPipeline = [];
+			if (filters && Object.keys(filters).length > 0) countPipeline.push({ $match: filters });
+			countPipeline.push({ $count: "total" });
+			const pipeline = [{ $facet: {
+				metadata: countPipeline,
+				data: dataPipeline
+			} }];
+			const aggregation = this.Model.aggregate(pipeline).session(session || null);
+			if (collation) aggregation.collation(collation);
 			if (readPref) aggregation.read(readPref);
 			const result = (await aggregation)[0] || {
 				metadata: [],
@@ -3569,7 +3672,7 @@ function softDeletePlugin(options = {}) {
 			}, { priority: HOOK_PRIORITY.POLICY });
 			if (addRestoreMethod) {
 				const restoreMethod = async function(id, restoreOptions = {}) {
-					const context = await this._buildContext.call(this, "restore", {
+					const context = await this._buildContext("restore", {
 						id,
 						...restoreOptions
 					});
@@ -3602,7 +3705,7 @@ function softDeletePlugin(options = {}) {
 			}
 			if (addGetDeletedMethod) {
 				const getDeletedMethod = async function(params = {}, getDeletedOptions = {}) {
-					const context = await this._buildContext.call(this, "getDeleted", {
+					const context = await this._buildContext("getDeleted", {
 						...params,
 						...getDeletedOptions
 					});
@@ -3676,13 +3779,13 @@ function subdocumentPlugin() {
 			* Add subdocument to array
 			*/
 			repo.registerMethod("addSubdocument", async function(parentId, arrayPath, subData, options = {}) {
-				return this.update.call(this, parentId, { $push: { [arrayPath]: subData } }, options);
+				return this.update(parentId, { $push: { [arrayPath]: subData } }, options);
 			});
 			/**
 			* Get subdocument from array
 			*/
 			repo.registerMethod("getSubdocument", async function(parentId, arrayPath, subId, options = {}) {
-				return this._executeQuery.call(this, async (Model) => {
+				return this._executeQuery(async (Model) => {
 					const parent = await Model.findById(parentId).session(options.session).exec();
 					if (!parent) throw createError(404, "Parent not found");
 					const arrayField = parent[arrayPath];
@@ -3696,7 +3799,7 @@ function subdocumentPlugin() {
 			* Update subdocument in array
 			*/
 			repo.registerMethod("updateSubdocument", async function(parentId, arrayPath, subId, updateData, options = {}) {
-				return this._executeQuery.call(this, async (Model) => {
+				return this._executeQuery(async (Model) => {
 					const query = {
 						_id: parentId,
 						[`${arrayPath}._id`]: subId
@@ -3718,7 +3821,7 @@ function subdocumentPlugin() {
 			* Delete subdocument from array
 			*/
 			repo.registerMethod("deleteSubdocument", async function(parentId, arrayPath, subId, options = {}) {
-				return this.update.call(this, parentId, { $pull: { [arrayPath]: { _id: subId } } }, options);
+				return this.update(parentId, { $pull: { [arrayPath]: { _id: subId } } }, options);
 			});
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@classytic/mongokit",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "Production-grade MongoDB repositories with zero dependencies - smart pagination, events, and plugins",
   "type": "module",
   "sideEffects": false,
@@ -84,7 +84,7 @@
     "mongoose": "^9.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "scripts": {
     "build": "tsdown",
@@ -96,7 +96,7 @@
     "lint": "biome check src/",
     "lint:fix": "biome check src/ --write",
     "format": "biome format src/ --write",
-    "check": "biome ci src/",
+    "check": "biome ci src/ --diagnostic-level=error",
     "prepublishOnly": "npm run check && npm run build && npm run typecheck && npm test",
     "publish:dry": "npm publish --dry-run --access public",
     "publish:npm": "npm publish --access public",