Merge branch 'release/1.3.1'

Author: swayf

lib/tree.js

@@ -197,10 +197,17 @@ function tree(schema, options) {
         recursive = recursive || false;
 
         if (recursive) {
-            filters['path'] = {$regex: '^' + this.path + pathSeparator}
-        }
-        else {
-            filters['parent'] = this._id
+            if(filters['$query']){
+                filters['$query']['path'] = {$regex: '^' + this.path + pathSeparator};
+            } else {
+                filters['path'] = {$regex: '^' + this.path + pathSeparator};
+            }
+        } else {
+            if(filters['$query']){
+                filters['$query']['parent'] = this._id;
+            } else {
+                filters['parent'] = this._id;
+            }
         }
 
         return this.model(this.constructor.modelName).find(filters, fields, options, next);
@@ -252,7 +259,11 @@ function tree(schema, options) {
             ids.pop();
         }
 
-        filters['_id'] = {$in: ids};
+        if(filters['$query']){
+            filters['$query']['_id'] = {$in: ids};
+        } else {
+            filters['_id'] = {$in: ids};
+        }
 
         return this.model(this.constructor.modelName).find(filters, fields, options, next);
     };

package.json

@@ -16,7 +16,7 @@
     "url": "git://github.com/swayf/mongoose-path-tree.git"
   },
   "main": "index.js",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "engine": "node >= 0.4.0",
   "dependencies": {
     "mongoose": "3.x.x",