prelim refactor commit

This commit is contained in:
Kevin Jahns
2019-03-26 01:14:15 +01:00
parent 293527e62b
commit d9ab593b07
44 changed files with 2263 additions and 1914 deletions

View File

@@ -2,59 +2,100 @@
* @module structs
*/
import { Item, splitHelper, logItemHelper } from './Item.js'
import { AbstractItem, logItemHelper, AbstractItemRef, splitItem } from './AbstractItem.js'
import * as encoding from 'lib0/encoding.js'
import * as decoding from 'lib0/decoding.js'
import { Y } from '../utils/Y.js' // eslint-disable-line
import { ID } from '../utils/ID.js' // eslint-disable-line
import { ItemType } from './ItemType.js' // eslint-disable-line
import { getItemCleanEnd, getItemCleanStart, getItemType } from '../utils/StructStore.js'
import { Transaction } from '../utils/Transaction.js' // eslint-disable-line
export class ItemString extends Item {
constructor () {
super()
this._content = null
}
_copy () {
let struct = super._copy()
struct._content = this._content
return struct
}
get _length () {
return this._content.length
}
export const structStringRefNumber = 6
export class ItemString extends AbstractItem {
/**
* @param {Y} y
* @param {decoding.Decoder} decoder
* @param {ID} id
* @param {AbstractItem | null} left
* @param {AbstractItem | null} right
* @param {ItemType | null} parent
* @param {string | null} parentSub
* @param {string} string
*/
_fromBinary (y, decoder) {
let missing = super._fromBinary(y, decoder)
this._content = decoding.readVarString(decoder)
return missing
constructor (id, left, right, parent, parentSub, string) {
super(id, left, right, parent, parentSub)
this.string = string
}
/**
* @param {encoding.Encoder} encoder
* @param {ID} id
* @param {AbstractItem | null} left
* @param {AbstractItem | null} right
* @param {ItemType | null} parent
* @param {string | null} parentSub
*/
_toBinary (encoder) {
super._toBinary(encoder)
encoding.writeVarString(encoder, this._content)
copy (id, left, right, parent, parentSub) {
return new ItemString(id, left, right, parent, parentSub, this.string)
}
/**
* Transform this YXml Type to a readable format.
* Transform this Type to a readable format.
* Useful for logging as all Items and Delete implement this method.
*
* @private
*/
_logString () {
return logItemHelper('ItemString', this, `content:"${this._content}"`)
logString () {
return logItemHelper('ItemString', this, `content:"${this.string}"`)
}
_splitAt (y, diff) {
get length () {
return this.string.length
}
splitAt (y, diff) {
if (diff === 0) {
return this
} else if (diff >= this._length) {
return this._right
} else if (diff >= this.string.length) {
return this.right
}
let item = new ItemString()
item._content = this._content.slice(diff)
this._content = this._content.slice(0, diff)
splitHelper(y, this, item, diff)
return item
/**
* @type {ItemString}
*/
const right = splitItem(this, y, diff)
right.string = this.string.slice(diff)
right.string = this.string.slice(0, diff)
return right
}
/**
* @param {encoding.Encoder} encoder
*/
write (encoder) {
super.write(encoder, structStringRefNumber)
encoding.writeVarString(encoder, this.string)
}
}
export class ItemStringRef extends AbstractItemRef {
/**
* @param {decoding.Decoder} decoder
* @param {number} info
*/
constructor (decoder, info) {
super(decoder, info)
/**
* @type {string}
*/
this.string = decoding.readVarString(decoder)
}
/**
* @param {Transaction} transaction
* @return {ItemString}
*/
toStruct (transaction) {
const store = transaction.y.store
return new ItemString(
this.id,
this.left === null ? null : getItemCleanEnd(store, transaction, this.left),
this.right === null ? null : getItemCleanStart(store, transaction, this.right),
this.parent === null ? null : getItemType(store, this.parent),
this.parentSub,
this.string
)
}
}