houdini 2.0.0-next.45 → 2.0.0-next.46

package/build/cmd/init.js

@@ -472,12 +472,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.45"
+    houdini: "^2.0.0-next.46"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.37"
+      "houdini-svelte": "^3.0.0-next.38"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/package.json

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

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

@@ -52,7 +52,7 @@ export declare class Cache {
     getFieldTime(id: string, field: string): number | null | undefined;
     config(): ConfigFile;
     serialize(): string;
-    hydrate(...args: Parameters<InMemoryStorage['hydrate']>): void;
+    hydrate(...args: Parameters<InMemoryStorage['hydrate']>): Layer | undefined;
     clearLayer(layerID: Layer['id']): void;
     reset(): void;
     getEpoch(): number;

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

@@ -34,7 +34,7 @@ export declare class InMemoryStorage {
         rank: number;
         fields: EntityFieldMap;
         links: LinkMap;
-    }, layer?: Layer): void;
+    }, layer?: Layer): Layer | undefined;
     getTypename(id: string): string | undefined;
     reset(): void;
 }

package/build/runtime/cache/storage.js

@@ -230,6 +230,7 @@ class InMemoryStorage {
     layer ??= this.createLayer(true);
     layer.fields = fields;
     layer.links = links;
+    return layer;
   }
   // fast typename lookup with lazy-populate fallback for records written via hydrate()
   getTypename(id) {

package/build/runtime/pagination.d.ts

@@ -1,16 +1,17 @@
 import type { SendParams } from './documentStore.js';
 import type { CursorHandlers, FetchFn, GraphQLObject, GraphQLVariables, QueryArtifact, QueryResult, FetchParams } from './types.js';
-export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, fetchUpdate: parentFetchUpdate, fetch: parentFetch, getState, getVariables, getSession, previousCursors, nextCursors, }: {
+export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, fetchUpdate: parentFetchUpdate, fetch: parentFetch, getState, getVariables, getSession, getLoading, previousCursors, nextCursors, }: {
     artifact: QueryArtifact;
     getState: () => _Data | null;
     getVariables: () => NonNullable<_Input>;
     getSession: () => Promise<App.Session>;
     fetch: FetchFn<_Data, _Input>;
     fetchUpdate: (arg: SendParams, updates: string[]) => ReturnType<FetchFn<_Data, _Input>>;
+    getLoading?: () => boolean;
     previousCursors?: (string | null)[];
     nextCursors?: (string | null)[];
 }): CursorHandlers<_Data, _Input>;
-export declare function offsetHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, storeName: _storeName, getState, getVariables, fetch: parentFetch, fetchUpdate: parentFetchUpdate, getSession, }: {
+export declare function offsetHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, storeName: _storeName, getState, getVariables, fetch: parentFetch, fetchUpdate: parentFetchUpdate, getSession, getLoading, }: {
     artifact: QueryArtifact;
     fetch: FetchFn<_Data, _Input>;
     fetchUpdate: (arg: SendParams) => ReturnType<FetchFn<_Data, _Input>>;
@@ -18,6 +19,7 @@ export declare function offsetHandlers<_Data extends GraphQLObject, _Input exten
     getState: () => _Data | null;
     getVariables: () => _Input;
     getSession: () => Promise<App.Session>;
+    getLoading?: () => boolean;
 }): {
     loadNextPage: ({ limit, offset, fetch, metadata, }?: {
         limit?: number;

package/build/runtime/pagination.js

@@ -9,6 +9,7 @@ function cursorHandlers({
   getState,
   getVariables,
   getSession,
+  getLoading,
   previousCursors = [],
   nextCursors = []
 }) {
@@ -58,6 +59,15 @@ function cursorHandlers({
   const getPageInfo = () => {
     return extractPageInfo(getState(), artifact.refetch?.path ?? []);
   };
+  const loadingNoOp = () => Promise.resolve({
+    data: getState(),
+    errors: null,
+    fetching: false,
+    partial: false,
+    stale: false,
+    source: DataSource.Cache,
+    variables: getVariables()
+  });
   return {
     loadNextPage: ({
       first,
@@ -65,6 +75,9 @@ function cursorHandlers({
       fetch,
       metadata
     } = {}) => {
+      if (getLoading?.()) {
+        return loadingNoOp();
+      }
       const isSinglePage = artifact.refetch?.mode === "SinglePage";
       const direction = artifact.refetch?.direction;
       if (isSinglePage && direction === "backward") {
@@ -146,6 +159,9 @@ function cursorHandlers({
       fetch,
       metadata
     } = {}) => {
+      if (getLoading?.()) {
+        return loadingNoOp();
+      }
       const isSinglePage = artifact.refetch?.mode === "SinglePage";
       const direction = artifact.refetch?.direction;
       if (isSinglePage && (direction === "forward" || direction === "both") && previousCursors.length > 0) {
@@ -209,6 +225,9 @@ function cursorHandlers({
     },
     async fetch(args) {
       const { variables } = args ?? {};
+      if (getLoading?.()) {
+        return loadingNoOp();
+      }
       if (variables && !deepEquals(getVariables(), variables)) {
         return await parentFetch(args);
       }
@@ -255,7 +274,8 @@ function offsetHandlers({
   getVariables,
   fetch: parentFetch,
   fetchUpdate: parentFetchUpdate,
-  getSession
+  getSession,
+  getLoading
 }) {
   const isSinglePage = artifact.refetch?.mode === "SinglePage";
   const getOffset = () => {
@@ -273,6 +293,9 @@ function offsetHandlers({
       fetch,
       metadata
     } = {}) => {
+      if (getLoading?.()) {
+        return;
+      }
       const queryVariables = {
         ...getVariables(),
         offset: offset ?? getOffset()
@@ -296,6 +319,17 @@ function offsetHandlers({
     },
     async fetch(params = {}) {
       const { variables } = params;
+      if (getLoading?.()) {
+        return {
+          data: getState(),
+          errors: null,
+          fetching: false,
+          partial: false,
+          stale: false,
+          source: DataSource.Cache,
+          variables: getVariables() ?? null
+        };
+      }
       if (variables && !deepEquals(getVariables(), variables)) {
         return parentFetch.call(this, params);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "2.0.0-next.45",
+  "version": "2.0.0-next.46",
   "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.31"
+    "houdini-core": "^2.0.0-next.32"
   },
   "peerDependencies": {
     "graphql": ">=16",