@geekbears/gb-mongoose-query-parser 1.3.9 → 1.3.11

package/lib/query-parser-helper.js

@@ -336,14 +336,25 @@ exports.QueryParser = QueryParser;
  */
 function transformFilter(filter) {
     var walk = function (obj) {
-        for (var key in obj) {
+        var _loop_1 = function (key) {
             if (Object.prototype.hasOwnProperty.call(obj, key)) {
                 var value = obj[key];
-                if (typeof value === 'object')
-                    walk(obj[key]);
-                else
-                    obj[key] = mongoose_1.Types.ObjectId.isValid(value) ? new mongoose_1.Types.ObjectId(value) : value;
+                var validId = (0, mongoose_1.isValidObjectId)(value);
+                if (validId)
+                    obj[key] = mongoose_1.Types.ObjectId.createFromHexString(value.toString());
+                else {
+                    setTimeout(function () {
+                        walk(obj[key]);
+                    }, 0);
+                }
+                // if (typeof value === 'object') {
+                //     console.log('walking......');
+                //     walk(obj[key]);
+                // } else obj[key] = Types.ObjectId.isValid(value) ? new Types.ObjectId(value) : value;
             }
+        };
+        for (var key in obj) {
+            _loop_1(key);
         }
         return obj;
     };

package/lib/test.spec.js

@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var mocha_1 = require("@testdeck/mocha");
 var chai_1 = require("chai");
 var _1 = require("./");
+var mongoose_1 = require("mongoose");
 var lodash_1 = require("lodash");
 var Tester = /** @class */ (function () {
     function Tester() {
@@ -178,6 +179,25 @@ var Tester = /** @class */ (function () {
         var parsed = parser.parse(query);
         chai_1.assert.isOk((0, lodash_1.isEqual)(parsed.filter, preDefined));
     };
+    Tester.prototype.parseId = function () {
+        var parser = new _1.MongooseQueryParser();
+        var filter = {
+            dailyRate: { $gte: 0, $lte: 60 },
+            geolocation: {
+                $near: {
+                    $geometry: { type: 'Point', coordinates: [-122.16106, 37.37646] },
+                    $minDistance: 0,
+                    $maxDistance: 10,
+                },
+            },
+            unavailableDates: { $nin: [] },
+            _org: new mongoose_1.Types.ObjectId(),
+        };
+        var parsed = parser.parse({ filter: filter });
+        chai_1.assert.isOk((0, mongoose_1.isValidObjectId)(parsed.filter['_org']));
+        chai_1.assert.isObject(parsed.filter);
+        chai_1.assert.isObject(parsed.filter['dailyRate']);
+    };
     __decorate([
         (0, mocha_1.test)('should parse general query'),
         __metadata("design:type", Function),
@@ -232,6 +252,12 @@ var Tester = /** @class */ (function () {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
     ], Tester.prototype, "parseComplex", null);
+    __decorate([
+        (0, mocha_1.test)('should parse mongo id'),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], Tester.prototype, "parseId", null);
     Tester = __decorate([
         (0, mocha_1.suite)('Tester')
     ], Tester);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbears/gb-mongoose-query-parser",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "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",