fix(print-schema-with-directives): add all args to AST even if they d…

…on't exist in the def
ardatan · Aug 12, 2024 · 6291e14 · 6291e14
1 parent 1d826c8
commit 6291e14
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 30 deletions.
diff --git a/.changeset/ninety-plums-explode.md b/.changeset/ninety-plums-explode.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': patch
+---
+
+Add all args from extensions to the AST even if they don't exist in the directive def
diff --git a/packages/utils/src/print-schema-with-directives.ts b/packages/utils/src/print-schema-with-directives.ts
@@ -45,6 +45,7 @@ import {
   TypeDefinitionNode,
   TypeExtensionNode,
   UnionTypeDefinitionNode,
+  ValueNode,
 } from 'graphql';
 import { astFromType } from './astFromType.js';
 import { astFromValue } from './astFromValue.js';
@@ -519,38 +520,27 @@ export function makeDirectiveNode(
 ): DirectiveNode {
   const directiveArguments: Array<ArgumentNode> = [];
 
-  if (directive != null) {
-    for (const arg of directive.args) {
-      const argName = arg.name;
-      const argValue = args?.[argName];
-      if (argValue !== undefined) {
-        const value = astFromValue(argValue, arg.type);
-        if (value) {
-          directiveArguments.push({
-            kind: Kind.ARGUMENT,
-            name: {
-              kind: Kind.NAME,
-              value: argName,
-            },
-            value,
-          });
-        }
+  for (const argName in args) {
+    const argValue = args[argName];
+    let value: Maybe<ValueNode>;
+    if (directive != null) {
+      const arg = directive.args.find(arg => arg.name === argName);
+      if (arg) {
+        value = astFromValue(argValue, arg.type);
       }
     }
-  } else {
-    for (const argName in args) {
-      const argValue = args[argName];
-      const value = astFromValueUntyped(argValue);
-      if (value) {
-        directiveArguments.push({
-          kind: Kind.ARGUMENT,
-          name: {
-            kind: Kind.NAME,
-            value: argName,
-          },
-          value,
-        });
-      }
+    if (value == null) {
+      value = astFromValueUntyped(argValue);
+    }
+    if (value != null) {
+      directiveArguments.push({
+        kind: Kind.ARGUMENT,
+        name: {
+          kind: Kind.NAME,
+          value: argName,
+        },
+        value,
+      });
     }
   }