hadron-document 7.8.0 → 7.9.0

package/lib/element.js

@@ -1,6 +1,6 @@
 'use strict';
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
@@ -12,9 +12,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 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); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -46,20 +46,11 @@ var TypeChecker = require('hadron-type-checker');
 
 var uuid = require('uuid');
 
-var DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSS';
-/**
- * The event constant.
- */
+var DateEditor = require('./editor/date');
 
-var Events = {
-  'Added': 'Element::Added',
-  'Edited': 'Element::Edited',
-  'Removed': 'Element::Removed',
-  'Reverted': 'Element::Reverted',
-  'Converted': 'Element::Converted',
-  'Invalid': 'Element::Invalid',
-  'Valid': 'Element::Valid'
-};
+var Events = require('./element-events');
+
+var DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSS';
 /**
  * Id field constant.
  */
@@ -69,7 +60,7 @@ var ID = '_id';
  * Types that are not editable.
  */
 
-var UNEDITABLE_TYPES = ['Binary', 'Code', 'MinKey', 'MaxKey', 'Timestamp', 'BSONRegExp', 'Undefined', 'Null'];
+var UNEDITABLE_TYPES = ['Binary', 'Code', 'MinKey', 'MaxKey', 'Timestamp', 'BSONRegExp', 'Undefined', 'Null', 'DBRef'];
 /**
  * Curly brace constant.
  */
@@ -120,6 +111,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
     _this.removed = false;
     _this.type = TypeChecker.type(value);
     _this.currentType = _this.type;
+    _this.level = _this._getLevel();
 
     _this.setValid();
 
@@ -133,12 +125,6 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
 
     return _this;
   }
-  /**
-   * Edit the element.
-   *
-   * @param {Object} value - The new value.
-   */
-
 
   _createClass(Element, [{
     key: "bulkEdit",
@@ -152,7 +138,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
       if (value.match(ARRAY_OR_OBJECT)) {
         this.edit(JSON.parse(value));
 
-        this._bubbleUp(Events.Converted);
+        this._bubbleUp(Events.Converted, this);
       } else {
         this.edit(value);
       }
@@ -165,18 +151,11 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
     key: "cancel",
     value: function cancel() {
       if (this.elements) {
-        var _iterator = _createForOfIteratorHelper(this.elements),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var element = _step.value;
-            element.cancel();
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
+        // Cancel will remove elements from iterator, clone it before iterating
+        // otherwise we will skip items
+        for (var _i = 0, _Array$from = Array.from(this.elements); _i < _Array$from.length; _i++) {
+          var element = _Array$from[_i];
+          element.cancel();
         }
       }
 
@@ -184,6 +163,25 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
         this.revert();
       }
     }
+  }, {
+    key: "_getLevel",
+    value: function _getLevel() {
+      var level = -1;
+      var parent = this.parent;
+
+      while (parent) {
+        level++;
+        parent = parent.parent;
+      }
+
+      return level;
+    }
+    /**
+     * Edit the element.
+     *
+     * @param {Object} value - The new value.
+     */
+
   }, {
     key: "edit",
     value: function edit(value) {
@@ -201,7 +199,45 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
 
       this.setValid();
 
-      this._bubbleUp(Events.Edited);
+      this._bubbleUp(Events.Edited, this);
+    }
+    /**
+     * @param {import('hadron-type-checker').TypeCastTypes} newType
+     */
+
+  }, {
+    key: "changeType",
+    value: function changeType(newType) {
+      if (newType === 'Object') {
+        this.edit('{');
+        this.next();
+      } else if (newType === 'Array') {
+        this.edit('[');
+        this.next();
+      } else {
+        try {
+          if (newType === 'Date') {
+            var editor = new DateEditor(this);
+            editor.edit(this.generateObject());
+            editor.complete();
+          } else {
+            this.edit(TypeChecker.cast(this.generateObject(), newType));
+          }
+        } catch (e) {
+          this.setInvalid(this.currentValue, newType, e.message);
+        }
+      }
+    }
+  }, {
+    key: "getRoot",
+    value: function getRoot() {
+      var parent = this.parent;
+
+      while (parent.parent) {
+        parent = parent.parent;
+      }
+
+      return parent;
     }
     /**
      * Get an element by its key.
@@ -265,7 +301,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
 
       this.currentKey = key;
 
-      this._bubbleUp(Events.Edited);
+      this._bubbleUp(Events.Edited, this);
     }
     /**
      * Generate the javascript object for this element.
@@ -280,7 +316,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
         return ObjectGenerator.generateArray(this.elements);
       }
 
-      if (this.elements) {
+      if (this.currentType === 'Object') {
         return ObjectGenerator.generate(this.elements);
       }
 
@@ -339,7 +375,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
         this.elements.updateKeys(newElement, 1);
       }
 
-      this._bubbleUp(Events.Added);
+      newElement._bubbleUp(Events.Added, newElement, this);
 
       return newElement;
     }
@@ -370,7 +406,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
 
       var newElement = this.elements.insertEnd(key, value, true, this);
 
-      this._bubbleUp(Events.Added);
+      this._bubbleUp(Events.Adde, newElement);
 
       return newElement;
     }
@@ -383,11 +419,12 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "insertPlaceholder",
     value: function insertPlaceholder() {
-      var newElement = this.elements.insertEnd('', '', true, this);
-
-      this._bubbleUp(Events.Added);
-
-      return newElement;
+      return this.insertEnd('', '');
+    }
+  }, {
+    key: "insertSiblingPlaceholder",
+    value: function insertSiblingPlaceholder() {
+      return this.parent.insertAfter(this, '', '');
     }
     /**
      * Is the element a newly added element?
@@ -432,7 +469,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
       this.currentTypeValid = true;
       this.invalidTypeMessage = undefined;
 
-      this._bubbleUp(Events.Valid, this.uuid);
+      this._bubbleUp(Events.Valid, this);
     }
     /**
      * Set the element as invalid.
@@ -450,7 +487,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
       this.currentTypeValid = false;
       this.invalidTypeMessage = message;
 
-      this._bubbleUp(Events.Invalid, this.uuid);
+      this._bubbleUp(Events.Invalid, this);
     }
     /**
      * Determine if the key is a duplicate.
@@ -463,25 +500,25 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "isDuplicateKey",
     value: function isDuplicateKey(value) {
-      if (value === this.currentKey) {
+      if (value === '') {
         return false;
       }
 
-      var _iterator2 = _createForOfIteratorHelper(this.parent.elements),
-          _step2;
+      var _iterator = _createForOfIteratorHelper(this.parent.elements),
+          _step;
 
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var element = _step2.value;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var element = _step.value;
 
-          if (element.currentKey === value) {
+          if (element.uuid !== this.uuid && element.currentKey === value) {
             return true;
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator.e(err);
       } finally {
-        _iterator2.f();
+        _iterator.f();
       }
 
       return false;
@@ -632,21 +669,21 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
     key: "isModified",
     value: function isModified() {
       if (this.elements) {
-        var _iterator3 = _createForOfIteratorHelper(this.elements),
-            _step3;
+        var _iterator2 = _createForOfIteratorHelper(this.elements),
+            _step2;
 
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var element = _step3.value;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var element = _step2.value;
 
             if (element.isModified()) {
               return true;
             }
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator3.f();
+          _iterator2.f();
         }
       }
 
@@ -684,7 +721,9 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
       this.revert();
       this.removed = true;
 
-      this._bubbleUp(Events.Removed);
+      if (this.parent) {
+        this._bubbleUp(Events.Removed, this, this.parent);
+      }
     }
     /**
      * Revert the changes to the element.
@@ -699,7 +738,9 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
         }
 
         this.parent.elements.remove(this);
-        this.parent.emit(Events.Removed);
+
+        this._bubbleUp(Events.Removed, this, this.parent);
+
         this.parent = null;
       } else {
         if (this.originalExpandableValue) {
@@ -722,7 +763,7 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
 
       this.setValid();
 
-      this._bubbleUp(Events.Reverted);
+      this._bubbleUp(Events.Reverted, this);
     }
     /**
      * Fire and bubble up the event.
@@ -733,15 +774,19 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
 
   }, {
     key: "_bubbleUp",
-    value: function _bubbleUp(evt, data) {
-      this.emit(evt, data);
+    value: function _bubbleUp(evt) {
+      for (var _len = arguments.length, data = new Array(_len > 1 ? _len - 1 : 0), _key2 = 1; _key2 < _len; _key2++) {
+        data[_key2 - 1] = arguments[_key2];
+      }
+
+      this.emit.apply(this, [evt].concat(data));
       var element = this.parent;
 
       if (element) {
         if (element.isRoot()) {
-          element.emit(evt, data);
+          element.emit.apply(element, [evt].concat(data));
         } else {
-          element._bubbleUp(evt, data);
+          element._bubbleUp.apply(element, [evt].concat(data));
         }
       }
     }
@@ -837,21 +882,21 @@ var Element = /*#__PURE__*/function (_EventEmitter) {
     key: "_removeAddedElements",
     value: function _removeAddedElements() {
       if (this.elements) {
-        var _iterator4 = _createForOfIteratorHelper(this.elements),
-            _step4;
+        var _iterator3 = _createForOfIteratorHelper(this.elements),
+            _step3;
 
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var element = _step4.value;
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var element = _step3.value;
 
             if (element.isAdded()) {
               this.elements.remove(element);
             }
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator4.f();
+          _iterator3.f();
         }
       }
     }
@@ -1046,21 +1091,21 @@ var LinkedList = /*#__PURE__*/function (_Symbol$iterator) {
     value: function flush() {
       if (this.loaded < this.size) {
         // Only iterate from the loaded index to the size.
-        var _iterator5 = _createForOfIteratorHelper(this),
-            _step5;
+        var _iterator4 = _createForOfIteratorHelper(this),
+            _step4;
 
         try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var element = _step5.value;
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var element = _step4.value;
 
             if (element && element.elements) {
               element.elements.flush();
             }
           }
         } catch (err) {
-          _iterator5.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator5.f();
+          _iterator4.f();
         }
       }
     }
@@ -1225,12 +1270,38 @@ var LinkedList = /*#__PURE__*/function (_Symbol$iterator) {
       this.loaded -= 1;
       return this;
     }
+  }, {
+    key: "findIndex",
+    value: function findIndex(el) {
+      var idx = 0;
+
+      var _iterator5 = _createForOfIteratorHelper(this),
+          _step5;
+
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var item = _step5.value;
+
+          if (item === el) {
+            return idx;
+          }
+
+          idx++;
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+
+      return -1;
+    }
   }]);
 
   return LinkedList;
 }(Symbol.iterator);
 
-module.exports = Element;
-module.exports.LinkedList = LinkedList;
-module.exports.Events = Events;
-module.exports.DATE_FORMAT = DATE_FORMAT;
+Element.LinkedList = LinkedList;
+Element.Events = Events;
+Element.DATE_FORMAT = DATE_FORMAT;
+module.exports = Element;

package/lib/index.js

@@ -1,4 +1,7 @@
 "use strict";
 
 module.exports = require('./document');
-module.exports.Element = require('./element');
+module.exports.DocumentEvents = module.exports.Events;
+module.exports.Element = require('./element');
+module.exports.ElementEvents = module.exports.Element.Events;
+module.exports.ElementEditor = require('./editor');

package/lib/object-generator.js

@@ -13,7 +13,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 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); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 var ObjectGenerator = /*#__PURE__*/function () {
   function ObjectGenerator() {

package/lib/utils.js

@@ -0,0 +1,10 @@
+"use strict";
+
+var fieldStringLen = function fieldStringLen(value) {
+  var length = String(value).length;
+  return length === 0 ? 1 : length;
+};
+
+module.exports = {
+  fieldStringLen: fieldStringLen
+};

package/package.json

@@ -7,7 +7,7 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -17,6 +17,7 @@
     "mongodb-js"
   ],
   "main": "index.js",
+  "types": "./index.d.ts",
   "exports": {
     "webpack": "./src/index.js",
     "require": "./index.js"
@@ -36,15 +37,13 @@
   "dependencies": {
     "debug": "4.3.0",
     "eventemitter3": "^4.0.0",
-    "hadron-type-checker": "^6.7.0",
+    "hadron-type-checker": "^6.8.0",
     "lodash.foreach": "^4.5.0",
     "lodash.isarray": "^4.0.0",
     "lodash.isequal": "^4.5.0",
     "lodash.isplainobject": "^4.0.6",
     "lodash.isstring": "^4.0.1",
     "lodash.keys": "^4.2.0",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
     "uuid": "^7.0.3"
   },
   "devDependencies": {
@@ -64,5 +63,5 @@
     "mocha": "^7.0.1",
     "moment": "^2.27.0"
   },
-  "gitHead": "2bb63cdb1d4e825f280c0d2af14b7298c5769490"
+  "gitHead": "a1283df32eb52881cc00eb73f8d435f772cdbfde"
 }

package/src/document.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const EventEmitter = require('eventemitter3');
+const uuid = require('uuid');
 const Element = require('./element');
 const LinkedList = Element.LinkedList;
 const ObjectGenerator = require('./object-generator');
@@ -25,7 +26,9 @@ class Document extends EventEmitter {
    * Send cancel event.
    */
   cancel() {
-    for (let element of this.elements) {
+    // Cancel will remove elements from iterator, clone it before iterating
+    // otherwise we will skip items
+    for (let element of Array.from(this.elements)) {
       element.cancel();
     }
     this.emit(Events.Cancel);
@@ -39,10 +42,34 @@ class Document extends EventEmitter {
    */
   constructor(doc, cloned) {
     super();
+    this.uuid = uuid.v4();
     this.doc = doc;
     this.cloned = cloned || false;
     this.isUpdatable = true;
     this.elements = this._generateElements();
+    this.type = 'Document';
+    this.currentType = 'Document';
+  }
+
+  apply(doc) {
+    let updatedKeys = [];
+    let prevKey = null;
+    for (const [key, value] of Object.entries(doc)) {
+      if (this.get(key)) {
+        this.get(key).edit(value);
+      } else if (prevKey) {
+        this.insertAfter(this.get(prevKey), key, value);
+      } else {
+        this.insertBeginning(key, value);
+      }
+      prevKey = key;
+      updatedKeys.push(key);
+    }
+    for (const el of [...this.elements]) {
+      if (!updatedKeys.includes(el.currentKey)) {
+        el.remove();
+      }
+    }
   }
 
   /**
@@ -290,6 +317,20 @@ class Document extends EventEmitter {
     return this.insertEnd('', '');
   }
 
+  /**
+   * Add a new element to this document.
+   *
+   * @param {String} key - The element key.
+   * @param {Object} value - The value.
+   *
+   * @returns {Element} The new element.
+   */
+  insertBeginning(key, value) {
+    var newElement = this.elements.insertBeginning(key, value, true, this);
+    newElement._bubbleUp(Element.Events.Added, newElement, this);
+    return newElement;
+  }
+
   /**
    * Add a new element to this document.
    *
@@ -300,7 +341,7 @@ class Document extends EventEmitter {
    */
   insertEnd(key, value) {
     var newElement = this.elements.insertEnd(key, value, true, this);
-    this.emit(Element.Events.Added);
+    newElement._bubbleUp(Element.Events.Added, newElement, this);
     return newElement;
   }
 
@@ -315,7 +356,7 @@ class Document extends EventEmitter {
    */
   insertAfter(element, key, value) {
     var newElement = this.elements.insertAfter(element, key, value, true, this);
-    this.emit(Element.Events.Added);
+    newElement._bubbleUp(Element.Events.Added, newElement, this);
     return newElement;
   }