houdini 2.0.0-next.34 → 2.0.0-next.36

package/build/cmd/init.js

@@ -472,12 +472,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.34"
+    houdini: "^2.0.0-next.36"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.33"
+      "houdini-svelte": "^3.0.0-next.34"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "houdini",
-    "version": "2.0.0-next.34",
+    "version": "2.0.0-next.36",
     "description": "The disappearing GraphQL clients",
     "keywords": [
         "typescript",

package/build/router/match.d.ts

@@ -10,6 +10,7 @@ export type RouteParam = {
     type?: string;
 };
 export type ParamMatcher = (param: string) => boolean;
+export declare function find_prefix_match<_ComponentType>(manifest: RouterManifest<_ComponentType>, url: string): RouterPageManifest<_ComponentType> | null;
 export declare function find_match<_ComponentType>(config: ConfigFile, manifest: RouterManifest<_ComponentType>, current: string, allowNull: true): [RouterPageManifest<_ComponentType> | null, GraphQLVariables];
 export declare function find_match<_ComponentType>(config: ConfigFile, manifest: RouterManifest<_ComponentType>, current: string, allowNull?: false): [RouterPageManifest<_ComponentType>, GraphQLVariables];
 /**

package/build/router/match.js

@@ -1,4 +1,30 @@
 const param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
+function find_prefix_match(manifest, url) {
+  const urlSegments = url.split("/").filter(Boolean);
+  let best = null;
+  let bestCount = -1;
+  for (const page of Object.values(manifest.pages)) {
+    const pageSegments = page.url.split("/").filter(Boolean);
+    let staticCount = 0;
+    for (const seg of pageSegments) {
+      if (seg.startsWith("[") || seg.startsWith("(") || seg === "*") break;
+      staticCount++;
+    }
+    if (staticCount > urlSegments.length) continue;
+    let matches = true;
+    for (let i = 0; i < staticCount; i++) {
+      if (pageSegments[i] !== urlSegments[i]) {
+        matches = false;
+        break;
+      }
+    }
+    if (matches && staticCount > bestCount) {
+      bestCount = staticCount;
+      best = page;
+    }
+  }
+  return best;
+}
 function find_match(config, manifest, current, allowNull = true) {
   let match = null;
   let matchVariables = null;
@@ -161,6 +187,7 @@ function parseScalar(config, type, value) {
 export {
   exec,
   find_match,
+  find_prefix_match,
   get_route_segments,
   parseScalar,
   parse_page_pattern

package/build/router/server.d.ts

@@ -17,6 +17,7 @@ export declare function _serverHandler<ComponentType = unknown>({ schema, server
     on_render: (args: {
         url: string;
         match: RouterPageManifest<ComponentType> | null;
+        is404: boolean;
         manifest: RouterManifest<unknown>;
         session: App.Session;
         componentCache: Record<string, any>;

package/build/router/server.js

@@ -3,7 +3,7 @@ import {
   YogaServer
 } from "graphql-yoga";
 import { serialize as encodeCookie } from "./cookies.js";
-import { find_match } from "./match.js";
+import { find_match, find_prefix_match } from "./match.js";
 import { get_session, handle_request, session_cookie_name } from "./session.js";
 function _serverHandler({
   schema,
@@ -70,10 +70,13 @@ function _serverHandler({
     if (authResponse) {
       return authResponse;
     }
-    const [match] = find_match(config_file, manifest, url);
+    const [exactMatch] = find_match(config_file, manifest, url);
+    const is404 = !exactMatch;
+    const match = exactMatch ?? find_prefix_match(manifest, url);
     const rendered = await on_render({
       url,
       match,
+      is404,
       session: await get_session(request.headers, session_keys),
       manifest,
       componentCache

package/build/runtime/cache/stuff.js

@@ -10,7 +10,7 @@ function evaluateKey(key, variables = null) {
         continue;
       }
       const value = variables?.[varName.slice(1)];
-      evaluated += typeof value !== "undefined" ? JSON.stringify(value) : "undefined";
+      evaluated += JSON.stringify(value ?? null);
       varName = "";
     }
     if (char === "$" && !inString) {

package/build/runtime/pagination.d.ts

@@ -1,12 +1,14 @@
 import type { SendParams } from './documentStore.js';
 import type { CursorHandlers, FetchFn, GraphQLObject, GraphQLVariables, QueryArtifact, QueryResult, FetchParams } from './types.js';
-export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, fetchUpdate: parentFetchUpdate, fetch: parentFetch, getState, getVariables, getSession, }: {
+export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, fetchUpdate: parentFetchUpdate, fetch: parentFetch, getState, getVariables, getSession, previousCursors, nextCursors, }: {
     artifact: QueryArtifact;
     getState: () => _Data | null;
     getVariables: () => NonNullable<_Input>;
     getSession: () => Promise<App.Session>;
     fetch: FetchFn<_Data, _Input>;
     fetchUpdate: (arg: SendParams, updates: string[]) => ReturnType<FetchFn<_Data, _Input>>;
+    previousCursors?: (string | null)[];
+    nextCursors?: (string | null)[];
 }): CursorHandlers<_Data, _Input>;
 export declare function offsetHandlers<_Data extends GraphQLObject, _Input extends GraphQLVariables | null | undefined>({ artifact, storeName: _storeName, getState, getVariables, fetch: parentFetch, fetchUpdate: parentFetchUpdate, getSession, }: {
     artifact: QueryArtifact;

package/build/runtime/pagination.js

@@ -1,5 +1,6 @@
 import { deepEquals } from "./deepEquals.js";
 import { countPage, extractPageInfo, missingPageSizeError } from "./pageInfo.js";
+import { defaultConfigValues, getCurrentConfig, keyFieldsForType } from "./config.js";
 import { CachePolicy, DataSource } from "./types.js";
 function cursorHandlers({
   artifact,
@@ -7,8 +8,23 @@ function cursorHandlers({
   fetch: parentFetch,
   getState,
   getVariables,
-  getSession
+  getSession,
+  previousCursors = [],
+  nextCursors = []
 }) {
+  const targetType = artifact.refetch?.targetType;
+  const getEntityVars = () => {
+    if (!targetType || targetType === "Query") return {};
+    const config = defaultConfigValues(getCurrentConfig());
+    const typeConfig = config.types?.[targetType];
+    const state = getState();
+    if (!state) return {};
+    if (typeConfig?.resolve?.arguments) {
+      return typeConfig.resolve.arguments(state) ?? {};
+    }
+    const keys = keyFieldsForType(config, targetType);
+    return Object.fromEntries(keys.map((key) => [key, state[key]]));
+  };
   const loadPage = async ({
     pageSizeVar,
     input,
@@ -18,6 +34,8 @@ function cursorHandlers({
     where
   }) => {
     const loadVariables = {
+      ...artifact.input?.defaults ?? {},
+      ...getEntityVars(),
       ...getVariables(),
       ...input
     };
@@ -25,12 +43,13 @@ function cursorHandlers({
       throw missingPageSizeError(functionName);
     }
     const isSinglePage = artifact.refetch?.mode === "SinglePage";
+    const policy = isSinglePage ? artifact.policy : CachePolicy.NetworkOnly;
     return (isSinglePage ? parentFetch : parentFetchUpdate)(
       {
         variables: loadVariables,
         fetch,
         metadata,
-        policy: isSinglePage ? artifact.policy : CachePolicy.NetworkOnly,
+        policy,
         session: await getSession()
       },
       isSinglePage ? [] : [where === "start" ? "prepend" : "append"]
@@ -46,6 +65,51 @@ function cursorHandlers({
       fetch,
       metadata
     } = {}) => {
+      const isSinglePage = artifact.refetch?.mode === "SinglePage";
+      const direction = artifact.refetch?.direction;
+      if (isSinglePage && direction === "backward") {
+        if (nextCursors.length === 0) {
+          return Promise.resolve({
+            data: getState(),
+            errors: null,
+            fetching: false,
+            partial: false,
+            stale: false,
+            source: DataSource.Cache,
+            variables: getVariables()
+          });
+        }
+        const beforeCursor = nextCursors.pop();
+        return loadPage({
+          pageSizeVar: "last",
+          functionName: "loadNextPage",
+          input: {
+            before: beforeCursor,
+            last: first ?? artifact.refetch.pageSize,
+            first: null,
+            after: null
+          },
+          fetch,
+          metadata,
+          where: "start"
+        });
+      }
+      if (isSinglePage && direction === "both" && nextCursors.length > 0) {
+        const beforeCursor = nextCursors.pop();
+        return loadPage({
+          pageSizeVar: "last",
+          functionName: "loadNextPage",
+          input: {
+            before: beforeCursor,
+            last: first ?? artifact.refetch.pageSize,
+            first: null,
+            after: null
+          },
+          fetch,
+          metadata,
+          where: "start"
+        });
+      }
       const currentPageInfo = getPageInfo();
       if (!currentPageInfo.hasNextPage) {
         return Promise.resolve({
@@ -58,6 +122,9 @@ function cursorHandlers({
           variables: getVariables()
         });
       }
+      if (isSinglePage && (direction === "forward" || direction === "both")) {
+        previousCursors.push(getVariables()?.after ?? null);
+      }
       const input = {
         first: first ?? artifact.refetch.pageSize,
         after: after ?? currentPageInfo.endCursor,
@@ -79,6 +146,35 @@ function cursorHandlers({
       fetch,
       metadata
     } = {}) => {
+      const isSinglePage = artifact.refetch?.mode === "SinglePage";
+      const direction = artifact.refetch?.direction;
+      if (isSinglePage && (direction === "forward" || direction === "both") && previousCursors.length > 0) {
+        const afterCursor = previousCursors.pop();
+        return loadPage({
+          pageSizeVar: "first",
+          functionName: "loadPreviousPage",
+          input: {
+            after: afterCursor,
+            first: last ?? artifact.refetch.pageSize,
+            before: null,
+            last: null
+          },
+          fetch,
+          metadata,
+          where: "end"
+        });
+      }
+      if (isSinglePage && direction === "forward") {
+        return Promise.resolve({
+          data: getState(),
+          errors: null,
+          fetching: false,
+          partial: false,
+          stale: false,
+          source: DataSource.Cache,
+          variables: getVariables()
+        });
+      }
       const currentPageInfo = getPageInfo();
       if (!currentPageInfo.hasPreviousPage) {
         return Promise.resolve({
@@ -91,6 +187,11 @@ function cursorHandlers({
           variables: getVariables()
         });
       }
+      const pVars = getVariables();
+      const isForwardPage = pVars?.first != null || pVars?.after != null;
+      if (isSinglePage && (direction === "backward" || direction === "both") && !isForwardPage) {
+        nextCursors.push(pVars?.before ?? null);
+      }
       const input = {
         before: before ?? currentPageInfo.startCursor,
         last: last ?? artifact.refetch.pageSize,

package/build/vite/hmr.js

@@ -283,27 +283,20 @@ function document_hmr(ctx) {
             { $task_id: task_id }
           );
           let results;
-          let taskDocCount = 0;
           try {
             results = await run_pipeline(compiler.trigger_hook, {
               task_id,
               after: "AfterExtract"
             });
-            taskDocCount = ctx.db.get(
-              `SELECT COUNT(DISTINCT d.id) as count
-								 FROM documents d
-								 JOIN raw_documents rd ON rd.id = d.raw_document
-								 WHERE rd.current_task = ?`,
-              [task_id]
-            )?.count ?? 0;
           } finally {
             ctx.db.run(
               `UPDATE raw_documents SET current_task = NULL WHERE current_task = ?`,
               [task_id]
             );
           }
+          const changedDocCount = Object.values(results.GenerateDocuments || {}).flat().length;
           console.log(
-            `\u{1F3A9} Updated ${taskDocCount} ${taskDocCount === 1 ? "document" : "documents"}`
+            `\u{1F3A9} Updated ${changedDocCount} ${changedDocCount === 1 ? "document" : "documents"}`
           );
           const updated_modules = [
             ...Object.values(results.GenerateDocuments || {}).flat(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "2.0.0-next.34",
+  "version": "2.0.0-next.36",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",
@@ -50,7 +50,7 @@
     "recast": "^0.23.11",
     "sql.js": "^1.14.1",
     "ws": "^8.21.0",
-    "houdini-core": "^2.0.0-next.22"
+    "houdini-core": "^2.0.0-next.23"
   },
   "peerDependencies": {
     "graphql": ">=16",