@graffiti-garden/implementation-local 0.2.11 → 0.2.12

package/dist/synchronize.d.ts

@@ -14,7 +14,7 @@ export declare class GraffitiSynchronize implements Pick<Graffiti, "put" | "get"
     protected readonly graffiti: GraffitiDatabaseMethods;
     protected readonly callbacks: Set<Callback>;
     constructor(graffiti: GraffitiDatabaseMethods, ajv?: Ajv);
-    protected synchronizeDispatch(oldObject: GraffitiObjectBase, newObject?: GraffitiObjectBase): Promise<void>;
+    protected synchronizeDispatch(oldObject: GraffitiObjectBase, newObject?: GraffitiObjectBase, macroTask?: boolean): Promise<void>;
     get: Graffiti["get"];
     put: Graffiti["put"];
     patch: Graffiti["patch"];

package/dist/synchronize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronize.d.ts","sourceRoot":"","sources":["../src/synchronize.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAY/D,KAAK,uBAAuB,GAAG,IAAI,CACjC,QAAQ,EACR,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,gBAAgB,CACnE,CAAC;AAEF,KAAK,QAAQ,GAAG,CACd,SAAS,EAAE,kBAAkB,EAC7B,SAAS,CAAC,EAAE,kBAAkB,KAC3B,IAAI,CAAC;AAEV;;;;;GAKG;AACH,qBAAa,mBACX,YACE,IAAI,CACF,QAAQ,EACN,KAAK,GACL,KAAK,GACL,OAAO,GACP,QAAQ,GACR,UAAU,GACV,gBAAgB,GAChB,qBAAqB,GACrB,gBAAgB,GAChB,2BAA2B,CAC9B;IAEH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAC5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,gBAAuB;gBAIvC,QAAQ,EAAE,uBAAuB,EAAE,GAAG,CAAC,EAAE,GAAG;cAKxC,mBAAmB,CACjC,SAAS,EAAE,kBAAkB,EAC7B,SAAS,CAAC,EAAE,kBAAkB;IAchC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAIlB;IAEF,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAYlB;IAEF,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,CAStB;IAEF,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAIxB;IAEF,SAAS,CAAC,YAAY,CAAC,MAAM,SAAS,WAAW,EAC/C,QAAQ,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;;;;;;;;;IAiBlE,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAG5B;IAEF,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAGxC;IAEF,SAAS,CAAC,WAAW,CAAC,MAAM,SAAS,WAAW,EAC9C,WAAW,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,EACpD,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAgClC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAMlD;IAEF,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAQxC;IAEF,yBAAyB,EAAE,QAAQ,CAAC,2BAA2B,CAAC,CAQ9D;CACH"}
+{"version":3,"file":"synchronize.d.ts","sourceRoot":"","sources":["../src/synchronize.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAY/D,KAAK,uBAAuB,GAAG,IAAI,CACjC,QAAQ,EACR,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,gBAAgB,CACnE,CAAC;AAEF,KAAK,QAAQ,GAAG,CACd,SAAS,EAAE,kBAAkB,EAC7B,SAAS,CAAC,EAAE,kBAAkB,KAC3B,IAAI,CAAC;AAEV;;;;;GAKG;AACH,qBAAa,mBACX,YACE,IAAI,CACF,QAAQ,EACN,KAAK,GACL,KAAK,GACL,OAAO,GACP,QAAQ,GACR,UAAU,GACV,gBAAgB,GAChB,qBAAqB,GACrB,gBAAgB,GAChB,2BAA2B,CAC9B;IAEH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAC5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,gBAAuB;gBAIvC,QAAQ,EAAE,uBAAuB,EAAE,GAAG,CAAC,EAAE,GAAG;cAKxC,mBAAmB,CACjC,SAAS,EAAE,kBAAkB,EAC7B,SAAS,CAAC,EAAE,kBAAkB,EAC9B,SAAS,UAAQ;IAsBnB,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAIlB;IAEF,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAYlB;IAEF,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,CAStB;IAEF,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAIxB;IAEF,SAAS,CAAC,YAAY,CAAC,MAAM,SAAS,WAAW,EAC/C,QAAQ,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;;;;;;;;;IAiBlE,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAG5B;IAEF,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAGxC;IAEF,SAAS,CAAC,WAAW,CAAC,MAAM,SAAS,WAAW,EAC9C,WAAW,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,EACpD,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAgClC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAMlD;IAEF,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAQxC;IAEF,yBAAyB,EAAE,QAAQ,CAAC,2BAA2B,CAAC,CAQ9D;CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graffiti-garden/implementation-local",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "A local implementation of the Graffiti API using PouchDB",
   "types": "./dist/index.d.ts",
   "module": "./dist/esm/index.js",

package/src/synchronize.ts

@@ -61,17 +61,26 @@ export class GraffitiSynchronize
   protected async synchronizeDispatch(
     oldObject: GraffitiObjectBase,
     newObject?: GraffitiObjectBase,
+    macroTask = false,
   ) {
     for (const callback of this.callbacks) {
       callback(oldObject, newObject);
     }
-    // No idea why this works...
-    // You can't await push in the callback
-    // below, because the await will only resolve
-    // after a subsequent .next() call
-    await Promise.resolve();
-    await Promise.resolve();
-    await Promise.resolve();
+    if (macroTask) {
+      // Wait for one macro task cycle...
+      // This way the yields, triggered by the callbacks,
+      // will resolve first. Unfortunately, if we try to
+      // use @repeaterjs's `await push` in the callback,
+      // the promise won't resolve until the next
+      // .next() call of the iterator, so if only
+      // one .next() is called, this dispatch will hang.
+      //
+      // Only mutators (put, patch, delete) should bother
+      // using this, so that they can ensure the application
+      // state has been updated everywhere before returning,
+      // for proper feedback.
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    }
   }
 
   get: Graffiti["get"] = async (...args) => {
@@ -90,7 +99,7 @@ export class GraffitiSynchronize
       allowed: partialObject.allowed,
       tombstone: false,
     };
-    await this.synchronizeDispatch(oldObject, newObject);
+    await this.synchronizeDispatch(oldObject, newObject, true);
     return oldObject;
   };
 
@@ -101,13 +110,13 @@ export class GraffitiSynchronize
     for (const prop of ["value", "channels", "allowed"] as const) {
       applyGraffitiPatch(applyPatch, prop, args[0], newObject);
     }
-    await this.synchronizeDispatch(oldObject, newObject);
+    await this.synchronizeDispatch(oldObject, newObject, true);
     return oldObject;
   };
 
   delete: Graffiti["delete"] = async (...args) => {
     const oldObject = await this.graffiti.delete(...args);
-    await this.synchronizeDispatch(oldObject);
+    await this.synchronizeDispatch(oldObject, undefined, true);
     return oldObject;
   };
 
@@ -150,7 +159,7 @@ export class GraffitiSynchronize
     const repeater: ReturnType<
       typeof Graffiti.prototype.synchronizeDiscover<typeof schema>
     > = new Repeater(async (push, stop) => {
-      const callback: Callback = async (oldObjectRaw, newObjectRaw) => {
+      const callback: Callback = (oldObjectRaw, newObjectRaw) => {
         for (const objectRaw of [newObjectRaw, oldObjectRaw]) {
           if (
             objectRaw &&