houdini-react 0.0.0-20240329062150 → 0.0.0-20240402040259

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

@@ -98,10 +98,10 @@ function Router({
     },
     preload(url, which) {
       const [page2, variables2] = (0, import_match.find_match)(import_config.default, manifest, url);
-      if (["both", "component"].includes(which)) {
+      if (["page", "component"].includes(which)) {
         loadComponent(page2);
       }
-      if (["both", "data"].includes(which)) {
+      if (["page", "data"].includes(which)) {
         loadData(page2, variables2);
       }
     }
@@ -125,9 +125,13 @@ function usePageData({
     last_variables
   } = useRouterContext();
   const [session] = useSession();
-  function load_query({ id, artifact }) {
+  function load_query({
+    id,
+    artifact,
+    variables: variables2
+  }) {
     for (const artifact2 of Object.keys(page.documents)) {
-      last_variables.set(artifact2, variables);
+      last_variables.set(artifact2, variables2);
     }
     if (ssr_signals.has(id)) {
       return ssr_signals.get(id);
@@ -140,10 +144,12 @@ function usePageData({
     const promise = new Promise((res, rej) => {
       resolve = res;
       reject = rej;
+      console.log("sending query", observer.artifact.name, variables2);
       observer.send({
-        variables,
+        variables: variables2,
         session
       }).then(async () => {
+        console.log("query resolved", observer.artifact.name, observer.state);
         data_cache.set(id, observer);
         if (observer.state.errors && observer.state.errors.length > 0) {
           reject(observer.state.errors.map((e) => e.message).join("\n"));
@@ -177,7 +183,7 @@ function usePageData({
 										variables: ${JSON.stringify(
           (0, import_scalars.marshalInputs)({
             artifact: observer.artifact,
-            input: variables,
+            input: variables2,
             config: import_config.default
           })
         )}
@@ -218,7 +224,7 @@ function usePageData({
 											variables: ${JSON.stringify(
           (0, import_scalars.marshalInputs)({
             artifact: observer.artifact,
-            input: variables,
+            input: variables2,
             config: import_config.default
           })
         )}
@@ -275,14 +281,14 @@ function usePageData({
         injectToStream?.(`
 						<script type="module" src="${assetPrefix}/artifacts/${artifact.name}.js" async=""><\/script>
 					`);
-        load_query({ id: artifact.name, artifact });
+        load_query({ id: artifact.name, artifact, variables: variables2 });
       }).catch((err) => {
         console.log(err);
       });
     }
     for (const artifact of Object.values(found_artifacts)) {
       if (!data_cache.has(artifact.name)) {
-        load_query({ id: artifact.name, artifact });
+        load_query({ id: artifact.name, artifact, variables: variables2 });
       }
     }
   }
@@ -451,10 +457,14 @@ function usePreload({ preload }) {
   import_react.default.useEffect(() => {
     const mouseMove = (e) => {
       const target = e.target;
-      if (!(target instanceof HTMLAnchorElement)) {
+      if (!(target instanceof HTMLElement)) {
         return;
       }
-      let preloadWhichRaw = target.attributes.getNamedItem("data-houdini-preload")?.value;
+      const anchor = target.closest("a");
+      if (!anchor) {
+        return;
+      }
+      let preloadWhichRaw = anchor.attributes.getNamedItem("data-houdini-preload")?.value;
       let preloadWhich = !preloadWhichRaw || preloadWhichRaw === "true" ? "page" : preloadWhichRaw;
       if (!PreloadWhich[preloadWhich]) {
         console.log(
@@ -466,7 +476,7 @@ function usePreload({ preload }) {
         clearTimeout(timeoutRef.current);
       }
       timeoutRef.current = setTimeout(() => {
-        const url = target.attributes.getNamedItem("href")?.value;
+        const url = anchor.attributes.getNamedItem("href")?.value;
         if (!url) {
           return;
         }

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

@@ -57,10 +57,10 @@ function Router({
     },
     preload(url, which) {
       const [page2, variables2] = find_match(configFile, manifest, url);
-      if (["both", "component"].includes(which)) {
+      if (["page", "component"].includes(which)) {
         loadComponent(page2);
       }
-      if (["both", "data"].includes(which)) {
+      if (["page", "data"].includes(which)) {
         loadData(page2, variables2);
       }
     }
@@ -84,9 +84,13 @@ function usePageData({
     last_variables
   } = useRouterContext();
   const [session] = useSession();
-  function load_query({ id, artifact }) {
+  function load_query({
+    id,
+    artifact,
+    variables: variables2
+  }) {
     for (const artifact2 of Object.keys(page.documents)) {
-      last_variables.set(artifact2, variables);
+      last_variables.set(artifact2, variables2);
     }
     if (ssr_signals.has(id)) {
       return ssr_signals.get(id);
@@ -99,10 +103,12 @@ function usePageData({
     const promise = new Promise((res, rej) => {
       resolve = res;
       reject = rej;
+      console.log("sending query", observer.artifact.name, variables2);
       observer.send({
-        variables,
+        variables: variables2,
         session
       }).then(async () => {
+        console.log("query resolved", observer.artifact.name, observer.state);
         data_cache.set(id, observer);
         if (observer.state.errors && observer.state.errors.length > 0) {
           reject(observer.state.errors.map((e) => e.message).join("\n"));
@@ -136,7 +142,7 @@ function usePageData({
 										variables: ${JSON.stringify(
           marshalInputs({
             artifact: observer.artifact,
-            input: variables,
+            input: variables2,
             config: configFile
           })
         )}
@@ -177,7 +183,7 @@ function usePageData({
 											variables: ${JSON.stringify(
           marshalInputs({
             artifact: observer.artifact,
-            input: variables,
+            input: variables2,
             config: configFile
           })
         )}
@@ -234,14 +240,14 @@ function usePageData({
         injectToStream?.(`
 						<script type="module" src="${assetPrefix}/artifacts/${artifact.name}.js" async=""><\/script>
 					`);
-        load_query({ id: artifact.name, artifact });
+        load_query({ id: artifact.name, artifact, variables: variables2 });
       }).catch((err) => {
         console.log(err);
       });
     }
     for (const artifact of Object.values(found_artifacts)) {
       if (!data_cache.has(artifact.name)) {
-        load_query({ id: artifact.name, artifact });
+        load_query({ id: artifact.name, artifact, variables: variables2 });
       }
     }
   }
@@ -410,10 +416,14 @@ function usePreload({ preload }) {
   React.useEffect(() => {
     const mouseMove = (e) => {
       const target = e.target;
-      if (!(target instanceof HTMLAnchorElement)) {
+      if (!(target instanceof HTMLElement)) {
         return;
       }
-      let preloadWhichRaw = target.attributes.getNamedItem("data-houdini-preload")?.value;
+      const anchor = target.closest("a");
+      if (!anchor) {
+        return;
+      }
+      let preloadWhichRaw = anchor.attributes.getNamedItem("data-houdini-preload")?.value;
       let preloadWhich = !preloadWhichRaw || preloadWhichRaw === "true" ? "page" : preloadWhichRaw;
       if (!PreloadWhich[preloadWhich]) {
         console.log(
@@ -425,7 +435,7 @@ function usePreload({ preload }) {
         clearTimeout(timeoutRef.current);
       }
       timeoutRef.current = setTimeout(() => {
-        const url = target.attributes.getNamedItem("href")?.value;
+        const url = anchor.attributes.getNamedItem("href")?.value;
         if (!url) {
           return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "0.0.0-20240329062150",
+  "version": "0.0.0-20240402040259",
   "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-20240329062150"
+    "houdini": "^0.0.0-20240402040259"
   },
   "files": [
     "build"