Merge pull request #669 from streamich/sync-store-updates

Make JSON Patch JSON CRDT store events synchronous

Author: streamich

src/json-crdt/json-patch/JsonPatchStore.ts

@@ -22,6 +22,7 @@ export class JsonPatchStore<N extends JsonNode = JsonNode<any>> implements SyncS
     this.node = api.find(path) as N;
     this.api = api.wrap(this.node) as unknown as JsonNodeApi<N>;
     this.patcher = new JsonPatch(model, path);
+    this.subscribe = (listener) => api.onChange.listen(listener);
   }
 
   public readonly update = (change: Operation | Operation[]): void => {
@@ -35,6 +36,6 @@ export class JsonPatchStore<N extends JsonNode = JsonNode<any>> implements SyncS
 
   // ---------------------------------------------------------------- SyncStore
 
-  public readonly subscribe = (callback: () => void) => this.api.events.onChanges.listen(() => callback());
+  public readonly subscribe: SyncStore<any>['subscribe'];
   public readonly getSnapshot = () => this.node.view() as Readonly<JsonNodeView<N>>;
 }

src/json-crdt/json-patch/__tests__/JsonPatchStore.spec.ts

@@ -28,7 +28,7 @@ test('can make updates', () => {
   });
 });
 
-test('can subscribe and unsubscribe to changes', async () => {
+test('can subscribe and unsubscribe to changes', () => {
   const model = Model.create(
     s.obj({
       ui: s.obj({
@@ -44,25 +44,21 @@ test('can subscribe and unsubscribe to changes', async () => {
   const unsubscribe = store.subscribe(() => {
     cnt++;
   });
-  await tick(1);
   expect(cnt).toBe(0);
   store.update({op: 'str_ins', path: '/text', pos: 1, str: 'x'});
-  await tick(1);
   expect(cnt).toBe(1);
   store.update({op: 'str_ins', path: '/text', pos: 1, str: 'x'});
-  await tick(1);
   expect(cnt).toBe(2);
   unsubscribe();
   store.update({op: 'str_ins', path: '/text', pos: 1, str: 'x'});
-  await tick(1);
   expect(cnt).toBe(2);
   expect(store.getSnapshot()).toEqual({
     text: 'axxxbc',
     counter: 123,
   });
 });
 
-test('can bind to a sub-path', async () => {
+test('can bind to a sub-path', () => {
   const model = Model.create(
     s.obj({
       ui: s.obj({
@@ -86,7 +82,7 @@ test('can bind to a sub-path', async () => {
   });
 });
 
-test('can bind store to a "str" node', async () => {
+test('can bind store to a "str" node', () => {
   const model = Model.create(
     s.obj({
       ui: s.obj({
@@ -104,7 +100,7 @@ test('can bind store to a "str" node', async () => {
   expect(store2.getSnapshot()).toEqual('abcx');
 });
 
-test('can execute mutations inside a transaction', async () => {
+test('can execute mutations inside a transaction', () => {
   const model = Model.create(
     s.obj({
       ui: s.obj({
@@ -126,7 +122,6 @@ test('can execute mutations inside a transaction', async () => {
     store2.update({op: 'str_ins', path: '', pos: 3, str: 'x'});
   });
   expect(cnt).toBe(1);
-  await tick(1);
   expect(cnt).toBe(1);
   expect(store2.getSnapshot()).toEqual('abcx');
 });