houdini-react 0.0.0-20240311071844 → 0.0.0-20240328033602

package/build/plugin-cjs/index.js

@@ -77807,7 +77807,7 @@ function processComponentFieldDirective(directive) {
     export: exportValue
   };
 }
-function unwrapType(config, type, wrappers = []) {
+function unwrapType(config, type, wrappers = [], convertRuntimeScalars) {
   if (type.kind === "NonNullType") {
     return unwrapType(config, type.type, [TypeWrapper.NonNull, ...wrappers]);
   }
@@ -77823,7 +77823,7 @@ function unwrapType(config, type, wrappers = []) {
   if (type instanceof graphql3.GraphQLList) {
     return unwrapType(config, type.ofType, [TypeWrapper.List, ...wrappers]);
   }
-  if (config.configFile.features?.runtimeScalars?.[type.name.value]) {
+  if (convertRuntimeScalars && config.configFile.features?.runtimeScalars?.[type.name.value]) {
     type = config.schema.getType(
       config.configFile.features?.runtimeScalars?.[type.name.value].type
     );
@@ -78700,6 +78700,7 @@ async function walk_routes(args) {
 async function add_view(args) {
   const target = args.type === "page" ? args.project.pages : args.project.layouts;
   const queries = await extractQueries(args.contents);
+  console.log({ queries });
   const missing_queries = queries.filter((query2) => !args.queries.includes(query2));
   if (missing_queries.length > 0) {
     throw {
@@ -78741,7 +78742,7 @@ async function add_query(args) {
   });
   const queryVariables = Object.fromEntries(
     query2.variableDefinitions?.map((variable) => {
-      const { type, wrappers } = unwrapType(args.config, variable.type);
+      const { type, wrappers } = unwrapType(args.config, variable.type, [], true);
       return [
         variable.variable.name.value,
         { wrappers, type: type.name }
@@ -78809,7 +78810,15 @@ 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);
+    }
+    return queries.concat([query2]);
+  }, []);
 }
 function isSecondaryBuild() {
   return process.env.HOUDINI_SECONDARY_BUILD && process.env.HOUDINI_SECONDARY_BUILD !== "false";

package/build/plugin-esm/index.js

@@ -77797,7 +77797,7 @@ function processComponentFieldDirective(directive) {
     export: exportValue
   };
 }
-function unwrapType(config, type, wrappers = []) {
+function unwrapType(config, type, wrappers = [], convertRuntimeScalars) {
   if (type.kind === "NonNullType") {
     return unwrapType(config, type.type, [TypeWrapper.NonNull, ...wrappers]);
   }
@@ -77813,7 +77813,7 @@ function unwrapType(config, type, wrappers = []) {
   if (type instanceof graphql3.GraphQLList) {
     return unwrapType(config, type.ofType, [TypeWrapper.List, ...wrappers]);
   }
-  if (config.configFile.features?.runtimeScalars?.[type.name.value]) {
+  if (convertRuntimeScalars && config.configFile.features?.runtimeScalars?.[type.name.value]) {
     type = config.schema.getType(
       config.configFile.features?.runtimeScalars?.[type.name.value].type
     );
@@ -78690,6 +78690,7 @@ async function walk_routes(args) {
 async function add_view(args) {
   const target = args.type === "page" ? args.project.pages : args.project.layouts;
   const queries = await extractQueries(args.contents);
+  console.log({ queries });
   const missing_queries = queries.filter((query2) => !args.queries.includes(query2));
   if (missing_queries.length > 0) {
     throw {
@@ -78731,7 +78732,7 @@ async function add_query(args) {
   });
   const queryVariables = Object.fromEntries(
     query2.variableDefinitions?.map((variable) => {
-      const { type, wrappers } = unwrapType(args.config, variable.type);
+      const { type, wrappers } = unwrapType(args.config, variable.type, [], true);
       return [
         variable.variable.name.value,
         { wrappers, type: type.name }
@@ -78799,7 +78800,15 @@ 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);
+    }
+    return queries.concat([query2]);
+  }, []);
 }
 function isSecondaryBuild() {
   return process.env.HOUDINI_SECONDARY_BUILD && process.env.HOUDINI_SECONDARY_BUILD !== "false";

package/build/runtime/hooks/useDocumentHandle.d.ts

@@ -10,6 +10,7 @@ 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, _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/hooks/useDocumentHandle.d.ts

@@ -10,6 +10,7 @@ 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, _Input>;
 } & RefetchHandlers<_Artifact, _Data, _Input>;
 type RefetchHandlers<_Artifact extends QueryArtifact, _Data extends GraphQLObject, _Input> = _Artifact extends {
     refetch: {

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 = {
@@ -392,15 +393,23 @@ 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 artifact = artifact_cache.get(name);
+  const handle = (0, import_useDocumentHandle.useDocumentHandle)({
+    artifact,
+    observer,
+    storeValue
+  });
+  return [data, handle];
 }
 function useLinkBehavior({
   goto,

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

@@ -10,6 +10,7 @@ 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, _Input>;
 } & RefetchHandlers<_Artifact, _Data, _Input>;
 type RefetchHandlers<_Artifact extends QueryArtifact, _Data extends GraphQLObject, _Input> = _Artifact extends {
     refetch: {

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 = {
@@ -351,15 +352,23 @@ 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 artifact = artifact_cache.get(name);
+  const handle = useDocumentHandle({
+    artifact,
+    observer,
+    storeValue
+  });
+  return [data, handle];
 }
 function useLinkBehavior({
   goto,

package/package.json

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