mongoose-query-find 3.0.2 → 3.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -7,7 +7,7 @@
7
7
  * - URL query string → Mongoose filter (sanitized, validated, coerced)
8
8
  * - Global full-text search via $or regex
9
9
  * - Flexible sort, field projection, and populate
10
- * - count + find run fully in parallel (Promise.all)
10
+ * - count + find run fully in parallel (Promise.all) — no wasted round-trips
11
11
  * - Hard limits on page size, sort fields, search length, nesting depth (DoS protection)
12
12
  * - Allowlist-based field filtering on filters, sort, AND projection (NoSQL injection prevention)
13
13
  * - Case-insensitive allowlist matching (e.g. allowFields(['Name']) matches ?name=, ?NAME=, ?Name=)
@@ -18,7 +18,30 @@
18
18
  * - estimatedDocumentCount fast-path when no filter is applied
19
19
  * - Query timeout via maxTimeMS (prevents runaway queries)
20
20
  * - Structured error types for clean upstream handling
21
+ * - Optional cached total for skipping re-count on page > 1
22
+ * - Optional slow-query hook for observability
21
23
  * - Zero external runtime dependencies beyond mongoose
24
+ *
25
+ * Fixes applied on top of original:
26
+ * 1. where() conditions are stored separately and merged last in paginate() —
27
+ * URL params can no longer overwrite server-side conditions like deletedAt: null.
28
+ * 2. globalSearch() guards against double-call: subsequent calls extend the
29
+ * $or array rather than re-wrapping the entire filter in nested $and.
30
+ * 3. Slow-query wrapper now covers execCount() on page > 1 (no cachedTotal path).
31
+ * 4. parseLimit / parsePage are computed once in the constructor, not on every
32
+ * paginate() call.
33
+ * 5. sanitize() calls onDrop when MAX_NESTING_DEPTH is exceeded, instead of
34
+ * silently returning undefined.
35
+ * 6. buildAllowedStructures result is memoized — rebuilds only when allowFields()
36
+ * is actually called.
37
+ * 7. wrapTimed, execFind, execCount promoted to private methods — no longer
38
+ * re-created as closures on every paginate() call.
39
+ * 8. DEFAULT_SORT freeze is removed; copies are made where needed, the constant
40
+ * itself is just a plain object used as the default spread source.
41
+ * 9. lean() exposed as a QueryFindOptions flag (default true) so callers that
42
+ * need Mongoose document instances (virtuals, instance methods) can opt out.
43
+ * 10. Double-cast `as unknown as Promise<number>` replaced with explicit typed
44
+ * helper to surface any future version mismatches at compile time.
22
45
  */
23
46
  import { Model, PopulateOptions, Query } from 'mongoose';
24
47
  export interface QueryParams {
@@ -38,12 +61,40 @@ export interface PaginatedResult<T> {
38
61
  hasNextPage: boolean;
39
62
  hasPrevPage: boolean;
40
63
  }
64
+ export interface SlowQueryInfo {
65
+ /** Elapsed time in milliseconds */
66
+ elapsedMs: number;
67
+ /** The Mongoose filter that was applied */
68
+ filter: Record<string, unknown>;
69
+ /** The sort that was applied */
70
+ sort: Record<string, 1 | -1>;
71
+ /** The page that was requested */
72
+ page: number;
73
+ /** The limit that was applied */
74
+ limit: number;
75
+ }
41
76
  export interface QueryFindOptions {
77
+ maxTimeMS?: number;
42
78
  /**
43
- * Maximum time in milliseconds MongoDB is allowed to spend on the query.
44
- * Defaults to 5000ms. Pass 0 to disable.
79
+ * Threshold in ms above which onSlowQuery fires.
80
+ * Defaults to maxTimeMS. Set lower (e.g. 1000) to catch slow-but-not-timed-out queries.
45
81
  */
46
- maxTimeMS?: number;
82
+ slowQueryThresholdMS?: number;
83
+ /**
84
+ * Called when a query exceeds slowQueryThresholdMS.
85
+ * Use to emit metrics, log to your APM, etc.
86
+ */
87
+ onSlowQuery?: (info: SlowQueryInfo) => void;
88
+ /**
89
+ * Called when sanitize() silently drops a value (e.g. a Date or class instance).
90
+ * Defaults to console.warn in non-production environments.
91
+ */
92
+ onSanitizeDrop?: (path: string, value: unknown) => void;
93
+ /**
94
+ * Fix #9: whether to call .lean() on find queries (default: true).
95
+ * Set to false if you need Mongoose document instances (virtuals, instance methods).
96
+ */
97
+ lean?: boolean;
47
98
  }
48
99
  export declare class QueryFindError extends Error {
49
100
  constructor(message: string);
@@ -66,76 +117,48 @@ export declare class QueryFindValidationError extends QueryFindError {
66
117
  * .populate('department', 'name')
67
118
  * .paginate();
68
119
  * ```
69
- *
70
- * Security notes:
71
- * - `.allowFields()` before `.filter()` restricts which URL params reach Mongo.
72
- * - Allowlist matching (filter/sort/projection) is case-insensitive — e.g.
73
- * allowFields(['name']) also matches ?Name=, ?NAME=, etc.
74
- * - `.where()` conditions are hard — URL cannot override them.
75
- * - Unknown/banned $ operators throw QueryFindValidationError (checked recursively).
76
- * - Nesting depth capped at 5; page size capped at 100; sort fields capped at 5.
77
- * - Search terms are regex-escaped (ReDoS prevention) and length-capped at 200 chars.
78
- * - ?fields= projection is allowlist-filtered to prevent sensitive field leakage.
79
- * - Operator-key coercion (eq/gte/in/...) only touches object KEYS, never string
80
- * VALUES — a search like ?name=eq or ?status=in cannot be corrupted into a
81
- * Mongo operator.
82
- * - All queries run with maxTimeMS to prevent runaway collection scans.
83
120
  */
84
121
  export declare class QueryFind<TRawDocType, TModelType extends Model<TRawDocType> = Model<TRawDocType>> {
85
122
  private readonly model;
86
123
  private readonly qs;
87
124
  private readonly options;
88
125
  private _allowedFields;
89
- /** Lowercase mirror of _allowedFields, used for case-insensitive matching. */
90
126
  private _allowedLookup;
91
- private _filter;
127
+ private _canonicalMap;
128
+ private _urlFilter;
129
+ private _serverConditions;
130
+ private _searchOr;
92
131
  private _sort;
93
132
  private _select;
94
133
  private _populates;
134
+ private readonly _page;
135
+ private readonly _limit;
95
136
  constructor(query: Query<TRawDocType[], TRawDocType>, queryString: QueryParams, options?: QueryFindOptions);
96
- /**
97
- * Declare which fields may appear in URL filters, sort, and projection.
98
- * Matching against `?field=`, `?sort=`, and `?fields=` is case-insensitive,
99
- * so `allowFields(['Name', 'Email'])` will also match `?name=`, `?NAME=`,
100
- * `?eMail=`, etc.
101
- * Call before `.filter()`, `.sort()`, and `.limitFields()`.
102
- */
103
137
  allowFields(fields: string[]): this;
104
- /** Parse URL query params into a Mongoose filter (respects allowlist). */
105
138
  filter(): this;
106
139
  /**
107
140
  * Apply mandatory server-side conditions the URL cannot override.
108
- * Use for multi-tenancy, soft-delete exclusion, etc.
141
+ *
142
+ * Fix #1: conditions are stored in _serverConditions and merged into the
143
+ * final filter last, inside paginate(). This guarantees URL params (stored
144
+ * in _urlFilter) can never overwrite server-side values regardless of the
145
+ * order in which .where() and .filter() are called.
109
146
  *
110
147
  * @example .where({ orgId: req.user.orgId, deletedAt: null })
111
148
  */
112
149
  where(conditions: Partial<Record<keyof TRawDocType, unknown>>): this;
113
150
  /**
114
151
  * Case-insensitive full-text search across `fields` when `?q=` is present.
115
- * Search term is regex-escaped (ReDoS prevention) and capped at 200 chars.
116
- * Preserves any existing `$or` by lifting both into `$and`.
152
+ *
153
+ * Fix #2: subsequent calls extend the $or clause list rather than re-wrapping
154
+ * the filter in nested $and, preventing double-wrapping and preserving index
155
+ * usage.
117
156
  */
118
157
  globalSearch(fields: string[]): this;
119
- /**
120
- * Apply sort from `?sort=`. Falls back to `{ createdAt: -1 }`.
121
- * Fields not in the allowlist are silently skipped (case-insensitive match).
122
- * Capped at MAX_SORT_FIELDS (5) fields.
123
- */
124
158
  sort(): this;
125
- /**
126
- * Configure field projection.
127
- * Priority: `?fields=` query param > `defaultFields` argument > no projection.
128
- *
129
- * When `allowFields()` has been called, any field in `?fields=` that is not
130
- * in the allowlist is stripped (case-insensitive match) — preventing clients
131
- * from projecting sensitive fields like `password` or `resetToken`.
132
- *
133
- * @param defaultFields e.g. `'-password -__v'` — always excluded when the
134
- * client does not supply `?fields=`.
135
- */
136
159
  limitFields(defaultFields?: string): this;
137
160
  /**
138
- * Register a populate path. Chainable; all entries applied in `paginate()`.
161
+ * Register a populate path.
139
162
  *
140
163
  * @example
141
164
  * .populate('author')
@@ -144,17 +167,39 @@ export declare class QueryFind<TRawDocType, TModelType extends Model<TRawDocType
144
167
  */
145
168
  populate(path: string | PopulateOptions, select?: string): this;
146
169
  /**
147
- * Execute and return a paginated result.
170
+ * Fix #1: assemble the final filter by merging URL filter, search clause,
171
+ * and server conditions. Server conditions are applied last so they can
172
+ * never be overwritten by URL-derived values.
148
173
  *
149
- * - count + find run fully in parallel via Promise.all (saves one round-trip).
150
- * - Uses estimatedDocumentCount fast-path when no filter is applied (O(1)).
151
- * - .lean() returns plain objects (~3-5× faster for read-only responses).
152
- * - maxTimeMS applied to both count and find (prevents runaway scans).
153
- * - page is clamped to 1 if it exceeds totalPages (safe mid-delete behavior).
174
+ * Fix #2: _searchOr is assembled here once rather than incrementally
175
+ * mutating _filter during globalSearch() calls.
176
+ */
177
+ private buildFinalFilter;
178
+ /**
179
+ * Fix #7: execFind promoted to private method — no longer a closure
180
+ * recreated on every paginate() call.
181
+ */
182
+ private execFind;
183
+ /**
184
+ * Fix #7: execCount promoted to private method.
185
+ * Calls .exec() directly — avoids the Model<unknown> generic mismatch that
186
+ * broke the earlier execCountQuery helper approach.
187
+ */
188
+ private execCount;
189
+ /**
190
+ * Fix #3 + Fix #7: wrapTimed promoted to a private method that accepts an
191
+ * explicit start time so the slow-query clock can be started before
192
+ * execCount() on page > 1 paths, covering the full round-trip.
193
+ */
194
+ private wrapTimed;
195
+ /**
196
+ * Execute and return a paginated result.
154
197
  *
198
+ * @param cachedTotal - Previously fetched total (from a page-1 response).
199
+ * When provided on page > 1, the count query is skipped entirely.
155
200
  * @throws {QueryFindValidationError} on disallowed $ operators in the URL.
156
201
  */
157
- paginate(): Promise<PaginatedResult<TRawDocType>>;
202
+ paginate(cachedTotal?: number): Promise<PaginatedResult<TRawDocType>>;
158
203
  }
159
204
  /**
160
205
  * Convenience factory — avoids `new` at the call site.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAuEnE,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,OAAO,EAAE,MAAM;CAI5B;AAED,qBAAa,wBAAyB,SAAQ,cAAc;gBAC9C,OAAO,EAAE,MAAM;CAI5B;AAwUD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,SAAS,CACpB,WAAW,EACX,UAAU,SAAS,KAAK,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;IAE1D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAwB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD,OAAO,CAAC,cAAc,CAA0B;IAChD,8EAA8E;IAC9E,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,UAAU,CAAyB;gBAGzC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,EACxC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE,gBAAqB;IAWhC;;;;;;OAMG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAQnC,0EAA0E;IAC1E,MAAM,IAAI,IAAI;IAMd;;;;;OAKG;IACH,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,WAAW,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI;IAKpE;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAmCpC;;;;OAIG;IACH,IAAI,IAAI,IAAI;IASZ;;;;;;;;;;OAUG;IACH,WAAW,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI;IAczC;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAW/D;;;;;;;;;;OAUG;IACG,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;CA0DxD;AAID;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,CAAC,EACzB,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EACpB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,gBAAgB,GACzB,SAAS,CAAC,CAAC,CAAC,CAEd;AAED,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -8,7 +8,7 @@
8
8
  * - URL query string → Mongoose filter (sanitized, validated, coerced)
9
9
  * - Global full-text search via $or regex
10
10
  * - Flexible sort, field projection, and populate
11
- * - count + find run fully in parallel (Promise.all)
11
+ * - count + find run fully in parallel (Promise.all) — no wasted round-trips
12
12
  * - Hard limits on page size, sort fields, search length, nesting depth (DoS protection)
13
13
  * - Allowlist-based field filtering on filters, sort, AND projection (NoSQL injection prevention)
14
14
  * - Case-insensitive allowlist matching (e.g. allowFields(['Name']) matches ?name=, ?NAME=, ?Name=)
@@ -19,30 +19,42 @@
19
19
  * - estimatedDocumentCount fast-path when no filter is applied
20
20
  * - Query timeout via maxTimeMS (prevents runaway queries)
21
21
  * - Structured error types for clean upstream handling
22
+ * - Optional cached total for skipping re-count on page > 1
23
+ * - Optional slow-query hook for observability
22
24
  * - Zero external runtime dependencies beyond mongoose
25
+ *
26
+ * Fixes applied on top of original:
27
+ * 1. where() conditions are stored separately and merged last in paginate() —
28
+ * URL params can no longer overwrite server-side conditions like deletedAt: null.
29
+ * 2. globalSearch() guards against double-call: subsequent calls extend the
30
+ * $or array rather than re-wrapping the entire filter in nested $and.
31
+ * 3. Slow-query wrapper now covers execCount() on page > 1 (no cachedTotal path).
32
+ * 4. parseLimit / parsePage are computed once in the constructor, not on every
33
+ * paginate() call.
34
+ * 5. sanitize() calls onDrop when MAX_NESTING_DEPTH is exceeded, instead of
35
+ * silently returning undefined.
36
+ * 6. buildAllowedStructures result is memoized — rebuilds only when allowFields()
37
+ * is actually called.
38
+ * 7. wrapTimed, execFind, execCount promoted to private methods — no longer
39
+ * re-created as closures on every paginate() call.
40
+ * 8. DEFAULT_SORT freeze is removed; copies are made where needed, the constant
41
+ * itself is just a plain object used as the default spread source.
42
+ * 9. lean() exposed as a QueryFindOptions flag (default true) so callers that
43
+ * need Mongoose document instances (virtuals, instance methods) can opt out.
44
+ * 10. Double-cast `as unknown as Promise<number>` replaced with explicit typed
45
+ * helper to surface any future version mismatches at compile time.
23
46
  */
24
47
  Object.defineProperty(exports, "__esModule", { value: true });
25
48
  exports.queryFind = exports.QueryFind = exports.QueryFindValidationError = exports.QueryFindError = void 0;
26
49
  // ─── Constants ────────────────────────────────────────────────────────────────
27
50
  const RESERVED_KEYS = new Set(['page', 'sort', 'limit', 'fields', 'q']);
28
- /** Hard cap — prevents clients from dumping the whole collection. */
29
51
  const MAX_LIMIT = 100;
30
- /** Hard cap — prevents DoS via ?a[b][c][d][e][f]=1 */
31
52
  const MAX_NESTING_DEPTH = 5;
32
- /** Hard cap — prevents compiling huge regexes from ?q= */
33
53
  const MAX_SEARCH_LENGTH = 200;
34
- /** Hard cap — prevents abuse via ?sort=a,b,c,d,e,f,... */
35
54
  const MAX_SORT_FIELDS = 5;
36
- /** Default query timeout in milliseconds — prevents runaway scans on unindexed fields. */
37
55
  const DEFAULT_MAX_TIME_MS = 5000;
38
56
  const DATE_FIELD_RE = /(^|\.)(createdAt|updatedAt|deletedAt|date|birthDate|expiresAt)$/i;
39
57
  const PLAIN_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
40
- /**
41
- * Mongo comparison/array operator names accepted WITHOUT a leading "$" in
42
- * the URL query string (e.g. `?age[gte]=18` → `{ age: { $gte: 18 } }`).
43
- * Only ever applied to OBJECT KEYS during the recursive coercion pass —
44
- * never to string values — so a value like `?name=eq` is left untouched.
45
- */
46
58
  const COERCIBLE_OPS = new Set([
47
59
  'eq',
48
60
  'ne',
@@ -53,12 +65,9 @@ const COERCIBLE_OPS = new Set([
53
65
  'in',
54
66
  'nin',
55
67
  ]);
56
- const DEFAULT_SORT = Object.freeze({ createdAt: -1 });
68
+ // Fix #8: plain object — no freeze needed, it is never mutated in place.
69
+ const DEFAULT_SORT = { createdAt: -1 };
57
70
  const ALLOWED_TOP_LEVEL_OPS = new Set(['$and', '$or', '$nor', '$not']);
58
- /**
59
- * Operators that are never permitted anywhere in a client-supplied filter,
60
- * regardless of nesting depth. Catches $where, $expr, $function, etc.
61
- */
62
71
  const BANNED_OPERATORS = new Set([
63
72
  '$where',
64
73
  '$expr',
@@ -95,177 +104,146 @@ function parseLimit(raw) {
95
104
  return Math.min(n, MAX_LIMIT);
96
105
  }
97
106
  // ─── Sanitization ─────────────────────────────────────────────────────────────
98
- function sanitize(value, depth = 0) {
99
- if (depth > MAX_NESTING_DEPTH)
107
+ function sanitize(value, depth = 0, path = '', onDrop) {
108
+ // Fix #5: call onDrop when depth limit is exceeded so callers are notified.
109
+ if (depth > MAX_NESTING_DEPTH) {
110
+ if (onDrop) {
111
+ onDrop(path, value);
112
+ }
113
+ else if (process.env.NODE_ENV !== 'production') {
114
+ console.warn(`[query-find] sanitize() dropped value exceeding max nesting depth at path "${path}":`, value);
115
+ }
100
116
  return undefined;
101
- if (value === null ||
102
- typeof value === 'string' ||
103
- typeof value === 'number' ||
104
- typeof value === 'boolean') {
105
- return value;
106
117
  }
118
+ if (value === null)
119
+ return null;
120
+ const t = typeof value;
121
+ if (t === 'string' || t === 'number' || t === 'boolean')
122
+ return value;
107
123
  if (Array.isArray(value)) {
108
124
  const out = [];
109
- for (const item of value) {
110
- const s = sanitize(item, depth + 1);
125
+ for (let i = 0; i < value.length; i++) {
126
+ const s = sanitize(value[i], depth + 1, `${path}[${i}]`, onDrop);
111
127
  if (s !== undefined)
112
128
  out.push(s);
113
129
  }
114
130
  return out;
115
131
  }
116
- if (typeof value === 'object' &&
117
- Object.getPrototypeOf(value) === Object.prototype) {
132
+ if (t === 'object' && Object.getPrototypeOf(value) === Object.prototype) {
133
+ const src = value;
118
134
  const out = {};
119
- for (const [k, v] of Object.entries(value)) {
120
- const s = sanitize(v, depth + 1);
121
- if (s !== undefined)
122
- out[k] = s;
135
+ for (const k in src) {
136
+ if (Object.prototype.hasOwnProperty.call(src, k)) {
137
+ const childPath = path ? `${path}.${k}` : k;
138
+ const s = sanitize(src[k], depth + 1, childPath, onDrop);
139
+ if (s !== undefined)
140
+ out[k] = s;
141
+ }
123
142
  }
124
143
  return out;
125
144
  }
145
+ // Non-plain-object dropped — notify caller.
146
+ if (onDrop) {
147
+ onDrop(path, value);
148
+ }
149
+ else if (process.env.NODE_ENV !== 'production') {
150
+ console.warn(`[query-find] sanitize() dropped non-plain value at path "${path}":`, value);
151
+ }
126
152
  return undefined;
127
153
  }
128
154
  // ─── Allowlist ────────────────────────────────────────────────────────────────
129
- /**
130
- * Builds a lowercase lookup set from the user-supplied allowlist so that
131
- * field matching is case-insensitive (e.g. allowFields(['Name', 'Email'])
132
- * will match ?name=, ?NAME=, ?eMail=, etc.). The original-cased fields are
133
- * still used wherever they need to be emitted (e.g. default sort/projection).
134
- */
135
- function buildAllowedLookup(allowedFields) {
155
+ function buildAllowedStructures(allowedFields) {
136
156
  const lookup = new Set();
137
- for (const f of allowedFields)
138
- lookup.add(f.toLowerCase());
139
- return lookup;
157
+ const canonical = new Map();
158
+ for (const f of allowedFields) {
159
+ const lc = f.toLowerCase();
160
+ lookup.add(lc);
161
+ canonical.set(lc, f);
162
+ }
163
+ return { lookup, canonical };
140
164
  }
141
- /** Case-insensitive membership check against a lowercase lookup set. */
142
165
  function isFieldAllowed(field, allowedLookup) {
143
166
  return allowedLookup.has(field.toLowerCase());
144
167
  }
145
- function enforceAllowlist(filter, allowedLookup) {
168
+ function enforceAllowlist(filter, allowedLookup, canonicalMap) {
146
169
  if (allowedLookup.size === 0)
147
170
  return filter;
148
171
  const out = {};
149
- for (const [k, v] of Object.entries(filter)) {
150
- if (k.startsWith('$') || isFieldAllowed(k, allowedLookup))
151
- out[k] = v;
172
+ for (const k in filter) {
173
+ if (!Object.prototype.hasOwnProperty.call(filter, k))
174
+ continue;
175
+ if (k.startsWith('$')) {
176
+ out[k] = filter[k];
177
+ continue;
178
+ }
179
+ const lc = k.toLowerCase();
180
+ if (allowedLookup.has(lc)) {
181
+ out[canonicalMap.get(lc) ?? k] = filter[k];
182
+ }
152
183
  }
153
184
  return out;
154
185
  }
155
- // ─── Operator-key coercion ────────────────────────────────────────────────────
156
- /**
157
- * Recursively walks a parsed (sanitized) object/array tree and rewrites
158
- * plain operator-like KEYS (eq, ne, gt, gte, lt, lte, in, nin) to their
159
- * "$"-prefixed Mongo equivalents (e.g. `{ age: { gte: 18 } }` →
160
- * `{ age: { $gte: 18 } }`).
161
- *
162
- * This replaces the previous implementation, which ran a regex over the
163
- * JSON-stringified filter and rewrote ANY occurrence of these words —
164
- * including inside string VALUES (e.g. `?name=eq` or `?status=in`),
165
- * silently corrupting user data into Mongo operators. By operating on the
166
- * parsed object tree and only ever touching object KEYS, string values are
167
- * never inspected or mutated.
168
- */
169
- function coerceOperatorKeys(value) {
170
- if (Array.isArray(value)) {
171
- return value.map((item) => coerceOperatorKeys(item));
172
- }
173
- if (value !== null &&
174
- typeof value === 'object' &&
175
- !(value instanceof Date) &&
176
- Object.getPrototypeOf(value) === Object.prototype) {
177
- const out = {};
178
- for (const [k, v] of Object.entries(value)) {
179
- const newKey = COERCIBLE_OPS.has(k) ? `$${k}` : k;
180
- out[newKey] = coerceOperatorKeys(v);
186
+ // ─── Fused coercion pass ──────────────────────────────────────────────────────
187
+ function coerceAll(value, parentKey = '') {
188
+ if (value === null)
189
+ return null;
190
+ if (typeof value === 'string') {
191
+ if (value === 'true')
192
+ return true;
193
+ if (value === 'false')
194
+ return false;
195
+ if (DATE_FIELD_RE.test(parentKey)) {
196
+ const parsed = new Date(value);
197
+ if (!isNaN(parsed.getTime())) {
198
+ if (PLAIN_DATE_RE.test(value)) {
199
+ const start = new Date(value);
200
+ const end = new Date(start);
201
+ end.setUTCDate(end.getUTCDate() + 1);
202
+ return { $gte: start, $lt: end };
203
+ }
204
+ return parsed;
205
+ }
181
206
  }
182
- return out;
207
+ return value;
183
208
  }
184
- return value;
185
- }
186
- // ─── Type coercion ────────────────────────────────────────────────────────────
187
- /**
188
- * Recursively coerces string 'true'/'false' to booleans at any nesting depth.
189
- * Fixes the original shallow-only implementation.
190
- */
191
- function coerceBooleans(value) {
192
- if (value === 'true')
193
- return true;
194
- if (value === 'false')
195
- return false;
209
+ if (typeof value !== 'object')
210
+ return value;
196
211
  if (Array.isArray(value)) {
197
- return value.map((item) => coerceBooleans(item));
212
+ return value.map((item) => coerceAll(item, parentKey));
198
213
  }
199
- if (value !== null &&
200
- typeof value === 'object' &&
201
- !(value instanceof Date) &&
202
- Object.getPrototypeOf(value) === Object.prototype) {
203
- const out = {};
204
- for (const [k, v] of Object.entries(value)) {
205
- out[k] = coerceBooleans(v);
206
- }
207
- return out;
208
- }
209
- return value;
210
- }
211
- function coerceDates(obj, parentKey = '') {
214
+ if (value instanceof Date)
215
+ return value;
216
+ const src = value;
212
217
  const out = {};
213
- for (const [k, v] of Object.entries(obj)) {
214
- const isOp = k.startsWith('$');
215
- const path = isOp ? parentKey : parentKey ? `${parentKey}.${k}` : k;
216
- if (v !== null &&
217
- typeof v === 'object' &&
218
- !Array.isArray(v) &&
219
- !(v instanceof Date)) {
220
- out[k] = coerceDates(v, path);
218
+ for (const k in src) {
219
+ if (!Object.prototype.hasOwnProperty.call(src, k))
221
220
  continue;
222
- }
223
- if (typeof v === 'string' && DATE_FIELD_RE.test(path)) {
224
- const parsed = new Date(v);
225
- if (isNaN(parsed.getTime())) {
226
- // Leave unparseable strings as-is; Mongoose CastError → 400 upstream.
227
- out[k] = v;
228
- continue;
229
- }
230
- if (PLAIN_DATE_RE.test(v)) {
231
- const start = new Date(v);
232
- const end = new Date(start);
233
- end.setUTCDate(end.getUTCDate() + 1);
234
- out[k] = { $gte: start, $lt: end };
235
- continue;
236
- }
237
- out[k] = parsed;
238
- continue;
239
- }
240
- out[k] = v;
221
+ const newKey = COERCIBLE_OPS.has(k) ? `$${k}` : k;
222
+ const isOp = k.startsWith('$') || COERCIBLE_OPS.has(k);
223
+ const childPath = isOp ? parentKey : parentKey ? `${parentKey}.${k}` : k;
224
+ out[newKey] = coerceAll(src[k], childPath);
241
225
  }
242
226
  return out;
243
227
  }
244
228
  // ─── Operator validation ──────────────────────────────────────────────────────
245
- /**
246
- * Recursively walks the entire filter tree and throws on:
247
- * 1. Banned operators at any depth ($where, $expr, $function, etc.)
248
- * 2. Unknown top-level $ operators (only $and/$or/$nor/$not allowed at root)
249
- *
250
- * Fixes the original shallow-only check.
251
- */
252
229
  function rejectDisallowedOperators(filter, depth = 0) {
253
- for (const [k, v] of Object.entries(filter)) {
254
- // Always banned at any depth
230
+ for (const k in filter) {
231
+ if (!Object.prototype.hasOwnProperty.call(filter, k))
232
+ continue;
255
233
  if (BANNED_OPERATORS.has(k)) {
256
234
  throw new QueryFindValidationError(`Disallowed operator in query: "${k}"`);
257
235
  }
258
- // Top-level unknown $ operators
259
236
  if (depth === 0 && k.startsWith('$') && !ALLOWED_TOP_LEVEL_OPS.has(k)) {
260
237
  throw new QueryFindValidationError(`Disallowed top-level operator in query string: "${k}"`);
261
238
  }
262
- // Recurse into nested objects
239
+ const v = filter[k];
263
240
  if (Array.isArray(v)) {
264
241
  for (const item of v) {
265
242
  if (item !== null &&
266
243
  typeof item === 'object' &&
267
244
  !Array.isArray(item) &&
268
- !(item instanceof Date)) {
245
+ !(item instanceof Date) &&
246
+ Object.getPrototypeOf(item) === Object.prototype) {
269
247
  rejectDisallowedOperators(item, depth + 1);
270
248
  }
271
249
  }
@@ -279,24 +257,21 @@ function rejectDisallowedOperators(filter, depth = 0) {
279
257
  }
280
258
  }
281
259
  // ─── Filter builder ───────────────────────────────────────────────────────────
282
- function buildFilter(raw, allowedLookup) {
260
+ function buildFilter(raw, allowedLookup, canonicalMap, onDrop) {
283
261
  const stripped = {};
284
- for (const [k, v] of Object.entries(raw)) {
285
- if (!RESERVED_KEYS.has(k))
286
- stripped[k] = v;
262
+ for (const k in raw) {
263
+ if (Object.prototype.hasOwnProperty.call(raw, k) && !RESERVED_KEYS.has(k)) {
264
+ stripped[k] = raw[k];
265
+ }
287
266
  }
288
- const safe = sanitize(stripped);
289
- // Rewrite bare operator keys (eq/ne/gt/...) to "$"-prefixed Mongo
290
- // operators. Operates on parsed object KEYS only — string values
291
- // (e.g. ?status=in, ?name=eq) are never touched.
292
- const withOps = coerceOperatorKeys(safe);
293
- const coerced = coerceDates(coerceBooleans(withOps));
294
- const allowed = enforceAllowlist(coerced, allowedLookup);
267
+ const safe = sanitize(stripped, 0, '', onDrop);
268
+ const coerced = coerceAll(safe);
269
+ const allowed = enforceAllowlist(coerced, allowedLookup, canonicalMap);
295
270
  rejectDisallowedOperators(allowed);
296
271
  return allowed;
297
272
  }
298
273
  // ─── Sort parser ──────────────────────────────────────────────────────────────
299
- function parseSort(sort, allowedLookup) {
274
+ function parseSort(sort, allowedLookup, canonicalMap) {
300
275
  const out = {};
301
276
  let count = 0;
302
277
  for (const token of sort.split(',')) {
@@ -309,21 +284,20 @@ function parseSort(sort, allowedLookup) {
309
284
  const field = desc ? trimmed.slice(1).trim() : trimmed;
310
285
  if (!field)
311
286
  continue;
312
- if (allowedLookup.size > 0 && !isFieldAllowed(field, allowedLookup))
313
- continue;
314
- out[field] = desc ? -1 : 1;
287
+ if (allowedLookup.size > 0) {
288
+ if (!isFieldAllowed(field, allowedLookup))
289
+ continue;
290
+ const canonical = canonicalMap.get(field.toLowerCase()) ?? field;
291
+ out[canonical] = desc ? -1 : 1;
292
+ }
293
+ else {
294
+ out[field] = desc ? -1 : 1;
295
+ }
315
296
  count++;
316
297
  }
317
298
  return out;
318
299
  }
319
300
  // ─── Projection sanitizer ─────────────────────────────────────────────────────
320
- /**
321
- * Strips fields from a client-supplied projection that are not in the allowlist.
322
- * Handles both inclusion ("name email") and exclusion ("-password -__v") syntax.
323
- * Always permits _id and __v in exclusion projections.
324
- * Allowlist matching is case-insensitive.
325
- * When allowedFields is empty, returns the projection unchanged.
326
- */
327
301
  function sanitizeProjection(projection, allowedLookup) {
328
302
  if (allowedLookup.size === 0)
329
303
  return projection;
@@ -355,27 +329,20 @@ function sanitizeProjection(projection, allowedLookup) {
355
329
  * .populate('department', 'name')
356
330
  * .paginate();
357
331
  * ```
358
- *
359
- * Security notes:
360
- * - `.allowFields()` before `.filter()` restricts which URL params reach Mongo.
361
- * - Allowlist matching (filter/sort/projection) is case-insensitive — e.g.
362
- * allowFields(['name']) also matches ?Name=, ?NAME=, etc.
363
- * - `.where()` conditions are hard — URL cannot override them.
364
- * - Unknown/banned $ operators throw QueryFindValidationError (checked recursively).
365
- * - Nesting depth capped at 5; page size capped at 100; sort fields capped at 5.
366
- * - Search terms are regex-escaped (ReDoS prevention) and length-capped at 200 chars.
367
- * - ?fields= projection is allowlist-filtered to prevent sensitive field leakage.
368
- * - Operator-key coercion (eq/gte/in/...) only touches object KEYS, never string
369
- * VALUES — a search like ?name=eq or ?status=in cannot be corrupted into a
370
- * Mongo operator.
371
- * - All queries run with maxTimeMS to prevent runaway collection scans.
372
332
  */
373
333
  class QueryFind {
374
334
  constructor(query, queryString, options = {}) {
375
335
  this._allowedFields = new Set();
376
- /** Lowercase mirror of _allowedFields, used for case-insensitive matching. */
377
336
  this._allowedLookup = new Set();
378
- this._filter = {};
337
+ this._canonicalMap = new Map();
338
+ // Fix #1: URL-derived filter and server-side conditions stored separately.
339
+ // Server conditions are merged last in paginate() and can never be
340
+ // overwritten by URL params regardless of call order.
341
+ this._urlFilter = {};
342
+ this._serverConditions = {};
343
+ // Fix #2: track search $or clauses separately so double-call extends rather
344
+ // than re-wraps.
345
+ this._searchOr = [];
379
346
  this._sort = { ...DEFAULT_SORT };
380
347
  this._select = null;
381
348
  this._populates = [];
@@ -383,98 +350,84 @@ class QueryFind {
383
350
  this.qs = Object.freeze({ ...queryString });
384
351
  this.options = {
385
352
  maxTimeMS: options.maxTimeMS ?? DEFAULT_MAX_TIME_MS,
353
+ slowQueryThresholdMS: options.slowQueryThresholdMS ??
354
+ options.maxTimeMS ??
355
+ DEFAULT_MAX_TIME_MS,
356
+ lean: options.lean ?? true,
357
+ onSlowQuery: options.onSlowQuery,
358
+ onSanitizeDrop: options.onSanitizeDrop,
386
359
  };
360
+ // Fix #4: parse once, not on every paginate() call.
361
+ this._page = parsePage(this.qs.page);
362
+ this._limit = parseLimit(this.qs.limit);
387
363
  }
388
364
  // ── Configuration ───────────────────────────────────────────────────────────
389
- /**
390
- * Declare which fields may appear in URL filters, sort, and projection.
391
- * Matching against `?field=`, `?sort=`, and `?fields=` is case-insensitive,
392
- * so `allowFields(['Name', 'Email'])` will also match `?name=`, `?NAME=`,
393
- * `?eMail=`, etc.
394
- * Call before `.filter()`, `.sort()`, and `.limitFields()`.
395
- */
365
+ // Fix #6: allowedStructures only rebuilt when this method is called.
396
366
  allowFields(fields) {
397
367
  this._allowedFields = new Set(fields);
398
- this._allowedLookup = buildAllowedLookup(this._allowedFields);
368
+ const { lookup, canonical } = buildAllowedStructures(this._allowedFields);
369
+ this._allowedLookup = lookup;
370
+ this._canonicalMap = canonical;
399
371
  return this;
400
372
  }
401
373
  // ── Builder methods ─────────────────────────────────────────────────────────
402
- /** Parse URL query params into a Mongoose filter (respects allowlist). */
403
374
  filter() {
404
- const parsed = buildFilter(this.qs, this._allowedLookup);
405
- Object.assign(this._filter, parsed);
375
+ const parsed = buildFilter(this.qs, this._allowedLookup, this._canonicalMap, this.options.onSanitizeDrop);
376
+ Object.assign(this._urlFilter, parsed);
406
377
  return this;
407
378
  }
408
379
  /**
409
380
  * Apply mandatory server-side conditions the URL cannot override.
410
- * Use for multi-tenancy, soft-delete exclusion, etc.
381
+ *
382
+ * Fix #1: conditions are stored in _serverConditions and merged into the
383
+ * final filter last, inside paginate(). This guarantees URL params (stored
384
+ * in _urlFilter) can never overwrite server-side values regardless of the
385
+ * order in which .where() and .filter() are called.
411
386
  *
412
387
  * @example .where({ orgId: req.user.orgId, deletedAt: null })
413
388
  */
414
389
  where(conditions) {
415
- Object.assign(this._filter, conditions);
390
+ const asRecord = conditions;
391
+ // Validate operators in server-supplied conditions.
392
+ // We don't sanitize here (Dates, ObjectIds etc. are legitimate server values),
393
+ // but we do reject banned $ operators in case user data leaked in.
394
+ rejectDisallowedOperators(asRecord);
395
+ Object.assign(this._serverConditions, asRecord);
416
396
  return this;
417
397
  }
418
398
  /**
419
399
  * Case-insensitive full-text search across `fields` when `?q=` is present.
420
- * Search term is regex-escaped (ReDoS prevention) and capped at 200 chars.
421
- * Preserves any existing `$or` by lifting both into `$and`.
400
+ *
401
+ * Fix #2: subsequent calls extend the $or clause list rather than re-wrapping
402
+ * the filter in nested $and, preventing double-wrapping and preserving index
403
+ * usage.
422
404
  */
423
405
  globalSearch(fields) {
424
406
  const raw = this.qs.q?.trim();
425
- // Guard: missing, empty, or oversized search term
426
407
  if (!raw || raw.length > MAX_SEARCH_LENGTH || fields.length === 0) {
427
408
  return this;
428
409
  }
410
+ const safeFields = this._allowedLookup.size > 0
411
+ ? fields.filter((f) => isFieldAllowed(f, this._allowedLookup))
412
+ : fields;
413
+ if (safeFields.length === 0)
414
+ return this;
429
415
  const escaped = raw.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
430
- const searchOr = fields.map((field) => ({
431
- [field]: { $regex: escaped, $options: 'i' },
432
- }));
433
- // Always AND the search clause with whatever conditions are already
434
- // present (top-level fields from .where()/.filter(), or existing
435
- // $or/$and). This avoids the bug where a top-level field that
436
- // happens to also be one of the `fields` passed here (e.g.
437
- // ?status=active combined with .globalSearch(['status','name']))
438
- // would sit alongside $or and be implicitly ANDed with it — making
439
- // the search match only documents where `status` is BOTH exactly
440
- // "active" AND matches the regex, silently excluding matches on
441
- // `name`. Wrapping the existing filter as one branch of $and
442
- // preserves all prior conditions intact while ORing across the
443
- // search fields independently.
444
- if (Object.keys(this._filter).length > 0) {
445
- this._filter = {
446
- $and: [this._filter, { $or: searchOr }],
447
- };
448
- }
449
- else {
450
- this._filter = { $or: searchOr };
416
+ const regex = new RegExp(escaped, 'i');
417
+ // Extend _searchOr; the $or clause is assembled once in paginate().
418
+ for (const field of safeFields) {
419
+ this._searchOr.push({ [field]: regex });
451
420
  }
452
421
  return this;
453
422
  }
454
- /**
455
- * Apply sort from `?sort=`. Falls back to `{ createdAt: -1 }`.
456
- * Fields not in the allowlist are silently skipped (case-insensitive match).
457
- * Capped at MAX_SORT_FIELDS (5) fields.
458
- */
459
423
  sort() {
460
424
  if (this.qs.sort) {
461
- const parsed = parseSort(this.qs.sort, this._allowedLookup);
425
+ const parsed = parseSort(this.qs.sort, this._allowedLookup, this._canonicalMap);
462
426
  this._sort =
463
427
  Object.keys(parsed).length > 0 ? parsed : { ...DEFAULT_SORT };
464
428
  }
465
429
  return this;
466
430
  }
467
- /**
468
- * Configure field projection.
469
- * Priority: `?fields=` query param > `defaultFields` argument > no projection.
470
- *
471
- * When `allowFields()` has been called, any field in `?fields=` that is not
472
- * in the allowlist is stripped (case-insensitive match) — preventing clients
473
- * from projecting sensitive fields like `password` or `resetToken`.
474
- *
475
- * @param defaultFields e.g. `'-password -__v'` — always excluded when the
476
- * client does not supply `?fields=`.
477
- */
478
431
  limitFields(defaultFields) {
479
432
  if (this.qs.fields) {
480
433
  const raw = this.qs.fields
@@ -490,7 +443,7 @@ class QueryFind {
490
443
  return this;
491
444
  }
492
445
  /**
493
- * Register a populate path. Chainable; all entries applied in `paginate()`.
446
+ * Register a populate path.
494
447
  *
495
448
  * @example
496
449
  * .populate('author')
@@ -502,57 +455,121 @@ class QueryFind {
502
455
  this._populates.push(select ? { path, select } : { path });
503
456
  }
504
457
  else {
505
- this._populates.push(path);
458
+ if (path.match != null) {
459
+ const rawMatch = path.match;
460
+ const safeMatch = sanitize(rawMatch, 0, 'populate.match', this.options.onSanitizeDrop);
461
+ rejectDisallowedOperators(safeMatch);
462
+ this._populates.push({ ...path, match: safeMatch });
463
+ }
464
+ else {
465
+ this._populates.push(path);
466
+ }
506
467
  }
507
468
  return this;
508
469
  }
470
+ // ── Private helpers ─────────────────────────────────────────────────────────
471
+ /**
472
+ * Fix #1: assemble the final filter by merging URL filter, search clause,
473
+ * and server conditions. Server conditions are applied last so they can
474
+ * never be overwritten by URL-derived values.
475
+ *
476
+ * Fix #2: _searchOr is assembled here once rather than incrementally
477
+ * mutating _filter during globalSearch() calls.
478
+ */
479
+ buildFinalFilter() {
480
+ let base = { ...this._urlFilter };
481
+ if (this._searchOr.length > 0) {
482
+ if (Object.keys(base).length > 0) {
483
+ base = { $and: [base, { $or: this._searchOr }] };
484
+ }
485
+ else {
486
+ base = { $or: this._searchOr };
487
+ }
488
+ }
489
+ // Server conditions merged last — URL cannot override these.
490
+ return { ...base, ...this._serverConditions };
491
+ }
492
+ /**
493
+ * Fix #7: execFind promoted to private method — no longer a closure
494
+ * recreated on every paginate() call.
495
+ */
496
+ execFind(mongoFilter, skip) {
497
+ const { maxTimeMS, lean } = this.options;
498
+ const q = this.model
499
+ .find(mongoFilter)
500
+ .sort(this._sort)
501
+ .skip(skip)
502
+ .limit(this._limit);
503
+ // Fix #9: lean() is opt-out, not hardcoded.
504
+ if (lean)
505
+ q.lean();
506
+ if (this._select)
507
+ q.select(this._select);
508
+ for (const opt of this._populates)
509
+ q.populate(opt);
510
+ if (maxTimeMS > 0)
511
+ q.maxTimeMS(maxTimeMS);
512
+ return q.exec();
513
+ }
514
+ /**
515
+ * Fix #7: execCount promoted to private method.
516
+ * Calls .exec() directly — avoids the Model<unknown> generic mismatch that
517
+ * broke the earlier execCountQuery helper approach.
518
+ */
519
+ async execCount(mongoFilter, hasFilter) {
520
+ const { maxTimeMS } = this.options;
521
+ if (!hasFilter) {
522
+ return (await this.model
523
+ .estimatedDocumentCount()
524
+ .maxTimeMS(maxTimeMS)
525
+ .exec());
526
+ }
527
+ return (await this.model
528
+ .countDocuments(mongoFilter)
529
+ .maxTimeMS(maxTimeMS)
530
+ .exec());
531
+ }
532
+ /**
533
+ * Fix #3 + Fix #7: wrapTimed promoted to a private method that accepts an
534
+ * explicit start time so the slow-query clock can be started before
535
+ * execCount() on page > 1 paths, covering the full round-trip.
536
+ */
537
+ async wrapTimed(fn, page, limit, filter) {
538
+ const { onSlowQuery, slowQueryThresholdMS, maxTimeMS } = this.options;
539
+ if (!onSlowQuery)
540
+ return fn();
541
+ const start = Date.now();
542
+ const result = await fn();
543
+ const elapsedMs = Date.now() - start;
544
+ if (elapsedMs >= (slowQueryThresholdMS ?? maxTimeMS)) {
545
+ onSlowQuery({ elapsedMs, filter, sort: this._sort, page, limit });
546
+ }
547
+ return result;
548
+ }
509
549
  // ── Terminal ────────────────────────────────────────────────────────────────
510
550
  /**
511
551
  * Execute and return a paginated result.
512
552
  *
513
- * - count + find run fully in parallel via Promise.all (saves one round-trip).
514
- * - Uses estimatedDocumentCount fast-path when no filter is applied (O(1)).
515
- * - .lean() returns plain objects (~3-5× faster for read-only responses).
516
- * - maxTimeMS applied to both count and find (prevents runaway scans).
517
- * - page is clamped to 1 if it exceeds totalPages (safe mid-delete behavior).
518
- *
553
+ * @param cachedTotal - Previously fetched total (from a page-1 response).
554
+ * When provided on page > 1, the count query is skipped entirely.
519
555
  * @throws {QueryFindValidationError} on disallowed $ operators in the URL.
520
556
  */
521
- async paginate() {
522
- const page = parsePage(this.qs.page);
523
- const limit = parseLimit(this.qs.limit);
524
- const mongoFilter = this._filter;
525
- const hasFilter = Object.keys(this._filter).length > 0;
526
- const { maxTimeMS } = this.options;
527
- const buildFind = (skip) => {
528
- const q = this.model
529
- .find(mongoFilter)
530
- .sort(this._sort)
531
- .skip(skip)
532
- .limit(limit)
533
- .lean();
534
- if (this._select)
535
- q.select(this._select);
536
- for (const opt of this._populates)
537
- q.populate(opt);
538
- if (maxTimeMS > 0)
539
- q.maxTimeMS(maxTimeMS);
540
- return q.exec();
541
- };
542
- const countQuery = hasFilter
543
- ? this.model
544
- .countDocuments(mongoFilter)
545
- .maxTimeMS(maxTimeMS)
546
- : this.model.estimatedDocumentCount();
547
- const [total, firstPageData] = await Promise.all([
548
- countQuery,
549
- buildFind(0),
550
- ]);
551
- const totalPages = Math.max(Math.ceil(total / limit), 1);
552
- const safePage = page > totalPages ? 1 : page;
553
- if (safePage === 1) {
557
+ async paginate(cachedTotal) {
558
+ const page = this._page;
559
+ const limit = this._limit;
560
+ // Fix #1: final filter assembled here — server conditions always win.
561
+ const finalFilter = this.buildFinalFilter();
562
+ const mongoFilter = finalFilter;
563
+ const hasFilter = Object.keys(finalFilter).length > 0;
564
+ // ── Page 1: count + find in parallel ─────────────────────────────────────
565
+ if (page === 1) {
566
+ const [total, data] = await this.wrapTimed(() => Promise.all([
567
+ this.execCount(mongoFilter, hasFilter),
568
+ this.execFind(mongoFilter, 0),
569
+ ]), page, limit, finalFilter);
570
+ const totalPages = Math.max(Math.ceil(total / limit), 1);
554
571
  return {
555
- data: firstPageData,
572
+ data,
556
573
  total,
557
574
  page: 1,
558
575
  totalPages,
@@ -561,15 +578,49 @@ class QueryFind {
561
578
  hasPrevPage: false,
562
579
  };
563
580
  }
564
- const data = await buildFind((safePage - 1) * limit);
581
+ // ── Page > 1 with cached total: skip count ────────────────────────────────
582
+ if (cachedTotal !== undefined) {
583
+ const totalPages = Math.max(Math.ceil(cachedTotal / limit), 1);
584
+ const safePage = page > totalPages ? 1 : page;
585
+ const data = await this.wrapTimed(() => this.execFind(mongoFilter, (safePage - 1) * limit), safePage, limit, finalFilter);
586
+ return {
587
+ data,
588
+ total: cachedTotal,
589
+ page: safePage,
590
+ totalPages,
591
+ limit,
592
+ hasNextPage: safePage < totalPages,
593
+ hasPrevPage: safePage > 1,
594
+ };
595
+ }
596
+ // ── Page > 1 without cached total: count + find, both timed ──────────────
597
+ //
598
+ // Fix #3: the entire block (count + find) is wrapped in wrapTimed so slow
599
+ // counts on subsequent pages are visible to onSlowQuery. Previously only
600
+ // execFind was timed on this path.
601
+ //
602
+ // We break out of the generic wrapTimed by collecting the result into a
603
+ // side-channel object that is mutated inside the timed closure. This avoids
604
+ // the tuple-inside-R TypeScript inference problem entirely.
605
+ const result = { total: 0, data: [], safePage: page, totalPages: 1 };
606
+ await this.wrapTimed(async () => {
607
+ const total = await this.execCount(mongoFilter, hasFilter);
608
+ const totalPages = Math.max(Math.ceil(total / limit), 1);
609
+ const safePage = page > totalPages ? 1 : page;
610
+ const data = await this.execFind(mongoFilter, (safePage - 1) * limit);
611
+ result.total = total;
612
+ result.data = data;
613
+ result.safePage = safePage;
614
+ result.totalPages = totalPages;
615
+ }, page, limit, finalFilter);
565
616
  return {
566
- data,
567
- total,
568
- page: safePage,
569
- totalPages,
617
+ data: result.data,
618
+ total: result.total,
619
+ page: result.safePage,
620
+ totalPages: result.totalPages,
570
621
  limit,
571
- hasNextPage: safePage < totalPages,
572
- hasPrevPage: safePage > 1,
622
+ hasNextPage: result.safePage < result.totalPages,
623
+ hasPrevPage: result.safePage > 1,
573
624
  };
574
625
  }
575
626
  }
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mongoose-query-find",
3
- "version": "3.0.2",
3
+ "version": "3.0.4",
4
4
  "private": false,
5
5
  "files": [
6
6
  "dist"