@graffiti-garden/implementation-local 0.2.10 → 0.2.11

package/dist/synchronize.d.ts

@@ -2,6 +2,7 @@ import Ajv from "ajv-draft-04";
 import type { Graffiti, GraffitiSession, JSONSchema4 } from "@graffiti-garden/api";
 import type { GraffitiObjectBase } from "@graffiti-garden/api";
 type GraffitiDatabaseMethods = Pick<Graffiti, "get" | "put" | "patch" | "delete" | "discover" | "recoverOrphans">;
+type Callback = (oldObject: GraffitiObjectBase, newObject?: GraffitiObjectBase) => void;
 /**
  * Wraps a partial implementation of the [Graffiti API](https://api.graffiti.garden/classes/Graffiti.html)
  * to provide the [`synchronize`](https://api.graffiti.garden/classes/Graffiti.html#synchronize) method.
@@ -9,11 +10,11 @@ type GraffitiDatabaseMethods = Pick<Graffiti, "get" | "put" | "patch" | "delete"
  * `get`, `put`, `patch`, `delete`, and `discover`.
  */
 export declare class GraffitiSynchronize implements Pick<Graffiti, "put" | "get" | "patch" | "delete" | "discover" | "recoverOrphans" | "synchronizeDiscover" | "synchronizeGet" | "synchronizeRecoverOrphans"> {
-    protected readonly synchronizeEvents: EventTarget;
     protected readonly ajv: Ajv;
     protected readonly graffiti: GraffitiDatabaseMethods;
+    protected readonly callbacks: Set<Callback>;
     constructor(graffiti: GraffitiDatabaseMethods, ajv?: Ajv);
-    protected synchronizeDispatch(oldObject: GraffitiObjectBase, newObject?: GraffitiObjectBase): void;
+    protected synchronizeDispatch(oldObject: GraffitiObjectBase, newObject?: GraffitiObjectBase): 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;AAiB/D,KAAK,uBAAuB,GAAG,IAAI,CACjC,QAAQ,EACR,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,gBAAgB,CACnE,CAAC;AAEF;;;;;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,iBAAiB,cAAqB;IACzD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAC5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;gBAIzC,QAAQ,EAAE,uBAAuB,EAAE,GAAG,CAAC,EAAE,GAAG;IAKxD,SAAS,CAAC,mBAAmB,CAC3B,SAAS,EAAE,kBAAkB,EAC7B,SAAS,CAAC,EAAE,kBAAkB;IAWhC,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;IAyClC,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;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graffiti-garden/implementation-local",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "A local implementation of the Graffiti API using PouchDB",
   "types": "./dist/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -89,7 +89,7 @@
     "vitest": "^2.1.8"
   },
   "dependencies": {
-    "@graffiti-garden/api": "^0.2.7",
+    "@graffiti-garden/api": "^0.2.11",
     "@repeaterjs/repeater": "^3.0.6",
     "@types/pouchdb": "^6.4.2",
     "ajv": "^8.17.1",

package/src/synchronize.ts

@@ -16,16 +16,16 @@ import {
   unpackLocationOrUri,
 } from "./utilities.js";
 
-type SynchronizeEvent = CustomEvent<{
-  oldObject: GraffitiObjectBase;
-  newObject?: GraffitiObjectBase;
-}>;
-
 type GraffitiDatabaseMethods = Pick<
   Graffiti,
   "get" | "put" | "patch" | "delete" | "discover" | "recoverOrphans"
 >;
 
+type Callback = (
+  oldObject: GraffitiObjectBase,
+  newObject?: GraffitiObjectBase,
+) => void;
+
 /**
  * Wraps a partial implementation of the [Graffiti API](https://api.graffiti.garden/classes/Graffiti.html)
  * to provide the [`synchronize`](https://api.graffiti.garden/classes/Graffiti.html#synchronize) method.
@@ -47,9 +47,9 @@ export class GraffitiSynchronize
       | "synchronizeRecoverOrphans"
     >
 {
-  protected readonly synchronizeEvents = new EventTarget();
   protected readonly ajv: Ajv;
   protected readonly graffiti: GraffitiDatabaseMethods;
+  protected readonly callbacks = new Set<Callback>();
 
   // Pass in the ajv instance
   // and database methods to wrap
@@ -58,17 +58,20 @@ export class GraffitiSynchronize
     this.graffiti = graffiti;
   }
 
-  protected synchronizeDispatch(
+  protected async synchronizeDispatch(
     oldObject: GraffitiObjectBase,
     newObject?: GraffitiObjectBase,
   ) {
-    const event: SynchronizeEvent = new CustomEvent("change", {
-      detail: {
-        oldObject,
-        newObject,
-      },
-    });
-    this.synchronizeEvents.dispatchEvent(event);
+    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();
   }
 
   get: Graffiti["get"] = async (...args) => {
@@ -87,7 +90,7 @@ export class GraffitiSynchronize
       allowed: partialObject.allowed,
       tombstone: false,
     };
-    this.synchronizeDispatch(oldObject, newObject);
+    await this.synchronizeDispatch(oldObject, newObject);
     return oldObject;
   };
 
@@ -98,13 +101,13 @@ export class GraffitiSynchronize
     for (const prop of ["value", "channels", "allowed"] as const) {
       applyGraffitiPatch(applyPatch, prop, args[0], newObject);
     }
-    this.synchronizeDispatch(oldObject, newObject);
+    await this.synchronizeDispatch(oldObject, newObject);
     return oldObject;
   };
 
   delete: Graffiti["delete"] = async (...args) => {
     const oldObject = await this.graffiti.delete(...args);
-    this.synchronizeDispatch(oldObject);
+    await this.synchronizeDispatch(oldObject);
     return oldObject;
   };
 
@@ -147,10 +150,7 @@ export class GraffitiSynchronize
     const repeater: ReturnType<
       typeof Graffiti.prototype.synchronizeDiscover<typeof schema>
     > = new Repeater(async (push, stop) => {
-      const callback = (event: SynchronizeEvent) => {
-        const { oldObject: oldObjectRaw, newObject: newObjectRaw } =
-          event.detail;
-
+      const callback: Callback = async (oldObjectRaw, newObjectRaw) => {
         for (const objectRaw of [newObjectRaw, oldObjectRaw]) {
           if (
             objectRaw &&
@@ -167,15 +167,9 @@ export class GraffitiSynchronize
         }
       };
 
-      this.synchronizeEvents.addEventListener(
-        "change",
-        callback as EventListener,
-      );
+      this.callbacks.add(callback);
       await stop;
-      this.synchronizeEvents.removeEventListener(
-        "change",
-        callback as EventListener,
-      );
+      this.callbacks.delete(callback);
     });
 
     return repeater;