houdini-react 1.3.7 → 2.0.0-next.0

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

@@ -5,9 +5,10 @@ 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 { suspense_cache } from "./cache";
 import { useDocumentHandle } from "../hooks/useDocumentHandle";
 import { useDocumentStore } from "../hooks/useDocumentStore";
-import { suspense_cache } from "./cache";
+import { Context, useRouterContext, useSession, useLocation, LocationContext } from "./hooks";
 const PreloadWhich = {
   component: "component",
   data: "data",
@@ -82,7 +83,6 @@ function Router({
     }
   ) });
 }
-const useLocation = () => useContext(LocationContext);
 function usePageData({
   page,
   variables,
@@ -209,7 +209,7 @@ function usePageData({
 									window.__houdini__nav_caches__.ssr_signals.delete(artifactName)
 								}
 							}
-						<\/script>
+						</script>
 					`);
         resolve();
       }).catch(reject);
@@ -254,7 +254,7 @@ function usePageData({
         const artifact = mod.default;
         artifact_cache.set(artifact_id, artifact);
         injectToStream?.(`
-						<script type="module" src="${assetPrefix}/artifacts/${artifact.name}.js" async=""><\/script>
+						<script type="module" src="${assetPrefix}/artifacts/${artifact.name}.js" async=""></script>
 					`);
         load_query({ id: artifact.name, artifact, variables: variables2 });
       }).catch((err) => {
@@ -322,20 +322,6 @@ function RouterContextProvider({
     }
   );
 }
-const Context = React.createContext(null);
-const useRouterContext = () => {
-  const ctx = React.useContext(Context);
-  if (!ctx) {
-    throw new Error("Could not find router context");
-  }
-  return ctx;
-};
-function useClient() {
-  return useRouterContext().client;
-}
-function useCache() {
-  return useRouterContext().cache;
-}
 function updateLocalSession(session) {
   window.dispatchEvent(
     new CustomEvent("_houdini_session_", {
@@ -344,37 +330,10 @@ function updateLocalSession(session) {
     })
   );
 }
-function useSession() {
-  const ctx = useRouterContext();
-  const updateSession = (newSession) => {
-    ctx.data_cache.clear();
-    ctx.setSession(newSession);
-    const auth = configFile.router?.auth;
-    if (!auth) {
-      return;
-    }
-    const url = "redirect" in auth ? auth.redirect : auth.url;
-    fetch(url, {
-      method: "POST",
-      body: JSON.stringify(newSession),
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json"
-      }
-    });
-  };
-  return [ctx.session, updateSession];
-}
 function useCurrentVariables() {
   return React.useContext(VariableContext);
 }
 const VariableContext = React.createContext(null);
-const LocationContext = React.createContext({
-  pathname: "",
-  params: {},
-  goto: () => {
-  }
-});
 function useQueryResult(name) {
   const { data_cache, artifact_cache } = useRouterContext();
   const store_ref = data_cache.get(name);
@@ -410,7 +369,11 @@ function useLinkNavigation({ goto }) {
         return;
       }
       const link = e.target?.closest("a");
-      if (!(link && link instanceof HTMLAnchorElement && link.href && (!link.target || link.target === "_self") && link.origin === location.origin && !link.hasAttribute("download") && e.button === 0 && !e.metaKey && !e.ctrlKey && !e.altKey && !e.shiftKey && !e.defaultPrevented)) {
+      if (!(link && link instanceof HTMLAnchorElement && link.href && (!link.target || link.target === "_self") && link.origin === location.origin && !link.hasAttribute("download") && e.button === 0 && // left clicks only
+      !e.metaKey && // open in new tab (mac)
+      !e.ctrlKey && // open in new tab (windows)
+      !e.altKey && // download
+      !e.shiftKey && !e.defaultPrevented)) {
         return;
       }
       const target = link.attributes.getNamedItem("href")?.value;
@@ -530,12 +493,7 @@ export {
   RouterContextProvider,
   router_cache,
   updateLocalSession,
-  useCache,
-  useClient,
   useCurrentVariables,
-  useLocation,
   useQueryResult,
-  useRoute,
-  useRouterContext,
-  useSession
+  useRoute
 };

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

@@ -7,6 +7,8 @@ function suspense_cache(initialData) {
   return cache;
 }
 class SuspenseCache extends LRUCache {
+  // if get is called before set, we need to invoke a callback.
+  // that means we need a place to put our callbacks
   #callbacks = /* @__PURE__ */ new Map();
   get(key) {
     if (super.has(key)) {
@@ -16,6 +18,7 @@ class SuspenseCache extends LRUCache {
       this.#subscribe(key, resolve, reject);
     });
   }
+  // TODO: reject?
   set(key, value) {
     super.set(key, value);
     if (this.#callbacks.has(key)) {

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

@@ -0,0 +1,40 @@
+import type { Cache } from '$houdini/runtime/cache/cache';
+import type { DocumentStore, HoudiniClient } from '$houdini/runtime/client';
+import type { LRUCache } from '$houdini/runtime/lib/lru';
+import type { GraphQLObject, GraphQLVariables, QueryArtifact } from '$houdini/runtime/lib/types';
+import { default as React } from 'react';
+import type { SuspenseCache } from './cache';
+export type PageComponent = React.ComponentType<{
+    url: string;
+}>;
+export type PendingCache = SuspenseCache<Promise<void> & {
+    resolve: () => void;
+    reject: (message: string) => void;
+}>;
+type RouterContext = {
+    client: HoudiniClient;
+    cache: Cache;
+    artifact_cache: SuspenseCache<QueryArtifact>;
+    component_cache: SuspenseCache<PageComponent>;
+    data_cache: SuspenseCache<DocumentStore<GraphQLObject, GraphQLVariables>>;
+    ssr_signals: PendingCache;
+    last_variables: LRUCache<GraphQLVariables>;
+    session: App.Session;
+    setSession: (newSession: Partial<App.Session>) => void;
+};
+export declare const Context: React.Context<RouterContext | null>;
+export declare const LocationContext: React.Context<{
+    pathname: string;
+    params: Record<string, any>;
+    goto: (url: string) => void;
+}>;
+export declare const useLocation: () => {
+    pathname: string;
+    params: Record<string, any>;
+    goto: (url: string) => void;
+};
+export declare const useRouterContext: () => RouterContext;
+export declare function useClient(): HoudiniClient;
+export declare function useCache(): Cache;
+export declare function useSession(): [App.Session, (newSession: Partial<App.Session>) => void];
+export {};

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

@@ -0,0 +1,53 @@
+import configFile from "$houdini/runtime/imports/config";
+import { useContext, default as React } from "react";
+const Context = React.createContext(null);
+const LocationContext = React.createContext({
+  pathname: "",
+  params: {},
+  goto: () => {
+  }
+});
+const useLocation = () => useContext(LocationContext);
+const useRouterContext = () => {
+  const ctx = React.useContext(Context);
+  if (!ctx) {
+    throw new Error("Could not find router context");
+  }
+  return ctx;
+};
+function useClient() {
+  return useRouterContext().client;
+}
+function useCache() {
+  return useRouterContext().cache;
+}
+function useSession() {
+  const ctx = useRouterContext();
+  const updateSession = (newSession) => {
+    ctx.data_cache.clear();
+    ctx.setSession(newSession);
+    const auth = configFile.router?.auth;
+    if (!auth) {
+      return;
+    }
+    const url = "redirect" in auth ? auth.redirect : auth.url;
+    fetch(url, {
+      method: "POST",
+      body: JSON.stringify(newSession),
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      }
+    });
+  };
+  return [ctx.session, updateSession];
+}
+export {
+  Context,
+  LocationContext,
+  useCache,
+  useClient,
+  useLocation,
+  useRouterContext,
+  useSession
+};

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

@@ -1,2 +1,3 @@
 export * from './Router';
+export * from './hooks';
 export { type SuspenseCache, suspense_cache } from './cache';

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

@@ -1,4 +1,5 @@
 export * from "./Router";
+export * from "./hooks";
 import { suspense_cache } from "./cache";
 export {
   suspense_cache

package/build/server-cjs/index.js

@@ -16,11 +16,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var server_exports = {};
-__export(server_exports, {
+var index_exports = {};
+__export(index_exports, {
   renderToStream: () => import_server.renderToStream
 });
-module.exports = __toCommonJS(server_exports);
+module.exports = __toCommonJS(index_exports);
 var import_server = require("react-streaming-compat/server");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-react",
-  "version": "1.3.7",
+  "version": "2.0.0-next.0",
   "description": "The React plugin for houdini",
   "keywords": [
     "typescript",
@@ -34,15 +34,15 @@
     "cookies": "^0.8.0",
     "estraverse": "^5.3.0",
     "express": "^4.18.2",
-    "graphql": "^15.8.0",
+    "graphql": "^16.10.0",
     "graphql-yoga": "^4.0.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-streaming-compat": "^0.3.18",
     "recast": "^0.23.1",
-    "rollup": "^4.28.1",
+    "rollup": "^4.39.0",
     "use-deep-compare-effect": "^1.8.1",
-    "houdini": "^1.5.3"
+    "houdini": "^2.0.0-next.0"
   },
   "files": [
     "build"