enhance: directive extraction

ardatan · Aug 16, 2024 · 0286437 · 0286437
1 parent 65452ab
commit 0286437
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 144 deletions.
diff --git a/.changeset/stale-weeks-type.md b/.changeset/stale-weeks-type.md
@@ -0,0 +1,7 @@
+---
+'@graphql-tools/schema': patch
+'@graphql-tools/merge': patch
+'@graphql-tools/utils': patch
+---
+
+Improve directive extraction
diff --git a/packages/merge/src/extensions.ts b/packages/merge/src/extensions.ts
@@ -11,10 +11,14 @@ function applyExtensionObject(
   obj: Maybe<{ extensions: Maybe<Readonly<Record<string, any>>> }>,
   extensions: ExtensionsObject,
 ) {
-  if (!obj) {
+  if (!obj || !extensions || extensions === obj.extensions) {
     return;
   }
-  obj.extensions = mergeDeep([obj.extensions || {}, extensions || {}], false, true);
+  if (!obj.extensions) {
+    obj.extensions = extensions;
+    return;
+  }
+  obj.extensions = mergeDeep([obj.extensions, extensions], false, true);
 }
 
 export function applyExtensions(

diff --git a/packages/schema/src/merge-schemas.ts b/packages/schema/src/merge-schemas.ts
@@ -32,12 +32,7 @@ export function mergeSchemas(config: MergeSchemasConfig) {
 
   if (config.schemas != null) {
     for (const schema of config.schemas) {
-      extractedTypeDefs.push(
-        getDocumentNodeFromSchema(schema, {
-          ...config,
-          pathToDirectivesInExtensions: ['NONEXISTENT'],
-        }),
-      );
+      extractedTypeDefs.push(getDocumentNodeFromSchema(schema));
       extractedResolvers.push(getResolversFromSchema(schema));
       extractedSchemaExtensions.push(extractExtensionsFromSchema(schema));
     }

diff --git a/packages/utils/src/get-directives.ts b/packages/utils/src/get-directives.ts
@@ -1,43 +1,12 @@
-import {
-  GraphQLEnumTypeConfig,
-  GraphQLEnumValue,
-  GraphQLEnumValueConfig,
-  GraphQLField,
-  GraphQLFieldConfig,
-  GraphQLInputField,
-  GraphQLInputFieldConfig,
-  GraphQLInputObjectTypeConfig,
-  GraphQLInterfaceTypeConfig,
-  GraphQLNamedType,
-  GraphQLObjectTypeConfig,
-  GraphQLScalarTypeConfig,
-  GraphQLSchema,
-  GraphQLSchemaConfig,
-  GraphQLUnionTypeConfig,
-} from 'graphql';
-import { getDirectiveExtensions } from './getDirectiveExtensions.js';
+import { GraphQLSchema } from 'graphql';
+import { DirectableObject, getDirectiveExtensions } from './getDirectiveExtensions.js';
 
 export interface DirectiveAnnotation {
   name: string;
   args?: Record<string, any>;
 }
 
-export type DirectableGraphQLObject =
-  | GraphQLSchema
-  | GraphQLSchemaConfig
-  | GraphQLNamedType
-  | GraphQLObjectTypeConfig<any, any>
-  | GraphQLInterfaceTypeConfig<any, any>
-  | GraphQLUnionTypeConfig<any, any>
-  | GraphQLScalarTypeConfig<any, any>
-  | GraphQLEnumTypeConfig
-  | GraphQLEnumValue
-  | GraphQLEnumValueConfig
-  | GraphQLInputObjectTypeConfig
-  | GraphQLField<any, any>
-  | GraphQLInputField
-  | GraphQLFieldConfig<any, any>
-  | GraphQLInputFieldConfig;
+export type DirectableGraphQLObject = DirectableObject;
 
 export function getDirectivesInExtensions(
   node: DirectableGraphQLObject,

diff --git a/packages/utils/src/getDirectiveExtensions.ts b/packages/utils/src/getDirectiveExtensions.ts
@@ -1,6 +1,7 @@
 import type { ASTNode, DirectiveNode, GraphQLSchema } from 'graphql';
 import { valueFromAST, valueFromASTUntyped } from 'graphql';
 import { getArgumentValues } from './getArgumentValues.js';
+import { memoize1 } from './memoize.js';
 
 export type DirectableASTNode = ASTNode & { directives?: readonly DirectiveNode[] };
 export type DirectableObject = {
@@ -25,6 +26,39 @@ export function getDirectiveExtensions<
       TDirectiveAnnotationsMap[directiveName]
     >;
   } = {};
+
+  if (directableObj.extensions) {
+    let directivesInExtensions = directableObj.extensions;
+    for (const pathSegment of pathToDirectivesInExtensions) {
+      directivesInExtensions = directivesInExtensions?.[pathSegment];
+    }
+    if (directivesInExtensions != null) {
+      for (const directiveNameProp in directivesInExtensions) {
+        const directiveObjs = directivesInExtensions[directiveNameProp];
+        const directiveName = directiveNameProp as keyof TDirectiveAnnotationsMap;
+        if (Array.isArray(directiveObjs)) {
+          for (const directiveObj of directiveObjs) {
+            let existingDirectiveExtensions = directiveExtensions[directiveName];
+            if (!existingDirectiveExtensions) {
+              existingDirectiveExtensions = [];
+              directiveExtensions[directiveName] = existingDirectiveExtensions;
+            }
+            existingDirectiveExtensions.push(directiveObj);
+          }
+        } else {
+          let existingDirectiveExtensions = directiveExtensions[directiveName];
+          if (!existingDirectiveExtensions) {
+            existingDirectiveExtensions = [];
+            directiveExtensions[directiveName] = existingDirectiveExtensions;
+          }
+          existingDirectiveExtensions.push(directiveObjs);
+        }
+      }
+    }
+  }
+
+  const memoizedStringify = memoize1(obj => JSON.stringify(obj));
+
   const astNodes: DirectableASTNode[] = [];
   if (directableObj.astNode) {
     astNodes.push(directableObj.astNode);
@@ -60,39 +94,16 @@ export function getDirectiveExtensions<
             }
           }
         }
-        existingDirectiveExtensions.push(value);
-      }
-    }
-  }
-
-  if (directableObj.extensions) {
-    let directivesInExtensions = directableObj.extensions;
-    for (const pathSegment of pathToDirectivesInExtensions) {
-      directivesInExtensions = directivesInExtensions?.[pathSegment];
-    }
-    if (directivesInExtensions != null) {
-      for (const directiveNameProp in directivesInExtensions) {
-        const directiveObjs = directivesInExtensions[directiveNameProp];
-        const directiveName = directiveNameProp as keyof TDirectiveAnnotationsMap;
-        if (Array.isArray(directiveObjs)) {
-          for (const directiveObj of directiveObjs) {
-            let existingDirectiveExtensions = directiveExtensions[directiveName];
-            if (!existingDirectiveExtensions) {
-              existingDirectiveExtensions = [];
-              directiveExtensions[directiveName] = existingDirectiveExtensions;
-            }
-            existingDirectiveExtensions.push(directiveObj);
+        if (astNodes.length > 0 && existingDirectiveExtensions.length > 0) {
+          const valStr = memoizedStringify(value);
+          if (existingDirectiveExtensions.some(val => memoizedStringify(val) === valStr)) {
+            continue;
           }
-        } else {
-          let existingDirectiveExtensions = directiveExtensions[directiveName];
-          if (!existingDirectiveExtensions) {
-            existingDirectiveExtensions = [];
-            directiveExtensions[directiveName] = existingDirectiveExtensions;
-          }
-          existingDirectiveExtensions.push(directiveObjs);
         }
+        existingDirectiveExtensions.push(value);
       }
     }
   }
+
   return directiveExtensions;
 }