viewdb 0.10.0 → 0.11.0

package/lib/observe.js

@@ -1,53 +1,53 @@
-var _ = require('lodash');
-var merge = require('./merger');
-
-var Observer = function (query, queryOptions, collection, options) {
-  this._query = query;
-  this._queryOptions = queryOptions;
-
-  this._options = options;
-  //this._options = logger;
-  this._collection = collection;
-  this._cache = [];
-  var self = this;
-  var listener = function () {
-    self.refresh();
-  };
-  collection.on('change', listener);
-  this.refresh(true);
-  return {
-    stop: function () {
-      self._cache = null;
-      collection.removeListener('change', listener);
-    }
-  };
-};
-
-Observer.prototype.refresh = function (initial) {
-  var self = this;
-
-  this._collection._getDocuments(this._query, function (err, result) {
-    if (initial && self._options.init) {
-      self._cache = result;
-      self._options.init(result);
-    } else {
-      var old = self._cache;
-
-      self._cache = merge(
-        old,
-        result,
-        _.defaults(
-          {
-            comparatorId: function (a, b) {
-              return _.get(a, '_id') === _.get(b, '_id');
-            }
-          },
-          self._options
-        )
-      );
-      //rewind cursor for next query...
-    }
-  });
-};
-
-module.exports = Observer;
+var _ = require('lodash');
+var merge = require('./merger');
+
+var Observer = function (query, queryOptions, collection, options) {
+  this._query = query;
+  this._queryOptions = queryOptions;
+
+  this._options = options;
+  //this._options = logger;
+  this._collection = collection;
+  this._cache = [];
+  var self = this;
+  var listener = function () {
+    self.refresh();
+  };
+  collection.on('change', listener);
+  this.refresh(true);
+  return {
+    stop: function () {
+      self._cache = null;
+      collection.removeListener('change', listener);
+    }
+  };
+};
+
+Observer.prototype.refresh = function (initial) {
+  var self = this;
+
+  this._collection._getDocuments(this._query, function (err, result) {
+    if (initial && self._options.init) {
+      self._cache = result;
+      self._options.init(result);
+    } else {
+      var old = self._cache;
+
+      self._cache = merge(
+        old,
+        result,
+        _.defaults(
+          {
+            comparatorId: function (a, b) {
+              return _.get(a, '_id') === _.get(b, '_id');
+            }
+          },
+          self._options
+        )
+      );
+      //rewind cursor for next query...
+    }
+  });
+};
+
+module.exports = Observer;

package/lib/plugins/index.js

@@ -1,2 +1,2 @@
-module.exports.VersioningPlugin = require('./viewdb_versioning_plugin');
-module.exports.TimestampPlugin = require('./viewdb_timestamp_plugin');
+module.exports.VersioningPlugin = require('./viewdb_versioning_plugin');
+module.exports.TimestampPlugin = require('./viewdb_timestamp_plugin');

package/lib/plugins/viewdb_timestamp_plugin.js

@@ -1,106 +1,106 @@
-var _ = require('lodash');
-
-var ViewDBTimestampPlugin = function (viewDb) {
-  var oldCollection = viewDb.collection;
-  viewDb.collection = function () {
-    var coll = oldCollection.apply(this, arguments);
-    if (!coll.__plugins_timestamp) {
-      coll.__plugins_timestamp = true;
-
-      var oldSave = coll.save;
-      coll.save = function (docs, options) {
-        var newdocs = docs;
-        if (!(options && options.skipTimestamp)) {
-          var timestamp = new Date().valueOf();
-          if (!_.isArray(docs)) {
-            newdocs = [docs];
-          }
-          for (var i = 0; i < newdocs.length; i++) {
-            var doc = newdocs[i];
-            if (!doc.createDateTime) {
-              doc.createDateTime = timestamp;
-            }
-            doc.changeDateTime = timestamp;
-          }
-        }
-        oldSave.apply(this, arguments);
-      };
-
-      var oldInsert = coll.insert;
-      coll.insert = function (docs, options) {
-        if (!(options && options.skipTimestamp)) {
-          if (!_.isArray(docs)) {
-            docs = [docs];
-          }
-          var timestamp = new Date().valueOf();
-          for (var i = 0; i < docs.length; i++) {
-            var doc = docs[i];
-            doc.createDateTime = timestamp;
-            doc.changeDateTime = timestamp;
-          }
-        }
-        oldInsert.apply(this, arguments);
-      };
-
-      var oldFindAndModify = coll.findAndModify;
-      coll.findAndModify = function (query, sort, update, options, cb) {
-        var timestamp = new Date().valueOf();
-        var clonedUpdate = _.clone(update);
-        var setOnInsert = clonedUpdate.$setOnInsert || {};
-        setOnInsert.createDateTime = timestamp;
-        clonedUpdate.$setOnInsert = setOnInsert;
-
-        var set = clonedUpdate.$set || {};
-        set.changeDateTime = timestamp;
-
-        // if consumer tries to $set createDateTime it will lead to conflict. remove it
-        if (set.createDateTime) {
-          delete set.createDateTime;
-        }
-        clonedUpdate.$set = set;
-        oldFindAndModify.apply(this, [query, sort, clonedUpdate, options, cb]);
-      };
-
-      var oldUpdateMany = coll.updateMany;
-      coll.updateMany = function (query, update, options, cb) {
-        var timestamp = new Date().valueOf();
-        var clonedUpdate = _.clone(update);
-        var setOnInsert = clonedUpdate.$setOnInsert || {};
-        setOnInsert.createDateTime = timestamp;
-        clonedUpdate.$setOnInsert = setOnInsert;
-
-        var set = clonedUpdate.$set || {};
-        set.changeDateTime = timestamp;
-
-        // if consumer tries to $set createDateTime it will lead to conflict. remove it
-        if (set.createDateTime) {
-          delete set.createDateTime;
-        }
-        clonedUpdate.$set = set;
-        oldUpdateMany.apply(this, [query, clonedUpdate, options, cb]);
-      };
-
-      var oldUpdateOne = coll.updateOne;
-      coll.updateOne = function (query, update, options, cb) {
-        var timestamp = new Date().valueOf();
-        var clonedUpdate = _.clone(update);
-        var setOnInsert = clonedUpdate.$setOnInsert || {};
-        setOnInsert.createDateTime = timestamp;
-        clonedUpdate.$setOnInsert = setOnInsert;
-
-        var set = clonedUpdate.$set || {};
-        set.changeDateTime = timestamp;
-
-        // if consumer tries to $set createDateTime it will lead to conflict. remove it
-        if (set.createDateTime) {
-          delete set.createDateTime;
-        }
-        clonedUpdate.$set = set;
-        oldUpdateOne.apply(this, [query, clonedUpdate, options, cb]);
-      };
-    }
-    return coll;
-  };
-};
-
-module.exports = ViewDBTimestampPlugin;
+var _ = require('lodash');
+
+var ViewDBTimestampPlugin = function (viewDb) {
+  var oldCollection = viewDb.collection;
+  viewDb.collection = function () {
+    var coll = oldCollection.apply(this, arguments);
+    if (!coll.__plugins_timestamp) {
+      coll.__plugins_timestamp = true;
+
+      var oldSave = coll.save;
+      coll.save = function (docs, options) {
+        var newdocs = docs;
+        if (!(options && options.skipTimestamp)) {
+          var timestamp = new Date().valueOf();
+          if (!_.isArray(docs)) {
+            newdocs = [docs];
+          }
+          for (var i = 0; i < newdocs.length; i++) {
+            var doc = newdocs[i];
+            if (!doc.createDateTime) {
+              doc.createDateTime = timestamp;
+            }
+            doc.changeDateTime = timestamp;
+          }
+        }
+        oldSave.apply(this, arguments);
+      };
+
+      var oldInsert = coll.insert;
+      coll.insert = function (docs, options) {
+        if (!(options && options.skipTimestamp)) {
+          if (!_.isArray(docs)) {
+            docs = [docs];
+          }
+          var timestamp = new Date().valueOf();
+          for (var i = 0; i < docs.length; i++) {
+            var doc = docs[i];
+            doc.createDateTime = timestamp;
+            doc.changeDateTime = timestamp;
+          }
+        }
+        oldInsert.apply(this, arguments);
+      };
+
+      var oldFindAndModify = coll.findAndModify;
+      coll.findAndModify = function (query, sort, update, options, cb) {
+        var timestamp = new Date().valueOf();
+        var clonedUpdate = _.clone(update);
+        var setOnInsert = clonedUpdate.$setOnInsert || {};
+        setOnInsert.createDateTime = timestamp;
+        clonedUpdate.$setOnInsert = setOnInsert;
+
+        var set = clonedUpdate.$set || {};
+        set.changeDateTime = timestamp;
+
+        // if consumer tries to $set createDateTime it will lead to conflict. remove it
+        if (set.createDateTime) {
+          delete set.createDateTime;
+        }
+        clonedUpdate.$set = set;
+        oldFindAndModify.apply(this, [query, sort, clonedUpdate, options, cb]);
+      };
+
+      var oldUpdateMany = coll.updateMany;
+      coll.updateMany = function (query, update, options, cb) {
+        var timestamp = new Date().valueOf();
+        var clonedUpdate = _.clone(update);
+        var setOnInsert = clonedUpdate.$setOnInsert || {};
+        setOnInsert.createDateTime = timestamp;
+        clonedUpdate.$setOnInsert = setOnInsert;
+
+        var set = clonedUpdate.$set || {};
+        set.changeDateTime = timestamp;
+
+        // if consumer tries to $set createDateTime it will lead to conflict. remove it
+        if (set.createDateTime) {
+          delete set.createDateTime;
+        }
+        clonedUpdate.$set = set;
+        oldUpdateMany.apply(this, [query, clonedUpdate, options, cb]);
+      };
+
+      var oldUpdateOne = coll.updateOne;
+      coll.updateOne = function (query, update, options, cb) {
+        var timestamp = new Date().valueOf();
+        var clonedUpdate = _.clone(update);
+        var setOnInsert = clonedUpdate.$setOnInsert || {};
+        setOnInsert.createDateTime = timestamp;
+        clonedUpdate.$setOnInsert = setOnInsert;
+
+        var set = clonedUpdate.$set || {};
+        set.changeDateTime = timestamp;
+
+        // if consumer tries to $set createDateTime it will lead to conflict. remove it
+        if (set.createDateTime) {
+          delete set.createDateTime;
+        }
+        clonedUpdate.$set = set;
+        oldUpdateOne.apply(this, [query, clonedUpdate, options, cb]);
+      };
+    }
+    return coll;
+  };
+};
+
+module.exports = ViewDBTimestampPlugin;

package/lib/plugins/viewdb_versioning_plugin.js

@@ -1,93 +1,93 @@
-var _ = require('lodash');
-
-var ViewDBVersioningPlugin = function (viewDb) {
-  var oldCollection = viewDb.collection;
-  viewDb.collection = function () {
-    var coll = oldCollection.apply(this, arguments);
-    if (!coll.__plugins_versioning) {
-      coll.__plugins_versioning = true;
-
-      var oldSave = coll.save;
-      coll.save = function (docs, options) {
-        var newdocs = docs;
-        if (!(options && options.skipVersioning)) {
-          if (!_.isArray(docs)) {
-            newdocs = [docs];
-          }
-          for (var i = 0; i < newdocs.length; i++) {
-            var doc = newdocs[i];
-            doc.version = _getVersion(doc.version);
-          }
-        }
-        oldSave.apply(this, arguments);
-      };
-
-      var oldInsert = coll.insert;
-      coll.insert = function (docs, options) {
-        if (!(options && options.skipVersioning)) {
-          if (!_.isArray(docs)) {
-            docs = [docs];
-          }
-          for (var i = 0; i < docs.length; i++) {
-            var doc = docs[i];
-            doc.version = _getVersion(doc.version);
-          }
-        }
-        oldInsert.apply(this, arguments);
-      };
-
-      var oldFindAndModify = coll.findAndModify;
-      coll.findAndModify = function (query, sort, update, options, cb) {
-        if (!(options && options.skipVersioning)) {
-          var inc = update.$inc || {};
-          inc.version = 1;
-          update.$inc = inc;
-          if (update.$set && update.$set.version >= 0) {
-            delete update.$set.version;
-          }
-        }
-        oldFindAndModify.apply(this, arguments);
-      };
-
-      var oldUpdateMany = coll.updateMany;
-      coll.updateMany = function (query, update, options, cb) {
-        if (!(options && options.skipVersioning)) {
-          var inc = update.$inc || {};
-          inc.version = 1;
-          update.$inc = inc;
-          if (update.$set && update.$set.version >= 0) {
-            delete update.$set.version;
-          }
-        }
-        oldUpdateMany.apply(this, arguments);
-      };
-
-      var oldUpdateOne = coll.updateOne;
-      coll.updateOne = function (query, update, options, cb) {
-        if (!(options && options.skipVersioning)) {
-          var inc = update.$inc || {};
-          inc.version = 1;
-          update.$inc = inc;
-          if (update.$set && update.$set.version >= 0) {
-            delete update.$set.version;
-          }
-        }
-        oldUpdateOne.apply(this, arguments);
-      };
-    }
-    return coll;
-  };
-};
-
-function _getVersion(version) {
-  var newVersion;
-  if (_.isUndefined(version)) {
-    newVersion = 0;
-  } else {
-    newVersion = version + 1;
-  }
-
-  return newVersion;
-}
-
-module.exports = ViewDBVersioningPlugin;
+var _ = require('lodash');
+
+var ViewDBVersioningPlugin = function (viewDb) {
+  var oldCollection = viewDb.collection;
+  viewDb.collection = function () {
+    var coll = oldCollection.apply(this, arguments);
+    if (!coll.__plugins_versioning) {
+      coll.__plugins_versioning = true;
+
+      var oldSave = coll.save;
+      coll.save = function (docs, options) {
+        var newdocs = docs;
+        if (!(options && options.skipVersioning)) {
+          if (!_.isArray(docs)) {
+            newdocs = [docs];
+          }
+          for (var i = 0; i < newdocs.length; i++) {
+            var doc = newdocs[i];
+            doc.version = _getVersion(doc.version);
+          }
+        }
+        oldSave.apply(this, arguments);
+      };
+
+      var oldInsert = coll.insert;
+      coll.insert = function (docs, options) {
+        if (!(options && options.skipVersioning)) {
+          if (!_.isArray(docs)) {
+            docs = [docs];
+          }
+          for (var i = 0; i < docs.length; i++) {
+            var doc = docs[i];
+            doc.version = _getVersion(doc.version);
+          }
+        }
+        oldInsert.apply(this, arguments);
+      };
+
+      var oldFindAndModify = coll.findAndModify;
+      coll.findAndModify = function (query, sort, update, options, cb) {
+        if (!(options && options.skipVersioning)) {
+          var inc = update.$inc || {};
+          inc.version = 1;
+          update.$inc = inc;
+          if (update.$set && update.$set.version >= 0) {
+            delete update.$set.version;
+          }
+        }
+        oldFindAndModify.apply(this, arguments);
+      };
+
+      var oldUpdateMany = coll.updateMany;
+      coll.updateMany = function (query, update, options, cb) {
+        if (!(options && options.skipVersioning)) {
+          var inc = update.$inc || {};
+          inc.version = 1;
+          update.$inc = inc;
+          if (update.$set && update.$set.version >= 0) {
+            delete update.$set.version;
+          }
+        }
+        oldUpdateMany.apply(this, arguments);
+      };
+
+      var oldUpdateOne = coll.updateOne;
+      coll.updateOne = function (query, update, options, cb) {
+        if (!(options && options.skipVersioning)) {
+          var inc = update.$inc || {};
+          inc.version = 1;
+          update.$inc = inc;
+          if (update.$set && update.$set.version >= 0) {
+            delete update.$set.version;
+          }
+        }
+        oldUpdateOne.apply(this, arguments);
+      };
+    }
+    return coll;
+  };
+};
+
+function _getVersion(version) {
+  var newVersion;
+  if (_.isUndefined(version)) {
+    newVersion = 0;
+  } else {
+    newVersion = version + 1;
+  }
+
+  return newVersion;
+}
+
+module.exports = ViewDBVersioningPlugin;

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "viewdb",
-  "version": "0.10.0",
-  "description": "",
-  "main": "index.js",
-  "directories": {
-    "test": "test"
-  },
-  "scripts": {
-    "test": "jest test",
-    "test.watch": "jest test --watch",
-    "coverage": "jest test --collectCoverage",
-    "coverage-start": "npm run coverage && start coverage/lcov-report/index.html",
-    "format": "prettier --write lib test",
-    "jshint": "jshint ./lib",
-    "jscs": "jscs -p google ./lib"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/surikaterna/viewdb"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "es-jest": "^2.1.0",
-    "jest": "^29.5.0",
-    "jshint": "^2.13.6",
-    "prettier": "^2.8.7",
-    "prettier-config-surikaterna": "^1.0.1"
-  },
-  "dependencies": {
-    "kuery": "^0.6.0",
-    "lodash": "^4.17.21",
-    "uuid": "^9.0.0"
-  }
-}
+{
+  "name": "viewdb",
+  "version": "0.11.0",
+  "description": "",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "test": "jest test",
+    "test.watch": "jest test --watch",
+    "coverage": "jest test --collectCoverage",
+    "coverage-start": "npm run coverage && start coverage/lcov-report/index.html",
+    "format": "prettier --write lib test",
+    "jshint": "jshint ./lib",
+    "jscs": "jscs -p google ./lib"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/surikaterna/viewdb"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "devDependencies": {
+    "es-jest": "^2.1.0",
+    "jest": "^29.5.0",
+    "jshint": "^2.13.6",
+    "prettier": "^2.8.7",
+    "prettier-config-surikaterna": "^1.0.1"
+  },
+  "dependencies": {
+    "kuery": "^0.6.0",
+    "lodash": "^4.17.21",
+    "uuid": "^9.0.0"
+  }
+}