Skip to content

Regex + elemMatch eq #32

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Regex + elemMatch eq #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,10 @@ Temporary Items
.apdisk

# Visual Studio Code
jsconfig.json
jsconfig.json




node_modules
package-lock.json
16 changes: 6 additions & 10 deletions build/src/aggregate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var _require = require('./util.js');

var unknownOp = _require.unknownOp;
var _require = require('./util.js'),
unknownOp = _require.unknownOp;

var Cursor = require('./cursor.js');

Expand Down Expand Up @@ -60,13 +59,10 @@ var aggregate = function aggregate(col, pipeline) {
for (var _iterator = pipeline[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var doc = _step.value;

var _getStageObject = getStageObject(doc);

var _getStageObject2 = _slicedToArray(_getStageObject, 2);

var fn = _getStageObject2[0];
var arg = _getStageObject2[1];

var _getStageObject = getStageObject(doc),
_getStageObject2 = _slicedToArray(_getStageObject, 2),
fn = _getStageObject2[0],
arg = _getStageObject2[1];

fn(cur, arg);
}
Expand Down
14 changes: 7 additions & 7 deletions build/src/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

var Q = require('q');

var _require = require('./util.js');

var getIDBError = _require.getIDBError;
var Cursor = require('./cursor.js');
var _aggregate = require('./aggregate.js');
var _update = require('./update.js');
var _remove = require('./remove.js');
var _require = require('./util.js'),
getIDBError = _require.getIDBError,
Cursor = require('./cursor.js'),
_aggregate = require('./aggregate.js'),
_update = require('./update.js'),
_remove = require('./remove.js');

/** Class representing a collection. */


var Collection = function () {
/** <strong>Note:</strong> Do not instantiate directly. */
function Collection(db, name) {
Expand Down
108 changes: 48 additions & 60 deletions build/src/create_next_fn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
'use strict';

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var merge = require('deepmerge');

var _require = require('./util.js');

var hashify = _require.hashify;
var getIDBError = _require.getIDBError;
var filter = require('./filter.js');
var sort = require('./sort.js');
var _require2 = require('./lang/filter.js');

var build = _require2.build;
var Conjunction = _require2.Conjunction;
var Disjunction = _require2.Disjunction;
var Exists = _require2.Exists;
var _require = require('./util.js'),
hashify = _require.hashify,
getIDBError = _require.getIDBError,
filter = require('./filter.js'),
sort = require('./sort.js');

var _require2 = require('./lang/filter.js'),
build = _require2.build,
Conjunction = _require2.Conjunction,
Disjunction = _require2.Disjunction,
Exists = _require2.Exists;

var toIDBDirection = function toIDBDirection(value) {
return value > 0 ? 'next' : 'prev';
Expand All @@ -33,15 +29,15 @@ var joinPredicates = function joinPredicates(preds) {
};

var removeClause = function removeClause(_ref) {
var parent = _ref.parent;
var index = _ref.index;
var parent = _ref.parent,
index = _ref.index;

parent.args.splice(index, 1);
};

var openConn = function openConn(_ref2, cb) {
var col = _ref2.col;
var read_pref = _ref2.read_pref;
var col = _ref2.col,
read_pref = _ref2.read_pref;

col._db._getConn(function (error, idb) {
if (error) {
Expand All @@ -64,9 +60,9 @@ var openConn = function openConn(_ref2, cb) {
};

var getIDBReqWithIndex = function getIDBReqWithIndex(store, clause) {
var key_range = clause.idb_key_range || null;
var direction = clause.idb_direction || 'next';
var literal = clause.path.literal;
var key_range = clause.idb_key_range || null,
direction = clause.idb_direction || 'next',
literal = clause.path.literal;


var index = void 0;
Expand All @@ -93,10 +89,9 @@ var buildPredicates = function buildPredicates(pipeline) {

try {
for (var _iterator = pipeline[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var _step$value = _slicedToArray(_step.value, 2);

var fn = _step$value[0];
var arg = _step$value[1];
var _step$value = _slicedToArray(_step.value, 2),
fn = _step$value[0],
arg = _step$value[1];

if (fn === filter) {
var pred = build(arg);
Expand Down Expand Up @@ -132,9 +127,10 @@ var buildPredicates = function buildPredicates(pipeline) {
};

var initPredAndSortSpec = function initPredAndSortSpec(config) {
var pipeline = config.pipeline;
var preds = [];
var sort_specs = [];
var pipeline = config.pipeline,
preds = [],
sort_specs = [];


var i = 0;

Expand All @@ -144,10 +140,9 @@ var initPredAndSortSpec = function initPredAndSortSpec(config) {

try {
for (var _iterator2 = pipeline[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var _step2$value = _slicedToArray(_step2.value, 2);

var fn = _step2$value[0];
var arg = _step2$value[1];
var _step2$value = _slicedToArray(_step2.value, 2),
fn = _step2$value[0],
arg = _step2$value[1];

if (fn === sort) {
sort_specs.push(arg);
Expand Down Expand Up @@ -230,8 +225,8 @@ var getClauses = function getClauses(col, pred) {
};

var initClauses = function initClauses(config) {
var col = config.col;
var pred = config.pred;
var col = config.col,
pred = config.pred;


config.clauses = getClauses(col, pred);
Expand All @@ -242,8 +237,8 @@ var initHint = function initHint(config) {
return;
}

var clauses = config.clauses;
var hint = config.hint;
var clauses = config.clauses,
hint = config.hint;


var new_clauses = [];
Expand Down Expand Up @@ -287,9 +282,9 @@ var initSort = function initSort(config) {
return;
}

var clauses = config.clauses;
var spec = config.sort_spec;
var pipeline = config.pipeline;
var clauses = config.clauses,
spec = config.sort_spec,
pipeline = config.pipeline;

var new_clauses = [];

Expand Down Expand Up @@ -334,30 +329,24 @@ var initSort = function initSort(config) {
};

var createGetIDBReqFn = function createGetIDBReqFn(_ref3) {
var pred = _ref3.pred;
var clauses = _ref3.clauses;
var pipeline = _ref3.pipeline;
var pred = _ref3.pred,
clauses = _ref3.clauses,
pipeline = _ref3.pipeline;

var getIDBReq = void 0;

if (clauses.length) {
var _ret = function () {
var clause = clauses[0];
var clause = clauses[0];

getIDBReq = function getIDBReq(store) {
return getIDBReqWithIndex(store, clause);
};

if (!pred || clause === pred) {
return {
v: getIDBReq
};
}
getIDBReq = function getIDBReq(store) {
return getIDBReqWithIndex(store, clause);
};

removeClause(clause);
}();
if (!pred || clause === pred) {
return getIDBReq;
}

if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
removeClause(clause);
} else {
getIDBReq = getIDBReqWithoutIndex;

Expand Down Expand Up @@ -427,10 +416,9 @@ var addPipelineStages = function addPipelineStages(_ref4, next) {

try {
for (var _iterator6 = pipeline[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
var _step6$value = _slicedToArray(_step6.value, 2);

var fn = _step6$value[0];
var arg = _step6$value[1];
var _step6$value = _slicedToArray(_step6.value, 2),
fn = _step6$value[0],
arg = _step6$value[1];

next = fn(next, arg);
}
Expand Down
4 changes: 2 additions & 2 deletions build/src/cursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var Cursor = function (_EventEmitter) {
function Cursor(col, read_pref) {
_classCallCheck(this, Cursor);

var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Cursor).call(this));
var _this = _possibleConstructorReturn(this, (Cursor.__proto__ || Object.getPrototypeOf(Cursor)).call(this));

_this._col = col;
_this._read_pref = read_pref;
Expand Down Expand Up @@ -90,7 +90,7 @@ var Cursor = function (_EventEmitter) {
}, {
key: 'forEach',
value: function forEach() {
var fn = arguments.length <= 0 || arguments[0] === undefined ? function () {} : arguments[0];
var fn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {};
var cb = arguments[1];

var deferred = Q.defer();
Expand Down
7 changes: 3 additions & 4 deletions build/src/db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ var EventEmitter = require('events'),
memoize = require('memoizee'),
Q = require('q');

var _require = require('./util.js');

var getIDBError = _require.getIDBError;
var _require = require('./util.js'),
getIDBError = _require.getIDBError;

var Collection = require('./collection.js');

Expand Down Expand Up @@ -68,7 +67,7 @@ var Db = function (_EventEmitter) {
function Db(name, version, config) {
_classCallCheck(this, Db);

var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Db).call(this));
var _this = _possibleConstructorReturn(this, (Db.__proto__ || Object.getPrototypeOf(Db)).call(this));

_this._name = name;

Expand Down
Loading