test(json-crdt): 💍 fix all tests after refactor

Author: streamich

src/json-crdt/__demos__/events.ts

@@ -25,7 +25,7 @@ const model = Model.withLogicalClock(1234); // 1234 is the session ID
 
 // DOM Level 2 node events
 const root = model.api.r;
-root.events.onViewChange.listen(() => {
+root.events.onViewChanges.listen(() => {
   console.log('Root value changed');
 });
 

src/json-crdt/model/__tests__/Model.cloning.spec.ts

@@ -215,7 +215,7 @@ describe('reset()', () => {
     });
     doc2.api.str(['text']).ins(5, ' world');
     let cnt = 0;
-    doc2.api.events.on('change', () => cnt++);
+    doc2.api.onChanges.listen(() => cnt++);
     doc2.reset(doc1);
     await until(() => cnt > 0);
     expect(cnt).toBe(1);

src/json-crdt/model/__tests__/Model.events.spec.ts

@@ -1,11 +1,11 @@
 import {PatchBuilder} from '../../../json-crdt-patch';
-import {Model, ModelChangeType} from '../Model';
+import {Model} from '../Model';
 
 describe('DOM Level 0, .onchange event system', () => {
   it('should trigger the onchange event when a value is set', () => {
     const model = Model.withLogicalClock();
     let cnt = 0;
-    model.onchange = () => {
+    model.onpatch = () => {
       cnt++;
     };
     expect(cnt).toBe(0);
@@ -26,7 +26,7 @@ describe('DOM Level 0, .onchange event system', () => {
   it('should trigger the onchange event when a value is set to the same value', () => {
     const model = Model.withLogicalClock();
     let cnt = 0;
-    model.onchange = () => {
+    model.onpatch = () => {
       cnt++;
     };
     expect(cnt).toBe(0);
@@ -42,7 +42,7 @@ describe('DOM Level 0, .onchange event system', () => {
   it('should trigger the onchange event when a value is deleted', () => {
     const model = Model.withLogicalClock();
     let cnt = 0;
-    model.onchange = () => {
+    model.onpatch = () => {
       cnt++;
     };
     expect(cnt).toBe(0);
@@ -60,7 +60,7 @@ describe('DOM Level 0, .onchange event system', () => {
   it('should trigger the onchange event when a non-existent value is deleted', () => {
     const model = Model.withLogicalClock();
     let cnt = 0;
-    model.onchange = () => {
+    model.onpatch = () => {
       cnt++;
     };
     expect(cnt).toBe(0);
@@ -78,7 +78,7 @@ describe('DOM Level 0, .onchange event system', () => {
   it('should trigger when root value is changed', () => {
     const model = Model.withLogicalClock();
     let cnt = 0;
-    model.onchange = () => {
+    model.onpatch = () => {
       cnt++;
     };
     expect(cnt).toBe(0);
@@ -96,29 +96,12 @@ describe('DOM Level 0, .onchange event system', () => {
   });
 
   describe('event types', () => {
-    it('should trigger the onchange event with a REMOTE event type', () => {
-      const model = Model.withLogicalClock();
-      let cnt = 0;
-      model.onchange = (type) => {
-        expect(type).toBe(ModelChangeType.REMOTE);
-        cnt++;
-      };
-      const builder = new PatchBuilder(model.clock.clone());
-      builder.root(builder.json({foo: 123}));
-      const patch = builder.flush();
-      expect(cnt).toBe(0);
-      model.applyPatch(patch);
-      expect(cnt).toBe(1);
-      expect(model.view()).toStrictEqual({foo: 123});
-    });
-
     it('should trigger the onchange event with a RESET event type', () => {
       const model1 = Model.withLogicalClock();
       const model2 = Model.withLogicalClock();
       model2.api.root([1, 2, 3]);
       let cnt = 0;
-      model1.onchange = (type) => {
-        expect(type).toBe(ModelChangeType.RESET);
+      model1.onreset = () => {
         cnt++;
       };
       expect(cnt).toBe(0);

src/json-crdt/model/api/NodeEvents.ts

@@ -24,11 +24,11 @@ export class NodeEvents<N extends JsonNode = JsonNode> implements SyncStore<Json
    * This event depends on overall Model's `onChanges` event, which is
    * batched using `queueMicrotask`.
    */
-  public readonly onViewChange: FanOut<JsonNodeView<N>>;
+  public readonly onViewChanges: FanOut<JsonNodeView<N>>;
 
   constructor(private readonly api: NodeApi<N>) {
     this.onChanges = new MapFanOut(this.api.api.onChanges, this.getSnapshot);
-    this.onViewChange = new OnNewFanOut(this.onChanges);
+    this.onViewChanges = new OnNewFanOut(this.onChanges);
   }
 
   /**
@@ -38,13 +38,13 @@ export class NodeEvents<N extends JsonNode = JsonNode> implements SyncStore<Json
    * @ignore
    */
   public handleDelete() {
-    (this.onViewChange as OnNewFanOut<JsonNodeView<N>>).clear();
+    (this.onViewChanges as OnNewFanOut<JsonNodeView<N>>).clear();
     (this.onChanges as MapFanOut<unknown, unknown>).clear();
   }
 
   // ---------------------------------------------------------------- SyncStore
 
   public readonly subscribe = (callback: () => void): SyncStoreUnsubscribe =>
-    this.onViewChange.listen(() => callback());
+    this.onViewChanges.listen(() => callback());
   public readonly getSnapshot = () => this.api.view();
 }

src/json-crdt/model/api/__tests__/NodeEvents.spec.ts

@@ -1,6 +1,6 @@
 import {Model} from '../..';
 
-test('does not fire events after node is deleted', () => {
+test('does not fire events after node is deleted', async () => {
   const model = Model.withLogicalClock();
   model.api.root({
     foo: {
@@ -11,13 +11,14 @@ test('does not fire events after node is deleted', () => {
   });
   const bar = model.api.obj(['foo', 'bar']);
   let cnt = 0;
-  bar.events.changes.listen(() => {
+  bar.events.onViewChanges.listen(() => {
     cnt++;
   });
   expect(cnt).toBe(0);
   bar.set({
     gg: 'wp',
   });
+  await Promise.resolve();
   expect(cnt).toBe(1);
   model.api.obj(['foo']).del(['bar']);
   model.api.obj(['foo']).set({gl: 'hf'});

src/json-crdt/model/api/__tests__/StrApi.spec.ts

@@ -75,14 +75,14 @@ describe('events', () => {
     const onView = () => cnt++;
     str.ins(0, 'aaa');
     expect(cnt).toEqual(0);
-    str.events.on('view', onView);
+    const unsub = str.events.onViewChanges.listen(onView);
     str.ins(0, 'bbb');
     await Promise.resolve();
     expect(cnt).toEqual(1);
     str.ins(0, 'ccc');
     await Promise.resolve();
     expect(cnt).toEqual(2);
-    str.events.off('view', onView);
+    unsub();
     str.del(1, 7);
     expect(cnt).toEqual(2);
   });
@@ -96,7 +96,7 @@ describe('events', () => {
     const onChange = () => cnt++;
     str.ins(0, 'aaa');
     expect(cnt).toEqual(0);
-    str.events.on('view', onChange);
+    str.events.onViewChanges.listen(onChange);
     str.ins(0, 'bbb');
     str.ins(0, 'ccc');
     str.del(1, 7);
@@ -114,7 +114,7 @@ describe('events', () => {
       const onView = () => cnt++;
       str.ins(0, 'aaa');
       expect(cnt).toEqual(0);
-      const unsubscribe = str.events.changes.listen(onView);
+      const unsubscribe = str.events.onViewChanges.listen(onView);
       str.ins(0, 'bbb');
       await Promise.resolve();
       expect(cnt).toEqual(1);

src/json-crdt/model/api/__tests__/VecApi.spec.ts

@@ -49,7 +49,7 @@ describe('events', () => {
     let cnt = 0;
     const onView = () => cnt++;
     const tuple = api.vec([]);
-    tuple.events.on('view', onView);
+    tuple.events.onViewChanges.listen(onView);
     expect(cnt).toBe(0);
     tuple.set([[0, 1.5]]);
     await Promise.resolve();
@@ -69,7 +69,7 @@ describe('events', () => {
     let cnt = 0;
     const onView = () => cnt++;
     const tuple = api.vec([]);
-    tuple.events.on('view', onView);
+    tuple.events.onViewChanges.listen(onView);
     expect(cnt).toBe(0);
     tuple.set([[0, 1.5]]);
     await Promise.resolve();
@@ -92,15 +92,15 @@ describe('events', () => {
     let cnt = 0;
     const onView = () => cnt++;
     const tuple = api.vec([]);
-    tuple.events.on('view', onView);
+    const unsub = tuple.events.onViewChanges.listen(onView);
     expect(cnt).toBe(0);
     tuple.set([[0, 1.5]]);
     await Promise.resolve();
     expect(cnt).toBe(1);
     tuple.set([[0, 2.5]]);
     await Promise.resolve();
     expect(cnt).toBe(2);
-    tuple.events.off('view', onView);
+    unsub();
     tuple.set([[0, 3.5]]);
     await Promise.resolve();
     expect(cnt).toBe(2);
@@ -113,7 +113,7 @@ describe('events', () => {
     let cnt = 0;
     const onView = () => cnt++;
     const tuple = api.vec([]);
-    tuple.events.on('view', onView);
+    tuple.events.onViewChanges.listen(onView);
     expect(cnt).toBe(0);
     tuple.set([[0, 1.5]]);
     tuple.set([[1, 44]]);