lib0 1.0.0-rc.11 → 1.0.0-rc.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lib0",
-  "version": "1.0.0-rc.11",
+  "version": "1.0.0-rc.12",
   "description": "",
   "sideEffects": false,
   "type": "module",

package/src/delta/delta.js

@@ -180,7 +180,12 @@ export class TextOp extends list.ListNode {
    * @param {TextOp} other
    */
   [equalityTrait.EqualityTraitSymbol] (other) {
-    return $textOp.check(other) && fun.equalityDeep(this.insert, other.insert) && fun.equalityDeep(this.format, other.format) && fun.equalityDeep(this.attribution, other.attribution)
+    return $textOp.check(other) &&
+      fun.equalityDeep(this.insert, other.insert) &&
+      (
+        (object.isEmpty(this.format) && object.isEmpty(other.format)) || fun.equalityDeep(this.format, other.format)
+      ) &&
+      fun.equalityDeep(this.attribution, other.attribution)
   }
 
   /**
@@ -297,7 +302,12 @@ export class InsertOp extends list.ListNode {
    * @param {InsertOp<ArrayContent>} other
    */
   [equalityTrait.EqualityTraitSymbol] (other) {
-    return $insertOp.check(other) && fun.equalityDeep(this.insert, other.insert) && fun.equalityDeep(this.format, other.format) && fun.equalityDeep(this.attribution, other.attribution)
+    return $insertOp.check(other) &&
+      fun.equalityDeep(this.insert, other.insert) &&
+      (
+        (object.isEmpty(this.format) && object.isEmpty(other.format)) || fun.equalityDeep(this.format, other.format)
+      ) &&
+      fun.equalityDeep(this.attribution, other.attribution)
   }
 
   /**
@@ -454,7 +464,12 @@ export class RetainOp extends list.ListNode {
    * @param {RetainOp} other
    */
   [equalityTrait.EqualityTraitSymbol] (other) {
-    return $retainOp.check(other) && this.retain === other.retain && fun.equalityDeep(this.format, other.format) && fun.equalityDeep(this.attribution, other.attribution)
+    return $retainOp.check(other) &&
+      this.retain === other.retain &&
+      (
+        (object.isEmpty(this.format) && object.isEmpty(other.format)) || fun.equalityDeep(this.format, other.format)
+      ) &&
+      fun.equalityDeep(this.attribution, other.attribution)
   }
 
   clone (start = 0, end = this.retain) {
@@ -554,7 +569,12 @@ export class ModifyOp extends list.ListNode {
    * @param {ModifyOp<any>} other
    */
   [equalityTrait.EqualityTraitSymbol] (other) {
-    return $modifyOp.check(other) && this.value[equalityTrait.EqualityTraitSymbol](other.value) && fun.equalityDeep(this.format, other.format) && fun.equalityDeep(this.attribution, other.attribution)
+    return $modifyOp.check(other) &&
+      this.value[equalityTrait.EqualityTraitSymbol](other.value) &&
+      (
+        (object.isEmpty(this.format) && object.isEmpty(other.format)) || fun.equalityDeep(this.format, other.format)
+      ) &&
+      fun.equalityDeep(this.attribution, other.attribution)
   }
 
   /**
@@ -1244,6 +1264,7 @@ export class DeltaBuilder extends Delta {
    */
   constructor (name, $schema) {
     super(name, $schema)
+    // @todo rename to usedFormats !!
     /**
      * @type {FormattingAttributes?}
      */
@@ -1324,8 +1345,8 @@ export class DeltaBuilder extends Delta {
    */
   insert (insert, formatting = null, attribution = null) {
     modDeltaCheck(this)
-    const mergedAttributes = mergeAttrs(this.usedAttributes, formatting)
-    const mergedAttribution = mergeAttrs(this.usedAttribution, attribution)
+    const mergedAttributes = mergeFormats(this.usedAttributes, formatting)
+    const mergedAttribution = mergeAttributions(this.usedAttribution, attribution)
     /**
      * @param {TextOp | InsertOp<any>} lastOp
      */
@@ -1335,7 +1356,7 @@ export class DeltaBuilder extends Delta {
       if ($textOp.check(end) && checkMergedEquals(end)) {
         end._updateInsert(end.insert + insert)
       } else if (insert.length > 0) {
-        list.pushEnd(this.children, new TextOp(insert, mergedAttributes, mergedAttribution))
+        list.pushEnd(this.children, new TextOp(insert, object.isEmpty(mergedAttributes) ? null : mergedAttributes, mergedAttribution))
       }
       this.childCnt += insert.length
     } else if (arr.isArray(insert)) {
@@ -1344,7 +1365,7 @@ export class DeltaBuilder extends Delta {
         end.insert.push(...insert)
         end._fingerprint = null
       } else if (insert.length > 0) {
-        list.pushEnd(this.children, new InsertOp(insert.slice() /* ensures that we don't reuse an existing array */, mergedAttributes, mergedAttribution))
+        list.pushEnd(this.children, new InsertOp(insert.slice() /* ensures that we don't reuse an existing array */, object.isEmpty(mergedAttributes) ? null : mergedAttributes, mergedAttribution))
       }
       this.childCnt += insert.length
     }
@@ -1360,9 +1381,9 @@ export class DeltaBuilder extends Delta {
    */
   modify (modify, formatting = null, attribution = null) {
     modDeltaCheck(this)
-    const mergedAttributes = mergeAttrs(this.usedAttributes, formatting)
-    const mergedAttribution = mergeAttrs(this.usedAttribution, attribution)
-    list.pushEnd(this.children, new ModifyOp(modify, mergedAttributes, mergedAttribution))
+    const mergedAttributes = mergeFormats(this.usedAttributes, formatting)
+    const mergedAttribution = mergeAttributions(this.usedAttribution, attribution)
+    list.pushEnd(this.children, new ModifyOp(modify, object.isEmpty(mergedAttributes) ? null : mergedAttributes, mergedAttribution))
     this.childCnt += 1
     return /** @type {any} */ (this)
   }
@@ -1374,14 +1395,14 @@ export class DeltaBuilder extends Delta {
    */
   retain (len, format = null, attribution = null) {
     modDeltaCheck(this)
-    const mergedFormats = mergeAttrs(this.usedAttributes, format)
-    const mergedAttribution = mergeAttrs(this.usedAttribution, attribution)
+    const mergedFormats = mergeFormats(this.usedAttributes, format)
+    const mergedAttribution = mergeAttributions(this.usedAttribution, attribution)
     const lastOp = /** @type {RetainOp|InsertOp<any>} */ (this.children.end)
     if ($retainOp.check(lastOp) && fun.equalityDeep(mergedFormats, lastOp.format) && fun.equalityDeep(mergedAttribution, lastOp.attribution)) {
       // @ts-ignore
       lastOp.retain += len
     } else if (len > 0) {
-      list.pushEnd(this.children, new RetainOp(len, mergedFormats, mergedAttribution))
+      list.pushEnd(this.children, new RetainOp(len, object.isEmpty(mergedFormats) ? null : mergedFormats, mergedAttribution))
     }
     this.childCnt += len
     return this
@@ -1419,7 +1440,7 @@ export class DeltaBuilder extends Delta {
     modDeltaCheck(this)
     // @ts-ignore
     this.attrs[key] /** @type {any} */ =
-      (new SetAttrOp(/** @type {any} */ (key), val, prevValue, mergeAttrs(this.usedAttribution, attribution)))
+      (new SetAttrOp(/** @type {any} */ (key), val, prevValue, mergeAttributions(this.usedAttribution, attribution)))
     return /** @type {any} */ (this)
   }
 
@@ -1454,7 +1475,7 @@ export class DeltaBuilder extends Delta {
     modDeltaCheck(this)
     // @ts-ignore
     this.attrs[key] /** @type {any} */ =
-      (new DeleteAttrOp(/** @type {any} */ (key), prevValue, mergeAttrs(this.usedAttribution, attribution)))
+      (new DeleteAttrOp(/** @type {any} */ (key), prevValue, mergeAttributions(this.usedAttribution, attribution)))
     return /** @type {any} */ (this)
   }
 
@@ -1910,7 +1931,7 @@ const updateOpFormat = (op, formatUpdate) => {
         /** @type {any} */ (op).format = object.assign({}, op.format, { [k]: v })
       } else if (op.format != null) {
         const { [k]: _, ...rest } = op.format
-        ;/** @type {any} */ (op).format = rest ? null : rest
+        ;/** @type {any} */ (op).format = object.isEmpty(rest) ? null : rest
       }
     }
   }
@@ -2038,10 +2059,21 @@ export const $deltaBuilderAny = /** @type {s.Schema<DeltaBuilderAny>} */ (/* @__
  * @param {T | null} a
  * @param {T | null} b
  */
-export const mergeAttrs = (a, b) => a == null
+export const mergeAttributions = (a, b) => a == null
   ? b
   : (b == null ? a : object.assign({}, a, b))
 
+/**
+ * Helper function to merge formats. The latter input "wins".
+ *
+ * @template {{ [key: string]: any }} T
+ * @param {T | null} a
+ * @param {T | null} b
+ */
+export const mergeFormats = (a, b) => object.isEmpty(a)
+  ? (object.isEmpty(b) ? null : b)
+  : (object.isEmpty(b) ? a : object.assign({}, a, b))
+
 /**
  * @template {DeltaAny|null} D
  * @param {D} a

package/types/delta/delta.d.ts

@@ -750,7 +750,10 @@ export function $delta<DeltaConf extends ReadableDeltaConf = {}>({ name, attrs,
 export const $$delta: s.Schema<$Delta<DeltaConf>>;
 export const $deltaAny: s.Schema<Delta<any>>;
 export const $deltaBuilderAny: s.Schema<DeltaBuilderAny>;
-export function mergeAttrs<T extends {
+export function mergeAttributions<T extends {
+    [key: string]: any;
+}>(a: T | null, b: T | null): T | null;
+export function mergeFormats<T extends {
     [key: string]: any;
 }>(a: T | null, b: T | null): T | null;
 export function mergeDeltas<D extends DeltaAny | null>(a: D, b: D): D;