@classytic/mongokit 3.5.4 → 3.5.6

package/dist/{validation-chain.plugin-BYMZB8dN.d.mts → validation-chain.plugin-BtmT-FFB.d.mts}

@@ -1,4 +1,4 @@
-import { I as Logger, J as Plugin, St as ValidatorDefinition, T as FieldPreset, U as OffsetPaginationResult, V as ObjectId, Z as PopulateSpec, bt as ValidationChainOptions, et as RepositoryContext, f as CascadeOptions, l as CacheOptions, nt as RepositoryInstance, pt as SortSpec, st as SelectSpec, u as CacheStats, ut as SoftDeleteOptions } from "./types-CkE3mOaW.mjs";
+import { I as Logger, J as Plugin, St as ValidatorDefinition, T as FieldPreset, U as OffsetPaginationResult, V as ObjectId, Z as PopulateSpec, bt as ValidationChainOptions, et as RepositoryContext, f as CascadeOptions, l as CacheOptions, nt as RepositoryInstance, pt as SortSpec, st as SelectSpec, u as CacheStats, ut as SoftDeleteOptions } from "./types-BwO4u3JN.mjs";
 import mongoose, { ClientSession } from "mongoose";
 
 //#region src/plugins/aggregate-helpers.plugin.d.ts

package/dist/{validation-chain.plugin-KjPV_6_N.mjs → validation-chain.plugin-DCYjnPau.mjs}

@@ -1,7 +1,9 @@
 import { a as warn, i as debug, n as parseDuplicateKeyError, t as createError } from "./error-Bpbi_NKo.mjs";
 import { a as exists, c as getOrCreate, d as deleteByQuery, g as upsert, i as count, m as createMany, n as updateByQuery, o as getById, p as create, s as getByQuery, t as update, u as deleteById, v as distinct, y as LookupBuilder } from "./update-AVfKWNGt.mjs";
-import { t as PaginationEngine } from "./PaginationEngine-DCs-zKwZ.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 { t as PaginationEngine } from "./PaginationEngine-CpsQl471.mjs";
+import { hasNearOperator, rewriteNearForCount } from "./query/primitives/geo.mjs";
+import { r as isValidIdForType, t as getSchemaIdType } from "./id-resolution-LZ-cCwR5.mjs";
+import { a as byIdKey, c as listQueryKey, l as modelPattern, o as byQueryKey, r as getFieldsForUser, u as versionKey } from "./field-selection-C5o7jyyA.mjs";
 import mongoose from "mongoose";
 //#region src/plugins/aggregate-helpers.plugin.ts
 /**
@@ -1182,6 +1184,8 @@ var Repository = class {
 	_pagination;
 	_hookMode;
 	idField;
+	searchMode;
+	searchFields;
 	_hasTextIndex = null;
 	constructor(Model, plugins = [], paginationConfig = {}, options = {}) {
 		this.Model = Model;
@@ -1190,6 +1194,9 @@ var Repository = class {
 		this._pagination = new PaginationEngine(Model, paginationConfig);
 		this._hookMode = options.hooks ?? "async";
 		this.idField = options.idField ?? "_id";
+		this.searchMode = options.searchMode ?? "text";
+		this.searchFields = options.searchFields;
+		if (this.searchMode === "regex" && (!this.searchFields || this.searchFields.length === 0)) warn(`[mongokit] Repository "${this.model}" configured with searchMode: 'regex' but no searchFields provided. getAll({ search }) will throw until searchFields is set.`);
 		plugins.forEach((plugin) => {
 			this.use(plugin);
 		});
@@ -1364,7 +1371,7 @@ var Repository = class {
 				});
 				return result;
 			}
-			if (typeof id === "string" && !mongoose.Types.ObjectId.isValid(id)) {
+			if (!isValidIdForType(id, getSchemaIdType(this.Model.schema))) {
 				if (context.throwOnNotFound === false || options.throwOnNotFound === false) return null;
 				throw createError(404, "Document not found");
 			}
@@ -1542,25 +1549,19 @@ var Repository = class {
 			sort: context.sort ?? params.sort
 		});
 		const filters = context.filters ?? params.filters ?? {};
-		const search = context.search ?? params.search;
-		const sort = context.sort ?? params.sort ?? "-createdAt";
+		const search = context.search;
+		const isNearQuery = hasNearOperator(filters);
+		const sort = this._resolveSort(context, params, isNearQuery);
 		const limit = context.limit ?? params.limit ?? params.pagination?.limit ?? this._pagination.config.defaultLimit;
 		const page = context.page ?? params.pagination?.page ?? params.page;
 		const after = context.after ?? params.cursor ?? params.after;
 		const mode = context.mode ?? params.mode;
-		let useKeyset = false;
-		if (mode) useKeyset = mode === "keyset";
-		else useKeyset = !page && !!(after || sort !== "-createdAt" && (context.sort ?? params.sort));
-		const query = { ...filters };
-		if (search) {
-			if (this._hasTextIndex === null) this._hasTextIndex = this.Model.schema.indexes().some((idx) => idx[0] && Object.values(idx[0]).includes("text"));
-			if (this._hasTextIndex) query.$text = { $search: search };
-			else throw createError(400, `No text index found for ${this.model}. Cannot perform text search.`);
-		}
+		const useKeyset = this._detectPaginationMode(mode, page, after, sort, context, params);
+		const query = this._buildSearchQuery(filters, search);
 		const populateSpec = options.populateOptions || params.populateOptions || context.populate || options.populate;
 		const paginationOptions = {
 			filters: query,
-			sort: this._parseSort(sort),
+			sort: isNearQuery ? void 0 : this._parseSort(sort),
 			limit,
 			populate: this._parsePopulate(populateSpec),
 			select: context.select || options.select,
@@ -1630,11 +1631,21 @@ var Repository = class {
 				sort: paginationOptions.sort,
 				after
 			});
-			else result = await this._pagination.paginate({
-				...paginationOptions,
-				page: page || 1,
-				countStrategy: context.countStrategy ?? params.countStrategy
-			});
+			else {
+				let countFilters;
+				let forcedCountStrategy;
+				if (isNearQuery) {
+					const rewritten = rewriteNearForCount(query);
+					if (rewritten) countFilters = rewritten;
+					else forcedCountStrategy = "none";
+				}
+				result = await this._pagination.paginate({
+					...paginationOptions,
+					page: page || 1,
+					countFilters,
+					countStrategy: context.countStrategy ?? params.countStrategy ?? forcedCountStrategy
+				});
+			}
 			await this._emitHook("after:getAll", {
 				context,
 				result
@@ -2201,6 +2212,56 @@ var Repository = class {
 		return context;
 	}
 	/**
+	* Resolve the effective sort for getAll. Handles $near conflict detection
+	* (warns + drops explicit sort when $near is in filters).
+	*/
+	_resolveSort(context, params, isNearQuery) {
+		const explicitSort = context.sort ?? params.sort;
+		if (isNearQuery) {
+			if (explicitSort !== void 0) warn(`[mongokit] Repository "${this.model}" dropping explicit sort (${JSON.stringify(explicitSort)}) because the filter contains $near / $nearSphere. MongoDB forbids explicit sort with $near. Use [withinRadius] instead of [near] if you need a custom sort.`);
+			return;
+		}
+		return explicitSort ?? "-createdAt";
+	}
+	/**
+	* Detect whether to use keyset (cursor) or offset (page) pagination.
+	*/
+	_detectPaginationMode(mode, page, after, sort, context, params) {
+		if (mode) return mode === "keyset";
+		return !page && !!(after || sort !== "-createdAt" && (context.sort ?? params.sort));
+	}
+	/**
+	* Build the MongoDB query filter with search merged in. Handles text
+	* search ($text), regex search ($or of $regex), and the search-resolver
+	* plugin contract (search already cleared by a before:getAll hook).
+	*/
+	_buildSearchQuery(filters, search) {
+		const query = { ...filters };
+		if (!search) return query;
+		if (this._hasTextIndex === null) this._hasTextIndex = this.Model.schema.indexes().some((idx) => idx[0] && Object.values(idx[0]).includes("text"));
+		let effectiveMode = this.searchMode === "regex" ? "regex" : "text";
+		if (this.searchMode === "auto") effectiveMode = this._hasTextIndex ? "text" : "regex";
+		if (effectiveMode === "regex") {
+			if (!this.searchFields || this.searchFields.length === 0) throw createError(400, `Repository "${this.model}" configured with searchMode: '${this.searchMode}' but no searchFields provided.`);
+			const escaped = String(search).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+			const orConds = this.searchFields.map((field) => ({ [field]: {
+				$regex: escaped,
+				$options: "i"
+			} }));
+			if (Array.isArray(query.$or)) {
+				const existingOr = query.$or;
+				delete query.$or;
+				query.$and = [
+					...Array.isArray(query.$and) ? query.$and : [],
+					{ $or: existingOr },
+					{ $or: orConds }
+				];
+			} else query.$or = orConds;
+		} else if (this._hasTextIndex) query.$text = { $search: search };
+		else throw createError(400, `No text index found for ${this.model}. Cannot perform text search. Configure Repository with searchMode: 'regex' (and searchFields) or 'auto' to enable index-free search.`);
+		return query;
+	}
+	/**
 	* Parse sort string or object
 	*/
 	_parseSort(sort) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@classytic/mongokit",
-  "version": "3.5.4",
+  "version": "3.5.6",
   "description": "Production-grade MongoDB repositories with zero dependencies - smart pagination, events, and plugins",
   "type": "module",
   "sideEffects": false,
@@ -31,6 +31,18 @@
     "./ai": {
       "types": "./dist/ai/index.d.mts",
       "default": "./dist/ai/index.mjs"
+    },
+    "./query/primitives/geo": {
+      "types": "./dist/query/primitives/geo.d.mts",
+      "default": "./dist/query/primitives/geo.mjs"
+    },
+    "./query/primitives/coercion": {
+      "types": "./dist/query/primitives/coercion.d.mts",
+      "default": "./dist/query/primitives/coercion.mjs"
+    },
+    "./query/primitives/indexes": {
+      "types": "./dist/query/primitives/indexes.d.mts",
+      "default": "./dist/query/primitives/indexes.mjs"
     }
   },
   "files": [
@@ -81,7 +93,7 @@
   },
   "homepage": "https://github.com/classytic/mongokit#readme",
   "peerDependencies": {
-    "mongoose": "^9.0.0"
+    "mongoose": ">=9.4.1"
   },
   "engines": {
     "node": ">=22"
@@ -111,7 +123,7 @@
     "@vitest/coverage-v8": "^3.2.4",
     "knip": "^6.3.0",
     "mongodb-memory-server": "^10.4.3",
-    "mongoose": "^9.1.3",
+    "mongoose": "^9.4.1",
     "tsdown": "^0.21.7",
     "typescript": "^5.7.0",
     "vitest": "^3.2.4"