@geekbears/gb-mongoose-query-parser 1.3.17 → 1.3.19

package/lib/query-parser-helper.js

@@ -245,27 +245,37 @@ class QueryParser {
             for (const [i, [key, value]] of Object.entries(obj).entries()) {
                 if (Object.prototype.hasOwnProperty.call(obj, key)) {
                     const validId = (0, mongoose_1.isObjectIdOrHexString)(value);
-                    if (validId && (0, class_validator_1.isMongoId)(value)) {
-                        obj[key] = mongoose_1.Types.ObjectId.createFromHexString(value.toString());
+                    // if (validId && isMongoId(value)) {
+                    //     obj[key] = Types.ObjectId.createFromHexString(value.toString());
+                    //     // console.log('value :>> ', obj[key]);
+                    //     console.log('valid', value);
+                    // }
+                    // if (typeof value === 'object' && !validId) {
+                    //     console.log('walking', value);
+                    //     if (i % 1000 === 0) {
+                    //         setImmediate(() => {
+                    //             walk(obj[key]);
+                    //         });
+                    //     } else walk(obj[key]);
+                    // } else {
+                    //     console.log('value as is ', value);
+                    //     obj[key] = value;
+                    // }
+                    // console.log(obj);
+                    // console.log('HERE', key);
+                    // console.log('obj :>> ', obj);
+                    if (typeof value === 'object' && !validId) {
+                        // console.log('walking......', key);
+                        walk(obj[key]);
                     }
-                    else {
-                        if (i % 1000 === 0) {
-                            setImmediate(() => {
-                                walk(obj[key]);
-                            });
-                        }
-                        else
-                            walk(obj[key]);
-                    }
-                    // if (typeof value === 'object') {
-                    //     console.log('walking......');
-                    //     walk(obj[key]);
-                    // } else obj[key] = Types.ObjectId.isValid(value) ? new Types.ObjectId(value) : value;
+                    else
+                        obj[key] = validId ? mongoose_1.Types.ObjectId.createFromHexString(value.toString()) : value;
                 }
             }
             return obj;
         };
         const res = walk({ ...filter });
+        // console.log('res', res.filter);
         return res;
     }
 }

package/lib/test.spec.js

@@ -14,7 +14,6 @@ const chai_1 = require("chai");
 const _1 = require("./");
 const mongoose_1 = require("mongoose");
 const lodash_1 = require("lodash");
-const class_validator_1 = require("class-validator");
 let Tester = class Tester {
     generalParse() {
         let parser = new _1.MongooseQueryParser();
@@ -172,15 +171,22 @@ let Tester = class Tester {
         };
         let parsed = parser.parse({ filter });
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(parsed.filter['_org']));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(parsed.filter['_org']));
         chai_1.assert.isObject(parsed.filter);
         chai_1.assert.isObject(parsed.filter['dailyRate']);
         chai_1.assert.isObject(parsed.filter['_org2']);
         const transformedFilter = _1.QueryParser.transformFilter(parsed);
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedFilter.filter._org));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(transformedFilter.filter._org));
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedFilter.filter._org2['$in'][0]));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(transformedFilter.filter._org2['$in'][0]));
+    }
+    transformFilter2() {
+        let parser = new _1.MongooseQueryParser();
+        const filter = {
+            _tags: { $in: ['66885d0e304ef564c27f5315'] },
+        };
+        const query = { filter, populate: 'tags' };
+        let parsed = parser.parse(query);
+        const transformedFilter = _1.QueryParser.transformFilter(parsed);
+        chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedFilter.filter._tags['$in'][0]));
     }
     transformFilterAggregate() {
         // let parser = new MongooseQueryParser();
@@ -220,13 +226,10 @@ let Tester = class Tester {
         };
         const transformedMatchFilter = _1.QueryParser.transformFilter(matchStage);
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedMatchFilter.$match._id));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(transformedMatchFilter.$match._id));
         const transformedMatchInFilter = _1.QueryParser.transformFilter(matchStageIn);
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedMatchInFilter.$match._id.$in[0]));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(transformedMatchInFilter.$match._id.$in[0]));
         const transformedMatchNinFilter = _1.QueryParser.transformFilter(matchStageNin);
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformedMatchNinFilter.$match._id.$nin[0]));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(transformedMatchNinFilter.$match._id.$nin[0]));
         const transformLookupFilter = _1.QueryParser.transformFilter(lookupStage);
         chai_1.assert.isObject(transformLookupFilter);
         const transformComplexLookupFilter = _1.QueryParser.transformFilter(lookupStageComplex);
@@ -234,7 +237,6 @@ let Tester = class Tester {
         chai_1.assert.isArray(transformComplexLookupFilter.$lookup.pipeline);
         chai_1.assert.lengthOf(transformComplexLookupFilter.$lookup.pipeline, 3);
         chai_1.assert.isOk((0, mongoose_1.isObjectIdOrHexString)(transformComplexLookupFilter.$lookup.pipeline[0].$match.$expr.$eq[0]));
-        chai_1.assert.isOk((0, class_validator_1.isMongoId)(transformComplexLookupFilter.$lookup.pipeline[0].$match.$expr.$eq[0]));
     }
 };
 __decorate([
@@ -303,6 +305,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], Tester.prototype, "transformFilter", null);
+__decorate([
+    (0, mocha_1.test)('should use transformFilter in FilterQuery 2'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], Tester.prototype, "transformFilter2", 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.17",
+  "version": "1.3.19",
   "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,18 +32,18 @@
   "homepage": "https://gitlab.com/geekbears/utilities/backend/gb-mongoose-query-parser#readme",
   "devDependencies": {
     "@testdeck/mocha": "^0.3.3",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.17",
     "@types/lodash": "^4.17.7",
     "@types/mocha": "^10.0.7",
-    "@types/node": "^20.14.11",
+    "@types/node": "^22.4.0",
     "@types/qs": "^6.9.15",
-    "chai": "^4.4.1",
-    "mocha": "^10.6.0",
+    "chai": "^4.5.0",
+    "mocha": "^10.7.3",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
     "tslint": "^6.1.3",
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
     "lodash": "^4.17.21",