Merge branch 'master' of https://github.com/c58/marsdb

c58 · Feb 5, 2016 · d261584 · d261584
2 parents f39f01a + 9a58194
commit d261584
Show file tree

Hide file tree

Showing 27 changed files with 380 additions and 431 deletions.
diff --git a/build/marsdb.js b/build/marsdb.js
diff --git a/build/marsdb.min.js b/build/marsdb.min.js
diff --git a/dist/AsyncEventEmitter.js b/dist/AsyncEventEmitter.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -25,7 +25,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
  */
 /* istanbul ignore next */
 
-var AsyncEventEmitter = function (_EventEmitter) {
+var AsyncEventEmitter = (function (_EventEmitter) {
   _inherits(AsyncEventEmitter, _EventEmitter);
 
   function AsyncEventEmitter() {
@@ -114,6 +114,6 @@ var AsyncEventEmitter = function (_EventEmitter) {
   }]);
 
   return AsyncEventEmitter;
-}(_eventemitter2.default);
+})(_eventemitter2.default);
 
 exports.default = AsyncEventEmitter;
diff --git a/dist/Base64.js b/dist/Base64.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -35,7 +35,7 @@ var getVal = function getVal(ch) {
 
 // Base 64 encoding
 
-var Base64 = exports.Base64 = function () {
+var Base64 = exports.Base64 = (function () {
   function Base64() {
     _classCallCheck(this, Base64);
   }
@@ -166,6 +166,6 @@ var Base64 = exports.Base64 = function () {
   }]);
 
   return Base64;
-}();
+})();
 
 exports.default = new Base64();
diff --git a/dist/Collection.js b/dist/Collection.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -74,7 +74,7 @@ var _defaultIdGenerator = function _defaultIdGenerator(modelName) {
   };
 };
 
-var Collection = exports.Collection = function (_EventEmitter) {
+var Collection = exports.Collection = (function (_EventEmitter) {
   _inherits(Collection, _EventEmitter);
 
   function Collection(name) {
@@ -449,6 +449,6 @@ var Collection = exports.Collection = function (_EventEmitter) {
   }]);
 
   return Collection;
-}(_eventemitter2.default);
+})(_eventemitter2.default);
 
 exports.default = Collection;
diff --git a/dist/CollectionDelegate.js b/dist/CollectionDelegate.js
@@ -1,10 +1,6 @@
 '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 ? "symbol" : typeof obj; };
-
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -30,7 +26,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
  * normal MarsDB approach – within a browser.
  */
 
-var CollectionDelegate = exports.CollectionDelegate = function () {
+var CollectionDelegate = exports.CollectionDelegate = (function () {
   function CollectionDelegate(db) {
     _classCallCheck(this, CollectionDelegate);
 
@@ -97,35 +93,19 @@ var CollectionDelegate = exports.CollectionDelegate = function () {
         var original = _ref3.original;
         var updated = _ref3.updated;
 
-        if (upsert && original.length && original[0] === null) {
-          var _ret = function () {
-            var newDoc = updated[0];
-            return {
-              v: _this3.db.insert(newDoc, { quiet: true }).then(function (docId) {
-                return {
-                  modified: 0, original: [], updated: [],
-                  inserted: _extends({ _id: docId }, newDoc)
-                };
-              })
-            };
-          }();
-
-          if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
-        } else {
-          var updateStorgePromises = (0, _map3.default)(updated, function (d) {
-            return _this3.db.storageManager.persist(d._id, d);
-          });
-          var updateIndexPromises = (0, _map3.default)(updated, function (d, i) {
-            return _this3.db.indexManager.reindexDocument(original[i], d);
-          });
-          return Promise.all([].concat(_toConsumableArray(updateStorgePromises), _toConsumableArray(updateIndexPromises))).then(function () {
-            return {
-              modified: updated.length,
-              original: original,
-              updated: updated
-            };
-          });
-        }
+        var updateStorgePromises = (0, _map3.default)(updated, function (d) {
+          return _this3.db.storageManager.persist(d._id, d);
+        });
+        var updateIndexPromises = (0, _map3.default)(updated, function (d, i) {
+          return _this3.db.indexManager.reindexDocument(original[i], d);
+        });
+        return Promise.all([].concat(_toConsumableArray(updateStorgePromises), _toConsumableArray(updateIndexPromises))).then(function () {
+          return {
+            modified: updated.length,
+            original: original,
+            updated: updated
+          };
+        });
       });
     }
   }, {
@@ -168,6 +148,6 @@ var CollectionDelegate = exports.CollectionDelegate = function () {
   }]);
 
   return CollectionDelegate;
-}();
+})();
 
 exports.default = CollectionDelegate;
diff --git a/dist/CollectionIndex.js b/dist/CollectionIndex.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,7 +15,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var CollectionIndex = exports.CollectionIndex = function () {
+var CollectionIndex = exports.CollectionIndex = (function () {
   function CollectionIndex() {
     var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
@@ -69,6 +69,6 @@ var CollectionIndex = exports.CollectionIndex = function () {
   }]);
 
   return CollectionIndex;
-}();
+})();
 
 exports.default = CollectionIndex;
diff --git a/dist/Cursor.js b/dist/Cursor.js
@@ -1,8 +1,6 @@
 '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 ? "symbol" : typeof obj; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 var _PIPELINE_PROCESSORS;
 
@@ -73,6 +71,8 @@ var _EJSON2 = _interopRequireDefault(_EJSON);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _typeof(obj) { return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -158,7 +158,7 @@ var PIPELINE_PROCESSORS = exports.PIPELINE_PROCESSORS = (_PIPELINE_PROCESSORS =
  * fully customizable response
  */
 
-var Cursor = function (_AsyncEventEmitter) {
+var Cursor = (function (_AsyncEventEmitter) {
   _inherits(Cursor, _AsyncEventEmitter);
 
   function Cursor(db) {
@@ -443,7 +443,7 @@ var Cursor = function (_AsyncEventEmitter) {
   }]);
 
   return Cursor;
-}(_AsyncEventEmitter3.default);
+})(_AsyncEventEmitter3.default);
 
 exports.Cursor = Cursor;
 exports.default = Cursor;
diff --git a/dist/CursorObservable.js b/dist/CursorObservable.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
 
@@ -58,7 +58,7 @@ var _defaultBatchSize = 10;
  * after some changes is happen in a database.
  */
 
-var CursorObservable = function (_Cursor) {
+var CursorObservable = (function (_Cursor) {
   _inherits(CursorObservable, _Cursor);
 
   function CursorObservable(db, query, options) {
@@ -362,7 +362,7 @@ var CursorObservable = function (_Cursor) {
   }]);
 
   return CursorObservable;
-}(_Cursor3.default);
+})(_Cursor3.default);
 
 exports.CursorObservable = CursorObservable;
 exports.default = CursorObservable;
diff --git a/dist/Document.js b/dist/Document.js
@@ -9,7 +9,6 @@ exports.selectorIsIdPerhapsAsObject = selectorIsIdPerhapsAsObject;
 exports.isArray = isArray;
 exports.isPlainObject = isPlainObject;
 exports.isIndexable = isIndexable;
-exports.removeDollarOperators = removeDollarOperators;
 exports.isOperatorObject = isOperatorObject;
 exports.isNumericKey = isNumericKey;
 
@@ -45,16 +44,10 @@ function selectorIsIdPerhapsAsObject(selector) {
   return selectorIsId(selector) || selector && _checkTypes2.default.object(selector) && selector._id && selectorIsId(selector._id) && (0, _keys3.default)(selector).length === 1;
 }
 
-// Like _isArray, but doesn't regard polyfilled Uint8Arrays on old browsers as
-// arrays.
-// XXX maybe this should be EJSON.isArray
 function isArray(x) {
   return _checkTypes2.default.array(x) && !_EJSON2.default.isBinary(x);
 }
 
-// XXX maybe this should be EJSON.isObject, though EJSON doesn't know about
-// RegExp
-// XXX note that _type(undefined) === 3!!!!
 function isPlainObject(x) {
   return x && MongoTypeComp._type(x) === 3;
 }
@@ -63,17 +56,6 @@ function isIndexable(x) {
   return isArray(x) || isPlainObject(x);
 }
 
-// Oddball function used by upsert.
-function removeDollarOperators(selector) {
-  var selectorDoc = {};
-  for (var k in selector) {
-    if (k.substr(0, 1) !== '$') {
-      selectorDoc[k] = selector[k];
-    }
-  }
-  return selectorDoc;
-}
-
 // Returns true if this is an object with at least one key and all keys begin
 // with $.  Unless inconsistentOK is set, throws if some keys begin with $ and
 // others don't.