houdini-react 0.0.0-20240411054045 → 0.0.0-20240422193548

package/build/plugin-cjs/index.js

@@ -76800,9 +76800,12 @@ var InMemorySubscriptions = class {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -76812,12 +76815,18 @@ var InMemorySubscriptions = class {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -76838,6 +76847,15 @@ var InMemorySubscriptions = class {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 };
 var Cache = class {
   _internal_unstable;
@@ -76884,6 +76902,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -77023,7 +77044,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -77054,10 +77075,10 @@ var CacheInternal = class {
     this._config = config;
     this.componentCache = componentCache ?? {};
     this.createComponent = createComponent ?? (() => ({}));
-    this._disabled = disabled;
+    this.disabled = disabled;
     try {
       if (process.env.HOUDINI_TEST === "true") {
-        this._disabled = false;
+        this.disabled = false;
       }
     } catch {
     }
@@ -77079,7 +77100,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -79870,7 +79891,6 @@ var vite_default = {
 						observer.send({
 							setup: true,
 							variables,
-							session: window.__houdini__initial__session__,
 						})
 
 						// save it in the cache

package/build/plugin-esm/index.js

@@ -76790,9 +76790,12 @@ var InMemorySubscriptions = class {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -76802,12 +76805,18 @@ var InMemorySubscriptions = class {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -76828,6 +76837,15 @@ var InMemorySubscriptions = class {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 };
 var Cache = class {
   _internal_unstable;
@@ -76874,6 +76892,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -77013,7 +77034,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -77044,10 +77065,10 @@ var CacheInternal = class {
     this._config = config;
     this.componentCache = componentCache ?? {};
     this.createComponent = createComponent ?? (() => ({}));
-    this._disabled = disabled;
+    this.disabled = disabled;
     try {
       if (process.env.HOUDINI_TEST === "true") {
-        this._disabled = false;
+        this.disabled = false;
       }
     } catch {
     }
@@ -77069,7 +77090,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -79860,7 +79881,6 @@ var vite_default = {
 						observer.send({
 							setup: true,
 							variables,
-							session: window.__houdini__initial__session__,
 						})
 
 						// save it in the cache

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

@@ -22,7 +22,6 @@ export declare function Router({ manifest, initialURL, assetPrefix, injectToStre
 export declare const useLocation: () => {
     pathname: string;
     params: Record<string, any>;
-    goto: (url: string) => void;
 };
 export declare function RouterContextProvider({ children, client, cache, artifact_cache, component_cache, data_cache, ssr_signals, last_variables, session: ssrSession, }: {
     children: React.ReactElement;

package/build/runtime-cjs/clientPlugin.js

@@ -23,7 +23,7 @@ __export(clientPlugin_exports, {
 module.exports = __toCommonJS(clientPlugin_exports);
 const plugin = () => () => {
   return {
-    start(ctx, { next }) {
+    beforeNetwork(ctx, { next }) {
       next({
         ...ctx,
         cacheParams: {

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

@@ -39,7 +39,6 @@ function useDocumentHandle({
 }) {
   const [forwardPending, setForwardPending] = import_react.default.useState(false);
   const [backwardPending, setBackwardPending] = import_react.default.useState(false);
-  const location = (0, import_Router.useLocation)();
   const [session] = (0, import_Router.useSession)();
   const client = (0, import_Router.useClient)();
   const paginationObserver = import_react.default.useMemo(() => {
@@ -57,22 +56,10 @@ function useDocumentHandle({
         return result;
       };
     };
-    const fetchQuery = (args) => {
-      const usedVariables = Object.fromEntries(
-        Object.keys(observer.artifact.input?.fields ?? {}).map((fieldName) => [
-          fieldName,
-          location.params[fieldName]
-        ])
-      );
-      return observer.send({
-        ...args,
-        variables: {
-          ...usedVariables,
-          ...args?.variables
-        },
-        session
-      });
-    };
+    const fetchQuery = (args) => observer.send({
+      ...args,
+      session
+    });
     if (artifact.kind !== import_types.ArtifactKind.Query || !artifact.refetch?.paginated) {
       return {
         artifact,

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

@@ -22,7 +22,6 @@ export declare function Router({ manifest, initialURL, assetPrefix, injectToStre
 export declare const useLocation: () => {
     pathname: string;
     params: Record<string, any>;
-    goto: (url: string) => void;
 };
 export declare function RouterContextProvider({ children, client, cache, artifact_cache, component_cache, data_cache, ssr_signals, last_variables, session: ssrSession, }: {
     children: React.ReactElement;

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

@@ -73,7 +73,7 @@ function Router({
     assetPrefix,
     injectToStream
   });
-  const { component_cache, data_cache } = useRouterContext();
+  const { component_cache } = useRouterContext();
   const PageComponent = component_cache.get(page.id);
   import_react.default.useEffect(() => {
     if (globalThis.window && window.location.pathname !== currentURL) {
@@ -92,36 +92,21 @@ function Router({
       window.removeEventListener("popstate", onChange);
     };
   }, []);
-  const goto = (url) => {
-    data_cache.clear();
-    setCurrentURL(url);
-  };
   useLinkBehavior({
-    goto,
+    goto: (val) => {
+      setCurrentURL(val);
+    },
     preload(url, which) {
       const [page2, variables2] = (0, import_match.find_match)(import_config.default, manifest, url);
-      if (!page2) {
-        return;
-      }
-      if (["page", "component"].includes(which)) {
+      if (["both", "component"].includes(which)) {
         loadComponent(page2);
       }
-      if (["page", "data"].includes(which)) {
+      if (["both", "data"].includes(which)) {
         loadData(page2, variables2);
       }
     }
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(VariableContext.Provider, { value: variables, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    LocationContext.Provider,
-    {
-      value: {
-        pathname: currentURL,
-        goto,
-        params: variables ?? {}
-      },
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PageComponent, { url: currentURL }, page.id)
-    }
-  ) });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(VariableContext.Provider, { value: variables, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LocationContext.Provider, { value: { pathname: currentURL, params: variables ?? {} }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PageComponent, { url: currentURL }, page.id) }) });
 }
 const useLocation = () => (0, import_react2.useContext)(LocationContext);
 function usePageData({
@@ -140,13 +125,9 @@ function usePageData({
     last_variables
   } = useRouterContext();
   const [session] = useSession();
-  function load_query({
-    id,
-    artifact,
-    variables: variables2
-  }) {
+  function load_query({ id, artifact }) {
     for (const artifact2 of Object.keys(page.documents)) {
-      last_variables.set(artifact2, variables2);
+      last_variables.set(artifact2, variables);
     }
     if (ssr_signals.has(id)) {
       return ssr_signals.get(id);
@@ -160,7 +141,7 @@ function usePageData({
       resolve = res;
       reject = rej;
       observer.send({
-        variables: variables2,
+        variables,
         session
       }).then(async () => {
         data_cache.set(id, observer);
@@ -196,7 +177,7 @@ function usePageData({
 										variables: ${JSON.stringify(
           (0, import_scalars.marshalInputs)({
             artifact: observer.artifact,
-            input: variables2,
+            input: variables,
             config: import_config.default
           })
         )}
@@ -237,7 +218,7 @@ function usePageData({
 											variables: ${JSON.stringify(
           (0, import_scalars.marshalInputs)({
             artifact: observer.artifact,
-            input: variables2,
+            input: variables,
             config: import_config.default
           })
         )}
@@ -262,9 +243,6 @@ function usePageData({
     return resolvable;
   }
   function loadData(targetPage, variables2) {
-    if (!targetPage) {
-      return;
-    }
     for (const [artifact, { variables: pageVariables }] of Object.entries(
       targetPage.documents
     )) {
@@ -297,14 +275,14 @@ function usePageData({
         injectToStream?.(`
 						<script type="module" src="${assetPrefix}/artifacts/${artifact.name}.js" async=""><\/script>
 					`);
-        load_query({ id: artifact.name, artifact, variables: variables2 });
+        load_query({ id: artifact.name, artifact });
       }).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, variables: variables2 });
+        load_query({ id: artifact.name, artifact });
       }
     }
   }
@@ -412,9 +390,7 @@ function useCurrentVariables() {
 const VariableContext = import_react.default.createContext(null);
 const LocationContext = import_react.default.createContext({
   pathname: "",
-  params: {},
-  goto: () => {
-  }
+  params: {}
 });
 function useQueryResult(name) {
   const { data_cache, artifact_cache } = useRouterContext();
@@ -475,14 +451,10 @@ function usePreload({ preload }) {
   import_react.default.useEffect(() => {
     const mouseMove = (e) => {
       const target = e.target;
-      if (!(target instanceof HTMLElement)) {
-        return;
-      }
-      const anchor = target.closest("a");
-      if (!anchor) {
+      if (!(target instanceof HTMLAnchorElement)) {
         return;
       }
-      let preloadWhichRaw = anchor.attributes.getNamedItem("data-houdini-preload")?.value;
+      let preloadWhichRaw = target.attributes.getNamedItem("data-houdini-preload")?.value;
       let preloadWhich = !preloadWhichRaw || preloadWhichRaw === "true" ? "page" : preloadWhichRaw;
       if (!PreloadWhich[preloadWhich]) {
         console.log(
@@ -494,7 +466,7 @@ function usePreload({ preload }) {
         clearTimeout(timeoutRef.current);
       }
       timeoutRef.current = setTimeout(() => {
-        const url = anchor.attributes.getNamedItem("href")?.value;
+        const url = target.attributes.getNamedItem("href")?.value;
         if (!url) {
           return;
         }

package/build/runtime-esm/clientPlugin.js

@@ -1,6 +1,6 @@
 const plugin = () => () => {
   return {
-    start(ctx, { next }) {
+    beforeNetwork(ctx, { next }) {
       next({
         ...ctx,
         cacheParams: {

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 { useClient, useLocation, useSession } from "../routing/Router";
+import { useClient, useSession } from "../routing/Router";
 function useDocumentHandle({
   artifact,
   observer,
@@ -10,7 +10,6 @@ function useDocumentHandle({
 }) {
   const [forwardPending, setForwardPending] = React.useState(false);
   const [backwardPending, setBackwardPending] = React.useState(false);
-  const location = useLocation();
   const [session] = useSession();
   const client = useClient();
   const paginationObserver = React.useMemo(() => {
@@ -28,22 +27,10 @@ function useDocumentHandle({
         return result;
       };
     };
-    const fetchQuery = (args) => {
-      const usedVariables = Object.fromEntries(
-        Object.keys(observer.artifact.input?.fields ?? {}).map((fieldName) => [
-          fieldName,
-          location.params[fieldName]
-        ])
-      );
-      return observer.send({
-        ...args,
-        variables: {
-          ...usedVariables,
-          ...args?.variables
-        },
-        session
-      });
-    };
+    const fetchQuery = (args) => observer.send({
+      ...args,
+      session
+    });
     if (artifact.kind !== ArtifactKind.Query || !artifact.refetch?.paginated) {
       return {
         artifact,

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

@@ -22,7 +22,6 @@ export declare function Router({ manifest, initialURL, assetPrefix, injectToStre
 export declare const useLocation: () => {
     pathname: string;
     params: Record<string, any>;
-    goto: (url: string) => void;
 };
 export declare function RouterContextProvider({ children, client, cache, artifact_cache, component_cache, data_cache, ssr_signals, last_variables, session: ssrSession, }: {
     children: React.ReactElement;

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

@@ -32,7 +32,7 @@ function Router({
     assetPrefix,
     injectToStream
   });
-  const { component_cache, data_cache } = useRouterContext();
+  const { component_cache } = useRouterContext();
   const PageComponent = component_cache.get(page.id);
   React.useEffect(() => {
     if (globalThis.window && window.location.pathname !== currentURL) {
@@ -51,36 +51,21 @@ function Router({
       window.removeEventListener("popstate", onChange);
     };
   }, []);
-  const goto = (url) => {
-    data_cache.clear();
-    setCurrentURL(url);
-  };
   useLinkBehavior({
-    goto,
+    goto: (val) => {
+      setCurrentURL(val);
+    },
     preload(url, which) {
       const [page2, variables2] = find_match(configFile, manifest, url);
-      if (!page2) {
-        return;
-      }
-      if (["page", "component"].includes(which)) {
+      if (["both", "component"].includes(which)) {
         loadComponent(page2);
       }
-      if (["page", "data"].includes(which)) {
+      if (["both", "data"].includes(which)) {
         loadData(page2, variables2);
       }
     }
   });
-  return /* @__PURE__ */ jsx(VariableContext.Provider, { value: variables, children: /* @__PURE__ */ jsx(
-    LocationContext.Provider,
-    {
-      value: {
-        pathname: currentURL,
-        goto,
-        params: variables ?? {}
-      },
-      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({
@@ -99,13 +84,9 @@ function usePageData({
     last_variables
   } = useRouterContext();
   const [session] = useSession();
-  function load_query({
-    id,
-    artifact,
-    variables: variables2
-  }) {
+  function load_query({ id, artifact }) {
     for (const artifact2 of Object.keys(page.documents)) {
-      last_variables.set(artifact2, variables2);
+      last_variables.set(artifact2, variables);
     }
     if (ssr_signals.has(id)) {
       return ssr_signals.get(id);
@@ -119,7 +100,7 @@ function usePageData({
       resolve = res;
       reject = rej;
       observer.send({
-        variables: variables2,
+        variables,
         session
       }).then(async () => {
         data_cache.set(id, observer);
@@ -155,7 +136,7 @@ function usePageData({
 										variables: ${JSON.stringify(
           marshalInputs({
             artifact: observer.artifact,
-            input: variables2,
+            input: variables,
             config: configFile
           })
         )}
@@ -196,7 +177,7 @@ function usePageData({
 											variables: ${JSON.stringify(
           marshalInputs({
             artifact: observer.artifact,
-            input: variables2,
+            input: variables,
             config: configFile
           })
         )}
@@ -221,9 +202,6 @@ function usePageData({
     return resolvable;
   }
   function loadData(targetPage, variables2) {
-    if (!targetPage) {
-      return;
-    }
     for (const [artifact, { variables: pageVariables }] of Object.entries(
       targetPage.documents
     )) {
@@ -256,14 +234,14 @@ function usePageData({
         injectToStream?.(`
 						<script type="module" src="${assetPrefix}/artifacts/${artifact.name}.js" async=""><\/script>
 					`);
-        load_query({ id: artifact.name, artifact, variables: variables2 });
+        load_query({ id: artifact.name, artifact });
       }).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, variables: variables2 });
+        load_query({ id: artifact.name, artifact });
       }
     }
   }
@@ -371,9 +349,7 @@ function useCurrentVariables() {
 const VariableContext = React.createContext(null);
 const LocationContext = React.createContext({
   pathname: "",
-  params: {},
-  goto: () => {
-  }
+  params: {}
 });
 function useQueryResult(name) {
   const { data_cache, artifact_cache } = useRouterContext();
@@ -434,14 +410,10 @@ function usePreload({ preload }) {
   React.useEffect(() => {
     const mouseMove = (e) => {
       const target = e.target;
-      if (!(target instanceof HTMLElement)) {
-        return;
-      }
-      const anchor = target.closest("a");
-      if (!anchor) {
+      if (!(target instanceof HTMLAnchorElement)) {
         return;
       }
-      let preloadWhichRaw = anchor.attributes.getNamedItem("data-houdini-preload")?.value;
+      let preloadWhichRaw = target.attributes.getNamedItem("data-houdini-preload")?.value;
       let preloadWhich = !preloadWhichRaw || preloadWhichRaw === "true" ? "page" : preloadWhichRaw;
       if (!PreloadWhich[preloadWhich]) {
         console.log(
@@ -453,7 +425,7 @@ function usePreload({ preload }) {
         clearTimeout(timeoutRef.current);
       }
       timeoutRef.current = setTimeout(() => {
-        const url = anchor.attributes.getNamedItem("href")?.value;
+        const url = target.attributes.getNamedItem("href")?.value;
         if (!url) {
           return;
         }

package/package.json

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