houdini 2.0.0-next.32 → 2.0.0-next.33

package/build/cmd/init.js

@@ -472,7 +472,7 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.32"
+    houdini: "^2.0.0-next.33"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "houdini",
-    "version": "2.0.0-next.32",
+    "version": "2.0.0-next.33",
     "description": "The disappearing GraphQL clients",
     "keywords": [
         "typescript",

package/build/runtime/cache/index.d.ts

@@ -54,9 +54,11 @@ export declare class Cache {
     hydrate(...args: Parameters<InMemoryStorage['hydrate']>): void;
     clearLayer(layerID: Layer['id']): void;
     reset(): void;
+    getEpoch(): number;
 }
 declare class CacheInternal {
     disabled: boolean;
+    epoch: number;
     _config?: ConfigFile;
     storage: InMemoryStorage;
     subscriptions: InMemorySubscriptions;

package/build/runtime/cache/index.js

@@ -203,10 +203,16 @@ class Cache {
     this._internal_unstable.storage.reset();
     this.#notifySubscribers(subSpecs);
   }
+  // returns the current notification generation; fragment references carry this value
+  // so hooks can detect which epoch of data they were rendered with
+  getEpoch() {
+    return this._internal_unstable.epoch;
+  }
   #notifySubscribers(subs) {
     if (subs.length === 0) {
       return;
     }
+    this._internal_unstable.epoch++;
     const notified = [];
     for (const spec of subs) {
       if (!notified.includes(spec.set)) {
@@ -226,6 +232,9 @@ class Cache {
 class CacheInternal {
   // for server-side requests we need to be able to flag the cache as disabled so we dont write to it
   disabled = false;
+  // monotonically increasing counter incremented on every cache notification flush;
+  // threaded into fragment references so hooks know which generation of data they hold
+  epoch = 0;
   _config;
   storage;
   subscriptions;

package/build/runtime/cache/subscription.js

@@ -149,8 +149,12 @@ class InMemorySubscriptions {
           keyRaw,
           selection: innerSelection,
           list,
-          filters
+          filters,
+          visible
         } = selection;
+        if (!visible) {
+          continue;
+        }
         const key = evaluateKey(keyRaw, variables);
         const fieldSelection = innerSelection ? getFieldsForType(innerSelection, parentType, false) : void 0;
         this.addFieldSubscription({

package/build/runtime/documentStore.d.ts

@@ -28,7 +28,7 @@ export declare class DocumentStore<_Data extends GraphQLObject, _Input extends G
         }) => Promise<any>>;
         config: ConfigFile;
     });
-    send({ metadata, session, fetch, variables, policy, stuff, cacheParams, setup, silenceEcho, abortController, }?: SendParams): Promise<QueryResult<_Data, _Input>>;
+    send({ metadata, session, fetch, variables, policy, stuff, cacheParams, setup, initialState, silenceEcho, abortController, }?: SendParams): Promise<QueryResult<_Data, _Input>>;
     cleanup(): Promise<void>;
     getFetch(getSession: () => App.Session | null | undefined): (input: RequestInfo | URL, init?: RequestInit | undefined) => Promise<Response>;
 }
@@ -105,6 +105,7 @@ export type SendParams = {
     stuff?: Partial<App.Stuff>;
     cacheParams?: ClientPluginContext['cacheParams'];
     setup?: boolean;
+    initialState?: QueryResult;
     silenceEcho?: boolean;
     abortController?: AbortController;
 };

package/build/runtime/documentStore.js

@@ -69,15 +69,17 @@ class DocumentStore extends Writable {
     stuff,
     cacheParams,
     setup = false,
+    initialState,
     silenceEcho = false,
     abortController = new AbortController()
   } = {}) {
     if ("dedupe" in this.artifact && this.artifact.dedupe && this.artifact.dedupe.match !== "None") {
       const dedupeKey = this.controllerKey(variables);
-      if (inflightRequests[dedupeKey]) {
+      const existingRequest = inflightRequests[dedupeKey];
+      if (existingRequest && !existingRequest.controller.signal.aborted) {
         if (this.artifact.dedupe.cancel === "first") {
-          inflightRequests[dedupeKey].controller.abort();
-          inflightRequests[dedupeKey].controller = abortController;
+          existingRequest.controller.abort();
+          existingRequest.controller = abortController;
         } else {
           abortController.abort();
         }
@@ -117,6 +119,7 @@ class DocumentStore extends Writable {
     const promise = new Promise((resolve, reject) => {
       const state = {
         setup,
+        initialState,
         currentStep: 0,
         index: 0,
         silenceEcho,
@@ -135,9 +138,11 @@ class DocumentStore extends Writable {
       }
       this.#step("forward", state);
     });
-    const response = await promise;
-    delete inflightRequests[this.controllerKey(variables)];
-    return response;
+    try {
+      return await promise;
+    } finally {
+      delete inflightRequests[this.controllerKey(variables)];
+    }
   }
   async cleanup() {
     for (const plugin of this.#plugins) {
@@ -285,7 +290,7 @@ class DocumentStore extends Writable {
             currentStep: 0,
             index: this.#plugins.length
           },
-          this.state
+          ctx.initialState ?? this.state
         );
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "2.0.0-next.32",
+  "version": "2.0.0-next.33",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",
@@ -50,7 +50,7 @@
     "recast": "^0.23.11",
     "sql.js": "^1.14.1",
     "ws": "^8.21.0",
-    "houdini-core": "^2.0.0-next.20"
+    "houdini-core": "^2.0.0-next.21"
   },
   "peerDependencies": {
     "graphql": ">=16",