mongoose-query-find 1.5.0 → 1.7.0
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.map +1 -1
- package/dist/index.js +38 -3
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAe,MAAM,UAAU,CAAC;AAIrD,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;CACf;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAe,MAAM,UAAU,CAAC;AAIrD,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;CACf;AAiGD;;;;;;;;;;;;GAYG;AACH,cAAM,SAAS,CACb,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,WAAW,CAAc;IAE1C,kFAAkF;IAClF,OAAO,CAAC,WAAW,CAAgC;IAEnD,0CAA0C;IAC1C,OAAO,CAAC,SAAS,CAA6C;IAE9D,iDAAiD;IACjD,OAAO,CAAC,WAAW,CAAuB;gBAGxC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,EACxC,WAAW,EAAE,WAAW;IAQ1B,yDAAyD;IACzD,MAAM,IAAI,IAAI;IASd;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAUpC;;;OAGG;IACH,IAAI,IAAI,IAAI;IAOZ;;;;;;;OAOG;IACH,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IASxC;;;;;;;;;OASG;IACG,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;CAgCxD;AAED,eAAe,SAAS,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -5,6 +5,36 @@ const RESERVED_KEYS = ['page', 'sort', 'limit', 'fields', 'q'];
|
|
|
5
5
|
// MongoDB comparison operators that need a `$` prefix
|
|
6
6
|
const MONGO_OPERATORS_RE = /\b(eq|ne|gt|gte|lt|lte|in|nin)\b/g;
|
|
7
7
|
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
|
8
|
+
/**
|
|
9
|
+
* Recursively keep only plain, JSON-serializable values (string, number,
|
|
10
|
+
* boolean, null, plain object, array). Drops anything that is a class
|
|
11
|
+
* instance, function, symbol, or undefined — which prevents circular-
|
|
12
|
+
* reference errors when req.query accidentally contains Mongoose/Express
|
|
13
|
+
* internal objects.
|
|
14
|
+
*/
|
|
15
|
+
function sanitize(value) {
|
|
16
|
+
if (value === null ||
|
|
17
|
+
typeof value === 'string' ||
|
|
18
|
+
typeof value === 'number' ||
|
|
19
|
+
typeof value === 'boolean') {
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
if (Array.isArray(value)) {
|
|
23
|
+
return value.map(sanitize).filter((v) => v !== undefined);
|
|
24
|
+
}
|
|
25
|
+
if (typeof value === 'object' && Object.getPrototypeOf(value) === Object.prototype) {
|
|
26
|
+
const result = {};
|
|
27
|
+
for (const [k, v] of Object.entries(value)) {
|
|
28
|
+
const sanitized = sanitize(v);
|
|
29
|
+
if (sanitized !== undefined) {
|
|
30
|
+
result[k] = sanitized;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return result;
|
|
34
|
+
}
|
|
35
|
+
// Drop class instances, functions, symbols, undefined, etc.
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
8
38
|
/**
|
|
9
39
|
* Coerce plain string booleans to real booleans so filters like
|
|
10
40
|
* `?isActive=true` work correctly against boolean schema fields.
|
|
@@ -20,11 +50,16 @@ function coerceBooleans(obj) {
|
|
|
20
50
|
}
|
|
21
51
|
/**
|
|
22
52
|
* Parse the raw query string into a Mongoose-compatible filter object.
|
|
23
|
-
* Strips reserved keys
|
|
53
|
+
* Strips reserved keys, sanitizes all values to plain JSON-safe types,
|
|
54
|
+
* and rewrites bare operator names (gt → $gt, etc.).
|
|
24
55
|
*/
|
|
25
56
|
function buildFilterFromQueryString(raw) {
|
|
26
|
-
|
|
27
|
-
const
|
|
57
|
+
// Strip reserved keys first
|
|
58
|
+
const stripped = Object.fromEntries(Object.entries(raw).filter(([k]) => !RESERVED_KEYS.includes(k)));
|
|
59
|
+
// Sanitize to plain values only — prevents circular JSON errors
|
|
60
|
+
const safe = sanitize(stripped);
|
|
61
|
+
// Rewrite bare operator names to MongoDB $ operators
|
|
62
|
+
const withOperators = JSON.parse(JSON.stringify(safe).replace(MONGO_OPERATORS_RE, (m) => `$${m}`));
|
|
28
63
|
return coerceBooleans(withOperators);
|
|
29
64
|
}
|
|
30
65
|
/**
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAqBA,oDAAoD;AACpD,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAU,CAAC;AAGxE,sDAAsD;AACtD,MAAM,kBAAkB,GAAG,mCAAmC,CAAC;AAE/D,iFAAiF;AAEjF;;;GAGG;AACH,SAAS,cAAc,CAAC,GAA4B;IAClD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACjC,IAAI,CAAC,KAAK,MAAM;YAAE,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,OAAO;YAAE,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACrC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|