houdini-react 1.2.44 → 1.2.46

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

@@ -1,9 +1,11 @@
 import { jsx } from "react/jsx-runtime";
 import configFile from "$houdini/runtime/imports/config";
 import { deepEquals } from "$houdini/runtime/lib/deepEquals";
+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 = {
@@ -20,7 +22,10 @@ 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");
+  }
   const { loadData, loadComponent } = usePageData({
     page,
     variables,
@@ -51,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);
       }
@@ -60,7 +65,7 @@ function Router({
       }
     }
   });
-  return /* @__PURE__ */ jsx(VariableContext.Provider, { value: variables, children: /* @__PURE__ */ jsx(LocationContext.Provider, { value: { pathname: currentURL }, children: /* @__PURE__ */ jsx(PageComponent, { url: currentURL }, page.id) }) });
+  return /* @__PURE__ */ jsx(VariableContext.Provider, { value: variables, children: /* @__PURE__ */ jsx(LocationContext.Provider, { value: { pathname: currentURL, params: variables ?? {} }, children: /* @__PURE__ */ jsx(PageComponent, { url: currentURL }, page.id) }) });
 }
 const useLocation = () => useContext(LocationContext);
 function usePageData({
@@ -96,9 +101,8 @@ function usePageData({
       reject = rej;
       observer.send({
         variables,
-        cacheParams: { disableSubscriptions: true },
         session
-      }).then(() => {
+      }).then(async () => {
         data_cache.set(id, observer);
         if (observer.state.errors && observer.state.errors.length > 0) {
           reject(observer.state.errors.map((e) => e.message).join("\n"));
@@ -110,7 +114,12 @@ function usePageData({
 								window.__houdini__cache__?.hydrate(${cache.serialize()}, window.__houdini__hydration__layer)
 
 								const artifactName = "${artifact.name}"
-								const value = ${JSON.stringify(observer.state.data)}
+								const value = ${JSON.stringify(
+          await marshalSelection({
+            selection: observer.artifact.selection,
+            data: observer.state.data
+          })
+        )}
 
 								// if the data is pending, we need to resolve it
 								if (window.__houdini__nav_caches__?.data_cache.has(artifactName)) {
@@ -119,10 +128,22 @@ function usePageData({
 									const new_store = window.__houdini__client__.observe({
 										artifact: window.__houdini__nav_caches__.artifact_cache.get(artifactName),
 										cache: window.__houdini__cache__,
-										initialValue: value,
 									})
 
-									window.__houdini__nav_caches__?.data_cache.set(artifactName, new_store)
+									// we're pushing this store onto the client, it should be initialized
+									window.__houdini__nav_caches__.data_cache.get(artifactName).send({
+										setup: true,
+										variables: ${JSON.stringify(
+          marshalInputs({
+            artifact: observer.artifact,
+            input: variables,
+            config: configFile
+          })
+        )}
+									}).then(() => {
+										window.__houdini__nav_caches__?.data_cache.set(artifactName, new_store)
+									})
+
 								}
 
 
@@ -139,12 +160,12 @@ function usePageData({
 									if (!window.__houdini__pending_artifacts__) {
 										window.__houdini__pending_artifacts__ = {}
 									}
-
-									window.__houdini__pending_variables__[artifactName] = ${JSON.stringify(variables)}
-									window.__houdini__pending_data__[artifactName] = value
-									window.__houdini__pending_artifacts__[artifactName] = ${JSON.stringify(artifact)}
 								}
 
+								window.__houdini__pending_variables__[artifactName] = ${JSON.stringify(observer.state.variables)}
+								window.__houdini__pending_data__[artifactName] = value
+								window.__houdini__pending_artifacts__[artifactName] = ${JSON.stringify(artifact)}
+
 								// if this payload finishes off an ssr request, we need to resolve the signal
 								if (window.__houdini__nav_caches__?.ssr_signals.has(artifactName)) {
 
@@ -153,7 +174,13 @@ function usePageData({
 										// we're pushing this store onto the client, it should be initialized
 										window.__houdini__nav_caches__.data_cache.get(artifactName).send({
 											setup: true,
-											variables: ${JSON.stringify(variables)}
+											variables: ${JSON.stringify(
+          marshalInputs({
+            artifact: observer.artifact,
+            input: variables,
+            config: configFile
+          })
+        )}
 										})
 									}
 
@@ -183,7 +210,7 @@ function usePageData({
       }
       let last = {};
       let usedVariables = {};
-      for (const variable of pageVariables) {
+      for (const variable of Object.keys(pageVariables)) {
         last[variable] = last_variables.get(artifact)[variable];
         usedVariables[variable] = (variables2 ?? {})[variable];
       }
@@ -309,7 +336,8 @@ function useSession() {
       method: "POST",
       body: JSON.stringify(newSession),
       headers: {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        Accept: "application/json"
       }
     });
   };
@@ -319,17 +347,27 @@ function useCurrentVariables() {
   return React.useContext(VariableContext);
 }
 const VariableContext = React.createContext(null);
-const LocationContext = React.createContext({ pathname: "" });
+const LocationContext = React.createContext({
+  pathname: "",
+  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,
@@ -429,6 +467,20 @@ function router_cache({
   }
   return result;
 }
+const PageContext = React.createContext({ params: {} });
+function PageContextProvider({
+  keys,
+  children
+}) {
+  const location2 = useLocation();
+  const params = Object.fromEntries(
+    Object.entries(location2.params).filter(([key]) => keys.includes(key))
+  );
+  return /* @__PURE__ */ jsx(PageContext.Provider, { value: { params }, children });
+}
+function useRoute() {
+  return useContext(PageContext);
+}
 function signal_promise() {
   let resolve = () => {
   };
@@ -445,6 +497,7 @@ function signal_promise() {
   };
 }
 export {
+  PageContextProvider,
   Router,
   RouterContextProvider,
   router_cache,
@@ -454,6 +507,7 @@ export {
   useCurrentVariables,
   useLocation,
   useQueryResult,
+  useRoute,
   useRouterContext,
   useSession
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "1.2.44",
+  "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.44"
+    "houdini": "^1.2.46"
   },
   "files": [
     "build"