houdini 1.5.3 → 1.5.5

package/build/lib-esm/index.js

@@ -59797,7 +59797,7 @@ function mergeSchemas(config) {
 
 // src/lib/config.ts
 var import_minimatch8 = __toESM(require_minimatch(), 1);
-import * as graphql4 from "graphql";
+import * as graphql5 from "graphql";
 import { fileURLToPath as fileURLToPath3, pathToFileURL } from "node:url";
 
 // src/runtime/imports/config.ts
@@ -67210,43 +67210,43 @@ __export(conventions_exports, {
   vite_render_path: () => vite_render_path
 });
 function router_path(config) {
-  return path_exports.join(base_dir(config), "Router.jsx");
+  return join2(base_dir(config), "Router.jsx");
 }
 function page_entry_path(config, id, base) {
-  return path_exports.join(page_entries_dir(config, base), `${id}.jsx`);
+  return join2(page_entries_dir(config, base), `${id}.jsx`);
 }
 function server_adapter_path(config, base) {
-  return path_exports.join(units_dir(config, base), "render", "server.js");
+  return join2(units_dir(config, base), "render", "server.js");
 }
 function adapter_config_path(config, base) {
-  return path_exports.join(units_dir(config, base), "render", "config.js");
+  return join2(units_dir(config, base), "render", "config.js");
 }
 function vite_render_path(config, base) {
-  return path_exports.join(units_dir(config, base), "render", "vite.js");
+  return join2(units_dir(config, base), "render", "vite.js");
 }
 function app_component_path(config, base) {
-  return path_exports.join(units_dir(config, base), "render", "App.jsx");
+  return join2(units_dir(config, base), "render", "App.jsx");
 }
 function page_unit_path(config, id, base) {
-  return path_exports.join(page_units_dir(config, base), `${id}.jsx`);
+  return join2(page_units_dir(config, base), `${id}.jsx`);
 }
 function layout_unit_path(config, id, base) {
-  return path_exports.join(layout_units_dir(config, base), `${id}.jsx`);
+  return join2(layout_units_dir(config, base), `${id}.jsx`);
 }
 function componentField_unit_path(config, id, base) {
-  return path_exports.join(units_dir(config, base), "componentFields", `wrapper_${id}.jsx`);
+  return join2(units_dir(config, base), "componentFields", `wrapper_${id}.jsx`);
 }
 function fallback_unit_path(config, which, id, base) {
-  return path_exports.join(fallbacks_units_dir(config, which, base), `${id}.jsx`);
+  return join2(fallbacks_units_dir(config, which, base), `${id}.jsx`);
 }
 async function read_pageQuery(base) {
-  const target = path_exports.join(base, "+page.gql");
-  return [target, await fs_exports.readFile(target)];
+  const target = join2(base, "+page.gql");
+  return [target, await readFile(target)];
 }
 async function read_pageView(base) {
   for (const name of ["+page.tsx", "+page.jsx"]) {
-    let target = path_exports.join(base, name);
-    let result = await fs_exports.readFile(target);
+    let target = join2(base, name);
+    let result = await readFile(target);
     if (result) {
       return [target, result];
     }
@@ -67254,13 +67254,13 @@ async function read_pageView(base) {
   return [null, null];
 }
 async function read_layoutQuery(base) {
-  const target = path_exports.join(base, "+layout.gql");
-  return [target, await fs_exports.readFile(target)];
+  const target = join2(base, "+layout.gql");
+  return [target, await readFile(target)];
 }
 async function read_layoutView(base) {
   for (const name of ["+layout.tsx", "+layout.jsx"]) {
-    let target = path_exports.join(base, name);
-    let result = await fs_exports.readFile(target);
+    let target = join2(base, name);
+    let result = await readFile(target);
     if (result) {
       return [target, result];
     }
@@ -67268,10 +67268,10 @@ async function read_layoutView(base) {
   return [null, null];
 }
 function temp_dir(config, key) {
-  return path_exports.join(config.rootDir, "temp", key);
+  return join2(config.rootDir, "temp", key);
 }
 function router_index_path(config) {
-  return path_exports.join(config.routesDir, "..", "+index.jsx");
+  return join2(config.routesDir, "..", "+index.jsx");
 }
 function is_layout(path4) {
   return path4.endsWith("+layout.tsx") || path4.endsWith("+layout.jsx");
@@ -67294,190 +67294,591 @@ function page_id(path4) {
   return copy;
 }
 function page_entries_dir(config, base) {
-  return path_exports.join(units_dir(config, base), "entries");
+  return join2(units_dir(config, base), "entries");
 }
 function page_units_dir(config, base) {
-  return path_exports.join(units_dir(config, base), "pages");
+  return join2(units_dir(config, base), "pages");
 }
 function layout_units_dir(config, base) {
-  return path_exports.join(units_dir(config, base), "layouts");
+  return join2(units_dir(config, base), "layouts");
 }
 function fallbacks_units_dir(config, which, base) {
-  return path_exports.join(units_dir(config, base), "fallbacks", which);
+  return join2(units_dir(config, base), "fallbacks", which);
 }
 function units_dir(config, base = base_dir(config)) {
-  return path_exports.join(base, "units");
+  return join2(base, "units");
 }
 function base_dir(config) {
   return config.pluginDirectory("houdini-react");
 }
 function serialized_manifest_path(config, base = base_dir(config)) {
-  return path_exports.join(base, "manifest.json");
+  return join2(base, "manifest.json");
 }
 
 // src/lib/router/manifest.ts
 var t2 = __toESM(require_lib5(), 1);
-import * as graphql2 from "graphql";
-async function load_manifest(args) {
-  const manifest = await walk_routes({
-    config: args.config,
-    url: "/",
-    filepath: args.config.routesDir,
-    project: {
-      component_fields: {},
-      pages: {},
-      layouts: {},
-      page_queries: {},
-      layout_queries: {},
-      artifacts: [],
-      local_schema: false,
-      local_yoga: false
-    },
-    queries: [],
-    layouts: [],
-    variables: {}
-  });
-  if (args.includeArtifacts) {
-    try {
-      for (const artifactPath of await fs_exports.readdir(args.config.artifactDirectory)) {
-        if (!artifactPath.endsWith(".js") || artifactPath === "index.js") {
-          continue;
-        }
-        manifest.artifacts.push(artifactPath.substring(0, artifactPath.length - 3));
-      }
-    } catch {
+import * as graphql3 from "graphql";
+
+// src/runtime/router/match.ts
+var param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
+function find_match(config, manifest, current, allowNull = true) {
+  let match2 = null;
+  let matchVariables = null;
+  for (const page of Object.values(manifest.pages)) {
+    const urlMatch = current.match(page.pattern);
+    if (!urlMatch) {
+      continue;
     }
+    match2 = page;
+    matchVariables = exec(urlMatch, page.params) || {};
+    break;
   }
-  try {
-    await fs_exports.stat(args.config.localApiDir);
-    for (const child of await fs_exports.readdir(args.config.localApiDir, { withFileTypes: true })) {
-      const name = child.isDirectory() ? child.name : path_exports.parse(child.name).name;
-      if (name === "+schema") {
-        manifest.local_schema = true;
-      } else if (name === "+yoga") {
-        manifest.local_yoga = true;
+  if (!match2 && !allowNull) {
+    throw new Error("404");
+  }
+  let variables = {
+    ...matchVariables
+  };
+  for (const document of Object.values(match2?.documents ?? {})) {
+    for (const [variable, { type }] of Object.entries(document.variables)) {
+      if (matchVariables?.[variable]) {
+        variables[variable] = parseScalar(config, type, matchVariables[variable]);
       }
     }
-  } catch {
   }
-  return manifest;
+  return [match2, variables];
 }
-async function walk_routes(args) {
-  const directory_contents = await fs_exports.readdir(args.filepath, {
-    withFileTypes: true
-  });
-  const variables = { ...args.variables };
-  let newLayouts = args.layouts;
-  let newLayoutQueries = args.queries;
-  let layout = null;
-  let layoutQuery = null;
-  let pageQuery = null;
-  const [
-    [layoutQueryPath, layoutQueryContents],
-    [layoutViewPath, layoutViewContents],
-    [pageQueryPath, pageQueryContents],
-    [pageViewPath, pageViewContents]
-  ] = await Promise.all([
-    read_layoutQuery(args.filepath),
-    read_layoutView(args.filepath),
-    read_pageQuery(args.filepath),
-    read_pageView(args.filepath)
-  ]);
-  if (layoutQueryContents) {
-    layoutQuery = await add_query({
-      path: layoutQueryPath,
-      config: args.config,
-      url: args.url,
-      project: args.project,
-      type: "layout",
-      contents: layoutQueryContents,
-      variables
-    });
-    newLayoutQueries = [...args.queries, layoutQuery.name];
-  }
-  if (layoutViewContents) {
-    layout = await add_view({
-      url: args.url,
-      path: layoutViewPath,
-      project: args.project,
-      type: "layout",
-      contents: layoutViewContents,
-      layouts: args.layouts,
-      queries: newLayoutQueries,
-      config: args.config,
-      variables
-    });
-    newLayouts = [...args.layouts, page_id(layout.url)];
-  }
-  if (pageQueryContents) {
-    pageQuery = await add_query({
-      path: pageQueryPath,
-      config: args.config,
-      url: args.url,
-      project: args.project,
-      type: "page",
-      contents: pageQueryContents,
-      variables
-    });
-  }
-  if (pageViewContents) {
-    await add_view({
-      path: pageViewPath,
-      url: args.url.substring(0, args.url.length - 1) || "/",
-      project: args.project,
-      type: "page",
-      contents: pageViewContents,
-      layouts: newLayouts,
-      queries: pageQuery ? [...newLayoutQueries, pageQuery.name] : newLayoutQueries,
-      config: args.config,
-      variables
-    });
-  }
-  await Promise.all(
-    directory_contents.map((dir) => {
-      if (!dir.isDirectory()) {
+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;
       }
-      return walk_routes({
-        ...args,
-        filepath: path_exports.join(args.filepath, dir.name),
-        url: `${args.url}${dir.name}/`,
-        queries: newLayoutQueries,
-        layouts: newLayouts,
-        variables
-      });
-    })
+      const parts = segment.split(/\[(.+?)\](?!\])/);
+      const result = parts.map((content, i2) => {
+        if (i2 % 2) {
+          if (content.startsWith("x+")) {
+            return escape3(
+              String.fromCharCode(parseInt(content.slice(2), 16))
+            );
+          }
+          if (content.startsWith("u+")) {
+            return escape3(
+              String.fromCharCode(
+                ...content.slice(2).split("-").map((code) => parseInt(code, 16))
+              )
+            );
+          }
+          const match2 = param_pattern.exec(content);
+          if (!match2) {
+            throw new Error(
+              `Invalid param: ${content}. Params and matcher names can only have underscores and alphanumeric characters.`
+            );
+          }
+          const [, is_optional, is_rest, name, matcher] = match2;
+          params.push({
+            name,
+            matcher,
+            optional: !!is_optional,
+            rest: !!is_rest,
+            chained: is_rest ? i2 === 1 && parts[0] === "" : false
+          });
+          return is_rest ? "(.*?)" : is_optional ? "([^/]*)?" : "([^/]+?)";
+        }
+        return escape3(content);
+      }).join("");
+      return "/" + result;
+    }).join("")}/?$`
   );
-  return args.project;
+  return { pattern, params, page_id: id };
 }
-async function add_view(args) {
-  const target = args.type === "page" ? args.project.pages : args.project.layouts;
-  const queries = await extractQueries(args.contents);
-  const missing_queries = queries.filter((query2) => !args.queries.includes(query2));
-  if (missing_queries.length > 0) {
-    throw {
-      message: `Unknown queries in ${args.path}: ${missing_queries.join(", ")}`
-    };
+function affects_path(segment) {
+  return !/^\([^)]+\)$/.test(segment);
+}
+function get_route_segments(route) {
+  return route.slice(1).split("/").filter(affects_path);
+}
+function exec(match2, params) {
+  const result = {};
+  const values = match2.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] = decodeURIComponent(value);
+    }
   }
-  const id = page_id(args.url);
-  target[id] = {
-    id,
-    queries,
-    url: args.url,
-    layouts: args.layouts,
-    path: path_exports.relative(args.config.projectRoot, args.path),
-    query_options: args.queries,
-    params: Object.fromEntries(
-      parse_page_pattern(args.url).params.map((param) => [
-        param.name,
-        args.variables[param.name] ?? null
-      ])
-    )
-  };
-  return target[id];
+  if (buffered)
+    return;
+  return result;
+}
+function escape3(str) {
+  return str.normalize().replace(/[[\]]/g, "\\$&").replace(/%/g, "%25").replace(/\//g, "%2[Ff]").replace(/\?/g, "%3[Ff]").replace(/#/g, "%23").replace(/[.*+?^${}()|\\]/g, "\\$&");
+}
+
+// src/lib/graphql.ts
+import * as graphql2 from "graphql";
+import crypto2 from "node:crypto";
+function getRootType(type) {
+  if (graphql2.isNonNullType(type)) {
+    return getRootType(type.ofType);
+  }
+  if (graphql2.isListType(type)) {
+    return getRootType(type.ofType);
+  }
+  return type;
+}
+function processComponentFieldDirective(directive) {
+  let field;
+  let exportValue;
+  let prop;
+  let raw;
+  for (const arg of directive.arguments ?? []) {
+    if (arg.name.value === "field" && arg.value.kind === "StringValue") {
+      field = arg.value.value;
+    } else if (arg.name.value === "export" && arg.value.kind === "StringValue") {
+      exportValue = arg.value.value;
+    } else if (arg.name.value === "prop" && arg.value.kind === "StringValue") {
+      prop = arg.value.value;
+    } else if (arg.name.value === "raw" && arg.value.kind === "StringValue") {
+      raw = arg.value.value;
+    }
+  }
+  const missing = [];
+  if (!field) {
+    missing.push("field");
+  }
+  if (!prop) {
+    missing.push("prop");
+  }
+  if (missing.length > 0) {
+    throw new Error(`missing arguments to @componentField: ${missing.join(", ")}`);
+  }
+  return {
+    prop,
+    field,
+    raw,
+    export: exportValue
+  };
+}
+function hashOriginal({ document }) {
+  return hashDocument(document.originalString);
+}
+function hashRaw({ document }) {
+  return hashDocument(document.artifact?.raw);
+}
+function hashDocument(str) {
+  return crypto2.createHash("sha256").update(str || "").digest("hex");
+}
+function parentField(ancestors) {
+  return walkParentField([...ancestors].sort(() => -1));
+}
+function walkParentField(ancestors) {
+  let head = ancestors.shift();
+  if (Array.isArray(head) || head.kind === "SelectionSet") {
+    return walkParentField(ancestors);
+  }
+  return head;
+}
+function parentTypeFromAncestors(schema, filepath, ancestors) {
+  const parents = [...ancestors];
+  parents.reverse();
+  return walkAncestors(schema, filepath, parents);
+}
+function walkAncestors(schema, filepath, ancestors) {
+  let head = ancestors.shift();
+  if (Array.isArray(head)) {
+    return walkAncestors(schema, filepath, ancestors);
+  }
+  if (!head) {
+    throw new HoudiniError({ filepath, message: "Could not figure out type of field" });
+  }
+  if (head.kind === "OperationDefinition") {
+    const operationType = {
+      query: schema.getQueryType(),
+      mutation: schema.getMutationType(),
+      subscription: schema.getSubscriptionType()
+    }[head.operation];
+    if (!operationType) {
+      throw new HoudiniError({ filepath, message: "Could not find operation type" });
+    }
+    return operationType;
+  }
+  if (head.kind === "FragmentDefinition") {
+    const result = schema.getType(head.typeCondition.name.value);
+    if (!result) {
+      throw new HoudiniError({
+        filepath,
+        message: `Could not find definition for ${head.typeCondition.name.value} in the schema`
+      });
+    }
+    return result;
+  }
+  if (head.kind === "FragmentSpread") {
+    throw new Error("How the hell did this happen?");
+  }
+  const parent = walkAncestors(schema, filepath, ancestors);
+  if (head.kind === "InlineFragment") {
+    if (!head.typeCondition) {
+      return parent;
+    }
+    const wrapper = schema.getType(head.typeCondition.name.value);
+    if (!wrapper) {
+      throw new HoudiniError({
+        filepath,
+        message: "Could not find type with name: " + head.typeCondition.name.value
+      });
+    }
+    return wrapper;
+  }
+  if (head.kind === "SelectionSet") {
+    return parent;
+  }
+  const field = parent.getFields()[head.name.value];
+  if (!field) {
+    throw new HoudiniError({
+      filepath,
+      message: `Could not find definition of ${head.name.value} in ${parent.toString()}`
+    });
+  }
+  return getRootType(field.type);
+}
+function definitionFromAncestors(ancestors) {
+  let parents = [...ancestors];
+  parents.shift();
+  let definition = parents.shift();
+  while (Array.isArray(definition) && definition) {
+    definition = parents.shift();
+  }
+  return { parents, definition };
+}
+function formatErrors(e2, afterError) {
+  const errors = Array.isArray(e2) ? e2 : [e2];
+  for (const error of errors) {
+    if ("filepath" in error && error.filepath) {
+      const relative2 = relative(process.cwd(), error.filepath);
+      console.error(`\u274C Encountered error in ${relative2}`);
+      if (error.message) {
+        console.error(error.message);
+      }
+    } else {
+      console.error(`\u274C ${error.message}`);
+      if ("description" in error && error.description) {
+        console.error(`${error.description}`);
+      }
+    }
+    afterError?.(e2);
+  }
+}
+function operation_requires_variables(operation) {
+  return Boolean(
+    operation.variableDefinitions && operation.variableDefinitions?.find(
+      (defn) => defn.type.kind === "NonNullType" && !defn.defaultValue
+    )
+  );
+}
+function unwrapType(config, type, wrappers = [], convertRuntimeScalars) {
+  if (type.kind === "NonNullType") {
+    return unwrapType(config, type.type, [TypeWrapper.NonNull, ...wrappers]);
+  }
+  if (type instanceof graphql2.GraphQLNonNull) {
+    return unwrapType(config, type.ofType, [TypeWrapper.NonNull, ...wrappers]);
+  }
+  if (wrappers[0] !== TypeWrapper.NonNull) {
+    wrappers.unshift(TypeWrapper.Nullable);
+  }
+  if (type.kind === "ListType") {
+    return unwrapType(config, type.type, [TypeWrapper.List, ...wrappers]);
+  }
+  if (type instanceof graphql2.GraphQLList) {
+    return unwrapType(config, type.ofType, [TypeWrapper.List, ...wrappers]);
+  }
+  if (convertRuntimeScalars && config.configFile.features?.runtimeScalars?.[type.name.value]) {
+    type = config.schema.getType(
+      config.configFile.features?.runtimeScalars?.[type.name.value].type
+    );
+  }
+  const namedType = config.schema.getType(type.name.value || type.name);
+  if (!namedType) {
+    throw new Error("Unknown type: " + type.name.value || type.name);
+  }
+  return { type: namedType, wrappers };
+}
+function wrapType({
+  type,
+  wrappers
+}) {
+  const head = wrappers[0];
+  const tail = wrappers.slice(1);
+  let kind = graphql2.Kind.NAMED_TYPE;
+  if (head === TypeWrapper.List) {
+    kind = graphql2.Kind.LIST_TYPE;
+  } else if (head === TypeWrapper.NonNull) {
+    kind = graphql2.Kind.NON_NULL_TYPE;
+  }
+  if (kind === "NamedType") {
+    return {
+      kind,
+      name: {
+        kind: graphql2.Kind.NAME,
+        value: type.name
+      }
+    };
+  }
+  return {
+    kind,
+    type: wrapType({ type, wrappers: tail })
+  };
+}
+var TypeWrapper = /* @__PURE__ */ ((TypeWrapper2) => {
+  TypeWrapper2["Nullable"] = "Nullable";
+  TypeWrapper2["List"] = "List";
+  TypeWrapper2["NonNull"] = "NonNull";
+  return TypeWrapper2;
+})(TypeWrapper || {});
+
+// src/lib/parse.ts
+var import_parser = __toESM(require_lib6(), 1);
+var import_recast = __toESM(require_main2(), 1);
+
+// src/lib/deepMerge.ts
+var import_deepmerge = __toESM(require_cjs(), 1);
+function deepMerge2(filepath, ...targets) {
+  try {
+    if (targets.length === 1) {
+      return targets[0];
+    } else if (targets.length === 2) {
+      return (0, import_deepmerge.default)(targets[0], targets[1], {
+        arrayMerge: (source, update) => [...new Set(source.concat(update))]
+      });
+    }
+    return deepMerge2(filepath, targets[0], deepMerge2(filepath, ...targets.slice(1)));
+  } catch (e2) {
+    throw new HoudiniError({
+      filepath,
+      message: "could not merge: " + JSON.stringify(targets, null, 4),
+      description: e2.message
+    });
+  }
+}
+
+// src/lib/parse.ts
+function parseJS(str, config) {
+  const defaultConfig = {
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
+    sourceType: "module"
+  };
+  return (0, import_parser.parse)(str || "", config ? deepMerge2("", defaultConfig, config) : defaultConfig).program;
+}
+function parseJSON(str) {
+  str = str.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m2, g) => g ? "" : m2);
+  return JSON.parse(str);
+}
+async function printJS(script, options) {
+  if (options?.pretty) {
+    return (0, import_recast.prettyPrint)(script, options);
+  } else {
+    return (0, import_recast.print)(script, options);
+  }
+}
+
+// src/lib/router/manifest.ts
+async function load_manifest(args) {
+  const manifest = await walk_routes({
+    config: args.config,
+    url: "/",
+    filepath: args.config.routesDir,
+    project: {
+      component_fields: {},
+      pages: {},
+      layouts: {},
+      page_queries: {},
+      layout_queries: {},
+      artifacts: [],
+      local_schema: false,
+      local_yoga: false
+    },
+    queries: [],
+    layouts: [],
+    variables: {}
+  });
+  if (args.includeArtifacts) {
+    try {
+      for (const artifactPath of await readdir2(args.config.artifactDirectory)) {
+        if (!artifactPath.endsWith(".js") || artifactPath === "index.js") {
+          continue;
+        }
+        manifest.artifacts.push(artifactPath.substring(0, artifactPath.length - 3));
+      }
+    } catch {
+    }
+  }
+  try {
+    await stat(args.config.localApiDir);
+    for (const child of await readdir2(args.config.localApiDir, { withFileTypes: true })) {
+      const name = child.isDirectory() ? child.name : parse3(child.name).name;
+      if (name === "+schema") {
+        manifest.local_schema = true;
+      } else if (name === "+yoga") {
+        manifest.local_yoga = true;
+      }
+    }
+  } catch {
+  }
+  return manifest;
+}
+async function walk_routes(args) {
+  const directory_contents = await readdir2(args.filepath, {
+    withFileTypes: true
+  });
+  const variables = { ...args.variables };
+  let newLayouts = args.layouts;
+  let newLayoutQueries = args.queries;
+  let layout = null;
+  let layoutQuery = null;
+  let pageQuery = null;
+  const [
+    [layoutQueryPath, layoutQueryContents],
+    [layoutViewPath, layoutViewContents],
+    [pageQueryPath, pageQueryContents],
+    [pageViewPath, pageViewContents]
+  ] = await Promise.all([
+    read_layoutQuery(args.filepath),
+    read_layoutView(args.filepath),
+    read_pageQuery(args.filepath),
+    read_pageView(args.filepath)
+  ]);
+  if (layoutQueryContents) {
+    layoutQuery = await add_query({
+      path: layoutQueryPath,
+      config: args.config,
+      url: args.url,
+      project: args.project,
+      type: "layout",
+      contents: layoutQueryContents,
+      variables
+    });
+    newLayoutQueries = [...args.queries, layoutQuery.name];
+  }
+  if (layoutViewContents) {
+    layout = await add_view({
+      url: args.url,
+      path: layoutViewPath,
+      project: args.project,
+      type: "layout",
+      contents: layoutViewContents,
+      layouts: args.layouts,
+      queries: newLayoutQueries,
+      config: args.config,
+      variables
+    });
+    newLayouts = [...args.layouts, page_id(layout.url)];
+  }
+  if (pageQueryContents) {
+    pageQuery = await add_query({
+      path: pageQueryPath,
+      config: args.config,
+      url: args.url,
+      project: args.project,
+      type: "page",
+      contents: pageQueryContents,
+      variables
+    });
+  }
+  if (pageViewContents) {
+    await add_view({
+      path: pageViewPath,
+      url: args.url.substring(0, args.url.length - 1) || "/",
+      project: args.project,
+      type: "page",
+      contents: pageViewContents,
+      layouts: newLayouts,
+      queries: pageQuery ? [...newLayoutQueries, pageQuery.name] : newLayoutQueries,
+      config: args.config,
+      variables
+    });
+  }
+  await Promise.all(
+    directory_contents.map((dir) => {
+      if (!dir.isDirectory()) {
+        return;
+      }
+      return walk_routes({
+        ...args,
+        filepath: join2(args.filepath, dir.name),
+        url: `${args.url}${dir.name}/`,
+        queries: newLayoutQueries,
+        layouts: newLayouts,
+        variables
+      });
+    })
+  );
+  return args.project;
+}
+async function add_view(args) {
+  const target = args.type === "page" ? args.project.pages : args.project.layouts;
+  const queries = await extractQueries(args.contents);
+  const missing_queries = queries.filter((query2) => !args.queries.includes(query2));
+  if (missing_queries.length > 0) {
+    throw {
+      message: `Unknown queries in ${args.path}: ${missing_queries.join(", ")}`
+    };
+  }
+  const id = page_id(args.url);
+  target[id] = {
+    id,
+    queries,
+    url: args.url,
+    layouts: args.layouts,
+    path: relative(args.config.projectRoot, args.path),
+    query_options: args.queries,
+    params: Object.fromEntries(
+      parse_page_pattern(args.url).params.map((param) => [
+        param.name,
+        args.variables[param.name] ?? null
+      ])
+    )
+  };
+  return target[id];
 }
 async function add_query(args) {
-  const parsed = graphql2.parse(args.contents);
+  const parsed = graphql3.parse(args.contents);
   const query2 = parsed.definitions.find(
     (def) => def.kind === "OperationDefinition" && def.operation === "query"
   );
@@ -67485,7 +67886,7 @@ async function add_query(args) {
     throw new Error("No query found");
   }
   let loading = false;
-  await graphql2.visit(parsed, {
+  await graphql3.visit(parsed, {
     Directive(node) {
       if (node.name.value === args.config.loadingDirective) {
         loading = true;
@@ -67504,7 +67905,7 @@ async function add_query(args) {
   Object.assign(args.variables, queryVariables);
   const target = args.type === "page" ? args.project.page_queries : args.project.layout_queries;
   target[page_id(args.url)] = {
-    path: path_exports.relative(args.config.routesDir, args.path),
+    path: relative(args.config.routesDir, args.path),
     name: query2.name.value,
     url: args.url,
     loading,
@@ -67579,7 +67980,7 @@ async function extractQueries(source) {
 }
 
 // src/lib/router/server.ts
-import * as graphql3 from "graphql";
+import * as graphql4 from "graphql";
 import path3 from "node:path";
 
 // src/runtime/lib/flatten.ts
@@ -71338,14 +71739,14 @@ function internalRoutes(config) {
 async function buildLocalSchema(config) {
   const { build } = await import("vite");
   const schema = path3.join(config.localApiDir, "+schema");
-  const outDir = conventions_exports.temp_dir(config, "schema");
+  const outDir = temp_dir(config, "schema");
   process.env.HOUDINI_SECONDARY_BUILD = "true";
   try {
-    await fs_exports.remove(path3.join(outDir, "assets", "schema.js"));
+    await remove(path3.join(outDir, "assets", "schema.js"));
   } catch {
   }
   try {
-    await fs_exports.mkdir(outDir);
+    await mkdir(outDir);
   } catch {
   }
   await build({
@@ -71377,14 +71778,14 @@ async function loadLocalSchema(config) {
   }
   try {
     const { default: schema } = await import(path3.join(
-      conventions_exports.temp_dir(config, "schema"),
+      temp_dir(config, "schema"),
       `schema.js?${Date.now().valueOf()}}`
     ));
     return schema;
   } catch (e2) {
     const message = "message" in e2 ? e2.message : e2;
     console.error("\u26A0\uFE0F Failed to load local schema: ", message);
-    return new graphql3.GraphQLSchema({});
+    return new graphql4.GraphQLSchema({});
   }
 }
 
@@ -71721,7 +72122,7 @@ var Config = class {
       persistedQueriesPath
     } = this.configFile;
     if (typeof schema === "string") {
-      this.schema = graphql4.buildSchema(schema);
+      this.schema = graphql5.buildSchema(schema);
     } else {
       this.schema = schema;
     }
@@ -71869,7 +72270,7 @@ var Config = class {
   set newSchema(value) {
     this.schemaString = value;
     if (value) {
-      this.#newSchemaInstance = graphql4.buildSchema(value);
+      this.#newSchemaInstance = graphql5.buildSchema(value);
     } else {
       this.#newSchemaInstance = null;
     }
@@ -71959,21 +72360,21 @@ var Config = class {
   }
   documentName(document) {
     const operation = document.definitions.find(
-      ({ kind }) => kind === graphql4.Kind.OPERATION_DEFINITION
+      ({ kind }) => kind === graphql5.Kind.OPERATION_DEFINITION
     );
     if (operation) {
       if (!operation.name) {
-        throw new Error("encountered operation with no name: " + graphql4.print(document));
+        throw new Error("encountered operation with no name: " + graphql5.print(document));
       }
       return operation.name.value;
     }
     const fragmentDefinitions = document.definitions.filter(
-      ({ kind }) => kind === graphql4.Kind.FRAGMENT_DEFINITION
+      ({ kind }) => kind === graphql5.Kind.FRAGMENT_DEFINITION
     );
     if (fragmentDefinitions.length) {
       return fragmentDefinitions[0].name.value;
     }
-    throw new Error("Could not generate artifact name for document: " + graphql4.print(document));
+    throw new Error("Could not generate artifact name for document: " + graphql5.print(document));
   }
   isSelectionScalar(type) {
     return ["String", "Boolean", "Float", "ID", "Int"].concat(Object.keys(this.scalars || {})).includes(type);
@@ -72183,10 +72584,10 @@ var Config = class {
   localDocumentData(document) {
     let paginated = false;
     let componentFields = [];
-    const typeInfo = new graphql4.TypeInfo(this.schema);
-    graphql4.visit(
+    const typeInfo = new graphql5.TypeInfo(this.schema);
+    graphql5.visit(
       document,
-      graphql4.visitWithTypeInfo(typeInfo, {
+      graphql5.visitWithTypeInfo(typeInfo, {
         Directive: (node) => {
           if ([this.paginateDirective].includes(node.name.value)) {
             paginated = true;
@@ -72397,7 +72798,7 @@ async function getConfig({
       if (apiURL) {
         if (glob2.hasMagic(_config.schemaPath)) {
           console.log(
-            `\u26A0\uFE0F  Your houdini configuration contains an apiUrl and a path pointing to multiple files.
+            `\u26A0\uFE0F  Your houdini configuration contains a watchSchema url and a path pointing to multiple files.
 	This will prevent your schema from being pulled.`
           );
         } else if (!await readFile(_config.schemaPath)) {
@@ -72486,347 +72887,76 @@ async function pluginPath(plugin_name, config_path) {
     if (process.versions.pnp) {
       const { findPnpApi } = __require("node:module");
       const pnp = findPnpApi(config_path);
-      return pnp.resolveRequest(plugin_name, config_path, { conditions: /* @__PURE__ */ new Set(["import"]) });
-    }
-    const pluginDirectory = findModule(plugin_name, config_path);
-    const packageJsonSrc = await readFile(join2(pluginDirectory, "package.json"));
-    if (!packageJsonSrc) {
-      throw new Error("skip");
-    }
-    const packageJSON = JSON.parse(packageJsonSrc);
-    if (!packageJSON.exports?.["."]?.import) {
-      throw new Error("");
-    }
-    return join2(pluginDirectory, packageJSON.exports["."].import);
-  } catch {
-    const err = new Error(
-      `Could not find plugin: ${plugin_name}. Are you sure its installed? If so, please open a ticket on GitHub.`
-    );
-    throw err;
-  }
-}
-function findModule(pkg = "houdini", currentLocation) {
-  const pathEndingBy = ["node_modules", pkg];
-  let locationFound = join2(currentLocation, ...pathEndingBy);
-  let previousLocation = "";
-  const backFolder = [];
-  while (previousLocation !== locationFound && !existsSync(locationFound)) {
-    previousLocation = locationFound;
-    backFolder.push("../");
-    locationFound = join2(currentLocation, ...backFolder, ...pathEndingBy);
-  }
-  if (previousLocation === locationFound) {
-    throw new Error("Could not find any node_modules/houdini folder");
-  }
-  return locationFound;
-}
-async function loadSchemaFile(schemaPath) {
-  if (isAbsolute(schemaPath)) {
-    const relPath = relative(process.cwd(), schemaPath);
-    const error = new Error(
-      `Invalid config value: 'schemaPath' must now be passed as a relative directory. Please change its value to "./${relPath}".`
-    );
-    error.stack = "";
-    throw error;
-  }
-  if (glob2.hasMagic(schemaPath)) {
-    const sourceFiles = await glob2(schemaPath);
-    return mergeSchemas({
-      typeDefs: await Promise.all(
-        sourceFiles.map(async (filepath) => await readFile(filepath))
-      )
-    });
-  }
-  try {
-    await stat(schemaPath);
-  } catch {
-    throw new HoudiniError({
-      message: `Schema file does not exist! Create it using houdini pull-schema`
-    });
-  }
-  const contents = await readFile(schemaPath);
-  if (schemaPath.endsWith("gql") || schemaPath.endsWith("graphql") || schemaPath.endsWith("graphqls")) {
-    return graphql4.buildSchema(contents);
-  }
-  const jsonContents = JSON.parse(contents);
-  if (jsonContents.data) {
-    return graphql4.buildClientSchema(jsonContents.data);
-  }
-  return graphql4.buildClientSchema(jsonContents);
-}
-var emptySchema = graphql4.buildSchema("type Query { hello: String }");
-var defaultDirectives = emptySchema.getDirectives().map((dir) => dir.name);
-
-// src/lib/graphql.ts
-import * as graphql5 from "graphql";
-import crypto2 from "node:crypto";
-function getRootType(type) {
-  if (graphql5.isNonNullType(type)) {
-    return getRootType(type.ofType);
-  }
-  if (graphql5.isListType(type)) {
-    return getRootType(type.ofType);
-  }
-  return type;
-}
-function processComponentFieldDirective(directive) {
-  let field;
-  let exportValue;
-  let prop;
-  let raw;
-  for (const arg of directive.arguments ?? []) {
-    if (arg.name.value === "field" && arg.value.kind === "StringValue") {
-      field = arg.value.value;
-    } else if (arg.name.value === "export" && arg.value.kind === "StringValue") {
-      exportValue = arg.value.value;
-    } else if (arg.name.value === "prop" && arg.value.kind === "StringValue") {
-      prop = arg.value.value;
-    } else if (arg.name.value === "raw" && arg.value.kind === "StringValue") {
-      raw = arg.value.value;
-    }
-  }
-  const missing = [];
-  if (!field) {
-    missing.push("field");
-  }
-  if (!prop) {
-    missing.push("prop");
-  }
-  if (missing.length > 0) {
-    throw new Error(`missing arguments to @componentField: ${missing.join(", ")}`);
-  }
-  return {
-    prop,
-    field,
-    raw,
-    export: exportValue
-  };
-}
-function hashOriginal({ document }) {
-  return hashDocument(document.originalString);
-}
-function hashRaw({ document }) {
-  return hashDocument(document.artifact?.raw);
-}
-function hashDocument(str) {
-  return crypto2.createHash("sha256").update(str || "").digest("hex");
-}
-function parentField(ancestors) {
-  return walkParentField([...ancestors].sort(() => -1));
-}
-function walkParentField(ancestors) {
-  let head = ancestors.shift();
-  if (Array.isArray(head) || head.kind === "SelectionSet") {
-    return walkParentField(ancestors);
-  }
-  return head;
-}
-function parentTypeFromAncestors(schema, filepath, ancestors) {
-  const parents = [...ancestors];
-  parents.reverse();
-  return walkAncestors(schema, filepath, parents);
-}
-function walkAncestors(schema, filepath, ancestors) {
-  let head = ancestors.shift();
-  if (Array.isArray(head)) {
-    return walkAncestors(schema, filepath, ancestors);
-  }
-  if (!head) {
-    throw new HoudiniError({ filepath, message: "Could not figure out type of field" });
-  }
-  if (head.kind === "OperationDefinition") {
-    const operationType = {
-      query: schema.getQueryType(),
-      mutation: schema.getMutationType(),
-      subscription: schema.getSubscriptionType()
-    }[head.operation];
-    if (!operationType) {
-      throw new HoudiniError({ filepath, message: "Could not find operation type" });
-    }
-    return operationType;
-  }
-  if (head.kind === "FragmentDefinition") {
-    const result = schema.getType(head.typeCondition.name.value);
-    if (!result) {
-      throw new HoudiniError({
-        filepath,
-        message: `Could not find definition for ${head.typeCondition.name.value} in the schema`
-      });
-    }
-    return result;
-  }
-  if (head.kind === "FragmentSpread") {
-    throw new Error("How the hell did this happen?");
-  }
-  const parent = walkAncestors(schema, filepath, ancestors);
-  if (head.kind === "InlineFragment") {
-    if (!head.typeCondition) {
-      return parent;
-    }
-    const wrapper = schema.getType(head.typeCondition.name.value);
-    if (!wrapper) {
-      throw new HoudiniError({
-        filepath,
-        message: "Could not find type with name: " + head.typeCondition.name.value
-      });
-    }
-    return wrapper;
-  }
-  if (head.kind === "SelectionSet") {
-    return parent;
-  }
-  const field = parent.getFields()[head.name.value];
-  if (!field) {
-    throw new HoudiniError({
-      filepath,
-      message: `Could not find definition of ${head.name.value} in ${parent.toString()}`
-    });
-  }
-  return getRootType(field.type);
-}
-function definitionFromAncestors(ancestors) {
-  let parents = [...ancestors];
-  parents.shift();
-  let definition = parents.shift();
-  while (Array.isArray(definition) && definition) {
-    definition = parents.shift();
-  }
-  return { parents, definition };
-}
-function formatErrors(e2, afterError) {
-  const errors = Array.isArray(e2) ? e2 : [e2];
-  for (const error of errors) {
-    if ("filepath" in error && error.filepath) {
-      const relative2 = relative(process.cwd(), error.filepath);
-      console.error(`\u274C Encountered error in ${relative2}`);
-      if (error.message) {
-        console.error(error.message);
-      }
-    } else {
-      console.error(`\u274C ${error.message}`);
-      if ("description" in error && error.description) {
-        console.error(`${error.description}`);
-      }
-    }
-    afterError?.(e2);
-  }
-}
-function operation_requires_variables(operation) {
-  return Boolean(
-    operation.variableDefinitions && operation.variableDefinitions?.find(
-      (defn) => defn.type.kind === "NonNullType" && !defn.defaultValue
-    )
-  );
-}
-function unwrapType(config, type, wrappers = [], convertRuntimeScalars) {
-  if (type.kind === "NonNullType") {
-    return unwrapType(config, type.type, [TypeWrapper.NonNull, ...wrappers]);
-  }
-  if (type instanceof graphql5.GraphQLNonNull) {
-    return unwrapType(config, type.ofType, [TypeWrapper.NonNull, ...wrappers]);
-  }
-  if (wrappers[0] !== TypeWrapper.NonNull) {
-    wrappers.unshift(TypeWrapper.Nullable);
-  }
-  if (type.kind === "ListType") {
-    return unwrapType(config, type.type, [TypeWrapper.List, ...wrappers]);
-  }
-  if (type instanceof graphql5.GraphQLList) {
-    return unwrapType(config, type.ofType, [TypeWrapper.List, ...wrappers]);
-  }
-  if (convertRuntimeScalars && config.configFile.features?.runtimeScalars?.[type.name.value]) {
-    type = config.schema.getType(
-      config.configFile.features?.runtimeScalars?.[type.name.value].type
+      return pnp.resolveRequest(plugin_name, config_path, { conditions: /* @__PURE__ */ new Set(["import"]) });
+    }
+    const pluginDirectory = findModule(plugin_name, config_path);
+    const packageJsonSrc = await readFile(join2(pluginDirectory, "package.json"));
+    if (!packageJsonSrc) {
+      throw new Error("skip");
+    }
+    const packageJSON = JSON.parse(packageJsonSrc);
+    if (!packageJSON.exports?.["."]?.import) {
+      throw new Error("");
+    }
+    return join2(pluginDirectory, packageJSON.exports["."].import);
+  } catch {
+    const err = new Error(
+      `Could not find plugin: ${plugin_name}. Are you sure its installed? If so, please open a ticket on GitHub.`
     );
+    throw err;
   }
-  const namedType = config.schema.getType(type.name.value || type.name);
-  if (!namedType) {
-    throw new Error("Unknown type: " + type.name.value || type.name);
-  }
-  return { type: namedType, wrappers };
 }
-function wrapType({
-  type,
-  wrappers
-}) {
-  const head = wrappers[0];
-  const tail = wrappers.slice(1);
-  let kind = graphql5.Kind.NAMED_TYPE;
-  if (head === TypeWrapper.List) {
-    kind = graphql5.Kind.LIST_TYPE;
-  } else if (head === TypeWrapper.NonNull) {
-    kind = graphql5.Kind.NON_NULL_TYPE;
+function findModule(pkg = "houdini", currentLocation) {
+  const pathEndingBy = ["node_modules", pkg];
+  let locationFound = join2(currentLocation, ...pathEndingBy);
+  let previousLocation = "";
+  const backFolder = [];
+  while (previousLocation !== locationFound && !existsSync(locationFound)) {
+    previousLocation = locationFound;
+    backFolder.push("../");
+    locationFound = join2(currentLocation, ...backFolder, ...pathEndingBy);
   }
-  if (kind === "NamedType") {
-    return {
-      kind,
-      name: {
-        kind: graphql5.Kind.NAME,
-        value: type.name
-      }
-    };
+  if (previousLocation === locationFound) {
+    throw new Error("Could not find any node_modules/houdini folder");
   }
-  return {
-    kind,
-    type: wrapType({ type, wrappers: tail })
-  };
+  return locationFound;
 }
-var TypeWrapper = /* @__PURE__ */ ((TypeWrapper2) => {
-  TypeWrapper2["Nullable"] = "Nullable";
-  TypeWrapper2["List"] = "List";
-  TypeWrapper2["NonNull"] = "NonNull";
-  return TypeWrapper2;
-})(TypeWrapper || {});
-
-// src/lib/parse.ts
-var import_parser = __toESM(require_lib6(), 1);
-var import_recast = __toESM(require_main2(), 1);
-
-// src/lib/deepMerge.ts
-var import_deepmerge = __toESM(require_cjs(), 1);
-function deepMerge2(filepath, ...targets) {
+async function loadSchemaFile(schemaPath) {
+  if (isAbsolute(schemaPath)) {
+    const relPath = relative(process.cwd(), schemaPath);
+    const error = new Error(
+      `Invalid config value: 'schemaPath' must now be passed as a relative directory. Please change its value to "./${relPath}".`
+    );
+    error.stack = "";
+    throw error;
+  }
+  if (glob2.hasMagic(schemaPath)) {
+    const sourceFiles = await glob2(schemaPath);
+    return mergeSchemas({
+      typeDefs: await Promise.all(
+        sourceFiles.map(async (filepath) => await readFile(filepath))
+      )
+    });
+  }
   try {
-    if (targets.length === 1) {
-      return targets[0];
-    } else if (targets.length === 2) {
-      return (0, import_deepmerge.default)(targets[0], targets[1], {
-        arrayMerge: (source, update) => [...new Set(source.concat(update))]
-      });
-    }
-    return deepMerge2(filepath, targets[0], deepMerge2(filepath, ...targets.slice(1)));
-  } catch (e2) {
+    await stat(schemaPath);
+  } catch {
     throw new HoudiniError({
-      filepath,
-      message: "could not merge: " + JSON.stringify(targets, null, 4),
-      description: e2.message
+      message: `Schema file does not exist! Create it using houdini pull-schema`
     });
   }
-}
-
-// src/lib/parse.ts
-function parseJS(str, config) {
-  const defaultConfig = {
-    plugins: [
-      "typescript",
-      "importAssertions",
-      "decorators-legacy",
-      "explicitResourceManagement"
-    ],
-    sourceType: "module"
-  };
-  return (0, import_parser.parse)(str || "", config ? deepMerge2("", defaultConfig, config) : defaultConfig).program;
-}
-function parseJSON(str) {
-  str = str.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m2, g) => g ? "" : m2);
-  return JSON.parse(str);
-}
-async function printJS(script, options) {
-  if (options?.pretty) {
-    return (0, import_recast.prettyPrint)(script, options);
-  } else {
-    return (0, import_recast.print)(script, options);
+  const contents = await readFile(schemaPath);
+  if (schemaPath.endsWith("gql") || schemaPath.endsWith("graphql") || schemaPath.endsWith("graphqls")) {
+    return graphql5.buildSchema(contents);
   }
+  const jsonContents = JSON.parse(contents);
+  if (jsonContents.data) {
+    return graphql5.buildClientSchema(jsonContents.data);
+  }
+  return graphql5.buildClientSchema(jsonContents);
 }
+var emptySchema = graphql5.buildSchema("type Query { hello: String }");
+var defaultDirectives = emptySchema.getDirectives().map((dir) => dir.name);
 
 // src/lib/imports.ts
 var recast = __toESM(require_main2(), 1);
@@ -72904,7 +73034,7 @@ async function cleanupFiles(pathFolder, listOfObj) {
 // src/lib/detectTools.ts
 async function detectFromPackageJSON(cwd) {
   try {
-    const packageJSONFile = await fs_exports.readFile(path_exports.join(cwd, "package.json"));
+    const packageJSONFile = await readFile(join2(cwd, "package.json"));
     if (packageJSONFile) {
       var packageJSON = JSON.parse(packageJSONFile);
     } else {
@@ -72929,22 +73059,22 @@ async function detectFromPackageJSON(cwd) {
 async function detectTools(cwd = process.cwd()) {
   let typescript = false;
   try {
-    await fs_exports.stat(path_exports.join(cwd, "tsconfig.json"));
+    await stat(join2(cwd, "tsconfig.json"));
     typescript = true;
   } catch {
   }
   let package_manager = "npm";
   let dir = cwd;
   do {
-    if (fs_exports.existsSync(path_exports.join(dir, "pnpm-lock.yaml"))) {
+    if (existsSync(join2(dir, "pnpm-lock.yaml"))) {
       package_manager = "pnpm";
       break;
     }
-    if (fs_exports.existsSync(path_exports.join(dir, "yarn.lock"))) {
+    if (existsSync(join2(dir, "yarn.lock"))) {
       package_manager = "yarn";
       break;
     }
-  } while (dir !== (dir = path_exports.dirname(dir)));
+  } while (dir !== (dir = dirname(dir)));
   return {
     typescript,
     package_manager,
@@ -72952,134 +73082,6 @@ async function detectTools(cwd = process.cwd()) {
   };
 }
 
-// src/runtime/router/match.ts
-var param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
-function find_match(config, manifest, current, allowNull = true) {
-  let match2 = null;
-  let matchVariables = null;
-  for (const page of Object.values(manifest.pages)) {
-    const urlMatch = current.match(page.pattern);
-    if (!urlMatch) {
-      continue;
-    }
-    match2 = page;
-    matchVariables = exec(urlMatch, page.params) || {};
-    break;
-  }
-  if (!match2 && !allowNull) {
-    throw new Error("404");
-  }
-  let variables = {
-    ...matchVariables
-  };
-  for (const document of Object.values(match2?.documents ?? {})) {
-    for (const [variable, { type }] of Object.entries(document.variables)) {
-      if (matchVariables?.[variable]) {
-        variables[variable] = parseScalar(config, type, matchVariables[variable]);
-      }
-    }
-  }
-  return [match2, variables];
-}
-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 escape3(
-              String.fromCharCode(parseInt(content.slice(2), 16))
-            );
-          }
-          if (content.startsWith("u+")) {
-            return escape3(
-              String.fromCharCode(
-                ...content.slice(2).split("-").map((code) => parseInt(code, 16))
-              )
-            );
-          }
-          const match2 = param_pattern.exec(content);
-          if (!match2) {
-            throw new Error(
-              `Invalid param: ${content}. Params and matcher names can only have underscores and alphanumeric characters.`
-            );
-          }
-          const [, is_optional, is_rest, name, matcher] = match2;
-          params.push({
-            name,
-            matcher,
-            optional: !!is_optional,
-            rest: !!is_rest,
-            chained: is_rest ? i2 === 1 && parts[0] === "" : false
-          });
-          return is_rest ? "(.*?)" : is_optional ? "([^/]*)?" : "([^/]+?)";
-        }
-        return escape3(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(match2, params) {
-  const result = {};
-  const values = match2.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] = decodeURIComponent(value);
-    }
-  }
-  if (buffered)
-    return;
-  return result;
-}
-function escape3(str) {
-  return str.normalize().replace(/[[\]]/g, "\\$&").replace(/%/g, "%25").replace(/\//g, "%2[Ff]").replace(/\?/g, "%3[Ff]").replace(/#/g, "%23").replace(/[.*+?^${}()|\\]/g, "\\$&");
-}
-
 // src/lib/typescript.ts
 var recast2 = __toESM(require_main2(), 1);
 import * as graphql6 from "graphql";
@@ -73149,18 +73151,18 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
       return AST3.tsNeverKeyword();
     }
     const component = config.componentFields[field.parent][field.field];
-    const sourcePathRelative = path_exports.relative(
-      path_exports.join(config.projectRoot, "src"),
+    const sourcePathRelative = relative(
+      join2(config.projectRoot, "src"),
       component.filepath
     );
-    let sourcePathParsed = path_exports.parse(sourcePathRelative);
-    let sourcePath = path_exports.join(sourcePathParsed.dir, sourcePathParsed.name);
+    let sourcePathParsed = parse3(sourcePathRelative);
+    let sourcePath = join2(sourcePathParsed.dir, sourcePathParsed.name);
     const localImport = ensureImports({
       config,
       body,
       import: "__component__" + component.fragment,
-      sourceModule: path_exports.join(
-        path_exports.relative(path_exports.dirname(filepath), config.projectRoot),
+      sourceModule: join2(
+        relative(dirname(filepath), config.projectRoot),
         "src",
         sourcePath
       )
@@ -73226,9 +73228,9 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
   }
 }
 async function writeTsConfig(config) {
-  await fs_exports.mkdirp(config.rootDir);
-  await fs_exports.writeFile(
-    path_exports.join(config.rootDir, "tsconfig.json"),
+  await mkdirp(config.rootDir);
+  await writeFile(
+    join2(config.rootDir, "tsconfig.json"),
     JSON.stringify(
       {
         compilerOptions: {