refactoring text types

build/node/Types/BasicTypes.js

@@ -130,9 +130,11 @@ module.exports = function(HB) {
     };
 
     Operation.prototype.saveOperation = function(name, op) {
-      if (((op != null ? op.execute : void 0) != null) || typeof op === "string") {
+      if (op == null) {
+
+      } else if ((op.execute != null) || !((op.op_number != null) && (op.creator != null))) {
         return this[name] = op;
-      } else if (op != null) {
+      } else {
         if (this.unchecked == null) {
           this.unchecked = {};
         }
@@ -207,7 +209,14 @@ module.exports = function(HB) {
   types.Insert = (function(_super) {
     __extends(Insert, _super);
 
-    function Insert(uid, prev_cl, next_cl, origin, parent) {
+    function Insert(content, uid, prev_cl, next_cl, origin, parent) {
+      if (content === void 0) {
+
+      } else if ((content != null) && (content.creator != null)) {
+        this.saveOperation('content', content);
+      } else {
+        this.content = content;
+      }
       this.saveOperation('parent', parent);
       this.saveOperation('prev_cl', prev_cl);
       this.saveOperation('next_cl', next_cl);
@@ -221,6 +230,10 @@ module.exports = function(HB) {
 
     Insert.prototype.type = "Insert";
 
+    Insert.prototype.val = function() {
+      return this.content;
+    };
+
     Insert.prototype.applyDelete = function(o) {
       var callLater, garbagecollect, _ref;
       if (this.deleted_by == null) {
@@ -242,8 +255,12 @@ module.exports = function(HB) {
         this.callOperationSpecificDeleteEvents(o);
       }
       if ((_ref = this.prev_cl) != null ? _ref.isDeleted() : void 0) {
-        return this.prev_cl.applyDelete();
+        this.prev_cl.applyDelete();
       }
+      if (this.content instanceof types.Operation) {
+        this.content.applyDelete();
+      }
+      return delete this.content;
     };
 
     Insert.prototype.cleanup = function() {
@@ -286,6 +303,9 @@ module.exports = function(HB) {
       if (!this.validateSavedOperations()) {
         return false;
       } else {
+        if (this.content instanceof types.Operation) {
+          this.content.insert_parent = this;
+        }
         if (this.parent != null) {
           if (this.prev_cl == null) {
             this.prev_cl = this.parent.beginning;
@@ -380,9 +400,39 @@ module.exports = function(HB) {
       return position;
     };
 
+    Insert.prototype._encode = function() {
+      var json, _ref;
+      json = {
+        'type': this.type,
+        'uid': this.getUid(),
+        'prev': this.prev_cl.getUid(),
+        'next': this.next_cl.getUid(),
+        'parent': this.parent.getUid()
+      };
+      if (this.origin.type === "Delimiter") {
+        json.origin = "Delimiter";
+      } else if (this.origin !== this.prev_cl) {
+        json.origin = this.origin.getUid();
+      }
+      if (((_ref = this.content) != null ? _ref.getUid : void 0) != null) {
+        json['content'] = this.content.getUid();
+      } else {
+        json['content'] = JSON.stringify(this.content);
+      }
+      return json;
+    };
+
     return Insert;
 
   })(types.Operation);
+  types.Insert.parse = function(json) {
+    var content, next, origin, parent, prev, uid;
+    content = json['content'], uid = json['uid'], prev = json['prev'], next = json['next'], origin = json['origin'], parent = json['parent'];
+    if (typeof content === "string") {
+      content = JSON.parse(content);
+    }
+    return new this(content, uid, prev, next, origin, parent);
+  };
   types.ImmutableObject = (function(_super) {
     __extends(ImmutableObject, _super);
 

build/node/Types/JsonTypes.js

@@ -37,7 +37,7 @@ module.exports = function(HB) {
           o = val[name];
           if (o instanceof types.Object) {
             json[name] = o.toJson(transform_to_value);
-          } else if (o instanceof types.Array) {
+          } else if (o instanceof types.ListManager) {
             json[name] = o.toJson(transform_to_value);
           } else if (transform_to_value && o instanceof types.Operation) {
             json[name] = o.val();

build/node/Types/StructuredTypes.js

@@ -102,6 +102,42 @@ module.exports = function(HB) {
 
     ListManager.prototype.type = "ListManager";
 
+    ListManager.prototype.applyDelete = function() {
+      var o;
+      o = this.end;
+      while (o != null) {
+        o.applyDelete();
+        o = o.prev_cl;
+      }
+      return ListManager.__super__.applyDelete.call(this);
+    };
+
+    ListManager.prototype.cleanup = function() {
+      return ListManager.__super__.cleanup.call(this);
+    };
+
+    ListManager.prototype.toJson = function(transform_to_value) {
+      var i, o, val, _i, _len, _results;
+      if (transform_to_value == null) {
+        transform_to_value = false;
+      }
+      val = this.val();
+      _results = [];
+      for (o = _i = 0, _len = val.length; _i < _len; o = ++_i) {
+        i = val[o];
+        if (o instanceof types.Object) {
+          _results.push(o.toJson(transform_to_value));
+        } else if (o instanceof types.ListManager) {
+          _results.push(o.toJson(transform_to_value));
+        } else if (transform_to_value && o instanceof types.Operation) {
+          _results.push(o.val());
+        } else {
+          _results.push(o);
+        }
+      }
+      return _results;
+    };
+
     ListManager.prototype.execute = function() {
       if (this.validateSavedOperations()) {
         this.beginning.setParent(this);
@@ -125,12 +161,53 @@ module.exports = function(HB) {
       o = this.beginning.next_cl;
       result = [];
       while (o !== this.end) {
-        result.push(o);
+        if (!o.is_deleted) {
+          result.push(o);
+        }
         o = o.next_cl;
       }
       return result;
     };
 
+    ListManager.prototype.map = function(f) {
+      var o, result;
+      o = this.beginning.next_cl;
+      result = [];
+      while (o !== this.end) {
+        if (!o.is_deleted) {
+          result.push(f(o));
+        }
+        o = o.next_cl;
+      }
+      return result;
+    };
+
+    ListManager.prototype.fold = function(init, f) {
+      var o;
+      o = this.beginning.next_cl;
+      while (o !== this.end) {
+        if (!o.is_deleted) {
+          init = f(init, o);
+        }
+        o = o.next_cl;
+      }
+      return init;
+    };
+
+    ListManager.prototype.val = function(pos) {
+      var o;
+      if (pos != null) {
+        o = this.getOperationByPosition(pos + 1);
+        if (!(o instanceof types.Delimiter)) {
+          return o.val();
+        } else {
+          throw new Error("this position does not exist");
+        }
+      } else {
+        return this.toArray();
+      }
+    };
+
     ListManager.prototype.getOperationByPosition = function(position) {
       var o;
       o = this.beginning;
@@ -153,9 +230,97 @@ module.exports = function(HB) {
       return o;
     };
 
+    ListManager.prototype.push = function(content) {
+      return this.insertAfter(this.end.prev_cl, content);
+    };
+
+    ListManager.prototype.insertAfter = function(left, content, options) {
+      var c, createContent, right, tmp, _i, _len;
+      createContent = function(content, options) {
+        var type;
+        if ((content != null) && (content.constructor != null)) {
+          type = types[content.constructor.name];
+          if ((type != null) && (type.create != null)) {
+            return type.create(content, options);
+          } else {
+            throw new Error("The " + content.constructor.name + "-type is not (yet) supported in Y.");
+          }
+        } else {
+          return content;
+        }
+      };
+      right = left.next_cl;
+      while (right.isDeleted()) {
+        right = right.next_cl;
+      }
+      left = right.prev_cl;
+      if (content instanceof types.Operation) {
+        (new types.Insert(content, void 0, left, right)).execute();
+      } else {
+        for (_i = 0, _len = content.length; _i < _len; _i++) {
+          c = content[_i];
+          tmp = (new types.Insert(createContent(c, options), void 0, left, right)).execute();
+          left = tmp;
+        }
+      }
+      return this;
+    };
+
+    ListManager.prototype.insert = function(position, content, options) {
+      var ith;
+      ith = this.getOperationByPosition(position);
+      return this.insertAfter(ith, [content], options);
+    };
+
+    ListManager.prototype["delete"] = function(position, length) {
+      var d, delete_ops, i, o, _i;
+      o = this.getOperationByPosition(position + 1);
+      delete_ops = [];
+      for (i = _i = 0; 0 <= length ? _i < length : _i > length; i = 0 <= length ? ++_i : --_i) {
+        if (o instanceof types.Delimiter) {
+          break;
+        }
+        d = (new types.Delete(void 0, o)).execute();
+        o = o.next_cl;
+        while ((!(o instanceof types.Delimiter)) && o.isDeleted()) {
+          o = o.next_cl;
+        }
+        delete_ops.push(d._encode());
+      }
+      return this;
+    };
+
+    ListManager.prototype._encode = function() {
+      var json;
+      json = {
+        'type': this.type,
+        'uid': this.getUid()
+      };
+      return json;
+    };
+
     return ListManager;
 
   })(types.Operation);
+  types.ListManager.parse = function(json) {
+    var uid;
+    uid = json['uid'];
+    return new this(uid);
+  };
+  types.Array = function() {};
+  types.Array.create = function(content, mutable) {
+    var ith, list;
+    if (mutable === "mutable") {
+      list = new types.ListManager().execute();
+      ith = list.getOperationByPosition(0);
+      list.insertAfter(ith, content);
+      return list;
+    } else if ((mutable == null) || (mutable === "immutable")) {
+      return content;
+    } else {
+      throw new Error("Specify either \"mutable\" or \"immutable\"!!");
+    }
+  };
   types.ReplaceManager = (function(_super) {
     __extends(ReplaceManager, _super);
 
@@ -240,13 +405,8 @@ module.exports = function(HB) {
     __extends(Replaceable, _super);
 
     function Replaceable(content, parent, uid, prev, next, origin, is_deleted) {
-      if ((content != null) && (content.creator != null)) {
-        this.saveOperation('content', content);
-      } else {
-        this.content = content;
-      }
       this.saveOperation('parent', parent);
-      Replaceable.__super__.constructor.call(this, uid, prev, next, origin);
+      Replaceable.__super__.constructor.call(this, content, uid, prev, next, origin);
       this.is_deleted = is_deleted;
     }
 

build/node/Types/TextTypes.js

@@ -9,241 +9,6 @@ module.exports = function(HB) {
   structured_types = structured_types_uninitialized(HB);
   types = structured_types.types;
   parser = structured_types.parser;
-  types.TextInsert = (function(_super) {
-    __extends(TextInsert, _super);
-
-    function TextInsert(content, uid, prev, next, origin, parent) {
-      if (content != null ? content.creator : void 0) {
-        this.saveOperation('content', content);
-      } else {
-        this.content = content;
-      }
-      TextInsert.__super__.constructor.call(this, uid, prev, next, origin, parent);
-    }
-
-    TextInsert.prototype.type = "TextInsert";
-
-    TextInsert.prototype.getLength = function() {
-      if (this.isDeleted()) {
-        return 0;
-      } else {
-        return this.content.length;
-      }
-    };
-
-    TextInsert.prototype.applyDelete = function() {
-      TextInsert.__super__.applyDelete.apply(this, arguments);
-      if (this.content instanceof types.Operation) {
-        this.content.applyDelete();
-      }
-      return this.content = null;
-    };
-
-    TextInsert.prototype.execute = function() {
-      if (!this.validateSavedOperations()) {
-        return false;
-      } else {
-        if (this.content instanceof types.Operation) {
-          this.content.insert_parent = this;
-        }
-        return TextInsert.__super__.execute.call(this);
-      }
-    };
-
-    TextInsert.prototype.val = function(current_position) {
-      if (this.isDeleted() || (this.content == null)) {
-        return "";
-      } else {
-        return this.content;
-      }
-    };
-
-    TextInsert.prototype._encode = function() {
-      var json, _ref;
-      json = {
-        'type': this.type,
-        'uid': this.getUid(),
-        'prev': this.prev_cl.getUid(),
-        'next': this.next_cl.getUid(),
-        'origin': this.origin.getUid(),
-        'parent': this.parent.getUid()
-      };
-      if (((_ref = this.content) != null ? _ref.getUid : void 0) != null) {
-        json['content'] = this.content.getUid();
-      } else {
-        json['content'] = JSON.stringify(this.content);
-      }
-      return json;
-    };
-
-    return TextInsert;
-
-  })(types.Insert);
-  types.TextInsert.parse = function(json) {
-    var content, next, origin, parent, prev, uid;
-    content = json['content'], uid = json['uid'], prev = json['prev'], next = json['next'], origin = json['origin'], parent = json['parent'];
-    if (typeof content === "string") {
-      content = JSON.parse(content);
-    }
-    return new types.TextInsert(content, uid, prev, next, origin, parent);
-  };
-  types.Array = (function(_super) {
-    __extends(Array, _super);
-
-    function Array() {
-      return Array.__super__.constructor.apply(this, arguments);
-    }
-
-    Array.prototype.type = "Array";
-
-    Array.prototype.applyDelete = function() {
-      var o;
-      o = this.end;
-      while (o != null) {
-        o.applyDelete();
-        o = o.prev_cl;
-      }
-      return Array.__super__.applyDelete.call(this);
-    };
-
-    Array.prototype.cleanup = function() {
-      return Array.__super__.cleanup.call(this);
-    };
-
-    Array.prototype.toJson = function(transform_to_value) {
-      var i, o, val, _i, _len, _results;
-      if (transform_to_value == null) {
-        transform_to_value = false;
-      }
-      val = this.val();
-      _results = [];
-      for (o = _i = 0, _len = val.length; _i < _len; o = ++_i) {
-        i = val[o];
-        if (o instanceof types.Object) {
-          _results.push(o.toJson(transform_to_value));
-        } else if (o instanceof types.Array) {
-          _results.push(o.toJson(transform_to_value));
-        } else if (transform_to_value && o instanceof types.Operation) {
-          _results.push(o.val());
-        } else {
-          _results.push(o);
-        }
-      }
-      return _results;
-    };
-
-    Array.prototype.val = function(pos) {
-      var o, result;
-      if (pos != null) {
-        o = this.getOperationByPosition(pos + 1);
-        if (!(o instanceof types.Delimiter)) {
-          return o.val();
-        } else {
-          throw new Error("this position does not exist");
-        }
-      } else {
-        o = this.beginning.next_cl;
-        result = [];
-        while (o !== this.end) {
-          if (!o.isDeleted()) {
-            result.push(o.val());
-          }
-          o = o.next_cl;
-        }
-        return result;
-      }
-    };
-
-    Array.prototype.push = function(content) {
-      return this.insertAfter(this.end.prev_cl, content);
-    };
-
-    Array.prototype.insertAfter = function(left, content, options) {
-      var c, createContent, right, tmp, _i, _len;
-      createContent = function(content, options) {
-        var type;
-        if ((content != null) && (content.constructor != null)) {
-          type = types[content.constructor.name];
-          if ((type != null) && (type.create != null)) {
-            return type.create(content, options);
-          } else {
-            throw new Error("The " + content.constructor.name + "-type is not (yet) supported in Y.");
-          }
-        } else {
-          return content;
-        }
-      };
-      right = left.next_cl;
-      while (right.isDeleted()) {
-        right = right.next_cl;
-      }
-      left = right.prev_cl;
-      if (content instanceof types.Operation) {
-        (new types.TextInsert(content, void 0, left, right)).execute();
-      } else {
-        for (_i = 0, _len = content.length; _i < _len; _i++) {
-          c = content[_i];
-          tmp = (new types.TextInsert(createContent(c, options), void 0, left, right)).execute();
-          left = tmp;
-        }
-      }
-      return this;
-    };
-
-    Array.prototype.insert = function(position, content, options) {
-      var ith;
-      ith = this.getOperationByPosition(position);
-      return this.insertAfter(ith, [content], options);
-    };
-
-    Array.prototype["delete"] = function(position, length) {
-      var d, delete_ops, i, o, _i;
-      o = this.getOperationByPosition(position + 1);
-      delete_ops = [];
-      for (i = _i = 0; 0 <= length ? _i < length : _i > length; i = 0 <= length ? ++_i : --_i) {
-        if (o instanceof types.Delimiter) {
-          break;
-        }
-        d = (new types.Delete(void 0, o)).execute();
-        o = o.next_cl;
-        while ((!(o instanceof types.Delimiter)) && o.isDeleted()) {
-          o = o.next_cl;
-        }
-        delete_ops.push(d._encode());
-      }
-      return this;
-    };
-
-    Array.prototype._encode = function() {
-      var json;
-      json = {
-        'type': this.type,
-        'uid': this.getUid()
-      };
-      return json;
-    };
-
-    return Array;
-
-  })(types.ListManager);
-  types.Array.parse = function(json) {
-    var uid;
-    uid = json['uid'];
-    return new this(uid);
-  };
-  types.Array.create = function(content, mutable) {
-    var ith, list;
-    if (mutable === "mutable") {
-      list = new types.Array().execute();
-      ith = list.getOperationByPosition(0);
-      list.insertAfter(ith, content);
-      return list;
-    } else if ((mutable == null) || (mutable === "immutable")) {
-      return content;
-    } else {
-      throw new Error("Specify either \"mutable\" or \"immutable\"!!");
-    }
-  };
   types.String = (function(_super) {
     __extends(String, _super);
 
@@ -255,22 +20,9 @@ module.exports = function(HB) {
     String.prototype.type = "String";
 
     String.prototype.val = function() {
-      var c, o;
-      c = (function() {
-        var _i, _len, _ref, _results;
-        _ref = this.toArray();
-        _results = [];
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          o = _ref[_i];
-          if (o.val != null) {
-            _results.push(o.val());
-          } else {
-            _results.push("");
-          }
-        }
-        return _results;
-      }).call(this);
-      return c.join('');
+      return this.fold("", function(left, o) {
+        return left + o.val();
+      });
     };
 
     String.prototype.toString = function() {
@@ -548,7 +300,7 @@ module.exports = function(HB) {
 
     return String;
 
-  })(types.Array);
+  })(types.ListManager);
   types.String.parse = function(json) {
     var uid;
     uid = json['uid'];