Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions src/json-crdt/model/__tests__/Model.node-deletion.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {s} from '../../../json-crdt-patch';
import {ValNode} from '../../nodes';
import {Model} from '../Model';

Expand Down Expand Up @@ -160,3 +161,74 @@ test('removes from index recursively after LWW register write', () => {
expect(!!doc.index.get(val3)).toBe(false);
expect(!!doc.index.get(val4)).toBe(false);
});

test('calling .view() on dangling "obj" when it was deleted, should not throw', () => {
const doc = Model.withLogicalClock().setSchema(
s.obj({
foo: s.obj({
bar: s.obj({
baz: s.con(123),
qux: s.str('asdf'),
}),
}),
}),
);

const bar = doc.root.child()!.get('foo')!.get('bar')!;
const baz = bar.get('baz')!;
const qux = bar.get('qux')!;
expect(bar.view()).toStrictEqual({
baz: 123,
qux: 'asdf',
});
doc.api.obj(['foo']).del(['bar']);
expect(bar.view()).toStrictEqual({});
expect((bar + '').includes(bar.id.time + '')).toBe(true);
expect(baz.view()).toBe(123);
expect(qux.view()).toBe('asdf');
});

test('calling .view() on dangling "arr" when it was deleted, should not throw', () => {
const doc = Model.withLogicalClock().setSchema(
s.obj({
foo: s.obj({
bar: s.arr([s.con(123), s.str('asdf')]),
}),
}),
);
const bar = doc.root.child()!.get('foo')!.get('bar')!;
expect(bar.view()).toStrictEqual([123, 'asdf']);
doc.api.obj(['foo']).del(['bar']);
expect(bar.view()).toStrictEqual([]);
expect((bar + '').includes(bar.id.time + '')).toBe(true);
});

test('calling .view() on dangling "vec" when it was deleted, should not throw', () => {
const doc = Model.withLogicalClock().setSchema(
s.obj({
foo: s.obj({
bar: s.vec(s.con(123), s.str('asdf')),
}),
}),
);
const bar = doc.root.child()!.get('foo')!.get('bar')!;
expect(bar.view()).toStrictEqual([123, 'asdf']);
doc.api.obj(['foo']).del(['bar']);
expect(bar.view()).toStrictEqual([undefined, undefined]);
expect((bar + '').includes(bar.id.time + '')).toBe(true);
});

test('calling .view() on dangling "val" when it was deleted, should not throw', () => {
const doc = Model.withLogicalClock().setSchema(
s.obj({
foo: s.obj({
bar: s.val(s.str('asdf')),
}),
}),
);
const bar = doc.root.child()!.get('foo')!.get('bar')!;
expect(bar.view()).toStrictEqual('asdf');
doc.api.obj(['foo']).del(['bar']);
expect(bar.view()).toStrictEqual(undefined);
expect((bar + '').includes(bar.id.time + '')).toBe(true);
});
14 changes: 10 additions & 4 deletions src/json-crdt/nodes/arr/ArrNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,12 @@ export class ArrNode<Element extends JsonNode = JsonNode>
for (let chunk = this.first(); chunk; chunk = this.next(chunk)) {
if (chunk.del) continue;
for (const node of chunk.data!) {
const element = index.get(node)!.view() as JsonNodeView<Element>;
const elementNode = index.get(node);
if (!elementNode) {
useCache = false;
continue;
}
const element = elementNode.view() as JsonNodeView<Element>;
if (_view[view.length] !== element) useCache = false;
view.push(element);
}
Expand Down Expand Up @@ -188,9 +193,10 @@ export class ArrNode<Element extends JsonNode = JsonNode>
const index = this.doc.index;
valueTree = printTree(
tab,
chunk.data!.map(
(id, i) => (tab) => `[${pos + i}]: ${index.get(id)!.toString(tab + ' ' + ' '.repeat(String(i).length))}`,
),
chunk
.data!.map((id) => index.get(id))
.filter((node) => !!node)
.map((node, i) => (tab) => `[${pos + i}]: ${node!.toString(tab + ' ' + ' '.repeat(String(i).length))}`),
);
}
return (
Expand Down
19 changes: 13 additions & 6 deletions src/json-crdt/nodes/obj/ObjNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@ export class ObjNode<Value extends Record<string, JsonNode> = Record<string, Jso
const index = doc.index;
let useCache = true;
this.keys.forEach((id, key) => {
const value = index.get(id)!.view();
const valueNode = index.get(id);
if (!valueNode) {
useCache = false;
return;
}
const value = valueNode.view();
if (value !== undefined) {
if (_view[key] !== value) useCache = false;
(<any>view)[key] = value;
Expand All @@ -137,11 +142,13 @@ export class ObjNode<Value extends Record<string, JsonNode> = Record<string, Jso
header +
printTree(
tab,
[...this.keys.entries()].map(
([key, id]) =>
(tab) =>
JSON.stringify(key) + printTree(tab + ' ', [(tab) => this.doc.index.get(id)!.toString(tab)]),
),
[...this.keys.entries()]
.filter(([, id]) => !!this.doc.index.get(id))
.map(
([key, id]) =>
(tab) =>
JSON.stringify(key) + printTree(tab + ' ', [(tab) => this.doc.index.get(id)!.toString(tab)]),
),
)
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/json-crdt/nodes/val/ValNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ export class ValNode<Value extends JsonNode = JsonNode> implements JsonNode<Read
* @returns The latest value of the node.
*/
public node(): Value {
return this.val.sid === SESSION.SYSTEM ? <any>UNDEFINED : this.child()!;
return this.val.sid === SESSION.SYSTEM ? <any>UNDEFINED : this.child();
}

// ----------------------------------------------------------------- JsonNode

public view(): Readonly<JsonNodeView<Value>> {
return this.node().view() as Readonly<JsonNodeView<Value>>;
return this.node()?.view() as Readonly<JsonNodeView<Value>>;
}

/**
Expand Down
5 changes: 4 additions & 1 deletion src/json-crdt/nodes/vec/VecNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,15 @@ export class VecNode<Value extends JsonNode[] = JsonNode[]>
if (extNode) {
return this.child()!.toString(tab);
}
const index = this.doc.index;
return (
header +
printTree(tab, [
...this.elements.map(
(id, i) => (tab: string) =>
`${i}: ${!id ? 'nil' : this.doc.index.get(id)!.toString(tab + ' ' + ' '.repeat(('' + i).length))}`,
`${i}: ${
!id ? 'nil' : index.get(id) ? index.get(id)!.toString(tab + ' ' + ' '.repeat(('' + i).length)) : 'nil'
}`,
),
...(extNode ? [(tab: string) => `${this.child()!.toString(tab)}`] : []),
])
Expand Down