@y/y 14.0.0-rc.2 → 14.0.0-rc.21

package/src/structs/AbstractStruct.js

@@ -1,7 +1,3 @@
-import {
-  UpdateEncoderV1, UpdateEncoderV2, ID, Transaction // eslint-disable-line
-} from '../internals.js'
-
 import * as error from 'lib0/error'
 
 export class AbstractStruct {
@@ -25,35 +21,44 @@ export class AbstractStruct {
    * Merge this struct with the item to the right.
    * This method is already assuming that `this.id.clock + this.length === this.id.clock`.
    * Also this method does *not* remove right from StructStore!
-   * @param {AbstractStruct} right
+   * @param {GC|Item|Skip} _right
    * @return {boolean} whether this merged with right
    */
-  mergeWith (right) {
+  mergeWith (_right) {
     return false
   }
 
   /**
-   * @param {UpdateEncoderV1 | UpdateEncoderV2} encoder The encoder to write data to.
-   * @param {number} offset
-   * @param {number} encodingRef
+   * @param {UpdateEncoderV1 | UpdateEncoderV2} _encoder The encoder to write data to.
+   * @param {number} _offset
+   * @param {number} _encodingRef
    */
-  write (encoder, offset, encodingRef) {
+  write (_encoder, _offset, _encodingRef) {
     throw error.methodUnimplemented()
   }
 
   /**
-   * @param {Transaction} transaction
-   * @param {number} offset
+   * @param {Transaction} _transaction
+   * @param {number} _offset
    */
-  integrate (transaction, offset) {
+  integrate (_transaction, _offset) {
     throw error.methodUnimplemented()
   }
 
   /**
-   * @param {number} diff
-   * @return {import('../internals.js').GC|import('../internals.js').Item}
+   * @param {number} _diff
+   * @return {GC|Item|Skip}
    */
-  splice (diff) {
+  splice (_diff) {
     throw error.methodUnimplemented()
   }
 }
+
+/**
+ * @param {IdSet} idSet
+ * @param {AbstractStruct} struct
+ *
+ * @private
+ * @function
+ */
+export const addStructToIdSet = (idSet, struct) => idSet.add(struct.id.client, struct.id.clock, struct.length)

package/src/structs/GC.js

@@ -1,11 +1,5 @@
-import {
-  AbstractStruct,
-  addStruct,
-  addStructToIdSet,
-  addToIdSet,
-  createID,
-  UpdateEncoderV1, UpdateEncoderV2, StructStore, Transaction // eslint-disable-line
-} from '../internals.js'
+import { AbstractStruct, addStructToIdSet } from './AbstractStruct.js'
+import { createID } from '../utils/ID.js'
 
 export const structGCRefNumber = 0
 
@@ -20,7 +14,7 @@ export class GC extends AbstractStruct {
   delete () {}
 
   /**
-   * @param {GC} right
+   * @param {GC | Skip | Item} right
    * @return {boolean}
    */
   mergeWith (right) {
@@ -40,9 +34,9 @@ export class GC extends AbstractStruct {
       this.id.clock += offset
       this.length -= offset
     }
-    addToIdSet(transaction.deleteSet, this.id.client, this.id.clock, this.length)
+    transaction.deleteSet.add(this.id.client, this.id.clock, this.length)
     addStructToIdSet(transaction.insertSet, this)
-    addStruct(transaction.doc.store, this)
+    transaction.doc.store.add(this)
   }
 
   /**
@@ -55,15 +49,6 @@ export class GC extends AbstractStruct {
     encoder.writeLen(this.length - offset - offsetEnd)
   }
 
-  /**
-   * @param {Transaction} _transaction
-   * @param {StructStore} _store
-   * @return {null | number}
-   */
-  getMissing (_transaction, _store) {
-    return null
-  }
-
   /**
    * gc structs can't be spliced.
    *
@@ -78,3 +63,13 @@ export class GC extends AbstractStruct {
     return other
   }
 }
+
+/**
+ * @type {0}
+ */
+GC.prototype.ref = structGCRefNumber
+
+/**
+ * @type {false}
+ */
+GC.prototype.isItem = false