yonote/yjs
26
0
Fork 0
Code Pull Requests 1 Releases Activity

Y.Map support for forEach, get, has on prelimContent

Browse Source
This commit is contained in:
Duane Johnson 2020-06-12 13:40:49 -06:00
parent 6dd26d3b48
commit bdf2dd7691
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/types/YMap.js
View File

@ -155,18 +155,21 @@ export class YMap extends AbstractType {
* Executes a provided function on once on every key-value pair.
*
* @param {function(T,string,YMap<T>):void} f A function to execute on every element of this YArray.
* @returns {Object<string,T>}
*/
forEach (f) {
/**
* @type {Object<string,T>}
*/
const map = {}
for (const [key, item] of this._map) {
if (!item.deleted) {
f(item.content.getContent()[item.length - 1], key, this)
if (this.doc !== null) {
for (const [key, item] of this._map) {
if (!item.deleted) {
f(item.content.getContent()[item.length - 1], key, this)
}
}
} else {
for (const [key, item] of /** @type {Map<string, any>} */ (this._prelimContent)) {
f(item, key, this)
}
}
return map
return {}
}
/**
@ -215,7 +218,11 @@ export class YMap extends AbstractType {
* @return {T|undefined}
*/
get (key) {
return /** @type {any} */ (typeMapGet(this, key))
if (this.doc !== null) {
return /** @type {any} */ (typeMapGet(this, key))
} else {
return /** @type {Map<string, any>} */ (this._prelimContent).get(key)
}
}
/**
@ -225,7 +232,11 @@ export class YMap extends AbstractType {
* @return {boolean}
*/
has (key) {
return typeMapHas(this, key)
if (this.doc !== null) {
return typeMapHas(this, key)
} else {
return /** @type {Map<string, any>} */ (this._prelimContent).has(key)
}
}
/**

29
tests/y-map.tests.js
View File

@ -83,6 +83,35 @@ export const testBasicMapTests = tc => {
compare(users)
}
export const testMapPrelimGetAndHas = () => {
const map = new Y.Map(Object.entries({ number: 1 }))
t.assert(map.get('number') === 1, 'get numbershould retrieve prelim value')
t.assert(map.has('number') === true, 'has number should be true for prelim value')
}
export const testMapPrelimForEach = () => {
const map = new Y.Map(Object.entries({
number: 1,
string: 'test',
map: new Y.Map(Object.entries({ boolean: true }))
}))
/**
* @type {Function[]}
*/
const assertions = [
(/** @type {string} */ key, /** @type {number} */ value) => { t.assert(key === 'number' && value === 1, "map.forEach on prelim should have key 'number' === 1") },
(/** @type {string} */ key, /** @type {string} */ value) => { t.assert(key === 'string' && value === 'test', "map.forEach on prelim should have key 'string' === 'test'") },
(/** @type {string} */ key, /** @type {any} */ value) => { t.assert(key === 'map' && value.get('boolean') === true, "map.forEach on prelim should have key 'map' and have a 'boolean' key that is true") }
]
let i = 0
map.forEach((value, key) => {
assertions[i](key, value)
i++
})
t.assert(i === 3, `forEach iterates over all 3 prelim keys (${i} iterations)`)
}
/**
* @param {t.TestCase} tc
*/