houdini-react 1.2.45 → 1.2.46

package/build/plugin-cjs/index.js

@@ -77863,7 +77863,12 @@ function deepMerge2(filepath, ...targets) {
 }
 function parseJS(str, config) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "decorators-legacy"],
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config ? deepMerge2("", defaultConfig, config) : defaultConfig).program;
@@ -78809,7 +78814,18 @@ async function extractQueries(source) {
   } else {
     return [];
   }
-  return props.filter((p) => p !== "children");
+  return props.reduce((queries, query2) => {
+    if (query2 === "children") {
+      return queries;
+    }
+    if (query2.endsWith("$handle")) {
+      query2 = query2.substring(0, query2.length - "$handle".length);
+    }
+    if (queries.includes(query2)) {
+      return queries;
+    }
+    return queries.concat([query2]);
+  }, []);
 }
 function isSecondaryBuild() {
   return process.env.HOUDINI_SECONDARY_BUILD && process.env.HOUDINI_SECONDARY_BUILD !== "false";
@@ -79850,6 +79866,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

@@ -77853,7 +77853,12 @@ function deepMerge2(filepath, ...targets) {
 }
 function parseJS(str, config) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "decorators-legacy"],
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config ? deepMerge2("", defaultConfig, config) : defaultConfig).program;
@@ -78799,7 +78804,18 @@ async function extractQueries(source) {
   } else {
     return [];
   }
-  return props.filter((p) => p !== "children");
+  return props.reduce((queries, query2) => {
+    if (query2 === "children") {
+      return queries;
+    }
+    if (query2.endsWith("$handle")) {
+      query2 = query2.substring(0, query2.length - "$handle".length);
+    }
+    if (queries.includes(query2)) {
+      return queries;
+    }
+    return queries.concat([query2]);
+  }, []);
 }
 function isSecondaryBuild() {
   return process.env.HOUDINI_SECONDARY_BUILD && process.env.HOUDINI_SECONDARY_BUILD !== "false";
@@ -79840,6 +79856,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,6 +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, Partial<_Input>>;
+    variables: _Input;
 } & RefetchHandlers<_Artifact, _Data, _Input>;
 type RefetchHandlers<_Artifact extends QueryArtifact, _Data extends GraphQLObject, _Input> = _Artifact extends {
     refetch: {

package/build/runtime/routing/Router.d.ts

@@ -5,6 +5,7 @@ import { GraphQLObject, GraphQLVariables } from '$houdini/runtime/lib/types';
 import { QueryArtifact } from '$houdini/runtime/lib/types';
 import type { RouterManifest } from '$houdini/runtime/router/types';
 import React from 'react';
+import { DocumentHandle } from '../hooks/useDocumentHandle';
 import { SuspenseCache } from './cache';
 type ComponentType = any;
 /**
@@ -54,7 +55,7 @@ export declare function useCache(): Cache;
 export declare function updateLocalSession(session: App.Session): void;
 export declare function useSession(): [App.Session, (newSession: Partial<App.Session>) => void];
 export declare function useCurrentVariables(): GraphQLVariables;
-export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentStore<_Data, _Input>];
+export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentHandle<any, _Data, _Input>];
 export type RouterCache = {
     artifact_cache: SuspenseCache<QueryArtifact>;
     component_cache: SuspenseCache<(props: any) => React.ReactElement>;

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,6 +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, 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.d.ts

@@ -5,6 +5,7 @@ import { GraphQLObject, GraphQLVariables } from '$houdini/runtime/lib/types';
 import { QueryArtifact } from '$houdini/runtime/lib/types';
 import type { RouterManifest } from '$houdini/runtime/router/types';
 import React from 'react';
+import { DocumentHandle } from '../hooks/useDocumentHandle';
 import { SuspenseCache } from './cache';
 type ComponentType = any;
 /**
@@ -54,7 +55,7 @@ export declare function useCache(): Cache;
 export declare function updateLocalSession(session: App.Session): void;
 export declare function useSession(): [App.Session, (newSession: Partial<App.Session>) => void];
 export declare function useCurrentVariables(): GraphQLVariables;
-export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentStore<_Data, _Input>];
+export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentHandle<any, _Data, _Input>];
 export type RouterCache = {
     artifact_cache: SuspenseCache<QueryArtifact>;
     component_cache: SuspenseCache<(props: any) => React.ReactElement>;

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

@@ -46,6 +46,7 @@ var import_scalars = require("$houdini/runtime/lib/scalars");
 var import_match = require("$houdini/runtime/router/match");
 var import_react = __toESM(require("react"));
 var import_react2 = require("react");
+var import_useDocumentHandle = require("../hooks/useDocumentHandle");
 var import_useDocumentStore = require("../hooks/useDocumentStore");
 var import_cache = require("./cache");
 const PreloadWhich = {
@@ -62,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");
   }
@@ -96,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);
       }
@@ -141,7 +142,6 @@ function usePageData({
       reject = rej;
       observer.send({
         variables,
-        cacheParams: { disableSubscriptions: true },
         session
       }).then(async () => {
         data_cache.set(id, observer);
@@ -181,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)
 								}
 
 
@@ -392,15 +393,22 @@ const LocationContext = import_react.default.createContext({
   params: {}
 });
 function useQueryResult(name) {
-  const store_ref = useRouterContext().data_cache.get(name);
-  const [{ data, errors }, observer] = (0, import_useDocumentStore.useDocumentStore)({
+  const { data_cache, artifact_cache } = useRouterContext();
+  const store_ref = data_cache.get(name);
+  const [storeValue, observer] = (0, import_useDocumentStore.useDocumentStore)({
     artifact: store_ref.artifact,
     observer: store_ref
   });
+  const { data, errors } = storeValue;
   if (errors && errors.length > 0) {
     throw new Error(JSON.stringify(errors));
   }
-  return [data, observer];
+  const handle = (0, import_useDocumentHandle.useDocumentHandle)({
+    artifact: artifact_cache.get(name),
+    observer,
+    storeValue
+  });
+  return [data, handle];
 }
 function useLinkBehavior({
   goto,

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,6 +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, 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.d.ts

@@ -5,6 +5,7 @@ import { GraphQLObject, GraphQLVariables } from '$houdini/runtime/lib/types';
 import { QueryArtifact } from '$houdini/runtime/lib/types';
 import type { RouterManifest } from '$houdini/runtime/router/types';
 import React from 'react';
+import { DocumentHandle } from '../hooks/useDocumentHandle';
 import { SuspenseCache } from './cache';
 type ComponentType = any;
 /**
@@ -54,7 +55,7 @@ export declare function useCache(): Cache;
 export declare function updateLocalSession(session: App.Session): void;
 export declare function useSession(): [App.Session, (newSession: Partial<App.Session>) => void];
 export declare function useCurrentVariables(): GraphQLVariables;
-export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentStore<_Data, _Input>];
+export declare function useQueryResult<_Data extends GraphQLObject, _Input extends GraphQLVariables>(name: string): [_Data | null, DocumentHandle<any, _Data, _Input>];
 export type RouterCache = {
     artifact_cache: SuspenseCache<QueryArtifact>;
     component_cache: SuspenseCache<(props: any) => React.ReactElement>;

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

@@ -5,6 +5,7 @@ import { marshalSelection, marshalInputs } from "$houdini/runtime/lib/scalars";
 import { find_match } from "$houdini/runtime/router/match";
 import React from "react";
 import { useContext } from "react";
+import { useDocumentHandle } from "../hooks/useDocumentHandle";
 import { useDocumentStore } from "../hooks/useDocumentStore";
 import { suspense_cache } from "./cache";
 const PreloadWhich = {
@@ -21,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");
   }
@@ -55,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);
       }
@@ -100,7 +101,6 @@ function usePageData({
       reject = rej;
       observer.send({
         variables,
-        cacheParams: { disableSubscriptions: true },
         session
       }).then(async () => {
         data_cache.set(id, observer);
@@ -140,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)
 								}
 
 
@@ -351,15 +352,22 @@ const LocationContext = React.createContext({
   params: {}
 });
 function useQueryResult(name) {
-  const store_ref = useRouterContext().data_cache.get(name);
-  const [{ data, errors }, observer] = useDocumentStore({
+  const { data_cache, artifact_cache } = useRouterContext();
+  const store_ref = data_cache.get(name);
+  const [storeValue, observer] = useDocumentStore({
     artifact: store_ref.artifact,
     observer: store_ref
   });
+  const { data, errors } = storeValue;
   if (errors && errors.length > 0) {
     throw new Error(JSON.stringify(errors));
   }
-  return [data, observer];
+  const handle = useDocumentHandle({
+    artifact: artifact_cache.get(name),
+    observer,
+    storeValue
+  });
+  return [data, handle];
 }
 function useLinkBehavior({
   goto,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "1.2.45",
+  "version": "1.2.46",
   "description": "The React plugin for houdini",
   "keywords": [
     "typescript",
@@ -37,13 +37,13 @@
     "express": "^4.18.2",
     "graphql": "^15.8.0",
     "graphql-yoga": "^4.0.4",
-    "react": "18.3.0-canary-09fbee89d-20231013",
-    "react-dom": "18.3.0-canary-09fbee89d-20231013",
+    "react": "19.0.0-canary-2b036d3f1-20240327",
+    "react-dom": "19.0.0-canary-2b036d3f1-20240327",
     "react-streaming-compat": "^0.3.18",
     "recast": "^0.23.1",
     "rollup": "^3.7.4",
     "use-deep-compare-effect": "^1.8.1",
-    "houdini": "^1.2.45"
+    "houdini": "^1.2.46"
   },
   "files": [
     "build"