houdini 1.2.42 → 1.2.44

package/build/codegen-cjs/index.js

@@ -24845,7 +24845,7 @@ var require_path_visitor = __commonJS({
         }
         return target;
       }
-      PathVisitor.visit = function visit18(node, methods) {
+      PathVisitor.visit = function visit19(node, methods) {
         return PathVisitor.fromMethodsObject(methods).visit(node);
       };
       var PVp = PathVisitor.prototype;
@@ -25036,7 +25036,7 @@ var require_path_visitor = __commonJS({
         this.needToCallTraverse = false;
         return visitChildren(path2, PathVisitor.fromMethodsObject(newVisitor || this.visitor));
       };
-      sharedContextProtoMethods.visit = function visit18(path2, newVisitor) {
+      sharedContextProtoMethods.visit = function visit19(path2, newVisitor) {
         if (!(this instanceof this.Context)) {
           throw new Error("");
         }
@@ -26429,7 +26429,7 @@ var require_main = __commonJS({
     var someField = _a.someField;
     var Type = _a.Type;
     var use = _a.use;
-    var visit18 = _a.visit;
+    var visit19 = _a.visit;
     exports.astNodesAreEquivalent = astNodesAreEquivalent;
     exports.builders = builders;
     exports.builtInTypes = builtInTypes;
@@ -26446,7 +26446,7 @@ var require_main = __commonJS({
     exports.someField = someField;
     exports.Type = Type;
     exports.use = use;
-    exports.visit = visit18;
+    exports.visit = visit19;
     Object.assign(namedTypes_1.namedTypes, n);
   }
 });
@@ -53824,7 +53824,7 @@ __export(codegen_exports, {
   runPipeline: () => runPipeline2
 });
 module.exports = __toCommonJS(codegen_exports);
-var graphql32 = __toESM(require("graphql"), 1);
+var graphql33 = __toESM(require("graphql"), 1);
 
 // src/lib/pipeline.ts
 async function runPipeline(config, pipeline, target) {
@@ -56696,8 +56696,22 @@ var query = documentPlugin(ArtifactKind.Query, function() {
   let lastVariables = null;
   return {
     start(ctx, { next }) {
+      const runtimeScalarPayload = {
+        session: ctx.session
+      };
       ctx.variables = {
         ...lastVariables,
+        ...Object.fromEntries(
+          Object.entries(ctx.artifact.input?.runtimeScalars ?? {}).map(
+            ([field, type]) => {
+              const runtimeScalar = ctx.config.features?.runtimeScalars?.[type];
+              if (!runtimeScalar) {
+                return [field, type];
+              }
+              return [field, runtimeScalar.resolve(runtimeScalarPayload)];
+            }
+          )
+        ),
         ...ctx.variables
       };
       next(ctx);
@@ -56977,7 +56991,7 @@ function unwrapType(config, type, wrappers = []) {
   }
   const namedType = config.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 };
 }
@@ -58400,7 +58414,7 @@ ${exportDefaultFrom(`./${doc.name}`, doc.name)}`,
 
 // src/codegen/generators/artifacts/inputs.ts
 var graphql8 = __toESM(require("graphql"), 1);
-function inputObject(config, inputs) {
+function inputObject(config, inputs, runtimeScalars) {
   const visitedTypes = /* @__PURE__ */ new Set();
   const inputObj = {
     fields: inputs.reduce((fields, input) => {
@@ -58416,7 +58430,8 @@ function inputObject(config, inputs) {
         ...fields,
         [input.variable.name.value]: input.defaultValue ? variableValue(input.defaultValue, {}) : void 0
       };
-    }, {})
+    }, {}),
+    runtimeScalars
   };
   for (const input of inputs) {
     walkInputs(config, visitedTypes, inputObj, input.type);
@@ -60259,7 +60274,21 @@ function artifactGenerator(stats) {
             artifact.pluginData[plugin2.name] = plugin2.artifactData({ config, document: doc }) ?? {};
           }
           if (inputs && inputs.length > 0) {
-            artifact.input = inputObject(config, inputs);
+            const runtimeScalars = inputs.reduce((prev, input) => {
+              const runtimeScalarDirective = input.directives?.find(
+                (directive2) => directive2.name.value === config.runtimeScalarDirective
+              );
+              if (!runtimeScalarDirective) {
+                return prev;
+              }
+              return {
+                ...prev,
+                [input.variable.name.value]: runtimeScalarDirective.arguments?.find(
+                  (arg) => arg.name.value === "type"
+                )?.value?.value
+              };
+            }, {});
+            artifact.input = inputObject(config, inputs, runtimeScalars);
           }
           if (artifact.kind === "HoudiniQuery") {
             const cacheDirective = operations[0].directives?.find(
@@ -61351,17 +61380,20 @@ export * from "${module2}"
     }
   }
   await fs_exports.writeFile(config.typeIndexPath, indexContent);
-  if (missingScalars.size > 0) {
-    console.warn(`\u26A0\uFE0F  Missing definitions for the following scalars: ${[...missingScalars].join(
-      ", "
-    )}
+  const missingScalarNames = [...missingScalars].filter(
+    (scalar) => !config.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: {
     ${cyan2(`/* in your case, something like */`)}
-${[...missingScalars].map(
+${[...missingScalarNames].map(
       (c) => `    ${c}: {                  ${green2(`// <- The GraphQL Scalar`)}
       type: "${cyan2(`YourType_${c}`)}"  ${green2(`// <-  The TypeScript type`)}
     }`
@@ -63943,7 +63975,7 @@ ${config.configFile.features?.componentFields ? `
 """
 @${config.componentFieldDirective} marks an inline fragment as the selection for a component field
 """
-directive @${config.componentFieldDirective}(field: String!, prop: String, export: String, raw: String) on FRAGMENT_DEFINITION | INLINE_FRAGMENT
+directive @${config.componentFieldDirective}(field: String!, prop: String, export: String, raw: String) on FRAGMENT_DEFINITION | INLINE_FRAGMENT | FIELD_DEFINITION
 
 ` : ""}
 
@@ -63954,7 +63986,7 @@ directive @${config.componentFieldDirective}(field: String!, prop: String, expor
     }
     internalSchema += plugin2.schema({ config });
   }
-  const extensions = Object.entries(config.componentFields).map(([parent2, fields]) => {
+  let extensions = Object.entries(config.componentFields).map(([parent2, fields]) => {
     return `
 		extend type ${parent2} {
 			${Object.entries(fields).map(([fieldName, field]) => {
@@ -63966,11 +63998,12 @@ directive @${config.componentFieldDirective}(field: String!, prop: String, expor
           return `${arg.name}:${typeName}${arg.required ? "!" : ""}`;
         }).join("\n") + ")";
       }
-      return `${fieldName}${argString}: ${config.componentScalar}!`;
+      return `${fieldName}${argString}: ${config.componentScalar}!  @componentField(field: "${fieldName}")`;
     }).join("\n")}
 		}
 	`;
   }).join("\n");
+  extensions += `${Object.keys(config.configFile.features?.runtimeScalars ?? {}).map((scalar) => `scalar ${scalar}`).join("\n")}`;
   config.newSchema = graphql25.print(mergeTypeDefs([internalSchema, config.newSchema]));
   config.schemaString += extensions;
   config.schema = graphql25.buildSchema(
@@ -64165,8 +64198,50 @@ async function componentFields(config, documents) {
   }
 }
 
-// src/codegen/validators/typeCheck.ts
+// src/codegen/transforms/runtimeScalars.ts
 var graphql29 = __toESM(require("graphql"), 1);
+async function addTypename2(config, documents) {
+  for (const doc of documents) {
+    doc.document = graphql29.visit(doc.document, {
+      VariableDefinition(node) {
+        const { type, wrappers } = unwrapType(config, node.type);
+        const runtimeScalar = config.configFile.features?.runtimeScalars?.[type.name];
+        if (runtimeScalar) {
+          return {
+            ...node,
+            type: wrapType({
+              type: config.schema.getType(runtimeScalar.type),
+              wrappers
+            }),
+            directives: [
+              ...node.directives ?? [],
+              {
+                kind: "Directive",
+                name: {
+                  kind: "Name",
+                  value: config.runtimeScalarDirective
+                },
+                arguments: [
+                  {
+                    kind: "Argument",
+                    name: { kind: "Name", value: "type" },
+                    value: {
+                      kind: "StringValue",
+                      value: type.name
+                    }
+                  }
+                ]
+              }
+            ]
+          };
+        }
+      }
+    });
+  }
+}
+
+// src/codegen/validators/typeCheck.ts
+var graphql30 = __toESM(require("graphql"), 1);
 async function typeCheck(config, docs) {
   const errors = [];
   const freeLists = [];
@@ -64174,7 +64249,7 @@ async function typeCheck(config, docs) {
   const listTypes = [];
   const fragments = {};
   for (const { document: parsed, originalString, filename } of docs) {
-    graphql29.visit(parsed, {
+    graphql30.visit(parsed, {
       FragmentDefinition(definition) {
         fragments[definition.name.value] = definition;
       },
@@ -64219,14 +64294,14 @@ async function typeCheck(config, docs) {
             );
             return;
           }
-          if (graphql29.isListType(rootType) || graphql29.isNonNullType(rootType) && graphql29.isListType(rootType.ofType)) {
+          if (graphql30.isListType(rootType) || graphql30.isNonNullType(rootType) && graphql30.isListType(rootType.ofType)) {
             needsParent = true;
             break;
           }
-          if (graphql29.isNonNullType(rootType) && "ofType" in rootType) {
+          if (graphql30.isNonNullType(rootType) && "ofType" in rootType) {
             rootType = rootType.ofType;
           }
-          if (graphql29.isScalarType(rootType)) {
+          if (graphql30.isScalarType(rootType)) {
             break;
           }
           rootType = rootType?.getFields()[parent3.name.value]?.type;
@@ -64302,9 +64377,9 @@ async function typeCheck(config, docs) {
           );
         }
         let targetTypes = [type];
-        if (graphql29.isUnionType(type)) {
+        if (graphql30.isUnionType(type)) {
           targetTypes = config.schema.getPossibleTypes(type);
-        } else if (graphql29.isInterfaceType(type)) {
+        } else if (graphql30.isInterfaceType(type)) {
           try {
             for (const key of config.keyFieldsForType(type.name)) {
               if (!type.getFields()[key]) {
@@ -64340,13 +64415,13 @@ async function typeCheck(config, docs) {
   if (errors.length > 0) {
     throw errors;
   }
-  const rules = (filepath) => [...graphql29.specifiedRules].filter(
+  const rules = (filepath) => [...graphql30.specifiedRules].filter(
     (rule) => ![
-      graphql29.NoUnusedFragmentsRule,
-      graphql29.KnownFragmentNamesRule,
-      graphql29.ExecutableDefinitionsRule,
-      graphql29.KnownDirectivesRule,
-      graphql29.KnownArgumentNamesRule
+      graphql30.NoUnusedFragmentsRule,
+      graphql30.KnownFragmentNamesRule,
+      graphql30.ExecutableDefinitionsRule,
+      graphql30.KnownDirectivesRule,
+      graphql30.KnownArgumentNamesRule
     ].includes(rule)
   ).concat(
     validateLists({
@@ -64367,7 +64442,7 @@ async function typeCheck(config, docs) {
     validateLoadingDirective(config)
   );
   for (const { filename, document: parsed, originalString } of docs) {
-    for (const error of graphql29.validate(config.schema, parsed, rules(filename))) {
+    for (const error of graphql30.validate(config.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
           filepath: filename,
@@ -64396,20 +64471,20 @@ function validateRequiredDirective(config, filepath) {
         if (!node.directives?.some(({ name }) => name.value === config.requiredDirective))
           return;
         const parentType = parentTypeFromAncestors(config.schema, filepath, ancestors);
-        if (!graphql29.isObjectType(parentType)) {
+        if (!graphql30.isObjectType(parentType)) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `@${config.requiredDirective} may only be used on objects, not arguments`
             )
           );
           return;
         }
         const type = parentType.getFields()[node.name.value].type;
-        const isServerNullable = !graphql29.isNonNullType(type);
+        const isServerNullable = !graphql30.isNonNullType(type);
         const isAlreadyClientNullable = isClientNullable(node, true);
         if (!isServerNullable && !isAlreadyClientNullable) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `@${config.requiredDirective} may only be used on nullable fields`
             )
           );
@@ -64431,7 +64506,7 @@ var validateLists = ({
       if (!config.isListFragment(node.name.value)) {
         if (!fragments[node.name.value]) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               "Encountered unknown fragment: " + node.name.value
             )
           );
@@ -64441,7 +64516,7 @@ var validateLists = ({
       const listName = config.listNameFromFragment(node.name.value);
       if (!lists.includes(listName)) {
         ctx.reportError(
-          new graphql29.GraphQLError(
+          new graphql30.GraphQLError(
             "Encountered fragment referencing unknown list: " + listName
           )
         );
@@ -64466,7 +64541,7 @@ var validateLists = ({
         );
         if (parentArg) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `@${config.deprecatedlistDirectiveParentIDArg} should be defined only in it's own directive now`
             )
           );
@@ -64482,7 +64557,7 @@ var validateLists = ({
         return;
       }
       ctx.reportError(
-        new graphql29.GraphQLError(
+        new graphql30.GraphQLError(
           `For this list fragment, you need to add or @${config.listParentDirective} or @${config.listAllListsDirective} directive to specify the behavior`
         )
       );
@@ -64492,7 +64567,7 @@ var validateLists = ({
       const directiveName = node.name.value;
       if (directiveName === "connection") {
         ctx.reportError(
-          new graphql29.GraphQLError(
+          new graphql30.GraphQLError(
             "@connection was renamed to @list. Please change your components. If you were using `cache.connection` in your components, you will need to update that to `cache.list` too."
           )
         );
@@ -64501,7 +64576,7 @@ var validateLists = ({
       if (!config.isInternalDirective(node.name.value)) {
         if (!config.schema.getDirective(directiveName)) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               "Encountered unknown directive: " + directiveName
             )
           );
@@ -64510,7 +64585,7 @@ var validateLists = ({
       }
       if (config.isListOperationDirective(directiveName) && !listTypes.includes(config.listNameFromDirective(directiveName))) {
         ctx.reportError(
-          new graphql29.GraphQLError(
+          new graphql30.GraphQLError(
             "Encountered directive referencing unknown list: " + directiveName
           )
         );
@@ -64521,7 +64596,7 @@ var validateLists = ({
 };
 function knownArguments(config) {
   return function(ctx) {
-    const nativeValidator = graphql29.KnownArgumentNamesRule(ctx);
+    const nativeValidator = graphql30.KnownArgumentNamesRule(ctx);
     return {
       ...nativeValidator,
       Directive(directiveNode) {
@@ -64556,7 +64631,7 @@ function validateFragmentArguments(config, filepath, fragments) {
         for (const arg of node.arguments || []) {
           if (arg.value.kind !== "ObjectValue") {
             ctx.reportError(
-              new graphql29.GraphQLError("values in @arguments must be an object")
+              new graphql30.GraphQLError("values in @arguments must be an object")
             );
             return;
           }
@@ -64566,13 +64641,13 @@ function validateFragmentArguments(config, filepath, fragments) {
           );
           if (!typeArg) {
             ctx.reportError(
-              new graphql29.GraphQLError("missing type field for @arguments directive")
+              new graphql30.GraphQLError("missing type field for @arguments directive")
             );
             return;
           }
-          if (typeArg.value.kind !== graphql29.Kind.STRING) {
+          if (typeArg.value.kind !== graphql30.Kind.STRING) {
             ctx.reportError(
-              new graphql29.GraphQLError("type field to @arguments must be a string")
+              new graphql30.GraphQLError("type field to @arguments must be a string")
             );
             return;
           }
@@ -64585,7 +64660,7 @@ function validateFragmentArguments(config, filepath, fragments) {
           );
           if (typeArg.value.value !== defaultValueType) {
             ctx.reportError(
-              new graphql29.GraphQLError(
+              new graphql30.GraphQLError(
                 `Invalid default value provided for ${arg.name.value}. Expected ${typeArg.value.value}, found ${defaultValueType}`
               )
             );
@@ -64603,7 +64678,7 @@ function validateFragmentArguments(config, filepath, fragments) {
           try {
             args = fragmentArguments(config, filepath, fragments[fragmentName]);
           } catch (e) {
-            ctx.reportError(new graphql29.GraphQLError(e.message));
+            ctx.reportError(new graphql30.GraphQLError(e.message));
             return;
           }
           fragmentArguments2[fragmentName] = args;
@@ -64626,7 +64701,7 @@ function validateFragmentArguments(config, filepath, fragments) {
         );
         if (missing.length > 0) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `The following arguments are missing from the "${fragmentName}" fragment: ` + JSON.stringify(missing)
             )
           );
@@ -64637,7 +64712,7 @@ function validateFragmentArguments(config, filepath, fragments) {
         );
         if (unknown.length > 0) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               "Encountered unknown arguments: " + JSON.stringify(unknown)
             )
           );
@@ -64649,7 +64724,7 @@ function validateFragmentArguments(config, filepath, fragments) {
           for (const [applied, target] of zipped) {
             if (!valueIsType(config, applied.value, target)) {
               ctx.reportError(
-                new graphql29.GraphQLError(
+                new graphql30.GraphQLError(
                   `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
@@ -64691,7 +64766,7 @@ function valueIsType(config, value, targetType) {
   }
   if (value.kind === "EnumValue" && targetType.kind === "NamedType") {
     const enumType = config.schema.getType(targetType.name.value);
-    if (!graphql29.isEnumType(enumType)) {
+    if (!graphql30.isEnumType(enumType)) {
       return false;
     }
     return enumType.getValues().some((enumValue) => enumValue.value === value.value);
@@ -64711,7 +64786,7 @@ function paginateArgs(config, filepath) {
         }
         if (alreadyPaginated) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `@${config.paginateDirective} can only appear in a document once.`
             )
           );
@@ -64743,7 +64818,7 @@ function paginateArgs(config, filepath) {
           const backwards = appliedArgs.has("last");
           if (!forward && !backwards) {
             ctx.reportError(
-              new graphql29.GraphQLError(
+              new graphql30.GraphQLError(
                 "A field with cursor-based pagination must have a first or last argument"
               )
             );
@@ -64757,7 +64832,7 @@ function paginateArgs(config, filepath) {
           }
           if (forward && backwards && paginateMode === "Infinite") {
             ctx.reportError(
-              new graphql29.GraphQLError(
+              new graphql30.GraphQLError(
                 `A field with cursor pagination cannot go forwards an backwards simultaneously`
               )
             );
@@ -64771,7 +64846,7 @@ function paginateArgs(config, filepath) {
           );
           if (!appliedLimitArg) {
             ctx.reportError(
-              new graphql29.GraphQLError(
+              new graphql30.GraphQLError(
                 "A field with offset-based pagination must have a limit argument"
               )
             );
@@ -64787,20 +64862,20 @@ function noUnusedFragmentArguments(config) {
     const args = /* @__PURE__ */ new Set();
     return {
       enter(node) {
-        if (node.kind === graphql29.Kind.FRAGMENT_DEFINITION) {
+        if (node.kind === graphql30.Kind.FRAGMENT_DEFINITION) {
           const definitionArguments = node.directives?.filter((directive) => directive.name.value === config.argumentsDirective).flatMap((directive) => directive.arguments);
           for (const arg of definitionArguments?.map((arg2) => arg2?.name.value) || []) {
             args.add(arg);
           }
-        } else if (node.kind === graphql29.Kind.VARIABLE) {
+        } else if (node.kind === graphql30.Kind.VARIABLE) {
           args.delete(node.name.value);
         }
       },
       leave(node) {
-        if (node.kind === graphql29.Kind.FRAGMENT_DEFINITION) {
+        if (node.kind === graphql30.Kind.FRAGMENT_DEFINITION) {
           if (args.size > 0) {
             ctx.reportError(
-              new graphql29.GraphQLError(
+              new graphql30.GraphQLError(
                 "Encountered unused fragment arguments: " + [...args].join(",")
               )
             );
@@ -64836,7 +64911,7 @@ function nodeDirectives(config, directives) {
         if (definition.kind === "OperationDefinition") {
           if (definition.operation !== "query") {
             ctx.reportError(
-              new graphql29.GraphQLError(
+              new graphql30.GraphQLError(
                 `@${node.name.value} must fall on a fragment or query document`
               )
             );
@@ -64848,7 +64923,7 @@ function nodeDirectives(config, directives) {
         }
         if (!possibleNodes.includes(definitionType)) {
           ctx.reportError(
-            new graphql29.GraphQLError(paginateOnNonNodeMessage(node.name.value))
+            new graphql30.GraphQLError(paginateOnNonNodeMessage(node.name.value))
           );
         }
       }
@@ -64867,7 +64942,7 @@ function checkMutationOperation(config) {
         );
         if (append && prepend) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `You can't apply both @${config.listPrependDirective} and @${config.listAppendDirective} at the same time`
             )
           );
@@ -64881,7 +64956,7 @@ function checkMutationOperation(config) {
         );
         if (parentId && allLists) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `You can't apply both @${config.listParentDirective} and @${config.listAllListsDirective} at the same time`
             )
           );
@@ -64903,7 +64978,7 @@ function checkMaskDirectives(config) {
         );
         if (maskEnableDirective && maskDisableDirective) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `You can't apply both @${config.maskEnableDirective} and @${config.maskDisableDirective} at the same time`
             )
           );
@@ -64945,7 +65020,7 @@ function validateLoadingDirective(config) {
         );
         if (!parentLoading && !global2) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `@${config.loadingDirective} can only be applied on a field or fragment spread at the root of a document or on one whose parent also has @${config.loadingDirective}`
             )
           );
@@ -64967,7 +65042,7 @@ function validateLoadingDirective(config) {
         );
         if (!parentLoading && !global2) {
           ctx.reportError(
-            new graphql29.GraphQLError(
+            new graphql30.GraphQLError(
               `@${config.loadingDirective} can only be applied on a field or fragment spread at the root of a document or on one whose parent also has @${config.loadingDirective}`
             )
           );
@@ -64982,7 +65057,7 @@ function getAndVerifyNodeInterface(config) {
   if (!nodeInterface) {
     return null;
   }
-  if (!graphql29.isInterfaceType(nodeInterface)) {
+  if (!graphql30.isInterfaceType(nodeInterface)) {
     displayInvalidNodeFieldMessage(config);
     return null;
   }
@@ -65077,11 +65152,11 @@ async function uniqueDocumentNames(config, docs) {
 }
 
 // src/codegen/validators/noIDAlias.ts
-var graphql30 = __toESM(require("graphql"), 1);
+var graphql31 = __toESM(require("graphql"), 1);
 async function noIDAlias(config, docs) {
   const errors = [];
   for (const { filename, document } of docs) {
-    graphql30.visit(document, {
+    graphql31.visit(document, {
       Field(node, _, __, ___, ancestors) {
         const fieldType = parentTypeFromAncestors(config.schema, filename, ancestors).name;
         if (config.keyFieldsForType(fieldType).includes(node.alias?.value || "")) {
@@ -65120,11 +65195,11 @@ async function validatePlugins(config, documents) {
 }
 
 // src/codegen/validators/componentFields.ts
-var graphql31 = __toESM(require("graphql"), 1);
+var graphql32 = __toESM(require("graphql"), 1);
 async function componentFields2(config, docs) {
   const errors = [];
   for (const { filename: filepath, document } of docs) {
-    graphql31.visit(document, {
+    graphql32.visit(document, {
       FragmentDefinition(node, _, __, ___, ancestors) {
         const componentFieldDirective = node.directives?.find(
           (dir) => dir.name.value === config.componentFieldDirective
@@ -65166,14 +65241,26 @@ async function componentFields2(config, 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 && config.componentFields[parent2]?.[fieldValue];
         const parentType = config.schema.getType(parent2);
-        if (parentType && fieldValue && (graphql31.isObjectType(parentType) && parentType.getFields()[fieldValue] || config.componentFields[parent2]?.[fieldValue])) {
+        let conflict = false;
+        if (existingField && existingField.filepath !== filepath) {
+          conflict = true;
+        } else if (parentType && fieldValue) {
+          const fieldDef = graphql32.isObjectType(parentType) && parentType.getFields()[fieldValue];
+          if (fieldDef && !fieldDef.astNode?.directives?.find(
+            (dir) => dir.name.value === config.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
           });
         }
-        if (parentType && graphql31.isAbstractType(parentType)) {
+        if (parentType && graphql32.isAbstractType(parentType)) {
           errors.push({
             message: `Cannot add component field ${parent2}.${fieldValue} because ${parent2} is an abstract type`,
             filepath
@@ -65239,6 +65326,7 @@ async function runPipeline2(config, docs) {
       [
         componentFields2,
         graphqlExtensions,
+        addTypename2,
         ...wrapHook(beforeValidate),
         typeCheck,
         uniqueDocumentNames,
@@ -65393,12 +65481,12 @@ async function processJSFile(config, contents) {
   return documents;
 }
 async function processGraphQLDocument(config, filepath, document) {
-  const parsedDoc = graphql32.parse(document);
+  const parsedDoc = graphql33.parse(document);
   const operations = parsedDoc.definitions.filter(
-    ({ kind: kind2 }) => kind2 === graphql32.Kind.OPERATION_DEFINITION
+    ({ kind: kind2 }) => kind2 === graphql33.Kind.OPERATION_DEFINITION
   );
   const fragments = parsedDoc.definitions.filter(
-    ({ kind: kind2 }) => kind2 === graphql32.Kind.FRAGMENT_DEFINITION
+    ({ kind: kind2 }) => kind2 === graphql33.Kind.FRAGMENT_DEFINITION
   );
   if (operations.length > 1) {
     throw new HoudiniError({