houdini-react 0.0.0-20240328033602 → 0.0.0-20240329010223

package/build/plugin-cjs/index.js

@@ -78700,7 +78700,6 @@ async function walk_routes(args) {
 async function add_view(args) {
   const target = args.type === "page" ? args.project.pages : args.project.layouts;
   const queries = await extractQueries(args.contents);
-  console.log({ queries });
   const missing_queries = queries.filter((query2) => !args.queries.includes(query2));
   if (missing_queries.length > 0) {
     throw {
@@ -78817,6 +78816,9 @@ async function extractQueries(source) {
     if (query2.endsWith("$handle")) {
       query2 = query2.substring(0, query2.length - "$handle".length);
     }
+    if (queries.includes(query2)) {
+      return queries;
+    }
     return queries.concat([query2]);
   }, []);
 }
@@ -79859,6 +79861,12 @@ var vite_default = {
 							initialVariables: variables,
 						})
 
+						// initialize the observer we just created
+						observer.send({
+							setup: true,
+							variables,
+						})
+
 						// save it in the cache
 						initialData[artifactName] = observer
 						initialVariables[artifactName] = variables

package/build/plugin-esm/index.js

@@ -78690,7 +78690,6 @@ async function walk_routes(args) {
 async function add_view(args) {
   const target = args.type === "page" ? args.project.pages : args.project.layouts;
   const queries = await extractQueries(args.contents);
-  console.log({ queries });
   const missing_queries = queries.filter((query2) => !args.queries.includes(query2));
   if (missing_queries.length > 0) {
     throw {
@@ -78807,6 +78806,9 @@ async function extractQueries(source) {
     if (query2.endsWith("$handle")) {
       query2 = query2.substring(0, query2.length - "$handle".length);
     }
+    if (queries.includes(query2)) {
+      return queries;
+    }
     return queries.concat([query2]);
   }, []);
 }
@@ -79849,6 +79851,12 @@ var vite_default = {
 							initialVariables: variables,
 						})
 
+						// initialize the observer we just created
+						observer.send({
+							setup: true,
+							variables,
+						})
+
 						// save it in the cache
 						initialData[artifactName] = observer
 						initialVariables[artifactName] = variables

package/build/runtime/hooks/useDocumentHandle.d.ts

@@ -10,7 +10,8 @@ export declare function useDocumentHandle<_Artifact extends QueryArtifact, _Data
 export type DocumentHandle<_Artifact extends QueryArtifact, _Data extends GraphQLObject = GraphQLObject, _Input extends GraphQLVariables = GraphQLVariables> = {
     data: _Data;
     partial: boolean;
-    fetch: FetchFn<_Data, _Input>;
+    fetch: FetchFn<_Data, Partial<_Input>>;
+    variables: _Input;
 } & RefetchHandlers<_Artifact, _Data, _Input>;
 type RefetchHandlers<_Artifact extends QueryArtifact, _Data extends GraphQLObject, _Input> = _Artifact extends {
     refetch: {

package/build/runtime-cjs/clientPlugin.js

@@ -27,7 +27,7 @@ const plugin = () => () => {
       next({
         ...ctx,
         cacheParams: {
-          ...ctx.fetchParams,
+          ...ctx.cacheParams,
           serverSideFallback: false
         }
       });

package/build/runtime-cjs/hooks/useDocumentHandle.d.ts

@@ -10,7 +10,8 @@ export declare function useDocumentHandle<_Artifact extends QueryArtifact, _Data
 export type DocumentHandle<_Artifact extends QueryArtifact, _Data extends GraphQLObject = GraphQLObject, _Input extends GraphQLVariables = GraphQLVariables> = {
     data: _Data;
     partial: boolean;
-    fetch: FetchFn<_Data, _Input>;
+    fetch: FetchFn<_Data, Partial<_Input>>;
+    variables: _Input;
 } & RefetchHandlers<_Artifact, _Data, _Input>;
 type RefetchHandlers<_Artifact extends QueryArtifact, _Data extends GraphQLObject, _Input> = _Artifact extends {
     refetch: {

package/build/runtime-cjs/hooks/useDocumentHandle.js

@@ -40,6 +40,13 @@ function useDocumentHandle({
   const [forwardPending, setForwardPending] = import_react.default.useState(false);
   const [backwardPending, setBackwardPending] = import_react.default.useState(false);
   const [session] = (0, import_Router.useSession)();
+  const client = (0, import_Router.useClient)();
+  const paginationObserver = import_react.default.useMemo(() => {
+    if (!artifact.refetch?.paginated) {
+      return null;
+    }
+    return client.observe({ artifact });
+  }, [artifact.name]);
   return import_react.default.useMemo(() => {
     const wrapLoad = (setLoading, fn) => {
       return async (value) => {
@@ -55,7 +62,9 @@ function useDocumentHandle({
     });
     if (artifact.kind !== import_types.ArtifactKind.Query || !artifact.refetch?.paginated) {
       return {
+        artifact,
         data: storeValue.data,
+        variables: storeValue.variables,
         fetch: fetchQuery,
         partial: storeValue.partial
       };
@@ -67,12 +76,12 @@ function useDocumentHandle({
         getVariables: () => storeValue.variables,
         fetch: fetchQuery,
         fetchUpdate: (args, updates) => {
-          return observer.send({
+          return paginationObserver.send({
             ...args,
             cacheParams: {
+              ...args?.cacheParams,
               disableSubscriptions: true,
-              applyUpdates: updates,
-              ...args?.cacheParams
+              applyUpdates: updates
             },
             session
           });
@@ -80,7 +89,9 @@ function useDocumentHandle({
         getSession: async () => session
       });
       return {
+        artifact,
         data: storeValue.data,
+        variables: storeValue.variables,
         fetch: handlers.fetch,
         partial: storeValue.partial,
         loadNext: wrapLoad(setForwardPending, handlers.loadNextPage),
@@ -98,7 +109,7 @@ function useDocumentHandle({
         storeName: artifact.name,
         fetch: fetchQuery,
         fetchUpdate: async (args, updates = ["append"]) => {
-          return observer.send({
+          return paginationObserver.send({
             ...args,
             cacheParams: {
               disableSubscriptions: true,
@@ -110,7 +121,9 @@ function useDocumentHandle({
         getSession: async () => session
       });
       return {
+        artifact,
         data: storeValue.data,
+        variables: storeValue.variables,
         fetch: handlers.fetch,
         partial: storeValue.partial,
         loadNext: wrapLoad(setForwardPending, handlers.loadNextPage),
@@ -118,12 +131,14 @@ function useDocumentHandle({
       };
     }
     return {
+      artifact,
       data: storeValue.data,
+      variables: storeValue.variables,
       fetch: fetchQuery,
       refetch: fetchQuery,
       partial: storeValue.partial
     };
-  }, [artifact, observer, session, storeValue, true, true]);
+  }, [artifact, observer, session, storeValue]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/runtime-cjs/routing/Router.js

@@ -63,7 +63,7 @@ function Router({
   const [currentURL, setCurrentURL] = import_react.default.useState(() => {
     return initialURL || window.location.pathname;
   });
-  const [page, variables] = (0, import_match.find_match)(manifest, currentURL);
+  const [page, variables] = (0, import_match.find_match)(import_config.default, manifest, currentURL);
   if (!page) {
     throw new Error("404");
   }
@@ -97,7 +97,7 @@ function Router({
       setCurrentURL(val);
     },
     preload(url, which) {
-      const [page2, variables2] = (0, import_match.find_match)(manifest, url);
+      const [page2, variables2] = (0, import_match.find_match)(import_config.default, manifest, url);
       if (["both", "component"].includes(which)) {
         loadComponent(page2);
       }
@@ -142,7 +142,6 @@ function usePageData({
       reject = rej;
       observer.send({
         variables,
-        cacheParams: { disableSubscriptions: true },
         session
       }).then(async () => {
         data_cache.set(id, observer);
@@ -182,9 +181,10 @@ function usePageData({
             config: import_config.default
           })
         )}
+									}).then(() => {
+										window.__houdini__nav_caches__?.data_cache.set(artifactName, new_store)
 									})
 
-									window.__houdini__nav_caches__?.data_cache.set(artifactName, new_store)
 								}
 
 
@@ -403,9 +403,8 @@ function useQueryResult(name) {
   if (errors && errors.length > 0) {
     throw new Error(JSON.stringify(errors));
   }
-  const artifact = artifact_cache.get(name);
   const handle = (0, import_useDocumentHandle.useDocumentHandle)({
-    artifact,
+    artifact: artifact_cache.get(name),
     observer,
     storeValue
   });

package/build/runtime-esm/clientPlugin.js

@@ -4,7 +4,7 @@ const plugin = () => () => {
       next({
         ...ctx,
         cacheParams: {
-          ...ctx.fetchParams,
+          ...ctx.cacheParams,
           serverSideFallback: false
         }
       });

package/build/runtime-esm/hooks/useDocumentHandle.d.ts

@@ -10,7 +10,8 @@ export declare function useDocumentHandle<_Artifact extends QueryArtifact, _Data
 export type DocumentHandle<_Artifact extends QueryArtifact, _Data extends GraphQLObject = GraphQLObject, _Input extends GraphQLVariables = GraphQLVariables> = {
     data: _Data;
     partial: boolean;
-    fetch: FetchFn<_Data, _Input>;
+    fetch: FetchFn<_Data, Partial<_Input>>;
+    variables: _Input;
 } & RefetchHandlers<_Artifact, _Data, _Input>;
 type RefetchHandlers<_Artifact extends QueryArtifact, _Data extends GraphQLObject, _Input> = _Artifact extends {
     refetch: {

package/build/runtime-esm/hooks/useDocumentHandle.js

@@ -2,7 +2,7 @@ import { extractPageInfo } from "$houdini/runtime/lib/pageInfo";
 import { cursorHandlers, offsetHandlers } from "$houdini/runtime/lib/pagination";
 import { ArtifactKind } from "$houdini/runtime/lib/types";
 import React from "react";
-import { useSession } from "../routing/Router";
+import { useClient, useSession } from "../routing/Router";
 function useDocumentHandle({
   artifact,
   observer,
@@ -11,6 +11,13 @@ function useDocumentHandle({
   const [forwardPending, setForwardPending] = React.useState(false);
   const [backwardPending, setBackwardPending] = React.useState(false);
   const [session] = useSession();
+  const client = useClient();
+  const paginationObserver = React.useMemo(() => {
+    if (!artifact.refetch?.paginated) {
+      return null;
+    }
+    return client.observe({ artifact });
+  }, [artifact.name]);
   return React.useMemo(() => {
     const wrapLoad = (setLoading, fn) => {
       return async (value) => {
@@ -26,7 +33,9 @@ function useDocumentHandle({
     });
     if (artifact.kind !== ArtifactKind.Query || !artifact.refetch?.paginated) {
       return {
+        artifact,
         data: storeValue.data,
+        variables: storeValue.variables,
         fetch: fetchQuery,
         partial: storeValue.partial
       };
@@ -38,12 +47,12 @@ function useDocumentHandle({
         getVariables: () => storeValue.variables,
         fetch: fetchQuery,
         fetchUpdate: (args, updates) => {
-          return observer.send({
+          return paginationObserver.send({
             ...args,
             cacheParams: {
+              ...args?.cacheParams,
               disableSubscriptions: true,
-              applyUpdates: updates,
-              ...args?.cacheParams
+              applyUpdates: updates
             },
             session
           });
@@ -51,7 +60,9 @@ function useDocumentHandle({
         getSession: async () => session
       });
       return {
+        artifact,
         data: storeValue.data,
+        variables: storeValue.variables,
         fetch: handlers.fetch,
         partial: storeValue.partial,
         loadNext: wrapLoad(setForwardPending, handlers.loadNextPage),
@@ -69,7 +80,7 @@ function useDocumentHandle({
         storeName: artifact.name,
         fetch: fetchQuery,
         fetchUpdate: async (args, updates = ["append"]) => {
-          return observer.send({
+          return paginationObserver.send({
             ...args,
             cacheParams: {
               disableSubscriptions: true,
@@ -81,7 +92,9 @@ function useDocumentHandle({
         getSession: async () => session
       });
       return {
+        artifact,
         data: storeValue.data,
+        variables: storeValue.variables,
         fetch: handlers.fetch,
         partial: storeValue.partial,
         loadNext: wrapLoad(setForwardPending, handlers.loadNextPage),
@@ -89,12 +102,14 @@ function useDocumentHandle({
       };
     }
     return {
+      artifact,
       data: storeValue.data,
+      variables: storeValue.variables,
       fetch: fetchQuery,
       refetch: fetchQuery,
       partial: storeValue.partial
     };
-  }, [artifact, observer, session, storeValue, true, true]);
+  }, [artifact, observer, session, storeValue]);
 }
 export {
   useDocumentHandle

package/build/runtime-esm/routing/Router.js

@@ -22,7 +22,7 @@ function Router({
   const [currentURL, setCurrentURL] = React.useState(() => {
     return initialURL || window.location.pathname;
   });
-  const [page, variables] = find_match(manifest, currentURL);
+  const [page, variables] = find_match(configFile, manifest, currentURL);
   if (!page) {
     throw new Error("404");
   }
@@ -56,7 +56,7 @@ function Router({
       setCurrentURL(val);
     },
     preload(url, which) {
-      const [page2, variables2] = find_match(manifest, url);
+      const [page2, variables2] = find_match(configFile, manifest, url);
       if (["both", "component"].includes(which)) {
         loadComponent(page2);
       }
@@ -101,7 +101,6 @@ function usePageData({
       reject = rej;
       observer.send({
         variables,
-        cacheParams: { disableSubscriptions: true },
         session
       }).then(async () => {
         data_cache.set(id, observer);
@@ -141,9 +140,10 @@ function usePageData({
             config: configFile
           })
         )}
+									}).then(() => {
+										window.__houdini__nav_caches__?.data_cache.set(artifactName, new_store)
 									})
 
-									window.__houdini__nav_caches__?.data_cache.set(artifactName, new_store)
 								}
 
 
@@ -362,9 +362,8 @@ function useQueryResult(name) {
   if (errors && errors.length > 0) {
     throw new Error(JSON.stringify(errors));
   }
-  const artifact = artifact_cache.get(name);
   const handle = useDocumentHandle({
-    artifact,
+    artifact: artifact_cache.get(name),
     observer,
     storeValue
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "0.0.0-20240328033602",
+  "version": "0.0.0-20240329010223",
   "description": "The React plugin for houdini",
   "keywords": [
     "typescript",
@@ -43,7 +43,7 @@
     "recast": "^0.23.1",
     "rollup": "^3.7.4",
     "use-deep-compare-effect": "^1.8.1",
-    "houdini": "^0.0.0-20240328033602"
+    "houdini": "^0.0.0-20240329010223"
   },
   "files": [
     "build"