chore(deps): lock file maintenance (#7282)

* chore(deps): lock file maintenance

* Fix sharp

* oneOf support

* Fix v15 support

* Relax type check on v15

* Better

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arda TANRIKULU <ardatanrikulu@gmail.com>

Author: renovate[bot]

.changeset/olive-plants-bet.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': patch
+---
+
+Support `@oneOf` directive

packages/utils/src/print-schema-with-directives.ts

@@ -41,6 +41,7 @@ import {
   ScalarTypeDefinitionNode,
   SchemaDefinitionNode,
   SchemaExtensionNode,
+  specifiedDirectives,
   UnionTypeDefinitionNode,
   ValueNode,
 } from 'graphql';
@@ -219,11 +220,12 @@ export function getDirectiveNodes<TDirectiveNode extends DirectiveNode>(
     deprecationReason?: string | null;
     specifiedByUrl?: string | null;
     specifiedByURL?: string | null;
+    isOneOf?: boolean;
   },
   schema?: GraphQLSchema,
   pathToDirectivesInExtensions?: Array<string>,
 ): Array<TDirectiveNode> {
-  let directiveNodesBesidesDeprecatedAndSpecifiedBy: Array<TDirectiveNode> = [];
+  let directiveNodesBesidesNativeDirectives: Array<TDirectiveNode> = [];
 
   const directivesInExtensions = getDirectivesInExtensions(entity, pathToDirectivesInExtensions);
 
@@ -234,19 +236,23 @@ export function getDirectiveNodes<TDirectiveNode extends DirectiveNode>(
 
   let deprecatedDirectiveNode: Maybe<TDirectiveNode> = null;
   let specifiedByDirectiveNode: Maybe<TDirectiveNode> = null;
+  let oneOfDirectiveNode: Maybe<TDirectiveNode> = null;
   if (directives != null) {
-    directiveNodesBesidesDeprecatedAndSpecifiedBy = directives.filter(
-      directive => directive.name.value !== 'deprecated' && directive.name.value !== 'specifiedBy',
+    directiveNodesBesidesNativeDirectives = directives.filter(directive =>
+      specifiedDirectives.every(
+        specifiedDirective => specifiedDirective.name !== directive.name.value,
+      ),
     );
     if (entity.deprecationReason != null) {
-      deprecatedDirectiveNode = directives.filter(
-        directive => directive.name.value === 'deprecated',
-      )?.[0];
+      deprecatedDirectiveNode = directives.find(directive => directive.name.value === 'deprecated');
     }
     if (entity.specifiedByUrl != null || entity.specifiedByURL != null) {
-      specifiedByDirectiveNode = directives.filter(
+      specifiedByDirectiveNode = directives.find(
         directive => directive.name.value === 'specifiedBy',
-      )?.[0];
+      );
+    }
+    if (entity.isOneOf) {
+      oneOfDirectiveNode = directives.find(directive => directive.name.value === 'oneOf');
     }
   }
 
@@ -265,13 +271,20 @@ export function getDirectiveNodes<TDirectiveNode extends DirectiveNode>(
     specifiedByDirectiveNode = makeDirectiveNode<TDirectiveNode>('specifiedBy', specifiedByArgs);
   }
 
+  if (entity.isOneOf && oneOfDirectiveNode == null) {
+    oneOfDirectiveNode = makeDirectiveNode<TDirectiveNode>('oneOf');
+  }
+
   if (deprecatedDirectiveNode != null) {
-    directiveNodesBesidesDeprecatedAndSpecifiedBy.push(deprecatedDirectiveNode);
+    directiveNodesBesidesNativeDirectives.push(deprecatedDirectiveNode);
   }
   if (specifiedByDirectiveNode != null) {
-    directiveNodesBesidesDeprecatedAndSpecifiedBy.push(specifiedByDirectiveNode);
+    directiveNodesBesidesNativeDirectives.push(specifiedByDirectiveNode);
+  }
+  if (oneOfDirectiveNode != null) {
+    directiveNodesBesidesNativeDirectives.push(oneOfDirectiveNode);
   }
-  return directiveNodesBesidesDeprecatedAndSpecifiedBy;
+  return directiveNodesBesidesNativeDirectives;
 }
 
 export function astFromArg(

packages/utils/tests/print-schema-with-directives.spec.ts

@@ -3,10 +3,14 @@ import {
   GraphQLDirective,
   GraphQLEnumType,
   GraphQLID,
+  GraphQLInputObjectType,
+  GraphQLInputObjectTypeConfig,
+  GraphQLInt,
   GraphQLList,
   GraphQLNonNull,
   GraphQLObjectType,
   GraphQLSchema,
+  GraphQLString,
   printSchema,
   specifiedDirectives,
 } from 'graphql';
@@ -371,4 +375,31 @@ describe('printSchemaWithDirectives', () => {
       expect(printedSchema).toContain(line.trim());
     }
   });
+  it(`prints oneOf correctly if they don't have astNode`, () => {
+    const oneOfInputType = new GraphQLInputObjectType({
+      name: 'OneOfInput',
+      isOneOf: true,
+      fields: {
+        a: {
+          type: GraphQLString,
+        },
+        b: {
+          type: GraphQLInt,
+        },
+      },
+    } as GraphQLInputObjectTypeConfig);
+    // Only if `isOneOf` is supported, it should print the directive
+    if ((oneOfInputType as any).isOneOf) {
+      const schema = new GraphQLSchema({
+        query: new GraphQLObjectType({
+          name: 'Query',
+          fields: {},
+        }),
+        types: [oneOfInputType],
+      });
+
+      const output = printSchemaWithDirectives(schema);
+      expect(output).toContain('input OneOfInput @oneOf');
+    }
+  });
 });

website/package.json

@@ -28,6 +28,7 @@
     "postcss": "8.5.6",
     "postcss-import": "16.1.1",
     "postcss-lightningcss": "1.0.1",
+    "sharp": "0.34.3",
     "tailwindcss": "3.4.17",
     "typescript": "5.8.3",
     "wrangler": "4.24.3"