@graffiti-garden/wrapper-vue 0.6.2 → 0.6.4

package/dist/node/pollers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pollers.d.ts","sourceRoot":"","sources":["../../src/pollers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EACV,cAAc,EAEd,iCAAiC,EACjC,oBAAoB,EACpB,4BAA4B,EAC7B,MAAM,sBAAsB,CAAC;AAE9B,8BAAsB,MAAM,CAAC,MAAM,SAAS,UAAU;IACpD,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,CAAC,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,IAAI,GACzE,OAAO,CAAC,IAAI,CAAC;IAChB,QAAQ,CAAC,KAAK,IAAI,IAAI;CACvB;AAED;;GAEG;AACH,qBAAa,SAAS,CAAC,MAAM,SAAS,UAAU,CAAE,YAAW,MAAM,CAAC,MAAM,CAAC;IAC7D,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAA7C,MAAM,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAElE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAS1B;IAEF,KAAK;CACN;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,MAAM,SAAS,UAAU,CAAE,YAAW,MAAM,CAAC,MAAM,CAAC;IAIhE,QAAQ,CAAC,aAAa,EAAE,MAAM,oBAAoB,CAAC,MAAM,CAAC;IAHtE,QAAQ,EAAE,4BAA4B,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAC3D,QAAQ,EAAE,CAAC,MAAM,4BAA4B,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;gBAE9C,aAAa,EAAE,MAAM,oBAAoB,CAAC,MAAM,CAAC;IAEtE,KAAK;IAYL,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAgC1B;CACH"}
+{"version":3,"file":"pollers.d.ts","sourceRoot":"","sources":["../../src/pollers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,cAAc,EAEnB,KAAK,iCAAiC,EACtC,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EAElC,MAAM,sBAAsB,CAAC;AAE9B,8BAAsB,MAAM,CAAC,MAAM,SAAS,UAAU;IACpD,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,CACP,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,OAAO,KAC9D,IAAI,GACR,OAAO,CAAC,IAAI,CAAC;IAChB,QAAQ,CAAC,KAAK,IAAI,IAAI;CACvB;AAED;;GAEG;AACH,qBAAa,SAAS,CAAC,MAAM,SAAS,UAAU,CAAE,YAAW,MAAM,CAAC,MAAM,CAAC;IAC7D,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAA7C,MAAM,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAElE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAc1B;IAEF,KAAK;CACN;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,MAAM,SAAS,UAAU,CAAE,YAAW,MAAM,CAAC,MAAM,CAAC;IAIhE,QAAQ,CAAC,aAAa,EAAE,MAAM,oBAAoB,CAAC,MAAM,CAAC;IAHtE,QAAQ,EAAE,4BAA4B,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAC3D,QAAQ,EAAE,CAAC,MAAM,4BAA4B,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;gBAE9C,aAAa,EAAE,MAAM,oBAAoB,CAAC,MAAM,CAAC;IAEtE,KAAK;IAYL,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAiD1B;CACH"}

package/dist/node/reducers.d.ts

@@ -2,7 +2,7 @@ import { Ref } from 'vue';
 import { GraffitiObject, Graffiti, JSONSchema, GraffitiObjectStreamContinueEntry } from '@graffiti-garden/api';
 export declare abstract class Reducer<Schema extends JSONSchema> {
     abstract clear(): void;
-    abstract onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null): void;
+    abstract onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear"): void;
 }
 /**
  * Retrieves multiple Graffiti objects and retains
@@ -15,7 +15,7 @@ export declare class SingletonReducer<Schema extends JSONSchema> implements Redu
     readonly entry: Ref<GraffitiObjectStreamContinueEntry<Schema> | null | undefined>;
     get result(): Ref<GraffitiObject<Schema> | null | undefined>;
     clear(): void;
-    onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null): void;
+    onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear"): void;
 }
 /**
  * Retrieves multiple Graffiti objects and retains
@@ -32,6 +32,6 @@ export declare class ArrayReducer<Schema extends JSONSchema> implements Reducer<
     constructor(graffiti: Graffiti);
     clear(): void;
     flattenResults(): void;
-    onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null): void;
+    onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear"): void;
 }
 //# sourceMappingURL=reducers.d.ts.map

package/dist/node/reducers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reducers.d.ts","sourceRoot":"","sources":["../../src/reducers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,KAAK,EACV,cAAc,EACd,QAAQ,EACR,UAAU,EACV,iCAAiC,EAClC,MAAM,sBAAsB,CAAC;AAE9B,8BAAsB,OAAO,CAAC,MAAM,SAAS,UAAU;IACrD,QAAQ,CAAC,KAAK,IAAI,IAAI;IACtB,QAAQ,CAAC,OAAO,CACd,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GACtD,IAAI;CACR;AAeD;;;;;;GAMG;AACH,qBAAa,gBAAgB,CAAC,MAAM,SAAS,UAAU,CACrD,YAAW,OAAO,CAAC,MAAM,CAAC;IAE1B,QAAQ,CAAC,KAAK,EAAE,GAAG,CACjB,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAC7D,CAAS;IAEV,IAAI,MAAM,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAO3D;IAED,KAAK;IAIL,OAAO,CAAC,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI;CAKhE;AAED;;;;;;GAMG;AACH,qBAAa,YAAY,CAAC,MAAM,SAAS,UAAU,CACjD,YAAW,OAAO,CAAC,MAAM,CAAC;IAOd,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IALvC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAW;IAC1D,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iCAAiC,CAAC,MAAM,CAAC,CAAC,CAC/D;IACZ,iBAAiB,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,SAAS,CAAC;gBAExC,QAAQ,EAAE,QAAQ;IAEvC,KAAK;IAOL,cAAc;IAWd,OAAO,CAAC,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI;CAiBhE"}
+{"version":3,"file":"reducers.d.ts","sourceRoot":"","sources":["../../src/reducers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,KAAK,EACV,cAAc,EACd,QAAQ,EACR,UAAU,EACV,iCAAiC,EAClC,MAAM,sBAAsB,CAAC;AAE9B,8BAAsB,OAAO,CAAC,MAAM,SAAS,UAAU;IACrD,QAAQ,CAAC,KAAK,IAAI,IAAI;IACtB,QAAQ,CAAC,OAAO,CACd,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,OAAO,GAChE,IAAI;CACR;AAeD;;;;;;GAMG;AACH,qBAAa,gBAAgB,CAAC,MAAM,SAAS,UAAU,CACrD,YAAW,OAAO,CAAC,MAAM,CAAC;IAE1B,QAAQ,CAAC,KAAK,EAAE,GAAG,CACjB,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAC7D,CAAS;IAEV,IAAI,MAAM,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAO3D;IAED,KAAK;IAIL,OAAO,CAAC,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,OAAO;CAS1E;AAED;;;;;;GAMG;AACH,qBAAa,YAAY,CAAC,MAAM,SAAS,UAAU,CACjD,YAAW,OAAO,CAAC,MAAM,CAAC;IAOd,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IALvC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAW;IAC1D,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iCAAiC,CAAC,MAAM,CAAC,CAAC,CAC/D;IACZ,iBAAiB,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,SAAS,CAAC;gBAExC,QAAQ,EAAE,QAAQ;IAEvC,KAAK;IAOL,cAAc;IAWd,OAAO,CAAC,KAAK,EAAE,iCAAiC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,OAAO;CAqB1E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graffiti-garden/wrapper-vue",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Vue.js wrapper for the Graffiti API",
   "types": "./dist/node/plugin.d.ts",
   "module": "./dist/node/plugin.mjs",

package/src/pollers.ts

@@ -1,16 +1,19 @@
-import type {
-  Graffiti,
-  JSONSchema,
-  GraffitiObject,
-  GraffitiObjectStreamReturn,
-  GraffitiObjectStreamContinueEntry,
-  GraffitiObjectStream,
-  GraffitiObjectStreamContinue,
+import {
+  type Graffiti,
+  type JSONSchema,
+  type GraffitiObject,
+  type GraffitiObjectStreamReturn,
+  type GraffitiObjectStreamContinueEntry,
+  type GraffitiObjectStream,
+  type GraffitiObjectStreamContinue,
+  GraffitiErrorNotFound,
 } from "@graffiti-garden/api";
 
 export abstract class Poller<Schema extends JSONSchema> {
   abstract poll(
-    onEntry: (entry: GraffitiObjectStreamContinueEntry<Schema> | null) => void,
+    onEntry: (
+      entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear",
+    ) => void,
   ): Promise<void>;
   abstract clear(): void;
 }
@@ -23,13 +26,18 @@ export class GetPoller<Schema extends JSONSchema> implements Poller<Schema> {
 
   poll: Poller<Schema>["poll"] = async (onEntry) => {
     let object: GraffitiObject<Schema>;
+    const myGetter = this.getter;
     try {
-      object = await this.getter();
+      object = await myGetter();
     } catch (e) {
-      onEntry(null);
+      if (this.getter === myGetter) {
+        onEntry(null);
+      }
       return;
     }
-    onEntry({ object });
+    if (this.getter === myGetter) {
+      onEntry({ object });
+    }
   };
 
   clear() {}
@@ -61,7 +69,17 @@ export class StreamPoller<Schema extends JSONSchema> implements Poller<Schema> {
   poll: Poller<Schema>["poll"] = async (onEntry) => {
     if (!this.iterator) {
       if (this.continue) {
-        this.iterator = this.continue();
+        try {
+          this.iterator = this.continue();
+        } catch (e) {
+          // The cursor has expired, we need to start from scratch.
+          if (e instanceof GraffitiErrorNotFound) {
+            onEntry("clear");
+            this.iterator = this.streamFactory();
+          } else {
+            throw e;
+          }
+        }
       } else {
         this.iterator = this.streamFactory();
       }
@@ -73,7 +91,14 @@ export class StreamPoller<Schema extends JSONSchema> implements Poller<Schema> {
         break;
       }
 
-      const result = await this.iterator.next();
+      const myIterator: GraffitiObjectStreamContinue<Schema> = this.iterator;
+
+      const result = await myIterator.next();
+
+      // Check again if it was cancelled.
+      if (myIterator !== this.iterator) {
+        continue;
+      }
 
       if (result.done) {
         if (result.value) {

package/src/reducers.ts

@@ -10,7 +10,7 @@ import type {
 export abstract class Reducer<Schema extends JSONSchema> {
   abstract clear(): void;
   abstract onEntry(
-    entry: GraffitiObjectStreamContinueEntry<Schema> | null,
+    entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear",
   ): void;
 }
 
@@ -54,7 +54,11 @@ export class SingletonReducer<Schema extends JSONSchema>
     this.entry.value = undefined;
   }
 
-  onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null) {
+  onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear") {
+    if (entry === "clear") {
+      this.clear();
+      return;
+    }
     if (!entry || isEntryNewer<Schema>(entry, this.entry.value)) {
       this.entry.value = entry;
     }
@@ -96,8 +100,12 @@ export class ArrayReducer<Schema extends JSONSchema>
     }, []);
   }
 
-  onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null) {
+  onEntry(entry: GraffitiObjectStreamContinueEntry<Schema> | null | "clear") {
     if (!entry) return;
+    if (entry === "clear") {
+      this.clear();
+      return;
+    }
     const existing = this.resultsRaw.get(entry.object.url);
     if (!isEntryNewer<Schema>(entry, existing)) return;
     this.resultsRaw.set(entry.object.url, entry);