houdini 1.2.12 → 1.2.14

package/build/runtime-esm/lib/types.js

@@ -8,6 +8,7 @@ const PaginateMode = {
   Infinite: "Infinite",
   SinglePage: "SinglePage"
 };
+export * from "../router/types";
 const ArtifactKind = {
   Query: "HoudiniQuery",
   Subscription: "HoudiniSubscription",

package/build/runtime-esm/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.
+*/

package/build/runtime-esm/router/match.js

@@ -0,0 +1,122 @@
+const 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, i) => {
+        if (i % 2) {
+          if (content.startsWith("x+")) {
+            return escape(
+              String.fromCharCode(parseInt(content.slice(2), 16))
+            );
+          }
+          if (content.startsWith("u+")) {
+            return escape(
+              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 ? i === 1 && parts[0] === "" : false
+          });
+          return is_rest ? "(.*?)" : is_optional ? "([^/]*)?" : "([^/]+?)";
+        }
+        return escape(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 i = 0; i < params.length; i += 1) {
+    const param = params[i];
+    let value = values[i];
+    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 escape(str) {
+  return str.normalize().replace(/[[\]]/g, "\\$&").replace(/%/g, "%25").replace(/\//g, "%2[Ff]").replace(/\?/g, "%3[Ff]").replace(/#/g, "%23").replace(/[.*+?^${}()|\\]/g, "\\$&");
+}
+export {
+  exec,
+  find_match,
+  get_route_segments,
+  parse_page_pattern
+};

package/build/runtime-esm/router/server.d.ts

@@ -1,25 +1,22 @@
-import type { ConfigFile } from '../lib';
-type ServerHandlerArgs = {
-    url: string;
-    config: ConfigFile;
-    session_keys: string[];
-    set_header: (key: string, value: string | number | string[]) => void;
-    get_header: (key: string) => string | number | string[] | undefined;
-    redirect: (code: number, url: string) => void;
-    next: () => void;
-};
-export declare function handle_request(args: ServerHandlerArgs): Promise<void>;
-export type Server = {
-    use(fn: ServerMiddleware): void;
-};
-export type ServerMiddleware = (req: IncomingRequest, res: ServerResponse, next: () => void) => void;
-export type IncomingRequest = {
-    url?: string;
-    headers: Headers;
-};
-export type ServerResponse = {
-    redirect(url: string, status?: number): void;
-    set_header(name: string, value: string): void;
-};
-export declare function get_session(req: Headers, secrets: string[]): Promise<App.Session>;
-export {};
+/// <reference types="node" />
+import { createServerAdapter as createAdapter } from '@whatwg-node/server';
+import { type GraphQLSchema } from 'graphql';
+import { createYoga } from 'graphql-yoga';
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { RouterManifest, RouterPageManifest, YogaServerOptions } from './types';
+export declare const serverAdapterFactory: <ComponentType>({ schema, yoga, production, manifest, on_render, pipe, assetPrefix, }: {
+    schema?: GraphQLSchema | null | undefined;
+    yoga?: import("graphql-yoga").YogaServerInstance<Record<string, any>, Record<string, any>> | null | undefined;
+    assetPrefix: string;
+    production?: boolean | undefined;
+    pipe?: ServerResponse<IncomingMessage> | undefined;
+    on_render: (args: {
+        url: string;
+        match: RouterPageManifest<ComponentType> | null;
+        manifest: RouterManifest<unknown>;
+        session: App.Session;
+        pipe?: ServerResponse<IncomingMessage> | undefined;
+    }) => Response | Promise<Response>;
+    manifest: RouterManifest<ComponentType> | null;
+} & Omit<import("graphql-yoga").YogaServerOptions<Record<string, any>, Record<string, any>>, "schema">) => ReturnType<typeof createAdapter>;
+export type ServerAdapterFactory = typeof serverAdapterFactory;

package/build/runtime-esm/router/server.js

@@ -1,53 +1,70 @@
-import { parse } from "./cookies";
-import { decode, encode, verify } from "./jwt";
-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);
+import { createServerAdapter as createAdapter } from "@whatwg-node/server";
+import { parse, execute } from "graphql";
+import { createYoga } from "graphql-yoga";
+import client from "../../../src/+client";
+import { localApiSessionKeys, localApiEndpoint, getCurrentConfig } from "../lib/config";
+import { find_match } from "./match";
+import { get_session, handle_request } from "./session";
+const config_file = getCurrentConfig();
+const session_keys = localApiSessionKeys(config_file);
+const graphqlEndpoint = localApiEndpoint(config_file);
+const serverAdapterFactory = ({
+  schema,
+  yoga,
+  production,
+  manifest,
+  on_render,
+  pipe,
+  assetPrefix
+}) => {
+  if (schema && !yoga) {
+    yoga = createYoga({
+      schema,
+      landingPage: !production,
+      graphqlEndpoint
+    });
   }
-  args.next();
-}
-async function redirect_auth(args) {
-  const { searchParams } = new URL(args.url, `http://${args.get_header("host")}`);
-  const { redirectTo, ...session } = Object.fromEntries(searchParams.entries());
-  await set_session(args, session);
-  if (redirectTo) {
-    return args.redirect(302, redirectTo);
+  if (schema) {
+    client.registerProxy(graphqlEndpoint, async ({ query, variables, session }) => {
+      const parsed = parse(query);
+      return await execute(schema, parsed, null, session, variables);
+    });
   }
-  args.next();
-}
-const session_cookie_name = "__houdini__";
-async function set_session(req, 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(
-    "Set-Cookie",
-    `${session_cookie_name}=${serialized}; Path=/; HttpOnly; Secure; SameSite=Lax; Expires=${expires.toUTCString()} `
-  );
-}
-async function get_session(req, secrets) {
-  const cookies = req.get("cookie");
-  if (!cookies) {
-    return {};
-  }
-  const cookie = parse(cookies)[session_cookie_name];
-  if (!cookie) {
-    return {};
-  }
-  for (const secret of secrets) {
-    if (!await verify(cookie, secret)) {
-      continue;
+  return createAdapter(async (request) => {
+    if (!manifest) {
+      return new Response(
+        "Adapter did not provide the project's manifest. Please open an issue on github.",
+        { status: 500 }
+      );
     }
-    const parsed = decode(cookie);
-    if (!parsed) {
-      return {};
+    const url = new URL(request.url).pathname;
+    if (yoga && url === localApiEndpoint(config_file)) {
+      return yoga(request);
     }
-    return parsed.payload;
-  }
-  return {};
-}
+    const authResponse = await handle_request({
+      url,
+      config: config_file,
+      session_keys,
+      headers: request.headers
+    });
+    if (authResponse) {
+      return authResponse;
+    }
+    const [match] = find_match(manifest, url);
+    const rendered = await on_render({
+      url,
+      match,
+      session: await get_session(request.headers, session_keys),
+      manifest,
+      pipe
+    });
+    if (rendered) {
+      console.log(url, rendered);
+      return rendered;
+    }
+    return new Response("404", { status: 404 });
+  });
+};
 export {
-  get_session,
-  handle_request
+  serverAdapterFactory
 };

package/build/runtime-esm/router/session.d.ts

@@ -0,0 +1,22 @@
+import type { ConfigFile } from '../lib';
+type ServerHandlerArgs = {
+    url: string;
+    config: ConfigFile;
+    session_keys: string[];
+    headers: Headers;
+};
+export declare function handle_request(args: ServerHandlerArgs): Promise<Response | undefined>;
+export type Server = {
+    use(fn: ServerMiddleware): void;
+};
+export type ServerMiddleware = (req: IncomingRequest, res: ServerResponse, next: () => void) => void;
+export type IncomingRequest = {
+    url?: string;
+    headers: Headers;
+};
+export type ServerResponse = {
+    redirect(url: string, status?: number): void;
+    set_header(name: string, value: string): void;
+};
+export declare function get_session(req: Headers, secrets: string[]): Promise<App.Session>;
+export {};

package/build/runtime-esm/router/session.js

@@ -0,0 +1,52 @@
+import { parse } from "./cookies";
+import { decode, encode, verify } from "./jwt";
+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);
+  }
+}
+async function redirect_auth(args) {
+  const { searchParams } = new URL(args.url, `http://${args.headers.get("host")}`);
+  const { redirectTo, ...session } = Object.fromEntries(searchParams.entries());
+  if (redirectTo) {
+    const response = Response.redirect(redirectTo, 302);
+    await set_session(args, response, session);
+    return response;
+  }
+}
+const session_cookie_name = "__houdini__";
+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]);
+  response.headers.set(
+    "Set-Cookie",
+    `${session_cookie_name}=${serialized}; Path=/; HttpOnly; Secure; SameSite=Lax; Expires=${expires.toUTCString()} `
+  );
+}
+async function get_session(req, secrets) {
+  const cookies = req.get("cookie");
+  if (!cookies) {
+    return {};
+  }
+  const cookie = parse(cookies)[session_cookie_name];
+  if (!cookie) {
+    return {};
+  }
+  for (const secret of secrets) {
+    if (!await verify(cookie, secret)) {
+      continue;
+    }
+    const parsed = decode(cookie);
+    if (!parsed) {
+      return {};
+    }
+    return parsed.payload;
+  }
+  return {};
+}
+export {
+  get_session,
+  handle_request
+};

package/build/runtime-esm/router/types.d.ts

@@ -0,0 +1,23 @@
+import type { QueryArtifact } from '$houdini/runtime/lib/types';
+import type { createYoga } from 'graphql-yoga';
+import type { RouteParam } from './match';
+export type YogaServer = ReturnType<typeof createYoga>;
+export type YogaServerOptions = Parameters<typeof createYoga>[0];
+export type RouterManifest<_ComponentType> = {
+    pages: Record<string, RouterPageManifest<_ComponentType>>;
+};
+export type { ServerAdapterFactory } from './server';
+export type RouterPageManifest<_ComponentType> = {
+    id: string;
+    pattern: RegExp;
+    params: RouteParam[];
+    documents: Record<string, {
+        artifact: () => Promise<{
+            default: QueryArtifact;
+        }>;
+        loading: boolean;
+    }>;
+    component: () => Promise<{
+        default: (props: any) => _ComponentType;
+    }>;
+};

package/build/test-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;
@@ -57118,7 +57117,7 @@ var LogLevel = {
 
 // src/lib/config.ts
 var import_meta = {};
-var currentDir = global.__dirname || dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+var currentDir = dirname((0, import_node_url.fileURLToPath)(import_meta.url));
 var Config = class {
   filepath;
   rootDir;
@@ -57977,13 +57976,10 @@ async function cleanupFiles(pathFolder, listOfObj) {
 // src/lib/walk.ts
 var graphql4 = __toESM(require("graphql"), 1);
 
-// src/router/manifest.ts
+// src/lib/router/manifest.ts
 var t = __toESM(require_lib6(), 1);
 var graphql5 = __toESM(require("graphql"), 1);
 
-// src/router/server.ts
-var import_vite = require("vite");
-
 // src/codegen/generators/artifacts/index.ts
 var graphql15 = __toESM(require("graphql"), 1);
 var recast5 = __toESM(require_main2(), 1);
@@ -58990,9 +58986,11 @@ function serializeValue(value) {
   }
   if (typeof value === "object" && value !== null) {
     return AST4.objectExpression(
-      Object.entries(value).filter(([, value2]) => typeof value2 !== "undefined").map(
-        ([key, value2]) => AST4.objectProperty(AST4.stringLiteral(key), serializeValue(value2))
-      )
+      Object.entries(value).filter(
+        ([key, value2]) => typeof value2 !== "undefined" && key !== "prev" && key !== "next"
+      ).map(([key, val]) => {
+        return AST4.objectProperty(AST4.stringLiteral(key), serializeValue(val));
+      })
     );
   }
   if (typeof value === "string") {
@@ -59539,7 +59537,7 @@ async function paginate(config2, documents) {
                           value: "__typename"
                         }
                       },
-                      ...(typeConfig?.keys || ["id"]).map((key) => ({
+                      ...(typeConfig?.keys || [config2.defaultKeys[0]]).map((key) => ({
                         kind: graphql11.Kind.FIELD,
                         name: {
                           kind: graphql11.Kind.NAME,
@@ -63223,7 +63221,7 @@ function validateFragmentArguments(config2, filepath, fragments) {
         if (missing.length > 0) {
           ctx.reportError(
             new graphql26.GraphQLError(
-              "The following arguments are missing from this fragment: " + JSON.stringify(missing)
+              `The following arguments are missing from the "${fragmentName}" fragment: ` + JSON.stringify(missing)
             )
           );
           return;
@@ -63459,7 +63457,7 @@ function nodeDirectives(config2, directives) {
         }
         if (!possibleNodes.includes(definitionType)) {
           ctx.reportError(
-            new graphql26.GraphQLError(paginateOnNonNodeMessage(config2, node.name.value))
+            new graphql26.GraphQLError(paginateOnNonNodeMessage(node.name.value))
           );
         }
       }
@@ -63594,45 +63592,45 @@ function getAndVerifyNodeInterface(config2) {
     return null;
   }
   if (!graphql26.isInterfaceType(nodeInterface)) {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
   const queryType = schema.getQueryType();
   if (!queryType) {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
   const nodeField = queryType.getFields()["node"];
   if (!nodeField) {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
   const args = nodeField.args;
   if (args.length === 0) {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
-  const idArg = args.find((arg) => arg.name === "id");
+  const idArg = args.find((arg) => arg.name === config2.defaultKeys[0]);
   if (!idArg) {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
   const idType = unwrapType(config2, idArg.type);
   if (idType.type.name !== "ID") {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
   const fieldReturnType = unwrapType(config2, nodeField.type);
   if (fieldReturnType.type.name !== "Node") {
-    displayInvalidNodeFieldMessage(config2.logLevel);
+    displayInvalidNodeFieldMessage(config2);
     return null;
   }
   return nodeInterface;
 }
 var nbInvalidNodeFieldMessageDisplayed = 0;
-function displayInvalidNodeFieldMessage(logLevel) {
+function displayInvalidNodeFieldMessage(config2) {
   if (nbInvalidNodeFieldMessageDisplayed === 0) {
-    if (logLevel === LogLevel.Full) {
+    if (config2.logLevel === LogLevel.Full) {
       console.warn(invalidNodeFieldMessage);
     } else {
       console.warn(invalidNodeFieldMessageLight);
@@ -63646,18 +63644,18 @@ var invalidNodeFieldMessage = `\u26A0\uFE0F  Your project defines a Node interfa
 If you are trying to provide the Node interface and its field, they must look like the following:
 
 interface Node {
-	id: ID!
+  id: ID!
 }
 
 extend type Query {
-	node(id: ID!): Node
+  node(id: ID!): Node
 }
 
 For more information, please visit these links:
 - https://graphql.org/learn/global-object-identification/
 - ${siteURL}/guides/caching-data#custom-ids
 `;
-var paginateOnNonNodeMessage = (config2, directiveName) => `It looks like you are trying to use @${directiveName} on a document that does not have a valid type resolver.
+var paginateOnNonNodeMessage = (directiveName) => `It looks like you are trying to use @${directiveName} on a document that does not have a valid type resolver.
 If this is happening inside of a fragment, make sure that the fragment either implements the Node interface or you
 have defined a resolver entry for the fragment type.
 
@@ -63887,6 +63885,10 @@ function testConfigFile({ plugins, ...config2 } = {}) {
 
 			directive @live on QUERY
 
+			input MyInput {
+				string: String
+			}
+
 			type User implements Node & Friend & CatOwner {
 				id: ID!
 				name: String!