Skip to content

issue #133 #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cprhokie wants to merge 3 commits into
base: master
Choose a base branch
from
Open

issue #133 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eda5f42
added signature for object,undef to find_options so finds do not cras…
Dec 5, 2020
c60a114
added find options test for signature object,undefined
Dec 5, 2020
a806080
fix for fields sniff test in find_options
Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions lib/find_options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
var ObjectID = require('../').ObjectID;

// check to see if all values are 1/-1
function is_fields(obj) {
for (prop in obj) {
if (Math.abs(obj[prop]) !== 1) {
return false
}
}
return true
}

module.exports = function find_options(args) {
if(!args) args = [];
var signature = Array.prototype.map.call(args, function(arg){ return Array.isArray(arg)? "array" : typeof arg }).join();
Expand Down Expand Up @@ -28,16 +38,21 @@ module.exports = function find_options(args) {
//selector, fields, callback?
//selector, options, callback?
case "object,object":
case "object,undefined":
case "object,undefined,function":
case "object,object,function":
//sniff for a 1 or -1 to detect fields object
if(!args[1] || Math.abs(args[1][0])===1) {
if(!args[1] || is_fields(args[1])) {
options.fields = args[1];
}
else {
else {
if(args[1].skip) options.skip = args[1].skip;
if(args[1].limit) options.limit = args[1].limit;
if(args[1].fields) options.fields = args[1].fields;
if(args[1].fields) {
options.fields = args[1].fields;
} else {
options.fields = {}
}
if(args[1].projection) options.fields = args[1].projection;
}
break;
Expand Down
12 changes: 12 additions & 0 deletions test/options.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ describe('options tests', function () {
var options = find_options({_id:"ABC123"}, undefined, cb);
options.should.eql({ callback:cb, fields:undefined, limit:0, query:{_id:"ABC123"}, skip:0 });
});
it('should accept signature: "selector, undefined"', function(){
var options = find_options({_id:"ABC123"}, undefined);
options.should.eql({ callback: undefined, fields:undefined, limit:0, query:{_id:"ABC123"}, skip:0 });
});
it('should accept signature: "selector, options"', function(){
var options = find_options({_id:"ABC123"}, {fields:{_id:-1}, skip:100});
options.should.eql({ callback:undefined, fields:{_id:-1}, limit:0, query:{_id:"ABC123"}, skip:100 });
Expand All @@ -49,6 +53,14 @@ describe('options tests', function () {
var options = find_options({_id:"ABC123"}, {projection:{_id:-1}, skip:100});
options.should.eql({ callback:undefined, fields:{_id:-1}, limit:0, query:{_id:"ABC123"}, skip:100 });
});
it('should accept limit:1, fields:undefined as options: "selector, options"', function(){
var options = find_options({_id:"ABC123"}, {limit:1, fields:undefined});
options.should.eql({ callback:undefined, fields:{}, limit:1, query:{_id:"ABC123"}, skip:0 });
});
it('should accept limit:1, fields:{...} as options: "selector, options"', function(){
var options = find_options({_id:"ABC123"}, {limit:1, fields:{"a":1}});
options.should.eql({ callback:undefined, fields:{"a":1}, limit:1, query:{_id:"ABC123"}, skip:0 });
});
it('should accept signature: "selector, options, callback"', function(){
var options = find_options({_id:"ABC123"}, {fields:{_id:-1}, skip:100}, cb);
options.should.eql({ callback:cb, fields:{_id:-1}, limit:0, query:{_id:"ABC123"}, skip:100 });
Expand Down