houdini 1.2.43 → 1.2.45

package/build/vite-esm/index.js

@@ -31868,7 +31868,7 @@ var require_path_visitor = __commonJS({
         }
         return target;
       }
-      PathVisitor.visit = function visit19(node, methods) {
+      PathVisitor.visit = function visit20(node, methods) {
         return PathVisitor.fromMethodsObject(methods).visit(node);
       };
       var PVp = PathVisitor.prototype;
@@ -32059,7 +32059,7 @@ var require_path_visitor = __commonJS({
         this.needToCallTraverse = false;
         return visitChildren(path3, PathVisitor.fromMethodsObject(newVisitor || this.visitor));
       };
-      sharedContextProtoMethods.visit = function visit19(path3, newVisitor) {
+      sharedContextProtoMethods.visit = function visit20(path3, newVisitor) {
         if (!(this instanceof this.Context)) {
           throw new Error("");
         }
@@ -33452,7 +33452,7 @@ var require_main = __commonJS({
     var someField = _a.someField;
     var Type = _a.Type;
     var use = _a.use;
-    var visit19 = _a.visit;
+    var visit20 = _a.visit;
     exports.astNodesAreEquivalent = astNodesAreEquivalent;
     exports.builders = builders;
     exports.builtInTypes = builtInTypes;
@@ -33469,7 +33469,7 @@ var require_main = __commonJS({
     exports.someField = someField;
     exports.Type = Type;
     exports.use = use;
-    exports.visit = visit19;
+    exports.visit = visit20;
     Object.assign(namedTypes_1.namedTypes, n);
   }
 });
@@ -64576,47 +64576,6 @@ function deepMerge(...objects) {
   return mergedObj;
 }
 
-// src/runtime/lib/scalars.ts
-async function marshalSelection({
-  selection,
-  data
-}) {
-  const config2 = getCurrentConfig();
-  if (data === null || typeof data === "undefined") {
-    return data;
-  }
-  if (Array.isArray(data)) {
-    return await Promise.all(data.map((val) => marshalSelection({ selection, data: val })));
-  }
-  const targetSelection = getFieldsForType(selection, data["__typename"], false);
-  return Object.fromEntries(
-    await Promise.all(
-      Object.entries(data).map(async ([fieldName, value]) => {
-        const { type, selection: selection2 } = targetSelection[fieldName];
-        if (!type) {
-          return [fieldName, value];
-        }
-        if (selection2) {
-          return [fieldName, await marshalSelection({ selection: selection2, data: value })];
-        }
-        if (config2.scalars?.[type]) {
-          const marshalFn = config2.scalars[type].marshal;
-          if (!marshalFn) {
-            throw new Error(
-              `scalar type ${type} is missing a \`marshal\` function. see https://github.com/AlecAivazis/houdini#%EF%B8%8Fcustom-scalars`
-            );
-          }
-          if (Array.isArray(value)) {
-            return [fieldName, value.map(marshalFn)];
-          }
-          return [fieldName, marshalFn(value)];
-        }
-        return [fieldName, value];
-      })
-    )
-  );
-}
-
 // src/runtime/lib/types.ts
 var CachePolicy = {
   CacheOrNetwork: "CacheOrNetwork",
@@ -64644,11 +64603,6 @@ var RefetchUpdateMode = {
   prepend: "prepend",
   replace: "replace"
 };
-var DataSource = {
-  Cache: "cache",
-  Network: "network",
-  Ssr: "ssr"
-};
 var fragmentKey = " $fragments";
 var PendingValue = Symbol("houdini_loading");
 
@@ -68419,188 +68373,6 @@ var cache_default = new Cache();
 // src/runtime/client/plugins/cache.ts
 var serverSide = typeof globalThis.window === "undefined";
 
-// src/runtime/client/utils/documentPlugins.ts
-var documentPlugin = (kind, source) => {
-  return () => {
-    const sourceHandlers = source();
-    const enterWrapper = (handler) => {
-      return !handler ? void 0 : (ctx, handlers) => {
-        if (ctx.artifact.kind !== kind) {
-          return handlers.next(ctx);
-        }
-        return handler(ctx, handlers);
-      };
-    };
-    const exitWrapper = (handler) => {
-      return !handler ? void 0 : (ctx, handlers) => {
-        if (ctx.artifact.kind !== kind) {
-          return handlers.resolve(ctx);
-        }
-        return handler(ctx, handlers);
-      };
-    };
-    return {
-      start: enterWrapper(sourceHandlers.start),
-      network: enterWrapper(sourceHandlers.network),
-      afterNetwork: exitWrapper(sourceHandlers.afterNetwork),
-      end: exitWrapper(sourceHandlers.end),
-      catch: sourceHandlers.catch ? (ctx, handlers) => sourceHandlers.catch(ctx, handlers) : void 0,
-      cleanup: (...args) => sourceHandlers.cleanup?.(...args)
-    };
-  };
-};
-
-// src/runtime/client/plugins/query.ts
-var query = documentPlugin(ArtifactKind.Query, function() {
-  let subscriptionSpec = null;
-  let lastVariables = null;
-  return {
-    start(ctx, { next }) {
-      ctx.variables = {
-        ...lastVariables,
-        ...ctx.variables
-      };
-      next(ctx);
-    },
-    end(ctx, { resolve: resolve2, marshalVariables, variablesChanged }) {
-      if (variablesChanged(ctx) && !ctx.cacheParams?.disableSubscriptions) {
-        if (subscriptionSpec) {
-          cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.() || {});
-        }
-        lastVariables = { ...marshalVariables(ctx) };
-        const variables = lastVariables;
-        subscriptionSpec = {
-          rootType: ctx.artifact.rootType,
-          selection: ctx.artifact.selection,
-          variables: () => variables,
-          set: (newValue) => {
-            resolve2(ctx, {
-              data: newValue,
-              errors: null,
-              fetching: false,
-              partial: false,
-              stale: false,
-              source: DataSource.Cache,
-              variables: ctx.variables ?? {}
-            });
-          }
-        };
-        cache_default.subscribe(subscriptionSpec, lastVariables);
-      }
-      resolve2(ctx);
-    },
-    cleanup() {
-      if (subscriptionSpec) {
-        cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.());
-        lastVariables = null;
-      }
-    }
-  };
-});
-
-// src/runtime/client/plugins/fragment.ts
-var fragment = documentPlugin(ArtifactKind.Fragment, function() {
-  let subscriptionSpec = null;
-  let lastReference = null;
-  return {
-    start(ctx, { next, resolve: resolve2, variablesChanged, marshalVariables }) {
-      if (!ctx.stuff.parentID) {
-        return next(ctx);
-      }
-      const currentReference = {
-        parent: ctx.stuff.parentID,
-        variables: marshalVariables(ctx)
-      };
-      if (!ctx.cacheParams?.disableSubscriptions && (!deepEquals(lastReference, currentReference) || variablesChanged(ctx))) {
-        if (subscriptionSpec) {
-          cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.() || {});
-        }
-        const variables = marshalVariables(ctx);
-        subscriptionSpec = {
-          rootType: ctx.artifact.rootType,
-          selection: ctx.artifact.selection,
-          variables: () => variables,
-          parentID: ctx.stuff.parentID,
-          set: (newValue) => {
-            resolve2(ctx, {
-              data: newValue,
-              errors: null,
-              fetching: false,
-              partial: false,
-              stale: false,
-              source: DataSource.Cache,
-              variables
-            });
-          }
-        };
-        cache_default.subscribe(subscriptionSpec, variables);
-        lastReference = currentReference;
-      }
-      next(ctx);
-    },
-    cleanup() {
-      if (subscriptionSpec) {
-        cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.());
-      }
-    }
-  };
-});
-
-// src/runtime/client/plugins/mutation.ts
-var mutation = documentPlugin(ArtifactKind.Mutation, () => {
-  return {
-    async start(ctx, { next, marshalVariables }) {
-      const layerOptimistic = cache_default._internal_unstable.storage.createLayer(true);
-      const optimisticResponse = ctx.stuff.optimisticResponse;
-      let toNotify = [];
-      if (optimisticResponse) {
-        toNotify = cache_default.write({
-          selection: ctx.artifact.selection,
-          data: await marshalSelection({
-            selection: ctx.artifact.selection,
-            data: optimisticResponse
-          }),
-          variables: marshalVariables(ctx),
-          layer: layerOptimistic.id
-        });
-      }
-      ctx.cacheParams = {
-        ...ctx.cacheParams,
-        layer: layerOptimistic,
-        notifySubscribers: toNotify,
-        forceNotify: true
-      };
-      next(ctx);
-    },
-    afterNetwork(ctx, { resolve: resolve2 }) {
-      if (ctx.cacheParams?.layer) {
-        cache_default.clearLayer(ctx.cacheParams.layer.id);
-      }
-      resolve2(ctx);
-    },
-    end(ctx, { resolve: resolve2, value }) {
-      const hasErrors = value.errors && value.errors.length > 0;
-      if (hasErrors) {
-        if (ctx.cacheParams?.layer) {
-          cache_default.clearLayer(ctx.cacheParams.layer.id);
-        }
-      }
-      if (ctx.cacheParams?.layer) {
-        cache_default._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
-      }
-      resolve2(ctx);
-    },
-    catch(ctx, { error }) {
-      if (ctx.cacheParams?.layer) {
-        const { layer } = ctx.cacheParams;
-        cache_default.clearLayer(layer.id);
-        cache_default._internal_unstable.storage.resolveLayer(layer.id);
-      }
-      throw error;
-    }
-  };
-});
-
 // src/lib/types.ts
 var LogLevel = {
   Full: "full",
@@ -69037,6 +68809,9 @@ var Config = class {
   get loadingDirective() {
     return `loading`;
   }
+  get runtimeScalarDirective() {
+    return "__houdini__runtimeScalar";
+  }
   get whenDirective() {
     return "when";
   }
@@ -69107,7 +68882,7 @@ var Config = class {
     const internalDirectives = this.#newSchemaInstance?.getDirectives().reduce((list, directive) => {
       return list.concat(directive.name);
     }, []) ?? [];
-    return !defaultDirectives.includes(name) && (internalDirectives.includes(name) || this.isDeleteDirective(name));
+    return !defaultDirectives.includes(name) && (internalDirectives.includes(name) || this.isDeleteDirective(name) || name === this.runtimeScalarDirective);
   }
   get componentFieldDirective() {
     return "componentField";
@@ -69610,7 +69385,7 @@ function formatErrors(e2, afterError) {
     afterError?.(e2);
   }
 }
-function unwrapType(config2, type, wrappers = []) {
+function unwrapType(config2, type, wrappers = [], convertRuntimeScalars) {
   if (type.kind === "NonNullType") {
     return unwrapType(config2, type.type, [TypeWrapper.NonNull, ...wrappers]);
   }
@@ -69626,9 +69401,14 @@ function unwrapType(config2, type, wrappers = []) {
   if (type instanceof graphql3.GraphQLList) {
     return unwrapType(config2, type.ofType, [TypeWrapper.List, ...wrappers]);
   }
+  if (convertRuntimeScalars && config2.configFile.features?.runtimeScalars?.[type.name.value]) {
+    type = config2.schema.getType(
+      config2.configFile.features?.runtimeScalars?.[type.name.value].type
+    );
+  }
   const namedType = config2.schema.getType(type.name.value || type.name);
   if (!namedType) {
-    throw new Error("Could not unwrap type: " + JSON.stringify(type));
+    throw new Error("Unknown type: " + type.name.value || type.name);
   }
   return { type: namedType, wrappers };
 }
@@ -69765,6 +69545,231 @@ async function cleanupFiles(pathFolder, listOfObj) {
   return allFilesNotInList;
 }
 
+// src/runtime/router/match.ts
+var param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
+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 escape2(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 graphql4 from "graphql";
+var AST2 = recast2.types.builders;
+function unwrappedTsTypeReference(config2, filepath, missingScalars, {
+  type,
+  wrappers
+}, body) {
+  let result;
+  if (graphql4.isScalarType(type)) {
+    result = scalarPropertyValue(config2, filepath, missingScalars, type, body, null);
+  } else if (graphql4.isEnumType(type)) {
+    result = enumReference(config2, body, type.name);
+  } else {
+    result = AST2.tsTypeReference(AST2.identifier(type.name));
+  }
+  for (const toWrap of wrappers) {
+    if (toWrap === "NonNull" /* NonNull */) {
+      continue;
+    } else if (toWrap === "Nullable" /* Nullable */) {
+      result = nullableField(result, true);
+    } else if (toWrap === "List" /* List */) {
+      result = AST2.tsArrayType(AST2.tsParenthesizedType(result));
+    }
+  }
+  return result;
+}
+function tsTypeReference(config2, filepath, missingScalars, definition, body) {
+  const { type, wrappers } = unwrapType(config2, definition.type);
+  return unwrappedTsTypeReference(
+    config2,
+    filepath,
+    missingScalars,
+    { type, wrappers },
+    body
+  );
+}
+function enumReference(config2, body, name) {
+  ensureImports({
+    config: config2,
+    body,
+    import: ["ValueOf"],
+    importKind: "type",
+    sourceModule: "$houdini/runtime/lib/types"
+  });
+  return AST2.tsTypeReference(
+    AST2.identifier("ValueOf"),
+    AST2.tsTypeParameterInstantiation([AST2.tsTypeQuery(AST2.identifier(name))])
+  );
+}
+function readonlyProperty(prop, enable = true) {
+  if (enable) {
+    prop.readonly = true;
+  }
+  return prop;
+}
+function nullableField(inner, input = false) {
+  const members = [inner, AST2.tsNullKeyword()];
+  if (input) {
+    members.push(AST2.tsUndefinedKeyword());
+  }
+  return AST2.tsUnionType(members);
+}
+function scalarPropertyValue(config2, filepath, missingScalars, target, body, field) {
+  if (config2.configFile.features?.componentFields && target.name === config2.componentScalar) {
+    if (!field) {
+      return AST2.tsNeverKeyword();
+    }
+    const component = config2.componentFields[field.parent][field.field];
+    const sourcePathRelative = path_exports.relative(
+      path_exports.join(config2.projectRoot, "src"),
+      component.filepath
+    );
+    let sourcePathParsed = path_exports.parse(sourcePathRelative);
+    let sourcePath = path_exports.join(sourcePathParsed.dir, sourcePathParsed.name);
+    const localImport = ensureImports({
+      config: config2,
+      body,
+      import: "__component__" + component.fragment,
+      sourceModule: path_exports.join(
+        path_exports.relative(path_exports.dirname(filepath), config2.projectRoot),
+        "src",
+        sourcePath
+      )
+    }) ?? "__component__" + component.fragment;
+    const parameters = AST2.tsTypeReference(AST2.identifier("Parameters"));
+    parameters.typeParameters = AST2.tsTypeParameterInstantiation([
+      AST2.tsTypeQuery(AST2.identifier(localImport))
+    ]);
+    const indexed = AST2.tsIndexedAccessType(
+      parameters,
+      AST2.tsLiteralType(AST2.numericLiteral(0))
+    );
+    const omit = AST2.tsTypeReference(AST2.identifier("Omit"));
+    omit.typeParameters = AST2.tsTypeParameterInstantiation([
+      indexed,
+      AST2.tsLiteralType(AST2.stringLiteral(component.prop))
+    ]);
+    const arg = AST2.identifier("props");
+    arg.typeAnnotation = AST2.tsTypeAnnotation(omit);
+    const returnType = AST2.tsTypeReference(AST2.identifier("ReturnType"));
+    returnType.typeParameters = AST2.tsTypeParameterInstantiation([
+      AST2.tsTypeQuery(AST2.identifier(localImport))
+    ]);
+    const fnType = AST2.tsFunctionType([arg]);
+    fnType.typeAnnotation = AST2.tsTypeAnnotation(returnType);
+    return fnType;
+  }
+  switch (target.name) {
+    case "String": {
+      return AST2.tsStringKeyword();
+    }
+    case "Int": {
+      return AST2.tsNumberKeyword();
+    }
+    case "Float": {
+      return AST2.tsNumberKeyword();
+    }
+    case "Boolean": {
+      return AST2.tsBooleanKeyword();
+    }
+    case "ID": {
+      return AST2.tsStringKeyword();
+    }
+    default: {
+      if (graphql4.isNonNullType(target) && "ofType" in target) {
+        return scalarPropertyValue(
+          config2,
+          filepath,
+          missingScalars,
+          target.ofType,
+          body,
+          field
+        );
+      }
+      if (config2.scalars?.[target.name]) {
+        return AST2.tsTypeReference(AST2.identifier(config2.scalars?.[target.name].type));
+      }
+      if (target.name !== config2.componentScalar) {
+        missingScalars.add(target.name);
+      }
+      return AST2.tsAnyKeyword();
+    }
+  }
+}
+
 // ../../node_modules/.pnpm/estree-walker@3.0.1/node_modules/estree-walker/src/walker.js
 var WalkerBase = class {
   constructor() {
@@ -69878,7 +69883,7 @@ async function asyncWalk(ast, { enter, leave }) {
 }
 
 // src/lib/walk.ts
-import * as graphql4 from "graphql";
+import * as graphql5 from "graphql";
 async function find_graphql(config2, parsedScript, walker) {
   await asyncWalk(parsedScript, {
     async enter(node, parent2) {
@@ -69933,7 +69938,7 @@ async function find_graphql(config2, parsedScript, walker) {
       } else if (!documentString) {
         return;
       }
-      const parsedTag = graphql4.parse(documentString);
+      const parsedTag = graphql5.parse(documentString);
       if (walker.where && !walker.where(parsedTag, { node, parent: parent2 })) {
         return;
       }
@@ -70065,7 +70070,7 @@ function extractAnonymousQuery(config2, raw, expr, propName) {
       };
       return defs.concat([
         {
-          raw: graphql4.print(parsed),
+          raw: graphql5.print(parsed),
           parsed
         }
       ]);
@@ -70206,7 +70211,7 @@ function serialized_manifest_path(config2, base = base_dir(config2)) {
 
 // src/lib/router/manifest.ts
 var t2 = __toESM(require_lib6(), 1);
-import * as graphql5 from "graphql";
+import * as graphql6 from "graphql";
 async function load_manifest(args) {
   const manifest = await walk_routes({
     config: args.config,
@@ -70223,7 +70228,8 @@ async function load_manifest(args) {
       local_yoga: false
     },
     queries: [],
-    layouts: []
+    layouts: [],
+    variables: {}
   });
   if (args.includeArtifacts) {
     try {
@@ -70254,6 +70260,7 @@ 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;
@@ -70277,7 +70284,8 @@ async function walk_routes(args) {
       url: args.url,
       project: args.project,
       type: "layout",
-      contents: layoutQueryContents
+      contents: layoutQueryContents,
+      variables
     });
     newLayoutQueries = [...args.queries, layoutQuery.name];
   }
@@ -70290,7 +70298,8 @@ async function walk_routes(args) {
       contents: layoutViewContents,
       layouts: args.layouts,
       queries: newLayoutQueries,
-      config: args.config
+      config: args.config,
+      variables
     });
     newLayouts = [...args.layouts, page_id(layout.url)];
   }
@@ -70301,7 +70310,8 @@ async function walk_routes(args) {
       url: args.url,
       project: args.project,
       type: "page",
-      contents: pageQueryContents
+      contents: pageQueryContents,
+      variables
     });
   }
   if (pageViewContents) {
@@ -70313,7 +70323,8 @@ async function walk_routes(args) {
       contents: pageViewContents,
       layouts: newLayouts,
       queries: pageQuery ? [...newLayoutQueries, pageQuery.name] : newLayoutQueries,
-      config: args.config
+      config: args.config,
+      variables
     });
   }
   await Promise.all(
@@ -70326,7 +70337,8 @@ async function walk_routes(args) {
         filepath: path_exports.join(args.filepath, dir.name),
         url: `${args.url}${dir.name}/`,
         queries: newLayoutQueries,
-        layouts: newLayouts
+        layouts: newLayouts,
+        variables
       });
     })
   );
@@ -70348,12 +70360,18 @@ async function add_view(args) {
     url: args.url,
     layouts: args.layouts,
     path: path_exports.relative(args.config.projectRoot, args.path),
-    query_options: args.queries
+    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 = graphql5.parse(args.contents);
+  const parsed = graphql6.parse(args.contents);
   const query2 = parsed.definitions.find(
     (def) => def.kind === "OperationDefinition" && def.operation === "query"
   );
@@ -70361,20 +70379,30 @@ async function add_query(args) {
     throw new Error("No query found");
   }
   let loading = false;
-  await graphql5.visit(parsed, {
+  await graphql6.visit(parsed, {
     Directive(node) {
       if (node.name.value === args.config.loadingDirective) {
         loading = true;
       }
     }
   });
+  const queryVariables = Object.fromEntries(
+    query2.variableDefinitions?.map((variable) => {
+      const { type, wrappers } = unwrapType(args.config, variable.type, [], true);
+      return [
+        variable.variable.name.value,
+        { wrappers, type: type.name }
+      ];
+    }) ?? []
+  );
+  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),
     name: query2.name.value,
     url: args.url,
     loading,
-    variables: query2.variableDefinitions?.map((variable) => variable.variable.name.value) ?? []
+    variables: queryVariables
   };
   return target[page_id(args.url)];
 }
@@ -70470,8 +70498,8 @@ async function loadLocalSchema(config2) {
 }
 
 // src/codegen/generators/artifacts/index.ts
-var recast4 = __toESM(require_main2(), 1);
-import * as graphql16 from "graphql";
+var recast5 = __toESM(require_main2(), 1);
+import * as graphql17 from "graphql";
 
 // src/codegen/utils/commonjs.ts
 var cjsIndexFilePreamble = `"use strict";
@@ -70713,19 +70741,19 @@ var FieldCollection = class {
 };
 
 // src/codegen/utils/moduleExport.ts
-var recast2 = __toESM(require_main2(), 1);
-var AST2 = recast2.types.builders;
+var recast3 = __toESM(require_main2(), 1);
+var AST3 = recast3.types.builders;
 function moduleExport(config2, key, value) {
   if (config2.module === "commonjs") {
-    let target = AST2.memberExpression(AST2.identifier("module"), AST2.identifier("exports"));
+    let target = AST3.memberExpression(AST3.identifier("module"), AST3.identifier("exports"));
     if (key !== "default") {
-      target = AST2.memberExpression(target, AST2.identifier(key));
+      target = AST3.memberExpression(target, AST3.identifier(key));
     }
-    return AST2.expressionStatement(AST2.assignmentExpression("=", target, value));
+    return AST3.expressionStatement(AST3.assignmentExpression("=", target, value));
   }
-  return key === "default" ? AST2.exportDefaultDeclaration(value) : AST2.exportNamedDeclaration(
-    AST2.variableDeclaration("const", [
-      AST2.variableDeclarator(AST2.identifier(key), value)
+  return key === "default" ? AST3.exportDefaultDeclaration(value) : AST3.exportNamedDeclaration(
+    AST3.variableDeclaration("const", [
+      AST3.variableDeclarator(AST3.identifier(key), value)
     ])
   );
 }
@@ -70982,7 +71010,7 @@ var serialize = (value, { json, lossy } = {}) => {
 var esm_default = typeof structuredClone === "function" ? (any, options) => options && ("json" in options || "lossy" in options) ? deserialize(serialize(any, options)) : structuredClone(any) : (any, options) => deserialize(serialize(any, options));
 
 // src/codegen/transforms/fragmentVariables.ts
-import * as graphql7 from "graphql";
+import * as graphql8 from "graphql";
 
 // src/codegen/utils/stripLoc.ts
 function stripLoc(value) {
@@ -71003,7 +71031,7 @@ function stripLoc(value) {
 }
 
 // src/codegen/transforms/collectDefinitions.ts
-import * as graphql6 from "graphql";
+import * as graphql7 from "graphql";
 import { Kind as GraphqlKinds } from "graphql";
 async function includeFragmentDefinitions(config2, documents) {
   const fragments = collectDefinitions(config2, documents);
@@ -71053,10 +71081,10 @@ function collectDefinitions(config2, docs) {
 }
 function findRequiredFragments(config2, definition) {
   const referencedFragments = [];
-  const typeInfo = new graphql6.TypeInfo(config2.schema);
-  definition.selectionSet = graphql6.visit(
+  const typeInfo = new graphql7.TypeInfo(config2.schema);
+  definition.selectionSet = graphql7.visit(
     definition,
-    graphql6.visitWithTypeInfo(typeInfo, {
+    graphql7.visitWithTypeInfo(typeInfo, {
       FragmentSpread(node) {
         referencedFragments.push(node.name.value);
       }
@@ -71090,7 +71118,7 @@ function flattenFragments(filepath, operation, fragments) {
 }
 
 // src/codegen/transforms/fragmentVariables.ts
-var GraphqlKinds2 = graphql7.Kind;
+var GraphqlKinds2 = graphql8.Kind;
 async function fragmentVariables(config2, documents) {
   const fragments = collectDefinitions(config2, documents);
   const generatedFragments = {};
@@ -71113,7 +71141,7 @@ async function fragmentVariables(config2, documents) {
     });
   }
   const doc = {
-    kind: graphql7.Kind.DOCUMENT,
+    kind: graphql8.Kind.DOCUMENT,
     definitions: Object.values(generatedFragments)
   };
   documents.push({
@@ -71184,7 +71212,7 @@ function inlineFragmentArgs({
     return null;
   };
   const result = esm_default(
-    graphql7.visit(document, {
+    graphql8.visit(document, {
       FragmentSpread(node) {
         if (!fragmentDefinitions[node.name.value]) {
           throw new Error("Could not find definition for fragment" + node.name.value);
@@ -71270,7 +71298,7 @@ function inlineFragmentArgs({
   );
   if (newName) {
     result.name = {
-      kind: graphql7.Kind.NAME,
+      kind: graphql8.Kind.NAME,
       value: newName
     };
   }
@@ -71437,8 +71465,8 @@ ${exportDefaultFrom(`./${doc.name}`, doc.name)}`,
 }
 
 // src/codegen/generators/artifacts/inputs.ts
-import * as graphql8 from "graphql";
-function inputObject(config2, inputs) {
+import * as graphql9 from "graphql";
+function inputObject(config2, inputs, runtimeScalars) {
   const visitedTypes = /* @__PURE__ */ new Set();
   const inputObj = {
     fields: inputs.reduce((fields, input) => {
@@ -71454,7 +71482,8 @@ function inputObject(config2, inputs) {
         ...fields,
         [input.variable.name.value]: input.defaultValue ? variableValue(input.defaultValue, {}) : void 0
       };
-    }, {})
+    }, {}),
+    runtimeScalars
   };
   for (const input of inputs) {
     walkInputs(config2, visitedTypes, inputObj, input.type);
@@ -71466,10 +71495,10 @@ function walkInputs(config2, visitedTypes, inputObj, rootType) {
   if (visitedTypes.has(type.name)) {
     return;
   }
-  if (graphql8.isEnumType(type) || graphql8.isScalarType(type)) {
+  if (graphql9.isEnumType(type) || graphql9.isScalarType(type)) {
     return;
   }
-  if (graphql8.isUnionType(type)) {
+  if (graphql9.isUnionType(type)) {
     return;
   }
   visitedTypes.add(type.name);
@@ -71487,50 +71516,50 @@ function walkInputs(config2, visitedTypes, inputObj, rootType) {
 }
 
 // src/codegen/generators/artifacts/operations.ts
-import * as graphql10 from "graphql";
+import * as graphql11 from "graphql";
 
 // src/codegen/generators/artifacts/utils.ts
-var recast3 = __toESM(require_main2(), 1);
-import * as graphql9 from "graphql";
-var AST3 = recast3.types.builders;
+var recast4 = __toESM(require_main2(), 1);
+import * as graphql10 from "graphql";
+var AST4 = recast4.types.builders;
 function serializeValue(value) {
   if (Array.isArray(value)) {
-    return AST3.arrayExpression(value.map(serializeValue));
+    return AST4.arrayExpression(value.map(serializeValue));
   }
   if (typeof value === "object" && value !== null) {
-    return AST3.objectExpression(
+    return AST4.objectExpression(
       Object.entries(value).filter(([key, value2]) => typeof value2 !== "undefined").map(([key, val]) => {
-        return AST3.objectProperty(AST3.stringLiteral(key), serializeValue(val));
+        return AST4.objectProperty(AST4.stringLiteral(key), serializeValue(val));
       })
     );
   }
   if (typeof value === "string") {
     if (value.indexOf("\n") !== -1) {
-      return AST3.templateLiteral(
-        [AST3.templateElement({ raw: value, cooked: value }, true)],
+      return AST4.templateLiteral(
+        [AST4.templateElement({ raw: value, cooked: value }, true)],
         []
       );
     }
-    return AST3.stringLiteral(value);
+    return AST4.stringLiteral(value);
   }
-  return AST3.literal(value);
+  return AST4.literal(value);
 }
 function convertValue(config2, val) {
   let value;
   let kind;
-  if (val.kind === graphql9.Kind.INT) {
+  if (val.kind === graphql10.Kind.INT) {
     value = parseInt(val.value, 10);
     kind = "Int";
-  } else if (val.kind === graphql9.Kind.FLOAT) {
+  } else if (val.kind === graphql10.Kind.FLOAT) {
     value = parseFloat(val.value);
     kind = "Float";
-  } else if (val.kind === graphql9.Kind.BOOLEAN) {
+  } else if (val.kind === graphql10.Kind.BOOLEAN) {
     value = val.value;
     kind = "Boolean";
-  } else if (val.kind === graphql9.Kind.VARIABLE) {
+  } else if (val.kind === graphql10.Kind.VARIABLE) {
     value = val.name.value;
     kind = "Variable";
-  } else if (val.kind === graphql9.Kind.STRING) {
+  } else if (val.kind === graphql10.Kind.STRING) {
     value = val.value;
     kind = "String";
   }
@@ -71543,7 +71572,7 @@ function operationsByPath(config2, filepath, definition, filterTypes) {
     return {};
   }
   const pathOperations = {};
-  graphql10.visit(definition, {
+  graphql11.visit(definition, {
     FragmentSpread(node, _, __, ___, ancestors) {
       if (!config2.isListFragment(node.name.value)) {
         return;
@@ -71702,19 +71731,19 @@ function ancestorKey(ancestors) {
 }
 
 // src/codegen/generators/artifacts/selection.ts
-import * as graphql15 from "graphql";
+import * as graphql16 from "graphql";
 
 // src/codegen/transforms/list.ts
-import * as graphql13 from "graphql";
+import * as graphql14 from "graphql";
 
 // src/codegen/utils/objectIdentificationSelection.ts
-import * as graphql11 from "graphql";
+import * as graphql12 from "graphql";
 var objectIdentificationSelection = (config2, type) => {
   return config2.keyFieldsForType(type.name).map((key) => {
     return {
-      kind: graphql11.Kind.FIELD,
+      kind: graphql12.Kind.FIELD,
       name: {
-        kind: graphql11.Kind.NAME,
+        kind: graphql12.Kind.NAME,
         value: key
       }
     };
@@ -71722,7 +71751,7 @@ var objectIdentificationSelection = (config2, type) => {
 };
 
 // src/codegen/transforms/paginate.ts
-import * as graphql12 from "graphql";
+import * as graphql13 from "graphql";
 async function paginate(config2, documents) {
   const newDocs = [];
   for (const doc of documents) {
@@ -71755,7 +71784,7 @@ async function paginate(config2, documents) {
     };
     let cursorType = "String";
     let paginationPath = [];
-    doc.document = graphql12.visit(doc.document, {
+    doc.document = graphql13.visit(doc.document, {
       Field(node, _, __, ___, ancestors) {
         const paginateDirective = node.directives?.find(
           (directive) => directive.name.value === config2.paginateDirective
@@ -71781,7 +71810,7 @@ async function paginate(config2, documents) {
         flags.offset.enabled = offsetPagination;
         flags.limit.enabled = offsetPagination;
         paginationPath = ancestors.filter(
-          (ancestor) => !Array.isArray(ancestor) && ancestor.kind === graphql12.Kind.FIELD
+          (ancestor) => !Array.isArray(ancestor) && ancestor.kind === graphql13.Kind.FIELD
         ).concat(node).map((field) => field.alias?.value || field.name.value);
         return {
           ...node,
@@ -71800,7 +71829,7 @@ async function paginate(config2, documents) {
       let fragment2 = "";
       let paginateMode = config2.defaultPaginateMode;
       const requiredArgs = [];
-      doc.document = graphql12.visit(doc.document, {
+      doc.document = graphql13.visit(doc.document, {
         OperationDefinition(node) {
           if (node.operation !== "query") {
             throw new HoudiniError({
@@ -71859,9 +71888,9 @@ async function paginate(config2, documents) {
               directives: [
                 ...node.directives || [],
                 {
-                  kind: graphql12.Kind.DIRECTIVE,
+                  kind: graphql13.Kind.DIRECTIVE,
                   name: {
-                    kind: graphql12.Kind.NAME,
+                    kind: graphql13.Kind.NAME,
                     value: config2.argumentsDirective
                   }
                 }
@@ -71931,22 +71960,22 @@ async function paginate(config2, documents) {
       const paginationArgs = Object.entries(flags).filter(([_, { enabled }]) => enabled).map(([key, value]) => ({ name: key, ...value }));
       const fragmentSpreadSelection = [
         {
-          kind: graphql12.Kind.FRAGMENT_SPREAD,
+          kind: graphql13.Kind.FRAGMENT_SPREAD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: fragmentName
           },
           directives: [
             {
-              kind: graphql12.Kind.DIRECTIVE,
+              kind: graphql13.Kind.DIRECTIVE,
               name: {
-                kind: graphql12.Kind.NAME,
+                kind: graphql13.Kind.NAME,
                 value: config2.withDirective
               },
               ["arguments"]: requiredArgs.map((arg) => variableAsArgument(arg.name)).concat(paginationArgs.map(({ name }) => variableAsArgument(name)))
             },
             {
-              kind: graphql12.Kind.DIRECTIVE,
+              kind: graphql13.Kind.DIRECTIVE,
               name: {
                 kind: "Name",
                 value: config2.maskDisableDirective
@@ -71973,23 +72002,23 @@ async function paginate(config2, documents) {
       });
       const typeConfig = config2.typeConfig?.[fragment2];
       const queryDoc = {
-        kind: graphql12.Kind.DOCUMENT,
+        kind: graphql13.Kind.DOCUMENT,
         definitions: [
           {
-            kind: graphql12.Kind.OPERATION_DEFINITION,
+            kind: graphql13.Kind.OPERATION_DEFINITION,
             name: {
-              kind: graphql12.Kind.NAME,
+              kind: graphql13.Kind.NAME,
               value: refetchQueryName
             },
             operation: "query",
             variableDefinitions: requiredArgs.map(
               (arg) => ({
-                kind: graphql12.Kind.VARIABLE_DEFINITION,
+                kind: graphql13.Kind.VARIABLE_DEFINITION,
                 type: arg.type,
                 variable: {
-                  kind: graphql12.Kind.VARIABLE,
+                  kind: graphql13.Kind.VARIABLE,
                   name: {
-                    kind: graphql12.Kind.NAME,
+                    kind: graphql13.Kind.NAME,
                     value: arg.name
                   }
                 }
@@ -71997,18 +72026,18 @@ async function paginate(config2, documents) {
             ).concat(
               paginationArgs.map(
                 (arg) => ({
-                  kind: graphql12.Kind.VARIABLE_DEFINITION,
+                  kind: graphql13.Kind.VARIABLE_DEFINITION,
                   type: {
-                    kind: graphql12.Kind.NAMED_TYPE,
+                    kind: graphql13.Kind.NAMED_TYPE,
                     name: {
-                      kind: graphql12.Kind.NAME,
+                      kind: graphql13.Kind.NAME,
                       value: arg.type
                     }
                   },
                   variable: {
-                    kind: graphql12.Kind.VARIABLE,
+                    kind: graphql13.Kind.VARIABLE,
                     name: {
-                      kind: graphql12.Kind.NAME,
+                      kind: graphql13.Kind.NAME,
                       value: arg.name
                     }
                   },
@@ -72020,12 +72049,12 @@ async function paginate(config2, documents) {
               ).concat(
                 !nodeQuery ? [] : keys2.map(
                   (key) => ({
-                    kind: graphql12.Kind.VARIABLE_DEFINITION,
+                    kind: graphql13.Kind.VARIABLE_DEFINITION,
                     type: key.type,
                     variable: {
-                      kind: graphql12.Kind.VARIABLE,
+                      kind: graphql13.Kind.VARIABLE,
                       name: {
-                        kind: graphql12.Kind.NAME,
+                        kind: graphql13.Kind.NAME,
                         value: key.name
                       }
                     }
@@ -72034,42 +72063,42 @@ async function paginate(config2, documents) {
               )
             ),
             selectionSet: {
-              kind: graphql12.Kind.SELECTION_SET,
+              kind: graphql13.Kind.SELECTION_SET,
               selections: !nodeQuery ? fragmentSpreadSelection : [
                 {
-                  kind: graphql12.Kind.FIELD,
+                  kind: graphql13.Kind.FIELD,
                   name: {
-                    kind: graphql12.Kind.NAME,
+                    kind: graphql13.Kind.NAME,
                     value: typeConfig?.resolve?.queryField || "node"
                   },
                   ["arguments"]: keys2.map((key) => ({
-                    kind: graphql12.Kind.ARGUMENT,
+                    kind: graphql13.Kind.ARGUMENT,
                     name: {
-                      kind: graphql12.Kind.NAME,
+                      kind: graphql13.Kind.NAME,
                       value: key.name
                     },
                     value: {
-                      kind: graphql12.Kind.VARIABLE,
+                      kind: graphql13.Kind.VARIABLE,
                       name: {
-                        kind: graphql12.Kind.NAME,
+                        kind: graphql13.Kind.NAME,
                         value: key.name
                       }
                     }
                   })),
                   selectionSet: {
-                    kind: graphql12.Kind.SELECTION_SET,
+                    kind: graphql13.Kind.SELECTION_SET,
                     selections: [
                       {
-                        kind: graphql12.Kind.FIELD,
+                        kind: graphql13.Kind.FIELD,
                         name: {
-                          kind: graphql12.Kind.NAME,
+                          kind: graphql13.Kind.NAME,
                           value: "__typename"
                         }
                       },
                       ...(typeConfig?.keys || [config2.defaultKeys[0]]).map((key) => ({
-                        kind: graphql12.Kind.FIELD,
+                        kind: graphql13.Kind.FIELD,
                         name: {
-                          kind: graphql12.Kind.NAME,
+                          kind: graphql13.Kind.NAME,
                           value: key
                         }
                       })),
@@ -72126,15 +72155,15 @@ function replaceArgumentsWithVariables(args, flags) {
 }
 function variableAsArgument(name, variable) {
   return {
-    kind: graphql12.Kind.ARGUMENT,
+    kind: graphql13.Kind.ARGUMENT,
     name: {
-      kind: graphql12.Kind.NAME,
+      kind: graphql13.Kind.NAME,
       value: name
     },
     value: {
-      kind: graphql12.Kind.VARIABLE,
+      kind: graphql13.Kind.VARIABLE,
       name: {
-        kind: graphql12.Kind.NAME,
+        kind: graphql13.Kind.NAME,
         value: variable ?? name
       }
     }
@@ -72142,18 +72171,18 @@ function variableAsArgument(name, variable) {
 }
 function staticVariableDefinition(name, type, defaultValue, variableName) {
   return {
-    kind: graphql12.Kind.VARIABLE_DEFINITION,
+    kind: graphql13.Kind.VARIABLE_DEFINITION,
     type: {
-      kind: graphql12.Kind.NAMED_TYPE,
+      kind: graphql13.Kind.NAMED_TYPE,
       name: {
-        kind: graphql12.Kind.NAME,
+        kind: graphql13.Kind.NAME,
         value: type
       }
     },
     variable: {
-      kind: graphql12.Kind.VARIABLE,
+      kind: graphql13.Kind.VARIABLE,
       name: {
-        kind: graphql12.Kind.NAME,
+        kind: graphql13.Kind.NAME,
         value: variableName ?? name
       }
     },
@@ -72165,9 +72194,9 @@ function staticVariableDefinition(name, type, defaultValue, variableName) {
 }
 function argumentNode(name, value) {
   return {
-    kind: graphql12.Kind.ARGUMENT,
+    kind: graphql13.Kind.ARGUMENT,
     name: {
-      kind: graphql12.Kind.NAME,
+      kind: graphql13.Kind.NAME,
       value: name
     },
     value: objectNode(value)
@@ -72175,16 +72204,16 @@ function argumentNode(name, value) {
 }
 function objectNode([type, defaultValue]) {
   const node = {
-    kind: graphql12.Kind.OBJECT,
+    kind: graphql13.Kind.OBJECT,
     fields: [
       {
-        kind: graphql12.Kind.OBJECT_FIELD,
+        kind: graphql13.Kind.OBJECT_FIELD,
         name: {
-          kind: graphql12.Kind.NAME,
+          kind: graphql13.Kind.NAME,
           value: "type"
         },
         value: {
-          kind: graphql12.Kind.STRING,
+          kind: graphql13.Kind.STRING,
           value: type
         }
       }
@@ -72192,8 +72221,8 @@ function objectNode([type, defaultValue]) {
   };
   if (defaultValue) {
     node.fields.push({
-      kind: graphql12.Kind.OBJECT_FIELD,
-      name: { kind: graphql12.Kind.NAME, value: "default" },
+      kind: graphql13.Kind.OBJECT_FIELD,
+      name: { kind: graphql13.Kind.NAME, value: "default" },
       value: {
         kind: typeof defaultValue === "number" ? "IntValue" : "StringValue",
         value: defaultValue.toString()
@@ -72204,34 +72233,34 @@ function objectNode([type, defaultValue]) {
 }
 var pageInfoSelection = [
   {
-    kind: graphql12.Kind.FIELD,
+    kind: graphql13.Kind.FIELD,
     name: {
-      kind: graphql12.Kind.NAME,
+      kind: graphql13.Kind.NAME,
       value: "edges"
     },
     selectionSet: {
-      kind: graphql12.Kind.SELECTION_SET,
+      kind: graphql13.Kind.SELECTION_SET,
       selections: [
         {
-          kind: graphql12.Kind.FIELD,
+          kind: graphql13.Kind.FIELD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: "cursor"
           }
         },
         {
-          kind: graphql12.Kind.FIELD,
+          kind: graphql13.Kind.FIELD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: "node"
           },
           selectionSet: {
-            kind: graphql12.Kind.SELECTION_SET,
+            kind: graphql13.Kind.SELECTION_SET,
             selections: [
               {
-                kind: graphql12.Kind.FIELD,
+                kind: graphql13.Kind.FIELD,
                 name: {
-                  kind: graphql12.Kind.NAME,
+                  kind: graphql13.Kind.NAME,
                   value: "__typename"
                 }
               }
@@ -72242,39 +72271,39 @@ var pageInfoSelection = [
     }
   },
   {
-    kind: graphql12.Kind.FIELD,
+    kind: graphql13.Kind.FIELD,
     name: {
-      kind: graphql12.Kind.NAME,
+      kind: graphql13.Kind.NAME,
       value: "pageInfo"
     },
     selectionSet: {
-      kind: graphql12.Kind.SELECTION_SET,
+      kind: graphql13.Kind.SELECTION_SET,
       selections: [
         {
-          kind: graphql12.Kind.FIELD,
+          kind: graphql13.Kind.FIELD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: "hasPreviousPage"
           }
         },
         {
-          kind: graphql12.Kind.FIELD,
+          kind: graphql13.Kind.FIELD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: "hasNextPage"
           }
         },
         {
-          kind: graphql12.Kind.FIELD,
+          kind: graphql13.Kind.FIELD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: "startCursor"
           }
         },
         {
-          kind: graphql12.Kind.FIELD,
+          kind: graphql13.Kind.FIELD,
           name: {
-            kind: graphql12.Kind.NAME,
+            kind: graphql13.Kind.NAME,
             value: "endCursor"
           }
         }
@@ -72288,17 +72317,17 @@ async function addListFragments(config2, documents) {
   const lists = {};
   const errors = [];
   for (const doc of documents) {
-    doc.document = graphql13.visit(doc.document, {
+    doc.document = graphql14.visit(doc.document, {
       Directive(node, key, parent2, path3, ancestors) {
         if ([config2.listDirective, config2.paginateDirective].includes(node.name.value)) {
           const nameArg = node.arguments?.find(
             (arg) => arg.name.value === config2.listOrPaginateNameArg
           );
           let error = {
-            ...new graphql13.GraphQLError(
+            ...new graphql14.GraphQLError(
               "",
               node,
-              new graphql13.Source(""),
+              new graphql14.Source(""),
               node.loc ? [node.loc.start, node.loc.end] : null,
               path3
             ),
@@ -72350,7 +72379,7 @@ async function addListFragments(config2, documents) {
                 {
                   kind: "Argument",
                   name: {
-                    kind: graphql13.Kind.NAME,
+                    kind: graphql14.Kind.NAME,
                     value: "connection"
                   },
                   value: {
@@ -72400,7 +72429,7 @@ async function addListFragments(config2, documents) {
   const validDeletes = [
     ...new Set(
       Object.values(lists).map(({ type }) => {
-        if (!(type instanceof graphql13.GraphQLObjectType)) {
+        if (!(type instanceof graphql14.GraphQLObjectType)) {
           return "";
         }
         if (config2.keyFieldsForType(type.name).length !== 1) {
@@ -72414,7 +72443,7 @@ async function addListFragments(config2, documents) {
     return;
   }
   const generatedDoc = {
-    kind: graphql13.Kind.DOCUMENT,
+    kind: graphql14.Kind.DOCUMENT,
     definitions: Object.entries(lists).flatMap(
       ([name, { selection, type }]) => {
         const schemaType = config2.schema.getType(type.name);
@@ -72422,7 +72451,7 @@ async function addListFragments(config2, documents) {
           throw new HoudiniError({ message: "Lists must have a selection" });
         }
         const fragmentSelection = {
-          kind: graphql13.Kind.SELECTION_SET,
+          kind: graphql14.Kind.SELECTION_SET,
           selections: [...selection.selections]
         };
         if (schemaType && fragmentSelection && !fragmentSelection?.selections.find(
@@ -72437,14 +72466,14 @@ async function addListFragments(config2, documents) {
           {
             name: {
               value: config2.listInsertFragment(name),
-              kind: graphql13.Kind.NAME
+              kind: graphql14.Kind.NAME
             },
-            kind: graphql13.Kind.FRAGMENT_DEFINITION,
+            kind: graphql14.Kind.FRAGMENT_DEFINITION,
             selectionSet: fragmentSelection,
             typeCondition: {
-              kind: graphql13.Kind.NAMED_TYPE,
+              kind: graphql14.Kind.NAMED_TYPE,
               name: {
-                kind: graphql13.Kind.NAME,
+                kind: graphql14.Kind.NAME,
                 value: type.name
               }
             }
@@ -72452,32 +72481,32 @@ async function addListFragments(config2, documents) {
           {
             name: {
               value: config2.listToggleFragment(name),
-              kind: graphql13.Kind.NAME
+              kind: graphql14.Kind.NAME
             },
-            kind: graphql13.Kind.FRAGMENT_DEFINITION,
+            kind: graphql14.Kind.FRAGMENT_DEFINITION,
             selectionSet: fragmentSelection,
             typeCondition: {
-              kind: graphql13.Kind.NAMED_TYPE,
+              kind: graphql14.Kind.NAMED_TYPE,
               name: {
-                kind: graphql13.Kind.NAME,
+                kind: graphql14.Kind.NAME,
                 value: type.name
               }
             }
           },
           {
-            kind: graphql13.Kind.FRAGMENT_DEFINITION,
+            kind: graphql14.Kind.FRAGMENT_DEFINITION,
             name: {
               value: config2.listRemoveFragment(name),
-              kind: graphql13.Kind.NAME
+              kind: graphql14.Kind.NAME
             },
             selectionSet: {
-              kind: graphql13.Kind.SELECTION_SET,
+              kind: graphql14.Kind.SELECTION_SET,
               selections: [...objectIdentificationSelection(config2, type)]
             },
             typeCondition: {
-              kind: graphql13.Kind.NAMED_TYPE,
+              kind: graphql14.Kind.NAMED_TYPE,
               name: {
-                kind: graphql13.Kind.NAME,
+                kind: graphql14.Kind.NAME,
                 value: type.name
               }
             }
@@ -72486,14 +72515,14 @@ async function addListFragments(config2, documents) {
       }
     ).concat(
       ...validDeletes.map((typeName) => ({
-        kind: graphql13.Kind.DIRECTIVE_DEFINITION,
+        kind: graphql14.Kind.DIRECTIVE_DEFINITION,
         name: {
-          kind: graphql13.Kind.NAME,
+          kind: graphql14.Kind.NAME,
           value: config2.listDeleteDirective(typeName)
         },
         locations: [
           {
-            kind: graphql13.Kind.NAME,
+            kind: graphql14.Kind.NAME,
             value: "FIELD"
           }
         ],
@@ -72501,8 +72530,8 @@ async function addListFragments(config2, documents) {
       }))
     )
   };
-  config2.newSchema += "\n" + generatedDoc.definitions.filter((c) => c.kind !== "FragmentDefinition").map(graphql13.print).join("\n\n");
-  config2.newDocuments += "\n" + generatedDoc.definitions.filter((c) => c.kind === "FragmentDefinition").map(graphql13.print).join("\n\n");
+  config2.newSchema += "\n" + generatedDoc.definitions.filter((c) => c.kind !== "FragmentDefinition").map(graphql14.print).join("\n\n");
+  config2.newDocuments += "\n" + generatedDoc.definitions.filter((c) => c.kind === "FragmentDefinition").map(graphql14.print).join("\n\n");
   documents.push({
     name: "generated::lists",
     kind: ArtifactKind.Fragment,
@@ -72588,11 +72617,11 @@ var nodeNotDefinedMessage = (config2) => `Looks like you are trying to use the $
 For more information, visit this link: ${siteURL}/guides/pagination`;
 
 // src/codegen/generators/artifacts/fieldKey.ts
-import * as graphql14 from "graphql";
+import * as graphql15 from "graphql";
 function fieldKey(config2, field) {
   const attributeName = field.alias?.value || field.name.value;
-  const printed = graphql14.print(field);
-  const secondParse = graphql14.parse(`{${printed}}`).definitions[0].selectionSet.selections[0];
+  const printed = graphql15.print(field);
+  const secondParse = graphql15.parse(`{${printed}}`).definitions[0].selectionSet.selections[0];
   let paginateMode = config2.defaultPaginateMode;
   const paginatedDirective = field.directives?.find(
     (directive) => directive.name.value === config2.paginateDirective
@@ -72715,13 +72744,13 @@ function prepareSelection({
       } else if ("getFields" in type) {
         let typeRef = type.getFields()[field.name.value].type;
         fieldType = getRootType(typeRef);
-        nullable = !graphql15.isNonNullType(typeRef);
-      } else if (graphql15.isAbstractType(type)) {
+        nullable = !graphql16.isNonNullType(typeRef);
+      } else if (graphql16.isAbstractType(type)) {
         for (const possible of config2.schema.getPossibleTypes(type)) {
-          if (graphql15.isObjectType(possible)) {
+          if (graphql16.isObjectType(possible)) {
             if (possible.getFields()[field.name.value]) {
               fieldType = possible.getFields()[field.name.value].type;
-              nullable = !graphql15.isNonNullType(fieldType);
+              nullable = !graphql16.isNonNullType(fieldType);
               break;
             }
           }
@@ -72858,7 +72887,7 @@ function prepareSelection({
           kind: "value"
         } : { kind: "continue" };
         const parentType = config2.schema.getType(rootType);
-        if (graphql15.isObjectType(parentType) || graphql15.isInterfaceType(parentType)) {
+        if (graphql16.isObjectType(parentType) || graphql16.isInterfaceType(parentType)) {
           const fieldType2 = parentType.getFields()[field.name.value]?.type;
           if (fieldType2) {
             const listCount = unwrapType(config2, fieldType2).wrappers.filter(
@@ -72881,7 +72910,7 @@ function prepareSelection({
         }
         fieldObj.loading = loadingValue;
       }
-      if (graphql15.isInterfaceType(fieldType) || graphql15.isUnionType(fieldType)) {
+      if (graphql16.isInterfaceType(fieldType) || graphql16.isUnionType(fieldType)) {
         fieldObj.abstract = true;
         if (Object.values(fieldObj.selection?.abstractFields?.fields ?? {}).some(
           (fields) => Object.values(fields ?? {}).some((field2) => field2.required)
@@ -72963,7 +72992,7 @@ function mergeSelection({
         typeSelection,
         abstractSelection.fields[typeName] ?? {}
       );
-      if (graphql15.isAbstractType(gqlType)) {
+      if (graphql16.isAbstractType(gqlType)) {
         for (const possible of config2.schema.getPossibleTypes(gqlType)) {
           if (!possibleSelectionTypes[typeName]) {
             possibleSelectionTypes[typeName] = [];
@@ -72998,7 +73027,7 @@ function mergeSelection({
       }
     }
     const parentType = config2.schema.getType(rootType);
-    const possibleParents = graphql15.isAbstractType(parentType) ? config2.schema.getPossibleTypes(parentType)?.map((t3) => t3.name) : [parentType.name];
+    const possibleParents = graphql16.isAbstractType(parentType) ? config2.schema.getPossibleTypes(parentType)?.map((t3) => t3.name) : [parentType.name];
     for (const key of Object.keys(abstractSelection.typeMap)) {
       if (!possibleParents.includes(key) && rootType !== key || abstractSelection.fields[key]) {
         delete abstractSelection.typeMap[key];
@@ -73055,12 +73084,12 @@ function mergeSelection({
 }
 
 // src/codegen/generators/artifacts/index.ts
-var AST4 = recast4.types.builders;
+var AST5 = recast5.types.builders;
 function artifactGenerator(stats) {
   return async function(config2, docs) {
     const filterTypes = {};
     for (const doc of docs) {
-      graphql16.visit(doc.document, {
+      graphql17.visit(doc.document, {
         Directive(node, _, __, ___, ancestors) {
           if (node.name.value !== config2.listDirective) {
             return;
@@ -73120,7 +73149,7 @@ function artifactGenerator(stats) {
             return;
           }
           const usedVariableNames = /* @__PURE__ */ new Set();
-          let documentWithoutInternalDirectives = graphql16.visit(document, {
+          let documentWithoutInternalDirectives = graphql17.visit(document, {
             Directive(node) {
               if (config2.isInternalDirective(node.name.value)) {
                 return null;
@@ -73133,7 +73162,7 @@ function artifactGenerator(stats) {
               }
             }
           });
-          let documentWithoutExtraVariables = graphql16.visit(
+          let documentWithoutExtraVariables = graphql17.visit(
             documentWithoutInternalDirectives,
             {
               VariableDefinition(variableDefinitionNode) {
@@ -73144,13 +73173,13 @@ function artifactGenerator(stats) {
               }
             }
           );
-          let rawString = graphql16.print(documentWithoutExtraVariables);
+          let rawString = graphql17.print(documentWithoutExtraVariables);
           let docKind = doc.kind;
           const operations = document.definitions.filter(
-            ({ kind }) => kind === graphql16.Kind.OPERATION_DEFINITION
+            ({ kind }) => kind === graphql17.Kind.OPERATION_DEFINITION
           );
           const fragments = document.definitions.filter(
-            ({ kind }) => kind === graphql16.Kind.FRAGMENT_DEFINITION
+            ({ kind }) => kind === graphql17.Kind.FRAGMENT_DEFINITION
           );
           let rootType = "";
           let selectionSet;
@@ -73297,7 +73326,21 @@ function artifactGenerator(stats) {
             artifact.pluginData[plugin2.name] = plugin2.artifactData({ config: config2, document: doc }) ?? {};
           }
           if (inputs && inputs.length > 0) {
-            artifact.input = inputObject(config2, inputs);
+            const runtimeScalars = inputs.reduce((prev, input) => {
+              const runtimeScalarDirective = input.directives?.find(
+                (directive2) => directive2.name.value === config2.runtimeScalarDirective
+              );
+              if (!runtimeScalarDirective) {
+                return prev;
+              }
+              return {
+                ...prev,
+                [input.variable.name.value]: runtimeScalarDirective.arguments?.find(
+                  (arg) => arg.name.value === "type"
+                )?.value?.value
+              };
+            }, {});
+            artifact.input = inputObject(config2, inputs, runtimeScalars);
           }
           if (artifact.kind === "HoudiniQuery") {
             const cacheDirective = operations[0].directives?.find(
@@ -73336,9 +73379,9 @@ function artifactGenerator(stats) {
             plugin2.artifactEnd({ config: config2, document: doc });
           }
           const _houdiniHash = hashOriginal({ document: doc });
-          const file = AST4.program([
+          const file = AST5.program([
             moduleExport(config2, "default", serializeValue(artifact)),
-            AST4.expressionStatement(AST4.stringLiteral(`HoudiniHash=${_houdiniHash}`))
+            AST5.expressionStatement(AST5.stringLiteral(`HoudiniHash=${_houdiniHash}`))
           ]);
           const artifactPath = config2.artifactPath(document);
           const countDocument = doc.generateStore;
@@ -73396,7 +73439,7 @@ function applyMask(config2, target, mask) {
     if (!targetType) {
       continue;
     }
-    if (graphql16.isAbstractType(targetType)) {
+    if (graphql17.isAbstractType(targetType)) {
       for (const possible of config2.schema.getPossibleTypes(targetType)) {
         if (target.abstractFields?.fields[possible.name]) {
           applyMask(
@@ -73419,8 +73462,8 @@ function applyMask(config2, target, mask) {
 }
 
 // src/codegen/generators/runtime/graphqlFunction.ts
-var recast5 = __toESM(require_main2(), 1);
-var AST5 = recast5.types.builders;
+var recast6 = __toESM(require_main2(), 1);
+var AST6 = recast6.types.builders;
 async function generateGraphqlReturnTypes(config2, docs) {
   const indexPath = path_exports.join(config2.runtimeDirectory, "index.d.ts");
   const fileContent = await fs_exports.readFile(indexPath) || "";
@@ -73455,18 +73498,18 @@ async function generateGraphqlReturnTypes(config2, docs) {
         continue;
       }
       for (const [queryString, returnValue] of Object.entries(overloaded_returns)) {
-        const input = AST5.identifier("str");
-        input.typeAnnotation = AST5.tsTypeAnnotation(
-          AST5.tsLiteralType(AST5.stringLiteral(queryString))
+        const input = AST6.identifier("str");
+        input.typeAnnotation = AST6.tsTypeAnnotation(
+          AST6.tsLiteralType(AST6.stringLiteral(queryString))
         );
         script.body.splice(
           i2,
           0,
-          AST5.exportNamedDeclaration(
-            AST5.tsDeclareFunction(
-              AST5.identifier("graphql"),
+          AST6.exportNamedDeclaration(
+            AST6.tsDeclareFunction(
+              AST6.identifier("graphql"),
               [input],
-              AST5.tsTypeAnnotation(AST5.tsTypeReference(AST5.identifier(returnValue)))
+              AST6.tsTypeAnnotation(AST6.tsTypeReference(AST6.identifier(returnValue)))
             )
           )
         );
@@ -73641,165 +73684,22 @@ function moduleStatments(config2) {
 var recast11 = __toESM(require_main2(), 1);
 
 // src/codegen/generators/typescript/addReferencedInputTypes.ts
-var recast8 = __toESM(require_main2(), 1);
-import * as graphql19 from "graphql";
-
-// src/codegen/generators/typescript/typeReference.ts
 var recast7 = __toESM(require_main2(), 1);
 import * as graphql18 from "graphql";
-
-// src/codegen/generators/typescript/types.ts
-var recast6 = __toESM(require_main2(), 1);
-import * as graphql17 from "graphql";
-var AST6 = recast6.types.builders;
-function readonlyProperty(prop, enable = true) {
-  if (enable) {
-    prop.readonly = true;
-  }
-  return prop;
-}
-function nullableField(inner, input = false) {
-  const members = [inner, AST6.tsNullKeyword()];
-  if (input) {
-    members.push(AST6.tsUndefinedKeyword());
-  }
-  return AST6.tsUnionType(members);
-}
-function scalarPropertyValue(config2, filepath, missingScalars, target, body, field) {
-  if (config2.configFile.features?.componentFields && target.name === config2.componentScalar) {
-    if (!field) {
-      return AST6.tsNeverKeyword();
-    }
-    const component = config2.componentFields[field.parent][field.field];
-    const sourcePathRelative = path_exports.relative(
-      path_exports.join(config2.projectRoot, "src"),
-      component.filepath
-    );
-    let sourcePathParsed = path_exports.parse(sourcePathRelative);
-    let sourcePath = path_exports.join(sourcePathParsed.dir, sourcePathParsed.name);
-    const localImport = ensureImports({
-      config: config2,
-      body,
-      import: "__component__" + component.fragment,
-      sourceModule: path_exports.join(
-        path_exports.relative(path_exports.dirname(filepath), config2.projectRoot),
-        "src",
-        sourcePath
-      )
-    });
-    const parameters = AST6.tsTypeReference(AST6.identifier("Parameters"));
-    parameters.typeParameters = AST6.tsTypeParameterInstantiation([
-      AST6.tsTypeQuery(AST6.identifier(localImport))
-    ]);
-    const indexed = AST6.tsIndexedAccessType(
-      parameters,
-      AST6.tsLiteralType(AST6.numericLiteral(0))
-    );
-    const omit = AST6.tsTypeReference(AST6.identifier("Omit"));
-    omit.typeParameters = AST6.tsTypeParameterInstantiation([
-      indexed,
-      AST6.tsLiteralType(AST6.stringLiteral(component.prop))
-    ]);
-    const arg = AST6.identifier("props");
-    arg.typeAnnotation = AST6.tsTypeAnnotation(omit);
-    const returnType = AST6.tsTypeReference(AST6.identifier("ReturnType"));
-    returnType.typeParameters = AST6.tsTypeParameterInstantiation([
-      AST6.tsTypeQuery(AST6.identifier(localImport))
-    ]);
-    const fnType = AST6.tsFunctionType([arg]);
-    fnType.typeAnnotation = AST6.tsTypeAnnotation(returnType);
-    return fnType;
-  }
-  switch (target.name) {
-    case "String": {
-      return AST6.tsStringKeyword();
-    }
-    case "Int": {
-      return AST6.tsNumberKeyword();
-    }
-    case "Float": {
-      return AST6.tsNumberKeyword();
-    }
-    case "Boolean": {
-      return AST6.tsBooleanKeyword();
-    }
-    case "ID": {
-      return AST6.tsStringKeyword();
-    }
-    default: {
-      if (graphql17.isNonNullType(target) && "ofType" in target) {
-        return scalarPropertyValue(
-          config2,
-          filepath,
-          missingScalars,
-          target.ofType,
-          body,
-          field
-        );
-      }
-      if (config2.scalars?.[target.name]) {
-        return AST6.tsTypeReference(AST6.identifier(config2.scalars?.[target.name].type));
-      }
-      if (target.name !== config2.componentScalar) {
-        missingScalars.add(target.name);
-      }
-      return AST6.tsAnyKeyword();
-    }
-  }
-}
-
-// src/codegen/generators/typescript/typeReference.ts
 var AST7 = recast7.types.builders;
-function tsTypeReference(config2, filepath, missingScalars, definition, body) {
-  const { type, wrappers } = unwrapType(config2, definition.type);
-  let result;
-  if (graphql18.isScalarType(type)) {
-    result = scalarPropertyValue(config2, filepath, missingScalars, type, body, null);
-  } else if (graphql18.isEnumType(type)) {
-    result = enumReference(config2, body, type.name);
-  } else {
-    result = AST7.tsTypeReference(AST7.identifier(type.name));
-  }
-  for (const toWrap of wrappers) {
-    if (toWrap === "NonNull" /* NonNull */) {
-      continue;
-    } else if (toWrap === "Nullable" /* Nullable */) {
-      result = nullableField(result, true);
-    } else if (toWrap === "List" /* List */) {
-      result = AST7.tsArrayType(AST7.tsParenthesizedType(result));
-    }
-  }
-  return result;
-}
-function enumReference(config2, body, name) {
-  ensureImports({
-    config: config2,
-    body,
-    import: ["ValueOf"],
-    importKind: "type",
-    sourceModule: "$houdini/runtime/lib/types"
-  });
-  return AST7.tsTypeReference(
-    AST7.identifier("ValueOf"),
-    AST7.tsTypeParameterInstantiation([AST7.tsTypeQuery(AST7.identifier(name))])
-  );
-}
-
-// src/codegen/generators/typescript/addReferencedInputTypes.ts
-var AST8 = recast8.types.builders;
 function addReferencedInputTypes(config2, filepath, body, visitedTypes, missingScalars, rootType) {
   const { type } = unwrapType(config2, rootType);
-  if (graphql19.isScalarType(type)) {
+  if (graphql18.isScalarType(type)) {
     return;
   }
   if (visitedTypes.has(type.name)) {
     return;
   }
-  if (graphql19.isUnionType(type)) {
+  if (graphql18.isUnionType(type)) {
     throw new HoudiniError({ filepath, message: "Input Unions are not supported yet. Sorry!" });
   }
   visitedTypes.add(type.name);
-  if (graphql19.isEnumType(type)) {
+  if (graphql18.isEnumType(type)) {
     ensureImports({
       config: config2,
       body,
@@ -73813,21 +73713,37 @@ function addReferencedInputTypes(config2, filepath, body, visitedTypes, missingS
   for (const field of Object.values(type.getFields())) {
     addReferencedInputTypes(config2, filepath, body, visitedTypes, missingScalars, field.type);
     members.push(
-      AST8.tsPropertySignature(
-        AST8.identifier(field.name),
-        AST8.tsTypeAnnotation(
+      AST7.tsPropertySignature(
+        AST7.identifier(field.name),
+        AST7.tsTypeAnnotation(
           tsTypeReference(config2, filepath, missingScalars, field, body)
         ),
-        graphql19.isNullableType(field.type)
+        graphql18.isNullableType(field.type)
       )
     );
   }
-  body.push(AST8.tsTypeAliasDeclaration(AST8.identifier(type.name), AST8.tsTypeLiteral(members)));
+  body.push(AST7.tsTypeAliasDeclaration(AST7.identifier(type.name), AST7.tsTypeLiteral(members)));
 }
 
 // src/codegen/generators/typescript/inlineType.ts
 var recast9 = __toESM(require_main2(), 1);
-import * as graphql20 from "graphql";
+import * as graphql19 from "graphql";
+
+// src/codegen/generators/comments/jsdoc.ts
+var recast8 = __toESM(require_main2(), 1);
+var AST8 = recast8.types.builders;
+function jsdocComment(text, deprecated) {
+  let commentContent = `*
+ * ${text}
+`;
+  if (deprecated) {
+    commentContent = `${commentContent} * @deprecated ${deprecated}
+`;
+  }
+  return AST8.commentBlock(commentContent, true);
+}
+
+// src/codegen/generators/typescript/inlineType.ts
 var AST9 = recast9.types.builders;
 var fragmentKey2 = " $fragments";
 function inlineType({
@@ -73848,7 +73764,7 @@ function inlineType({
   const { type, wrappers } = unwrapType(config2, rootType);
   let result;
   let forceNullable = false;
-  if (graphql20.isScalarType(type)) {
+  if (graphql19.isScalarType(type)) {
     result = scalarPropertyValue(
       config2,
       filepath,
@@ -73857,7 +73773,7 @@ function inlineType({
       body,
       field
     );
-  } else if (graphql20.isEnumType(type)) {
+  } else if (graphql19.isEnumType(type)) {
     ensureImports({
       config: config2,
       body,
@@ -73882,11 +73798,11 @@ function inlineType({
     for (const selection of selections) {
       if (selection.kind === "InlineFragment" && selection.typeCondition) {
         const fragmentType = config2.schema.getType(selection.typeCondition.name.value);
-        if (!graphql20.isInterfaceType(type) && !graphql20.isUnionType(type)) {
+        if (!graphql19.isInterfaceType(type) && !graphql19.isUnionType(type)) {
           selectedFields.push(...selection.selectionSet.selections);
           continue;
         }
-        if (!graphql20.isInterfaceType(fragmentType) && !graphql20.isUnionType(fragmentType)) {
+        if (!graphql19.isInterfaceType(fragmentType) && !graphql19.isUnionType(fragmentType)) {
           if (!inlineFragments[fragmentType.name]) {
             inlineFragments[fragmentType.name] = [];
           }
@@ -73978,6 +73894,11 @@ function inlineType({
         if (allOptional) {
           prop.optional = true;
         }
+        if (field2.description || field2.deprecationReason) {
+          prop.comments = [
+            jsdocComment(field2.description ?? "", field2.deprecationReason ?? void 0)
+          ];
+        }
         return prop;
       })
     ]);
@@ -74029,7 +73950,7 @@ function inlineType({
           }
         }
       }
-      if (objectType.type === "TSTypeLiteral" && !graphql20.isInterfaceType(fragmentRootType) && !graphql20.isUnionType(fragmentRootType)) {
+      if (objectType.type === "TSTypeLiteral" && !graphql19.isInterfaceType(fragmentRootType) && !graphql19.isUnionType(fragmentRootType)) {
         const existingTypenameIndex = objectType.members.findIndex(
           (member) => member.type === "TSPropertySignature" && member.key.type === "Identifier" && member.key.name === "__typename"
         );
@@ -74054,11 +73975,11 @@ function inlineType({
         ];
       }
       let coveredTypenames;
-      if (graphql20.isInterfaceType(fragmentRootType)) {
+      if (graphql19.isInterfaceType(fragmentRootType)) {
         coveredTypenames = interfaceCoveredTypenames(fragmentRootType);
-      } else if (graphql20.isUnionType(fragmentRootType)) {
+      } else if (graphql19.isUnionType(fragmentRootType)) {
         coveredTypenames = fragmentRootType.getTypes().map((type2) => type2.name);
-      } else if (graphql20.isObjectType(fragmentRootType)) {
+      } else if (graphql19.isObjectType(fragmentRootType)) {
         coveredTypenames = [fragmentRootType.name];
       } else {
         throw Error("unreachable code");
@@ -74094,7 +74015,7 @@ function inlineType({
           );
         }
       );
-      const parentIsUnionOrInterface = !graphql20.isInterfaceType(type) && !graphql20.isUnionType(type);
+      const parentIsUnionOrInterface = !graphql19.isInterfaceType(type) && !graphql19.isUnionType(type);
       const possibleTypenames = parentIsUnionOrInterface ? [parent.name] : config2.schema.getPossibleTypes(type).map((type2) => type2.name);
       const coveredTypenames = new Set(
         Object.values(inlineFragmentSelections).flatMap((sel) => sel.coveredTypenames)
@@ -74161,7 +74082,7 @@ function selectionTypeInfo(schema, filepath, rootType, selection) {
       },
       type: schema.getType("String")
     };
-  } else if (graphql20.isNonNullType(rootType) && "getFields" in rootType.ofType) {
+  } else if (graphql19.isNonNullType(rootType) && "getFields" in rootType.ofType) {
     fields = rootType.ofType.getFields();
   } else {
     fields = rootType.getFields();
@@ -74173,7 +74094,7 @@ function selectionTypeInfo(schema, filepath, rootType, selection) {
       message: `Could not find type information for field ${rootType.toString()}.${selectionName} ${field}`
     });
   }
-  const fieldType = graphql20.getNamedType(field.type);
+  const fieldType = graphql19.getNamedType(field.type);
   if (!fieldType) {
     throw new HoudiniError({
       filepath,
@@ -74389,17 +74310,20 @@ export * from "${module}"
     }
   }
   await fs_exports.writeFile(config2.typeIndexPath, indexContent);
-  if (missingScalars.size > 0) {
-    console.warn(`\u26A0\uFE0F  Missing definitions for the following scalars: ${[...missingScalars].join(
-      ", "
-    )}
+  const missingScalarNames = [...missingScalars].filter(
+    (scalar) => !config2.configFile.features?.runtimeScalars?.[scalar]
+  );
+  if (missingScalarNames.length > 0) {
+    console.warn(`\u26A0\uFE0F  Missing definitions for the following scalars: ${[
+      ...missingScalarNames
+    ].join(", ")}
 Generated types will contain an any type in place of these values. To fix this, provide an equivalent
 type in your config file:
 
 {
   scalars: {
     ${cyan3(`/* in your case, something like */`)}
-${[...missingScalars].map(
+${[...missingScalarNames].map(
       (c) => `    ${c}: {                  ${green3(`// <- The GraphQL Scalar`)}
       type: "${cyan3(`YourType_${c}`)}"  ${green3(`// <-  The TypeScript type`)}
     }`
@@ -74679,7 +74603,7 @@ async function generateFragmentTypeDefs(config2, filepath, body, selections, def
 
 // src/codegen/generators/typescript/imperativeTypeDef.ts
 var recast12 = __toESM(require_main2(), 1);
-import * as graphql21 from "graphql";
+import * as graphql20 from "graphql";
 var AST12 = recast12.types.builders;
 async function imperativeCacheTypef(config2, docs) {
   const returnType = (doc) => config2.plugins.find((plugin2) => plugin2.graphqlTagReturn)?.graphqlTagReturn?.({
@@ -74730,7 +74654,7 @@ function typeDefinitions(config2, filepath, body, docs, returnType) {
   const operationTypes = [config2.schema.getMutationType(), config2.schema.getSubscriptionType()].filter(Boolean).map((type) => type?.name);
   const visitedTypes = /* @__PURE__ */ new Set();
   const types17 = Object.values(config2.schema.getTypeMap()).filter(
-    (type) => !graphql21.isAbstractType(type) && !graphql21.isScalarType(type) && !graphql21.isEnumType(type) && !graphql21.isInputObjectType(type) && !type.name.startsWith("__") && !operationTypes.includes(type.name)
+    (type) => !graphql20.isAbstractType(type) && !graphql20.isScalarType(type) && !graphql20.isEnumType(type) && !graphql20.isInputObjectType(type) && !type.name.startsWith("__") && !operationTypes.includes(type.name)
   );
   const fragmentMap = fragmentListMap(
     config2,
@@ -74747,7 +74671,7 @@ function typeDefinitions(config2, filepath, body, docs, returnType) {
       }
       let idFields = AST12.tsNeverKeyword();
       const keys2 = keyFieldsForType(config2.configFile, type.name);
-      if (graphql21.isObjectType(type) && keys2.length > 0 && keys2.every((key) => type.getFields()[key])) {
+      if (graphql20.isObjectType(type) && keys2.length > 0 && keys2.every((key) => type.getFields()[key])) {
         idFields = AST12.tsTypeLiteral(
           keys2.map((key) => {
             const fieldType = type.getFields()[key];
@@ -74774,13 +74698,13 @@ function typeDefinitions(config2, filepath, body, docs, returnType) {
         idFields = AST12.tsTypeLiteral([]);
       }
       let fields = AST12.tsTypeLiteral([]);
-      if (graphql21.isObjectType(type)) {
+      if (graphql20.isObjectType(type)) {
         fields = AST12.tsTypeLiteral(
           Object.entries(type.getFields()).map(
             ([key, fieldType]) => {
               const unwrapped = unwrapType(config2, fieldType.type);
               let typeOptions = AST12.tsUnionType([]);
-              if (graphql21.isScalarType(unwrapped.type)) {
+              if (graphql20.isScalarType(unwrapped.type)) {
                 typeOptions.types.push(
                   scalarPropertyValue(
                     config2,
@@ -74794,11 +74718,11 @@ function typeDefinitions(config2, filepath, body, docs, returnType) {
                     }
                   )
                 );
-              } else if (graphql21.isEnumType(unwrapped.type)) {
+              } else if (graphql20.isEnumType(unwrapped.type)) {
                 typeOptions.types.push(
                   AST12.tsTypeReference(AST12.identifier(unwrapped.type.name))
                 );
-              } else if (!graphql21.isAbstractType(unwrapped.type)) {
+              } else if (!graphql20.isAbstractType(unwrapped.type)) {
                 typeOptions.types.push(record(unwrapped.type.name));
               } else {
                 typeOptions.types.push(
@@ -74894,7 +74818,7 @@ function listDefinitions(config2, filepath, body, docs) {
   const lists = [];
   const visitedLists = /* @__PURE__ */ new Set();
   for (const doc of docs) {
-    graphql21.visit(doc.document, {
+    graphql20.visit(doc.document, {
       Directive(node, key, parent2, path3, ancestors) {
         if (![config2.listDirective, config2.paginateDirective].includes(node.name.value)) {
           return;
@@ -74916,7 +74840,7 @@ function listDefinitions(config2, filepath, body, docs) {
         const targetFieldDefinition = parentType.getFields()[targetField.name.value];
         const { type: listType } = unwrapType(config2, targetFieldDefinition.type);
         const possibleTypes = [];
-        if (graphql21.isAbstractType(listType)) {
+        if (graphql20.isAbstractType(listType)) {
           possibleTypes.push(
             ...config2.schema.getPossibleTypes(listType).map((possible) => possible.name)
           );
@@ -75078,7 +75002,7 @@ async function typescriptGenerator(config2, docs) {
 }
 
 // src/codegen/generators/persistedQueries/index.ts
-import * as graphql22 from "graphql";
+import * as graphql21 from "graphql";
 async function persistOutputGenerator(config2, docs) {
   if (!config2.persistedQueriesPath.endsWith(".json")) {
     throw new Error('Can write Persisted Queries only in a ".json" file.');
@@ -75088,8 +75012,8 @@ async function persistOutputGenerator(config2, docs) {
     if (!generateArtifact) {
       return acc;
     }
-    let rawString = graphql22.print(
-      graphql22.visit(document, {
+    let rawString = graphql21.print(
+      graphql21.visit(document, {
         Directive(node) {
           if (config2.isInternalDirective(node.name.value)) {
             return null;
@@ -75098,7 +75022,7 @@ async function persistOutputGenerator(config2, docs) {
       })
     );
     const operations = document.definitions.filter(
-      ({ kind }) => kind === graphql22.Kind.OPERATION_DEFINITION
+      ({ kind }) => kind === graphql21.Kind.OPERATION_DEFINITION
     );
     if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
       if (artifact) {
@@ -75113,33 +75037,45 @@ async function persistOutputGenerator(config2, docs) {
 }
 
 // src/codegen/generators/definitions/index.ts
-import * as graphql24 from "graphql";
+import * as graphql23 from "graphql";
 
 // src/codegen/generators/definitions/enums.ts
 var recast13 = __toESM(require_main2(), 1);
-import * as graphql23 from "graphql";
+import * as graphql22 from "graphql";
 var AST13 = recast13.types.builders;
 async function definitionsGenerator(config2) {
-  const enums = graphql23.parse(graphql23.printSchema(config2.schema)).definitions.filter(
+  const enums = graphql22.parse(graphql22.printSchema(config2.schema)).definitions.filter(
     (definition) => definition.kind === "EnumTypeDefinition"
   ).filter((def) => !config2.isInternalEnum(def));
   const { code: runtimeDefinitions } = await printJS(
     AST13.program(
       enums.map((defn) => {
         const name = defn.name.value;
-        return moduleExport(
+        const declaration = moduleExport(
           config2,
           name,
           AST13.objectExpression(
             defn.values?.map((value) => {
               const str = value.name.value;
-              return AST13.objectProperty(
+              const prop = AST13.objectProperty(
                 AST13.stringLiteral(str),
                 AST13.stringLiteral(str)
               );
+              const deprecationReason = value.directives?.find((d) => d.name.value === "deprecated")?.arguments?.find((a) => a.name.value === "reason")?.value?.value;
+              if (value.description || deprecationReason)
+                prop.comments = [
+                  jsdocComment(value.description?.value ?? "", deprecationReason)
+                ];
+              return prop;
             }) || []
           )
         );
+        if (defn.description) {
+          declaration.comments = [
+            AST13.commentBlock(`* ${defn.description.value} `, true, false)
+          ];
+        }
+        return declaration;
       })
     )
   );
@@ -75148,11 +75084,19 @@ type ValuesOf<T> = T[keyof T]
 	` + enums.sort((a, b) => a.name.value.localeCompare(b.name.value)).map((definition) => {
     const name = definition.name.value;
     const values = definition.values;
-    return `
+    let jsdoc = "";
+    if (definition.description) {
+      jsdoc = `
+/** ${definition.description.value} */`;
+    }
+    return `${jsdoc}
 export declare const ${name}: {
-${values?.map((value) => `    readonly ${value.name.value}: "${value.name.value}";`).join("\n")}
+${values?.map(
+      (value) => (value.description ? `    /** ${value.description.value} */
+` : "") + `    readonly ${value.name.value}: "${value.name.value}";`
+    ).join("\n")}
 }
-
+${jsdoc}
 export type ${name}$options = ValuesOf<typeof ${name}>
  `;
   }).join("");
@@ -75172,7 +75116,7 @@ async function schemaGenerator(config2) {
   await Promise.all([
     fs_exports.writeFile(
       config2.definitionsSchemaPath,
-      config2.localSchema ? graphql24.printSchema(config2.schema) : config2.newSchema
+      config2.localSchema ? graphql23.printSchema(config2.schema) : config2.newSchema
     ),
     fs_exports.writeFile(config2.definitionsDocumentsPath, config2.newDocuments),
     definitionsGenerator(config2)
@@ -76877,7 +76821,7 @@ function mergeGraphQLTypes2(typeSource, config2) {
 }
 
 // src/codegen/transforms/schema.ts
-import * as graphql25 from "graphql";
+import * as graphql24 from "graphql";
 async function graphqlExtensions(config2, documents) {
   let internalSchema = `
 enum CachePolicy {
@@ -76981,7 +76925,7 @@ ${config2.configFile.features?.componentFields ? `
 """
 @${config2.componentFieldDirective} marks an inline fragment as the selection for a component field
 """
-directive @${config2.componentFieldDirective}(field: String!, prop: String, export: String, raw: String) on FRAGMENT_DEFINITION | INLINE_FRAGMENT
+directive @${config2.componentFieldDirective}(field: String!, prop: String, export: String, raw: String) on FRAGMENT_DEFINITION | INLINE_FRAGMENT | FIELD_DEFINITION
 
 ` : ""}
 
@@ -76992,7 +76936,7 @@ directive @${config2.componentFieldDirective}(field: String!, prop: String, expo
     }
     internalSchema += plugin2.schema({ config: config2 });
   }
-  const extensions = Object.entries(config2.componentFields).map(([parent2, fields]) => {
+  let extensions = Object.entries(config2.componentFields).map(([parent2, fields]) => {
     return `
 		extend type ${parent2} {
 			${Object.entries(fields).map(([fieldName, field]) => {
@@ -77000,29 +76944,30 @@ directive @${config2.componentFieldDirective}(field: String!, prop: String, expo
       const args = fragmentArguments(config2, "", field.parent);
       if (args.length > 0) {
         argString = "(" + args.map((arg) => {
-          const typeName = graphql25.print(arg.type);
+          const typeName = graphql24.print(arg.type);
           return `${arg.name}:${typeName}${arg.required ? "!" : ""}`;
         }).join("\n") + ")";
       }
-      return `${fieldName}${argString}: ${config2.componentScalar}!`;
+      return `${fieldName}${argString}: ${config2.componentScalar}!  @componentField(field: "${fieldName}")`;
     }).join("\n")}
 		}
 	`;
   }).join("\n");
-  config2.newSchema = graphql25.print(mergeTypeDefs2([internalSchema, config2.newSchema]));
+  extensions += `${Object.keys(config2.configFile.features?.runtimeScalars ?? {}).map((scalar) => `scalar ${scalar}`).join("\n")}`;
+  config2.newSchema = graphql24.print(mergeTypeDefs2([internalSchema, config2.newSchema]));
   config2.schemaString += extensions;
-  config2.schema = graphql25.buildSchema(
-    graphql25.print(
-      mergeTypeDefs2([graphql25.printSchema(config2.schema), internalSchema, extensions])
+  config2.schema = graphql24.buildSchema(
+    graphql24.print(
+      mergeTypeDefs2([graphql24.printSchema(config2.schema), internalSchema, extensions])
     )
   );
 }
 
 // src/codegen/transforms/typename.ts
-import * as graphql26 from "graphql";
+import * as graphql25 from "graphql";
 async function addTypename(config2, documents) {
   for (const doc of documents) {
-    doc.document = graphql26.visit(doc.document, {
+    doc.document = graphql25.visit(doc.document, {
       Field(node, key, parent2, path3, ancestors) {
         if (!node.selectionSet) {
           return;
@@ -77034,7 +76979,7 @@ async function addTypename(config2, documents) {
         );
         const field = type.getFields()[node.name.value];
         const fieldType = unwrapType(config2, field.type).type;
-        if (graphql26.isInterfaceType(fieldType) || graphql26.isUnionType(fieldType)) {
+        if (graphql25.isInterfaceType(fieldType) || graphql25.isUnionType(fieldType)) {
           return {
             ...node,
             selectionSet: {
@@ -77042,9 +76987,9 @@ async function addTypename(config2, documents) {
               selections: [
                 ...node.selectionSet.selections,
                 {
-                  kind: graphql26.Kind.FIELD,
+                  kind: graphql25.Kind.FIELD,
                   name: {
-                    kind: graphql26.Kind.NAME,
+                    kind: graphql25.Kind.NAME,
                     value: "__typename"
                   }
                 }
@@ -77061,9 +77006,9 @@ async function addTypename(config2, documents) {
             selections: [
               ...node.selectionSet.selections,
               {
-                kind: graphql26.Kind.FIELD,
+                kind: graphql25.Kind.FIELD,
                 name: {
-                  kind: graphql26.Kind.NAME,
+                  kind: graphql25.Kind.NAME,
                   value: "__typename"
                 }
               }
@@ -77076,10 +77021,10 @@ async function addTypename(config2, documents) {
 }
 
 // src/codegen/transforms/addID.ts
-import * as graphql27 from "graphql";
+import * as graphql26 from "graphql";
 async function addID(config2, documents) {
   for (const doc of documents) {
-    doc.document = graphql27.visit(doc.document, {
+    doc.document = graphql26.visit(doc.document, {
       Field(node, key, parent2, path3, ancestors) {
         if (!node.selectionSet) {
           return;
@@ -77117,7 +77062,7 @@ function addKeysToSelection(config2, node, fieldType) {
   if (!node.selectionSet || node.selectionSet.selections.length == 0) {
     return;
   }
-  if (!graphql27.isObjectType(fieldType) && !graphql27.isInterfaceType(fieldType)) {
+  if (!graphql26.isObjectType(fieldType) && !graphql26.isInterfaceType(fieldType)) {
     return;
   }
   const keyFields = config2.keyFieldsForType(fieldType.name);
@@ -77132,9 +77077,9 @@ function addKeysToSelection(config2, node, fieldType) {
       continue;
     }
     selections.push({
-      kind: graphql27.Kind.FIELD,
+      kind: graphql26.Kind.FIELD,
       name: {
-        kind: graphql27.Kind.NAME,
+        kind: graphql26.Kind.NAME,
         value: keyField
       }
     });
@@ -77149,13 +77094,13 @@ function addKeysToSelection(config2, node, fieldType) {
 }
 
 // src/codegen/transforms/componentFields.ts
-import * as graphql28 from "graphql";
+import * as graphql27 from "graphql";
 async function componentFields(config2, documents) {
   for (const document of documents) {
-    const typeInfo = new graphql28.TypeInfo(config2.schema);
-    document.document = graphql28.visit(
+    const typeInfo = new graphql27.TypeInfo(config2.schema);
+    document.document = graphql27.visit(
       document.document,
-      graphql28.visitWithTypeInfo(typeInfo, {
+      graphql27.visitWithTypeInfo(typeInfo, {
         Field(node) {
           const parentType = typeInfo.getParentType();
           if (!parentType) {
@@ -77203,6 +77148,48 @@ async function componentFields(config2, documents) {
   }
 }
 
+// src/codegen/transforms/runtimeScalars.ts
+import * as graphql28 from "graphql";
+async function addTypename2(config2, documents) {
+  for (const doc of documents) {
+    doc.document = graphql28.visit(doc.document, {
+      VariableDefinition(node) {
+        const { type, wrappers } = unwrapType(config2, node.type);
+        const runtimeScalar = config2.configFile.features?.runtimeScalars?.[type.name];
+        if (runtimeScalar) {
+          return {
+            ...node,
+            type: wrapType({
+              type: config2.schema.getType(runtimeScalar.type),
+              wrappers
+            }),
+            directives: [
+              ...node.directives ?? [],
+              {
+                kind: "Directive",
+                name: {
+                  kind: "Name",
+                  value: config2.runtimeScalarDirective
+                },
+                arguments: [
+                  {
+                    kind: "Argument",
+                    name: { kind: "Name", value: "type" },
+                    value: {
+                      kind: "StringValue",
+                      value: type.name
+                    }
+                  }
+                ]
+              }
+            ]
+          };
+        }
+      }
+    });
+  }
+}
+
 // src/codegen/validators/typeCheck.ts
 import * as graphql29 from "graphql";
 async function typeCheck(config2, docs) {
@@ -78204,10 +78191,22 @@ async function componentFields2(config2, docs) {
         }
         const fieldValue = fieldArg.value?.kind === "StringValue" ? fieldArg.value.value : void 0;
         const propValue = propArg.value?.kind === "StringValue" ? propArg.value.value : void 0;
+        const existingField = fieldValue && config2.componentFields[parent2]?.[fieldValue];
         const parentType = config2.schema.getType(parent2);
-        if (parentType && fieldValue && (graphql31.isObjectType(parentType) && parentType.getFields()[fieldValue] || config2.componentFields[parent2]?.[fieldValue])) {
+        let conflict = false;
+        if (existingField && existingField.filepath !== filepath) {
+          conflict = true;
+        } else if (parentType && fieldValue) {
+          const fieldDef = graphql31.isObjectType(parentType) && parentType.getFields()[fieldValue];
+          if (fieldDef && !fieldDef.astNode?.directives?.find(
+            (dir) => dir.name.value === config2.componentFieldDirective
+          )) {
+            conflict = true;
+          }
+        }
+        if (conflict) {
           errors.push({
-            message: `Duplicate component field definition for ${parent2}.${fieldValue}`,
+            message: `Duplicate component field definition for ${parent2}.${fieldValue}.` + (existingField ? "The conflicting component field was defined in " + existingField.filepath : ""),
             filepath
           });
         }
@@ -78277,6 +78276,7 @@ async function runPipeline2(config2, docs) {
       [
         componentFields2,
         graphqlExtensions,
+        addTypename2,
         ...wrapHook(beforeValidate),
         typeCheck,
         uniqueDocumentNames,