github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Lines 66, 1011 and 1352: Linting

Browse Source 
- Line 497: `return` after `throw`
- Lines 523 - 527: `e` already defined in same function scope
(hoisting)
- Line 937: Missed semicolon
- Line 1095: Very confused about ES6 “default parameter” set via
colon, which probably will be interpreted as Object - Babel failed to
build on my end, regarding [this
docs](https://mongodb.github.io/node-mongodb-native/api-generated/cursor
.html#count) it should be a Boolean, so we set it to `false` by default
- Line 1120: no need to set variable to `undefined`
- Lines 1122, 1128, and 1133: Define `doc` above while due to function
scope and hoisting `doc` is already allocated inside `while` and `try`
This commit is contained in:
dr-dimitru
2016-12-21 02:55:02 +03:00
parent 9df15fc224
commit 69ef77bcb6
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/mongo/mongo_driver.js
View File

@@ -63,8 +63,7 @@ var replaceMongoAtomWithMeteor = function (document) {
if (document instanceof MongoDB.ObjectID) {
return new Mongo.ObjectID(document.toHexString());
}
if (document["EJSON$type"] && document["EJSON$value"]
&& _.size(document) === 2) {
if (document["EJSON$type"] && document["EJSON$value"] && _.size(document) === 2) {
return EJSON.fromJSONValue(replaceNames(unmakeMongoLegal, document));
}
if (document instanceof MongoDB.Timestamp) {
@@ -494,7 +493,6 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
throw new Error(
"Only plain objects may be used as replacement" +
" documents in MongoDB");
return;
}
if (!options) options = {};
@@ -522,11 +520,11 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
var knownId = selector._id || mod._id;
if (options._forbidReplace && ! isModify) {
var e = new Error("Invalid modifier. Replacements are forbidden.");
var err = new Error("Invalid modifier. Replacements are forbidden.");
if (callback) {
return callback(e);
return callback(err);
} else {
throw e;
throw err;
}
}
@@ -936,7 +934,7 @@ Cursor.prototype._publishCursor = function (sub) {
Cursor.prototype._getCollectionName = function () {
var self = this;
return self._cursorDescription.collectionName;
}
};
Cursor.prototype.observe = function (callbacks) {
var self = this;
@@ -1092,7 +1090,7 @@ _.extend(SynchronousCursor.prototype, {
return self.map(_.identity);
},
count: function (applySkipLimit: false) {
count: function (applySkipLimit = false) {
var self = this;
return self._synchronousCount(applySkipLimit).wait();
},
@@ -1120,18 +1118,19 @@ MongoConnection.prototype.tail = function (cursorDescription, docCallback) {
var cursor = self._createSynchronousCursor(cursorDescription);
var stopped = false;
var lastTS = undefined;
var lastTS;
var loop = function () {
var doc = null;
while (true) {
if (stopped)
return;
try {
var doc = cursor._nextObject();
doc = cursor._nextObject();
} catch (err) {
// There's no good way to figure out if this was actually an error
// from Mongo. Ah well. But either way, we need to retry the cursor
// (unless the failure was because the observe got stopped).
doc = null;
// `doc` is already `null` here;
}
// Since cursor._nextObject can yield, we need to check again to see if
// we've been stopped before calling the callback.
@@ -1350,9 +1349,7 @@ MongoConnection.prototype._observeChangesTailable = function (
// error if you didn't provide them.
if ((ordered && !callbacks.addedBefore) ||
(!ordered && !callbacks.added)) {
throw new Error("Can't observe an " + (ordered ? "ordered" : "unordered")
+ " tailable cursor without a "
+ (ordered ? "addedBefore" : "added") + " callback");
throw new Error("Can't observe an " + (ordered ? "ordered" : "unordered") + " tailable cursor without a " + (ordered ? "addedBefore" : "added") + " callback");
}
return self.tail(cursorDescription, function (doc) {