houdini 1.2.12 → 1.2.14

package/build/lib-cjs/index.js

@@ -1,4 +1,3 @@
-import { createRequire as conflict_free } from 'module'; const require = conflict_free(import.meta.url);
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -58608,11 +58607,13 @@ __export(lib_exports, {
   detectTools: () => detectTools,
   ensureArtifactImport: () => ensureArtifactImport,
   ensureImports: () => ensureImports,
+  exec: () => exec,
   extractHeaders: () => extractHeaders,
   extractHeadersStr: () => extractHeadersStr,
   extractQueries: () => extractQueries,
   fetch: () => fetch2,
   find_graphql: () => find_graphql,
+  find_match: () => find_match,
   formatErrors: () => formatErrors,
   fragmentKey: () => fragmentKey,
   fs: () => fs_exports,
@@ -58620,13 +58621,14 @@ __export(lib_exports, {
   getCurrentConfig: () => getCurrentConfig,
   getMockConfig: () => getMockConfig,
   getRootType: () => getRootType,
+  get_route_segments: () => get_route_segments,
   get_session: () => get_session,
   handle_request: () => handle_request,
   hashOriginal: () => hashOriginal,
   hashRaw: () => hashRaw,
   houdini_mode: () => houdini_mode,
   isPending: () => isPending,
-  isViteSchemaBuild: () => isViteSchemaBuild,
+  isSecondaryBuild: () => isSecondaryBuild,
   keyFieldsForType: () => keyFieldsForType,
   loadLocalSchema: () => loadLocalSchema,
   load_manifest: () => load_manifest,
@@ -58639,6 +58641,7 @@ __export(lib_exports, {
   parentTypeFromAncestors: () => parentTypeFromAncestors,
   parseJS: () => parseJS,
   parseJSON: () => parseJSON,
+  parse_page_pattern: () => parse_page_pattern,
   path: () => path_exports,
   plugin: () => plugin,
   printJS: () => printJS,
@@ -66882,7 +66885,7 @@ var LogLevel = {
 
 // src/lib/config.ts
 var import_meta = {};
-var currentDir = global.__dirname || dirname((0, import_node_url2.fileURLToPath)(import_meta.url));
+var currentDir = dirname((0, import_node_url2.fileURLToPath)(import_meta.url));
 var Config = class {
   filepath;
   rootDir;
@@ -68048,6 +68051,124 @@ async function detectTools(cwd) {
   };
 }
 
+// src/runtime/router/match.ts
+var param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
+function find_match(manifest, current, allowNull = true) {
+  let match = null;
+  let matchVariables = null;
+  for (const page of Object.values(manifest.pages)) {
+    const urlMatch = current.match(page.pattern);
+    if (!urlMatch) {
+      continue;
+    }
+    match = page;
+    matchVariables = exec(urlMatch, page.params) || {};
+    break;
+  }
+  if (!match && !allowNull) {
+    throw new Error("404");
+  }
+  return [match, matchVariables];
+}
+function parse_page_pattern(id) {
+  const params = [];
+  const pattern = id === "/" ? /^\/$/ : new RegExp(
+    `^${get_route_segments(id).map((segment) => {
+      const rest_match = /^\[\.\.\.(\w+)(?:=(\w+))?\]$/.exec(segment);
+      if (rest_match) {
+        params.push({
+          name: rest_match[1],
+          matcher: rest_match[2],
+          optional: false,
+          rest: true,
+          chained: true
+        });
+        return "(?:/(.*))?";
+      }
+      const optional_match = /^\[\[(\w+)(?:=(\w+))?\]\]$/.exec(segment);
+      if (optional_match) {
+        params.push({
+          name: optional_match[1],
+          matcher: optional_match[2],
+          optional: true,
+          rest: false,
+          chained: true
+        });
+        return "(?:/([^/]+))?";
+      }
+      if (!segment) {
+        return;
+      }
+      const parts = segment.split(/\[(.+?)\](?!\])/);
+      const result = parts.map((content, i2) => {
+        if (i2 % 2) {
+          if (content.startsWith("x+")) {
+            return escape2(
+              String.fromCharCode(parseInt(content.slice(2), 16))
+            );
+          }
+          if (content.startsWith("u+")) {
+            return escape2(
+              String.fromCharCode(
+                ...content.slice(2).split("-").map((code) => parseInt(code, 16))
+              )
+            );
+          }
+          const match = param_pattern.exec(content);
+          if (!match) {
+            throw new Error(
+              `Invalid param: ${content}. Params and matcher names can only have underscores and alphanumeric characters.`
+            );
+          }
+          const [, is_optional, is_rest, name, matcher] = match;
+          params.push({
+            name,
+            matcher,
+            optional: !!is_optional,
+            rest: !!is_rest,
+            chained: is_rest ? i2 === 1 && parts[0] === "" : false
+          });
+          return is_rest ? "(.*?)" : is_optional ? "([^/]*)?" : "([^/]+?)";
+        }
+        return escape2(content);
+      }).join("");
+      return "/" + result;
+    }).join("")}/?$`
+  );
+  return { pattern, params, page_id: id };
+}
+function affects_path(segment) {
+  return !/^\([^)]+\)$/.test(segment);
+}
+function get_route_segments(route) {
+  return route.slice(1).split("/").filter(affects_path);
+}
+function exec(match, params) {
+  const result = {};
+  const values = match.slice(1);
+  let buffered = "";
+  for (let i2 = 0; i2 < params.length; i2 += 1) {
+    const param = params[i2];
+    let value = values[i2];
+    if (param.chained && param.rest && buffered) {
+      value = value ? buffered + "/" + value : buffered;
+    }
+    buffered = "";
+    if (value === void 0) {
+      if (param.rest)
+        result[param.name] = "";
+    } else {
+      result[param.name] = value;
+    }
+  }
+  if (buffered)
+    return;
+  return result;
+}
+function escape2(str) {
+  return str.normalize().replace(/[[\]]/g, "\\$&").replace(/%/g, "%25").replace(/\//g, "%2[Ff]").replace(/\?/g, "%3[Ff]").replace(/#/g, "%23").replace(/[.*+?^${}()|\\]/g, "\\$&");
+}
+
 // ../../node_modules/.pnpm/estree-walker@3.0.1/node_modules/estree-walker/src/walker.js
 var WalkerBase = class {
   constructor() {
@@ -68232,9 +68353,10 @@ async function find_graphql(config2, parsedScript, walker) {
   });
 }
 
-// src/router/conventions.ts
+// src/lib/router/conventions.ts
 var conventions_exports = {};
 __export(conventions_exports, {
+  adapter_config_path: () => adapter_config_path,
   fallback_unit_path: () => fallback_unit_path,
   is_layout: () => is_layout,
   layout_unit_path: () => layout_unit_path,
@@ -68246,13 +68368,10 @@ __export(conventions_exports, {
   read_layoutView: () => read_layoutView,
   read_pageQuery: () => read_pageQuery,
   read_pageView: () => read_pageView,
-  render_app_path: () => render_app_path,
-  render_client_path: () => render_client_path,
-  render_server_path: () => render_server_path,
-  render_yoga_path: () => render_yoga_path,
   router_index_path: () => router_index_path,
   router_path: () => router_path,
-  serialized_manifest_path: () => serialized_manifest_path
+  serialized_manifest_path: () => serialized_manifest_path,
+  server_adapter_path: () => server_adapter_path
 });
 function router_path(config2) {
   return path_exports.join(base_dir(config2), "Router.jsx");
@@ -68260,17 +68379,11 @@ function router_path(config2) {
 function page_entry_path(config2, id, base) {
   return path_exports.join(page_entries_dir(config2, base), `${id}.jsx`);
 }
-function render_client_path(config2, base) {
-  return path_exports.join(units_dir(config2, base), "render", "client.jsx");
-}
-function render_server_path(config2, base) {
+function server_adapter_path(config2, base) {
   return path_exports.join(units_dir(config2, base), "render", "server.js");
 }
-function render_yoga_path(config2, base) {
-  return path_exports.join(units_dir(config2, base), "render", "yoga.js");
-}
-function render_app_path(config2, base) {
-  return path_exports.join(units_dir(config2, base), "render", "App.jsx");
+function adapter_config_path(config2, base) {
+  return path_exports.join(units_dir(config2, base), "render", "config.js");
 }
 function page_unit_path(config2, id, base) {
   return path_exports.join(page_units_dir(config2, base), `${id}.jsx`);
@@ -68354,7 +68467,7 @@ function serialized_manifest_path(config2, base = base_dir(config2)) {
   return path_exports.join(base, "manifest.json");
 }
 
-// src/router/manifest.ts
+// src/lib/router/manifest.ts
 var t2 = __toESM(require_lib6(), 1);
 var graphql5 = __toESM(require("graphql"), 1);
 async function load_manifest(args) {
@@ -68580,15 +68693,15 @@ async function extractQueries(source) {
   return props.filter((p) => p !== "children");
 }
 
-// src/router/server.ts
+// src/lib/router/server.ts
 var import_node_path2 = __toESM(require("node:path"), 1);
-var import_vite = require("vite");
-function isViteSchemaBuild() {
+function isSecondaryBuild() {
   return process.env.HOUDINI_SCHEMA_BUILD === "true";
 }
 async function loadLocalSchema(config2) {
+  const { build } = await import("vite");
   process.env.HOUDINI_SCHEMA_BUILD = "true";
-  await (0, import_vite.build)({
+  await build({
     logLevel: "silent",
     build: {
       outDir: import_node_path2.default.join(config2.rootDir, "temp"),
@@ -68807,29 +68920,28 @@ function decode2(token) {
   };
 }
 
-// src/runtime/router/server.ts
+// src/runtime/router/session.ts
 async function handle_request(args) {
   const plugin_config = args.config.router ?? {};
   if (plugin_config.auth && "redirect" in plugin_config.auth && args.url.startsWith(plugin_config.auth.redirect)) {
     return await redirect_auth(args);
   }
-  args.next();
 }
 async function redirect_auth(args) {
-  const { searchParams } = new URL(args.url, `http://${args.get_header("host")}`);
+  const { searchParams } = new URL(args.url, `http://${args.headers.get("host")}`);
   const { redirectTo, ...session } = Object.fromEntries(searchParams.entries());
-  await set_session(args, session);
   if (redirectTo) {
-    return args.redirect(302, redirectTo);
+    const response = Response.redirect(redirectTo, 302);
+    await set_session(args, response, session);
+    return response;
   }
-  args.next();
 }
 var session_cookie_name = "__houdini__";
-async function set_session(req, value) {
+async function set_session(req, response, value) {
   const today = new Date();
   const expires = new Date(today.getTime() + 7 * 24 * 60 * 60 * 1e3);
   const serialized = await encode(value, req.session_keys[0]);
-  req.set_header(
+  response.headers.set(
     "Set-Cookie",
     `${session_cookie_name}=${serialized}; Path=/; HttpOnly; Secure; SameSite=Lax; Expires=${expires.toUTCString()} `
   );
@@ -68884,11 +68996,13 @@ async function get_session(req, secrets) {
   detectTools,
   ensureArtifactImport,
   ensureImports,
+  exec,
   extractHeaders,
   extractHeadersStr,
   extractQueries,
   fetch,
   find_graphql,
+  find_match,
   formatErrors,
   fragmentKey,
   fs,
@@ -68896,13 +69010,14 @@ async function get_session(req, secrets) {
   getCurrentConfig,
   getMockConfig,
   getRootType,
+  get_route_segments,
   get_session,
   handle_request,
   hashOriginal,
   hashRaw,
   houdini_mode,
   isPending,
-  isViteSchemaBuild,
+  isSecondaryBuild,
   keyFieldsForType,
   loadLocalSchema,
   load_manifest,
@@ -68915,6 +69030,7 @@ async function get_session(req, secrets) {
   parentTypeFromAncestors,
   parseJS,
   parseJSON,
+  parse_page_pattern,
   path,
   plugin,
   printJS,

package/build/lib-esm/index.js

@@ -66809,7 +66809,7 @@ var LogLevel = {
 };
 
 // src/lib/config.ts
-var currentDir = global.__dirname || dirname(fileURLToPath(import.meta.url));
+var currentDir = dirname(fileURLToPath(import.meta.url));
 var Config = class {
   filepath;
   rootDir;
@@ -67975,6 +67975,124 @@ async function detectTools(cwd) {
   };
 }
 
+// src/runtime/router/match.ts
+var param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
+function find_match(manifest, current, allowNull = true) {
+  let match = null;
+  let matchVariables = null;
+  for (const page of Object.values(manifest.pages)) {
+    const urlMatch = current.match(page.pattern);
+    if (!urlMatch) {
+      continue;
+    }
+    match = page;
+    matchVariables = exec(urlMatch, page.params) || {};
+    break;
+  }
+  if (!match && !allowNull) {
+    throw new Error("404");
+  }
+  return [match, matchVariables];
+}
+function parse_page_pattern(id) {
+  const params = [];
+  const pattern = id === "/" ? /^\/$/ : new RegExp(
+    `^${get_route_segments(id).map((segment) => {
+      const rest_match = /^\[\.\.\.(\w+)(?:=(\w+))?\]$/.exec(segment);
+      if (rest_match) {
+        params.push({
+          name: rest_match[1],
+          matcher: rest_match[2],
+          optional: false,
+          rest: true,
+          chained: true
+        });
+        return "(?:/(.*))?";
+      }
+      const optional_match = /^\[\[(\w+)(?:=(\w+))?\]\]$/.exec(segment);
+      if (optional_match) {
+        params.push({
+          name: optional_match[1],
+          matcher: optional_match[2],
+          optional: true,
+          rest: false,
+          chained: true
+        });
+        return "(?:/([^/]+))?";
+      }
+      if (!segment) {
+        return;
+      }
+      const parts = segment.split(/\[(.+?)\](?!\])/);
+      const result = parts.map((content, i2) => {
+        if (i2 % 2) {
+          if (content.startsWith("x+")) {
+            return escape2(
+              String.fromCharCode(parseInt(content.slice(2), 16))
+            );
+          }
+          if (content.startsWith("u+")) {
+            return escape2(
+              String.fromCharCode(
+                ...content.slice(2).split("-").map((code) => parseInt(code, 16))
+              )
+            );
+          }
+          const match = param_pattern.exec(content);
+          if (!match) {
+            throw new Error(
+              `Invalid param: ${content}. Params and matcher names can only have underscores and alphanumeric characters.`
+            );
+          }
+          const [, is_optional, is_rest, name, matcher] = match;
+          params.push({
+            name,
+            matcher,
+            optional: !!is_optional,
+            rest: !!is_rest,
+            chained: is_rest ? i2 === 1 && parts[0] === "" : false
+          });
+          return is_rest ? "(.*?)" : is_optional ? "([^/]*)?" : "([^/]+?)";
+        }
+        return escape2(content);
+      }).join("");
+      return "/" + result;
+    }).join("")}/?$`
+  );
+  return { pattern, params, page_id: id };
+}
+function affects_path(segment) {
+  return !/^\([^)]+\)$/.test(segment);
+}
+function get_route_segments(route) {
+  return route.slice(1).split("/").filter(affects_path);
+}
+function exec(match, params) {
+  const result = {};
+  const values = match.slice(1);
+  let buffered = "";
+  for (let i2 = 0; i2 < params.length; i2 += 1) {
+    const param = params[i2];
+    let value = values[i2];
+    if (param.chained && param.rest && buffered) {
+      value = value ? buffered + "/" + value : buffered;
+    }
+    buffered = "";
+    if (value === void 0) {
+      if (param.rest)
+        result[param.name] = "";
+    } else {
+      result[param.name] = value;
+    }
+  }
+  if (buffered)
+    return;
+  return result;
+}
+function escape2(str) {
+  return str.normalize().replace(/[[\]]/g, "\\$&").replace(/%/g, "%25").replace(/\//g, "%2[Ff]").replace(/\?/g, "%3[Ff]").replace(/#/g, "%23").replace(/[.*+?^${}()|\\]/g, "\\$&");
+}
+
 // ../../node_modules/.pnpm/estree-walker@3.0.1/node_modules/estree-walker/src/walker.js
 var WalkerBase = class {
   constructor() {
@@ -68159,9 +68277,10 @@ async function find_graphql(config2, parsedScript, walker) {
   });
 }
 
-// src/router/conventions.ts
+// src/lib/router/conventions.ts
 var conventions_exports = {};
 __export(conventions_exports, {
+  adapter_config_path: () => adapter_config_path,
   fallback_unit_path: () => fallback_unit_path,
   is_layout: () => is_layout,
   layout_unit_path: () => layout_unit_path,
@@ -68173,13 +68292,10 @@ __export(conventions_exports, {
   read_layoutView: () => read_layoutView,
   read_pageQuery: () => read_pageQuery,
   read_pageView: () => read_pageView,
-  render_app_path: () => render_app_path,
-  render_client_path: () => render_client_path,
-  render_server_path: () => render_server_path,
-  render_yoga_path: () => render_yoga_path,
   router_index_path: () => router_index_path,
   router_path: () => router_path,
-  serialized_manifest_path: () => serialized_manifest_path
+  serialized_manifest_path: () => serialized_manifest_path,
+  server_adapter_path: () => server_adapter_path
 });
 function router_path(config2) {
   return path_exports.join(base_dir(config2), "Router.jsx");
@@ -68187,17 +68303,11 @@ function router_path(config2) {
 function page_entry_path(config2, id, base) {
   return path_exports.join(page_entries_dir(config2, base), `${id}.jsx`);
 }
-function render_client_path(config2, base) {
-  return path_exports.join(units_dir(config2, base), "render", "client.jsx");
-}
-function render_server_path(config2, base) {
+function server_adapter_path(config2, base) {
   return path_exports.join(units_dir(config2, base), "render", "server.js");
 }
-function render_yoga_path(config2, base) {
-  return path_exports.join(units_dir(config2, base), "render", "yoga.js");
-}
-function render_app_path(config2, base) {
-  return path_exports.join(units_dir(config2, base), "render", "App.jsx");
+function adapter_config_path(config2, base) {
+  return path_exports.join(units_dir(config2, base), "render", "config.js");
 }
 function page_unit_path(config2, id, base) {
   return path_exports.join(page_units_dir(config2, base), `${id}.jsx`);
@@ -68281,7 +68391,7 @@ function serialized_manifest_path(config2, base = base_dir(config2)) {
   return path_exports.join(base, "manifest.json");
 }
 
-// src/router/manifest.ts
+// src/lib/router/manifest.ts
 var t2 = __toESM(require_lib6(), 1);
 import * as graphql5 from "graphql";
 async function load_manifest(args) {
@@ -68507,13 +68617,13 @@ async function extractQueries(source) {
   return props.filter((p) => p !== "children");
 }
 
-// src/router/server.ts
+// src/lib/router/server.ts
 import path2 from "node:path";
-import { build } from "vite";
-function isViteSchemaBuild() {
+function isSecondaryBuild() {
   return process.env.HOUDINI_SCHEMA_BUILD === "true";
 }
 async function loadLocalSchema(config2) {
+  const { build } = await import("vite");
   process.env.HOUDINI_SCHEMA_BUILD = "true";
   await build({
     logLevel: "silent",
@@ -68734,29 +68844,28 @@ function decode2(token) {
   };
 }
 
-// src/runtime/router/server.ts
+// src/runtime/router/session.ts
 async function handle_request(args) {
   const plugin_config = args.config.router ?? {};
   if (plugin_config.auth && "redirect" in plugin_config.auth && args.url.startsWith(plugin_config.auth.redirect)) {
     return await redirect_auth(args);
   }
-  args.next();
 }
 async function redirect_auth(args) {
-  const { searchParams } = new URL(args.url, `http://${args.get_header("host")}`);
+  const { searchParams } = new URL(args.url, `http://${args.headers.get("host")}`);
   const { redirectTo, ...session } = Object.fromEntries(searchParams.entries());
-  await set_session(args, session);
   if (redirectTo) {
-    return args.redirect(302, redirectTo);
+    const response = Response.redirect(redirectTo, 302);
+    await set_session(args, response, session);
+    return response;
   }
-  args.next();
 }
 var session_cookie_name = "__houdini__";
-async function set_session(req, value) {
+async function set_session(req, response, value) {
   const today = new Date();
   const expires = new Date(today.getTime() + 7 * 24 * 60 * 60 * 1e3);
   const serialized = await encode(value, req.session_keys[0]);
-  req.set_header(
+  response.headers.set(
     "Set-Cookie",
     `${session_cookie_name}=${serialized}; Path=/; HttpOnly; Secure; SameSite=Lax; Expires=${expires.toUTCString()} `
   );
@@ -68810,11 +68919,13 @@ export {
   detectTools,
   ensureArtifactImport,
   ensureImports,
+  exec,
   extractHeaders,
   extractHeadersStr,
   extractQueries,
   fetch2 as fetch,
   find_graphql,
+  find_match,
   formatErrors,
   fragmentKey,
   fs_exports as fs,
@@ -68822,13 +68933,14 @@ export {
   getCurrentConfig,
   getMockConfig,
   getRootType,
+  get_route_segments,
   get_session,
   handle_request,
   hashOriginal,
   hashRaw,
   houdini_mode,
   isPending,
-  isViteSchemaBuild,
+  isSecondaryBuild,
   keyFieldsForType,
   loadLocalSchema,
   load_manifest,
@@ -68841,6 +68953,7 @@ export {
   parentTypeFromAncestors,
   parseJS,
   parseJSON,
+  parse_page_pattern,
   path_exports as path,
   plugin,
   printJS,

package/build/runtime/lib/types.d.ts

@@ -11,6 +11,7 @@ export declare const PaginateMode: {
     readonly SinglePage: "SinglePage";
 };
 export type PaginateModes = ValuesOf<typeof PaginateMode>;
+export * from '../router/types';
 declare global {
     namespace App {
         interface Session {
@@ -356,4 +357,3 @@ export type QueryManifest = {
     /** The filepath of the unit */
     path: string;
 };
-export {};

package/build/runtime/router/match.d.ts

@@ -0,0 +1,38 @@
+import type { GraphQLVariables } from '$houdini/runtime/lib/types';
+import type { RouterManifest, RouterPageManifest } from './types';
+export type RouteParam = {
+    name: string;
+    matcher: string;
+    optional: boolean;
+    rest: boolean;
+    chained: boolean;
+};
+export interface ParamMatcher {
+    (param: string): boolean;
+}
+export declare function find_match<_ComponentType>(manifest: RouterManifest<_ComponentType>, current: string, allowNull: true): [RouterPageManifest<_ComponentType> | null, GraphQLVariables];
+export declare function find_match<_ComponentType>(manifest: RouterManifest<_ComponentType>, current: string, allowNull?: false): [RouterPageManifest<_ComponentType>, GraphQLVariables];
+/**
+ * Creates the regex pattern, extracts parameter names, and generates types for a route
+ */
+export declare function parse_page_pattern(id: string): {
+    pattern: RegExp;
+    params: RouteParam[];
+    page_id: string;
+};
+/**
+ * Splits a route id into its segments, removing segments that
+ * don't affect the path (i.e. groups). The root route is represented by `/`
+ * and will be returned as `['']`.
+ */
+export declare function get_route_segments(route: string): string[];
+export declare function exec(match: RegExpMatchArray, params: RouteParam[]): Record<string, string> | undefined;
+/**
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/