@geekbears/gb-mongoose-query-parser 1.3.26 → 1.3.28

package/.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha Test Debugger",
+            "skipFiles": ["<node_internals>/**"],
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": ["${workspaceFolder}/lib/**/*.spec.js"],
+            "preLaunchTask": "tsc: build - tsconfig.json",
+            "outputCapture": "std"
+        }
+    ]
+}

package/lib/query-parser-helper.d.ts

@@ -118,4 +118,5 @@ export declare class QueryParser {
      * @returns a casted filter
      */
     static transformFilter<T = any>(filter: T): T;
+    private static isValidDateStr;
 }

package/lib/query-parser-helper.js

@@ -5,6 +5,7 @@ const mongoose_1 = require("mongoose");
 const lodash_1 = require("lodash");
 const query_parser_1 = require("./query-parser");
 const class_validator_1 = require("class-validator");
+const moment = require("moment");
 /**
  * Helper class
  * Implements the `MongooseQueryParser` and exposes a single method to execute queries on models
@@ -264,8 +265,13 @@ class QueryParser {
                     // console.log(obj);
                     // console.log('HERE', key);
                     // console.log('obj :>> ', obj);
-                    if (typeof value === 'object' && !validId && !(0, lodash_1.isNil)(value)) {
-                        // console.log('walking......', key);
+                    if (!(0, lodash_1.isNil)(value) &&
+                        typeof value === 'string' &&
+                        this.isValidDateStr(value) &&
+                        moment(value).isValid()) {
+                        obj[key] = moment(value).toDate();
+                    }
+                    else if (typeof value === 'object' && !validId && !(0, lodash_1.isNil)(value)) {
                         walk(obj[key]);
                     }
                     else
@@ -278,6 +284,9 @@ class QueryParser {
         // console.log('res', res.filter);
         return res;
     }
+    static isValidDateStr(dateString) {
+        return !isNaN(Date.parse(dateString));
+    }
 }
 exports.QueryParser = QueryParser;
 //# sourceMappingURL=query-parser-helper.js.map

package/lib/test.spec.d.ts

@@ -12,5 +12,6 @@ export declare class Tester {
     transformFilter(): void;
     transformFilterNull(): void;
     transformFilter2(): void;
+    parseNestedFilter(): void;
     transformFilterAggregate(): void;
 }

package/lib/test.spec.js

@@ -15,6 +15,7 @@ const chai_1 = require("chai");
 const _1 = require("./");
 const mongoose_1 = require("mongoose");
 const lodash_1 = require("lodash");
+const moment = require("moment");
 let Tester = class Tester {
     generalParse() {
         const parser = new _1.MongooseQueryParser();
@@ -197,6 +198,25 @@ let Tester = class Tester {
         const transformedFilter = _1.QueryParser.transformFilter(parsed);
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedFilter.filter._tags.$in[0]));
     }
+    parseNestedFilter() {
+        const parser = new _1.MongooseQueryParser();
+        const now = moment();
+        const filter = {
+            dates: { startDate: { $gte: now.toDate() }, endDate: { $lte: now.add(1, 'day').toDate() } },
+            nested: {
+                nested1: {
+                    nested2: { startDate: { $gte: now.toDate() }, endDate: { $lte: now.add(1, 'day').toDate() } },
+                },
+            },
+        };
+        const query = { filter };
+        const parsed = parser.parse(query);
+        const transformedFilter = _1.QueryParser.transformFilter(parsed);
+        chai_1.assert.isOk(transformedFilter.filter.dates.startDate.$gte instanceof Date);
+        chai_1.assert.isOk(transformedFilter.filter.dates.endDate.$lte instanceof Date);
+        chai_1.assert.isOk(transformedFilter.filter.nested.nested1.nested2.endDate.$lte instanceof Date);
+        chai_1.assert.isOk(transformedFilter.filter.nested.nested1.nested2.startDate.$gte instanceof Date);
+    }
     transformFilterAggregate() {
         // let parser = new MongooseQueryParser();
         const matchStage = { $match: { _id: new mongoose_1.Types.ObjectId().toString() } };
@@ -327,6 +347,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], Tester.prototype, "transformFilter2", null);
+__decorate([
+    (0, mocha_1.test)('should parse nested filter with dates'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], Tester.prototype, "parseNestedFilter", null);
 __decorate([
     (0, mocha_1.test)('should use transformFilter in Aggregate'),
     __metadata("design:type", Function),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbears/gb-mongoose-query-parser",
-  "version": "1.3.26",
+  "version": "1.3.28",
   "description": "Convert url query string to MongooseJs friendly query object including advanced filtering, sorting, population, deep population, string template, type casting and many more...",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -32,22 +32,22 @@
   "homepage": "https://gitlab.com/geekbears/utilities/backend/gb-mongoose-query-parser#readme",
   "devDependencies": {
     "@testdeck/mocha": "^0.3.3",
-    "@types/chai": "^5.2.0",
+    "@types/chai": "^5.2.2",
     "@types/lodash": "^4.17.16",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.15.10",
     "@types/qs": "^6.9.18",
-    "@typescript-eslint/eslint-plugin": "^8.26.1",
-    "@typescript-eslint/parser": "^8.26.1",
+    "@typescript-eslint/eslint-plugin": "^8.32.0",
+    "@typescript-eslint/parser": "^8.32.0",
     "chai": "^4.5.0",
-    "eslint": "^9.22.0",
-    "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-prettier": "^5.2.3",
-    "mocha": "^11.1.0",
+    "eslint": "^9.26.0",
+    "eslint-config-prettier": "^10.1.2",
+    "eslint-plugin-prettier": "^5.4.0",
+    "mocha": "^11.2.2",
     "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.3"
   },
   "dependencies": {
     "lodash": "^4.17.21",