graphql 16.13.2 → 16.14.0

package/utilities/buildASTSchema.mjs

@@ -87,6 +87,10 @@ export function buildSchema(source, options) {
       options === null || options === void 0
         ? void 0
         : options.allowLegacyFragmentVariables,
+    experimentalDirectivesOnDirectiveDefinitions:
+      options === null || options === void 0
+        ? void 0
+        : options.experimentalDirectivesOnDirectiveDefinitions,
   });
   return buildASTSchema(document, {
     assumeValidSDL:

package/utilities/buildClientSchema.js

@@ -380,6 +380,7 @@ function buildClientSchema(introspection, options) {
       name: directiveIntrospection.name,
       description: directiveIntrospection.description,
       isRepeatable: directiveIntrospection.isRepeatable,
+      deprecationReason: directiveIntrospection.deprecationReason,
       locations: directiveIntrospection.locations.slice(),
       args: buildInputValueDefMap(directiveIntrospection.args),
     });

package/utilities/buildClientSchema.mjs

@@ -357,6 +357,7 @@ export function buildClientSchema(introspection, options) {
       name: directiveIntrospection.name,
       description: directiveIntrospection.description,
       isRepeatable: directiveIntrospection.isRepeatable,
+      deprecationReason: directiveIntrospection.deprecationReason,
       locations: directiveIntrospection.locations.slice(),
       args: buildInputValueDefMap(directiveIntrospection.args),
     });

package/utilities/extendSchema.js

@@ -78,7 +78,8 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
   // Collect the type definitions and extensions found in the document.
   const typeDefs = [];
-  const typeExtensionsMap = Object.create(null); // New directives and types are separate because a directives and types can
+  const typeExtensionsMap = Object.create(null);
+  const directiveExtensionsMap = Object.create(null); // New directives and types are separate because a directives and types can
   // have the same name. For example, a type named "skip".
 
   const directiveDefs = [];
@@ -101,6 +102,14 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
         : [def];
     } else if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) {
       directiveDefs.push(def);
+    } else if (def.kind === _kinds.Kind.DIRECTIVE_EXTENSION) {
+      const extendedDirectiveName = def.name.value;
+      const existingDirectiveExtensions =
+        directiveExtensionsMap[extendedDirectiveName];
+      directiveExtensionsMap[extendedDirectiveName] =
+        existingDirectiveExtensions
+          ? existingDirectiveExtensions.concat([def])
+          : [def];
     }
   } // If this document contains no new types, extensions, or directives then
   // return the same unmodified GraphQLSchema instance.
@@ -108,6 +117,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   if (
     Object.keys(typeExtensionsMap).length === 0 &&
     typeDefs.length === 0 &&
+    Object.keys(directiveExtensionsMap).length === 0 &&
     directiveDefs.length === 0 &&
     schemaExtensions.length === 0 &&
     schemaDef == null
@@ -132,6 +142,12 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
         : buildType(typeNode);
   }
 
+  const directiveMap = Object.create(null);
+
+  for (const existingDirective of schemaConfig.directives) {
+    directiveMap[existingDirective.name] = extendDirective(existingDirective);
+  }
+
   const operationTypes = {
     // Get the extended root operation types.
     query: schemaConfig.query && replaceNamedType(schemaConfig.query),
@@ -143,6 +159,8 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
     ...getOperationTypes(schemaExtensions),
   }; // Then produce and return a Schema config with these types.
 
+  const directives = Object.values(directiveMap); // will be `Array<GraphQLDirective>`
+
   return {
     description:
       (_schemaDef = schemaDef) === null || _schemaDef === void 0
@@ -154,7 +172,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
     ...operationTypes,
     types: Object.values(typeMap),
     directives: [
-      ...schemaConfig.directives.map(replaceDirective),
+      ...directives.map(replaceDirective),
       ...directiveDefs.map(buildDirective),
     ],
     extensions: Object.create(null),
@@ -413,6 +431,29 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
     return opTypes;
   }
 
+  function extendDirective(directive) {
+    var _directiveExtensionsM, _config$deprecationRe;
+
+    const config = directive.toConfig();
+    const extensions =
+      (_directiveExtensionsM = directiveExtensionsMap[config.name]) !== null &&
+      _directiveExtensionsM !== void 0
+        ? _directiveExtensionsM
+        : [];
+    const deprecationReason =
+      (_config$deprecationRe = config.deprecationReason) !== null &&
+      _config$deprecationRe !== void 0
+        ? _config$deprecationRe
+        : extensions
+            .map((ext) => getDeprecationReason(ext))
+            .find((reason) => reason != null);
+    return new _directives.GraphQLDirective({
+      ...config,
+      deprecationReason,
+      extensionASTNodes: config.extensionASTNodes.concat(extensions),
+    });
+  }
+
   function getNamedType(node) {
     var _stdTypeMap$name2;
 
@@ -443,8 +484,20 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   }
 
   function buildDirective(node) {
-    var _node$description;
+    var _directiveExtensionsM2, _getDeprecationReason, _node$description;
 
+    const extensions =
+      (_directiveExtensionsM2 = directiveExtensionsMap[node.name.value]) !==
+        null && _directiveExtensionsM2 !== void 0
+        ? _directiveExtensionsM2
+        : [];
+    const deprecationReason =
+      (_getDeprecationReason = getDeprecationReason(node)) !== null &&
+      _getDeprecationReason !== void 0
+        ? _getDeprecationReason
+        : extensions
+            .map((ext) => getDeprecationReason(ext))
+            .find((reason) => reason != null);
     return new _directives.GraphQLDirective({
       name: node.name.value,
       description:
@@ -456,7 +509,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
       locations: node.locations.map(({ value }) => value),
       isRepeatable: node.repeatable,
       args: buildArgumentMap(node.arguments),
+      deprecationReason,
       astNode: node,
+      extensionASTNodes: extensions,
     });
   }
 

package/utilities/extendSchema.mjs

@@ -87,7 +87,8 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
 
   // Collect the type definitions and extensions found in the document.
   const typeDefs = [];
-  const typeExtensionsMap = Object.create(null); // New directives and types are separate because a directives and types can
+  const typeExtensionsMap = Object.create(null);
+  const directiveExtensionsMap = Object.create(null); // New directives and types are separate because a directives and types can
   // have the same name. For example, a type named "skip".
 
   const directiveDefs = [];
@@ -110,6 +111,14 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
         : [def];
     } else if (def.kind === Kind.DIRECTIVE_DEFINITION) {
       directiveDefs.push(def);
+    } else if (def.kind === Kind.DIRECTIVE_EXTENSION) {
+      const extendedDirectiveName = def.name.value;
+      const existingDirectiveExtensions =
+        directiveExtensionsMap[extendedDirectiveName];
+      directiveExtensionsMap[extendedDirectiveName] =
+        existingDirectiveExtensions
+          ? existingDirectiveExtensions.concat([def])
+          : [def];
     }
   } // If this document contains no new types, extensions, or directives then
   // return the same unmodified GraphQLSchema instance.
@@ -117,6 +126,7 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
   if (
     Object.keys(typeExtensionsMap).length === 0 &&
     typeDefs.length === 0 &&
+    Object.keys(directiveExtensionsMap).length === 0 &&
     directiveDefs.length === 0 &&
     schemaExtensions.length === 0 &&
     schemaDef == null
@@ -141,6 +151,12 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
         : buildType(typeNode);
   }
 
+  const directiveMap = Object.create(null);
+
+  for (const existingDirective of schemaConfig.directives) {
+    directiveMap[existingDirective.name] = extendDirective(existingDirective);
+  }
+
   const operationTypes = {
     // Get the extended root operation types.
     query: schemaConfig.query && replaceNamedType(schemaConfig.query),
@@ -152,6 +168,8 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
     ...getOperationTypes(schemaExtensions),
   }; // Then produce and return a Schema config with these types.
 
+  const directives = Object.values(directiveMap); // will be `Array<GraphQLDirective>`
+
   return {
     description:
       (_schemaDef = schemaDef) === null || _schemaDef === void 0
@@ -163,7 +181,7 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
     ...operationTypes,
     types: Object.values(typeMap),
     directives: [
-      ...schemaConfig.directives.map(replaceDirective),
+      ...directives.map(replaceDirective),
       ...directiveDefs.map(buildDirective),
     ],
     extensions: Object.create(null),
@@ -415,6 +433,29 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
     return opTypes;
   }
 
+  function extendDirective(directive) {
+    var _directiveExtensionsM, _config$deprecationRe;
+
+    const config = directive.toConfig();
+    const extensions =
+      (_directiveExtensionsM = directiveExtensionsMap[config.name]) !== null &&
+      _directiveExtensionsM !== void 0
+        ? _directiveExtensionsM
+        : [];
+    const deprecationReason =
+      (_config$deprecationRe = config.deprecationReason) !== null &&
+      _config$deprecationRe !== void 0
+        ? _config$deprecationRe
+        : extensions
+            .map((ext) => getDeprecationReason(ext))
+            .find((reason) => reason != null);
+    return new GraphQLDirective({
+      ...config,
+      deprecationReason,
+      extensionASTNodes: config.extensionASTNodes.concat(extensions),
+    });
+  }
+
   function getNamedType(node) {
     var _stdTypeMap$name2;
 
@@ -445,8 +486,20 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
   }
 
   function buildDirective(node) {
-    var _node$description;
+    var _directiveExtensionsM2, _getDeprecationReason, _node$description;
 
+    const extensions =
+      (_directiveExtensionsM2 = directiveExtensionsMap[node.name.value]) !==
+        null && _directiveExtensionsM2 !== void 0
+        ? _directiveExtensionsM2
+        : [];
+    const deprecationReason =
+      (_getDeprecationReason = getDeprecationReason(node)) !== null &&
+      _getDeprecationReason !== void 0
+        ? _getDeprecationReason
+        : extensions
+            .map((ext) => getDeprecationReason(ext))
+            .find((reason) => reason != null);
     return new GraphQLDirective({
       name: node.name.value,
       description:
@@ -458,7 +511,9 @@ export function extendSchemaImpl(schemaConfig, documentAST, options) {
       locations: node.locations.map(({ value }) => value),
       isRepeatable: node.repeatable,
       args: buildArgumentMap(node.arguments),
+      deprecationReason,
       astNode: node,
+      extensionASTNodes: extensions,
     });
   }
 

package/utilities/getIntrospectionQuery.d.ts

@@ -26,11 +26,25 @@ export interface IntrospectionOptions {
    * Default: false
    */
   inputValueDeprecation?: boolean;
+  /**
+   * Whether target GraphQL server supports deprecation of directives.
+   * Default: false
+   */
+  experimentalDirectiveDeprecation?: boolean;
   /**
    * Whether target GraphQL server supports `@oneOf` input objects.
    * Default: false
    */
   oneOf?: boolean;
+  /**
+   * How deep to recurse into nested types, larger values will result in more
+   * accurate results, but have a higher load on the server.
+   * Some servers might restrict the maximum query depth or complexity.
+   * If that's the case, try decreasing this value.
+   *
+   * Default: 9
+   */
+  typeDepth?: number;
 }
 /**
  * Produce the GraphQL query recommended for a full schema introspection.
@@ -183,6 +197,8 @@ export interface IntrospectionDirective {
   readonly name: string;
   readonly description?: Maybe<string>;
   readonly isRepeatable?: boolean;
+  readonly isDeprecated?: boolean;
+  readonly deprecationReason?: Maybe<string>;
   readonly locations: ReadonlyArray<DirectiveLocation>;
   readonly args: ReadonlyArray<IntrospectionInputValue>;
 }

package/utilities/getIntrospectionQuery.js

@@ -16,7 +16,9 @@ function getIntrospectionQuery(options) {
     directiveIsRepeatable: false,
     schemaDescription: false,
     inputValueDeprecation: false,
+    experimentalDirectiveDeprecation: false,
     oneOf: false,
+    typeDepth: 9,
     ...options,
   };
   const descriptions = optionsWithDefault.descriptions ? 'description' : '';
@@ -34,7 +36,30 @@ function getIntrospectionQuery(options) {
     return optionsWithDefault.inputValueDeprecation ? str : '';
   }
 
+  function experimentalDirectiveDeprecation(str) {
+    return optionsWithDefault.experimentalDirectiveDeprecation ? str : '';
+  }
+
   const oneOf = optionsWithDefault.oneOf ? 'isOneOf' : '';
+
+  function ofType(level, indent) {
+    if (level <= 0) {
+      return '';
+    }
+
+    if (level > 100) {
+      throw new Error(
+        'Please set typeDepth to a reasonable value between 0 and 100; the default is 9.',
+      );
+    }
+
+    return `
+${indent}ofType {
+${indent}  name
+${indent}  kind${ofType(level - 1, indent + '  ')}
+${indent}}`;
+  }
+
   return `
     query IntrospectionQuery {
       __schema {
@@ -45,10 +70,14 @@ function getIntrospectionQuery(options) {
         types {
           ...FullType
         }
-        directives {
+        directives${experimentalDirectiveDeprecation(
+          '(includeDeprecated: true)',
+        )} {
           name
           ${descriptions}
           ${directiveIsRepeatable}
+          ${experimentalDirectiveDeprecation('isDeprecated')}
+          ${experimentalDirectiveDeprecation('deprecationReason')}
           locations
           args${inputDeprecation('(includeDeprecated: true)')} {
             ...InputValue
@@ -103,43 +132,7 @@ function getIntrospectionQuery(options) {
 
     fragment TypeRef on __Type {
       kind
-      name
-      ofType {
-        kind
-        name
-        ofType {
-          kind
-          name
-          ofType {
-            kind
-            name
-            ofType {
-              kind
-              name
-              ofType {
-                kind
-                name
-                ofType {
-                  kind
-                  name
-                  ofType {
-                    kind
-                    name
-                    ofType {
-                      kind
-                      name
-                      ofType {
-                        kind
-                        name
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
+      name${ofType(optionsWithDefault.typeDepth, '      ')}
     }
   `;
 }

package/utilities/getIntrospectionQuery.mjs

@@ -9,7 +9,9 @@ export function getIntrospectionQuery(options) {
     directiveIsRepeatable: false,
     schemaDescription: false,
     inputValueDeprecation: false,
+    experimentalDirectiveDeprecation: false,
     oneOf: false,
+    typeDepth: 9,
     ...options,
   };
   const descriptions = optionsWithDefault.descriptions ? 'description' : '';
@@ -27,7 +29,30 @@ export function getIntrospectionQuery(options) {
     return optionsWithDefault.inputValueDeprecation ? str : '';
   }
 
+  function experimentalDirectiveDeprecation(str) {
+    return optionsWithDefault.experimentalDirectiveDeprecation ? str : '';
+  }
+
   const oneOf = optionsWithDefault.oneOf ? 'isOneOf' : '';
+
+  function ofType(level, indent) {
+    if (level <= 0) {
+      return '';
+    }
+
+    if (level > 100) {
+      throw new Error(
+        'Please set typeDepth to a reasonable value between 0 and 100; the default is 9.',
+      );
+    }
+
+    return `
+${indent}ofType {
+${indent}  name
+${indent}  kind${ofType(level - 1, indent + '  ')}
+${indent}}`;
+  }
+
   return `
     query IntrospectionQuery {
       __schema {
@@ -38,10 +63,14 @@ export function getIntrospectionQuery(options) {
         types {
           ...FullType
         }
-        directives {
+        directives${experimentalDirectiveDeprecation(
+          '(includeDeprecated: true)',
+        )} {
           name
           ${descriptions}
           ${directiveIsRepeatable}
+          ${experimentalDirectiveDeprecation('isDeprecated')}
+          ${experimentalDirectiveDeprecation('deprecationReason')}
           locations
           args${inputDeprecation('(includeDeprecated: true)')} {
             ...InputValue
@@ -96,43 +125,7 @@ export function getIntrospectionQuery(options) {
 
     fragment TypeRef on __Type {
       kind
-      name
-      ofType {
-        kind
-        name
-        ofType {
-          kind
-          name
-          ofType {
-            kind
-            name
-            ofType {
-              kind
-              name
-              ofType {
-                kind
-                name
-                ofType {
-                  kind
-                  name
-                  ofType {
-                    kind
-                    name
-                    ofType {
-                      kind
-                      name
-                      ofType {
-                        kind
-                        name
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
+      name${ofType(optionsWithDefault.typeDepth, '      ')}
     }
   `;
 }

package/utilities/introspectionFromSchema.js

@@ -28,6 +28,7 @@ function introspectionFromSchema(schema, options) {
     directiveIsRepeatable: true,
     schemaDescription: true,
     inputValueDeprecation: true,
+    experimentalDirectiveDeprecation: true,
     oneOf: true,
     ...options,
   };

package/utilities/introspectionFromSchema.mjs

@@ -18,6 +18,7 @@ export function introspectionFromSchema(schema, options) {
     directiveIsRepeatable: true,
     schemaDescription: true,
     inputValueDeprecation: true,
+    experimentalDirectiveDeprecation: true,
     oneOf: true,
     ...options,
   };

package/utilities/printSchema.js

@@ -286,6 +286,7 @@ function printDirective(directive) {
     'directive @' +
     directive.name +
     printArgs(directive.args) +
+    printDeprecated(directive.deprecationReason) +
     (directive.isRepeatable ? ' repeatable' : '') +
     ' on ' +
     directive.locations.join(' | ')

package/utilities/printSchema.mjs

@@ -262,6 +262,7 @@ function printDirective(directive) {
     'directive @' +
     directive.name +
     printArgs(directive.args) +
+    printDeprecated(directive.deprecationReason) +
     (directive.isRepeatable ? ' repeatable' : '') +
     ' on ' +
     directive.locations.join(' | ')

package/utilities/valueFromAST.js

@@ -45,7 +45,11 @@ function valueFromAST(valueNode, type, variables) {
   if (valueNode.kind === _kinds.Kind.VARIABLE) {
     const variableName = valueNode.name.value;
 
-    if (variables == null || variables[variableName] === undefined) {
+    if (
+      variables == null ||
+      variables[variableName] === undefined ||
+      !hasOwnProperty(variables, variableName)
+    ) {
       // No valid return value.
       return;
     }
@@ -192,6 +196,12 @@ function valueFromAST(valueNode, type, variables) {
 function isMissingVariable(valueNode, variables) {
   return (
     valueNode.kind === _kinds.Kind.VARIABLE &&
-    (variables == null || variables[valueNode.name.value] === undefined)
+    (variables == null ||
+      variables[valueNode.name.value] === undefined ||
+      !hasOwnProperty(variables, valueNode.name.value))
   );
 }
+
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}

package/utilities/valueFromAST.mjs

@@ -39,7 +39,11 @@ export function valueFromAST(valueNode, type, variables) {
   if (valueNode.kind === Kind.VARIABLE) {
     const variableName = valueNode.name.value;
 
-    if (variables == null || variables[variableName] === undefined) {
+    if (
+      variables == null ||
+      variables[variableName] === undefined ||
+      !hasOwnProperty(variables, variableName)
+    ) {
       // No valid return value.
       return;
     }
@@ -179,6 +183,12 @@ export function valueFromAST(valueNode, type, variables) {
 function isMissingVariable(valueNode, variables) {
   return (
     valueNode.kind === Kind.VARIABLE &&
-    (variables == null || variables[valueNode.name.value] === undefined)
+    (variables == null ||
+      variables[valueNode.name.value] === undefined ||
+      !hasOwnProperty(variables, valueNode.name.value))
   );
 }
+
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}

package/validation/rules/KnownDirectivesRule.js

@@ -140,6 +140,10 @@ function getDirectiveLocationForASTPath(ancestors) {
         ? _directiveLocation.DirectiveLocation.INPUT_FIELD_DEFINITION
         : _directiveLocation.DirectiveLocation.ARGUMENT_DEFINITION;
     }
+
+    case _kinds.Kind.DIRECTIVE_DEFINITION:
+    case _kinds.Kind.DIRECTIVE_EXTENSION:
+      return _directiveLocation.DirectiveLocation.DIRECTIVE_DEFINITION;
     // Not reachable, all possible types have been considered.
 
     /* c8 ignore next */

package/validation/rules/KnownDirectivesRule.mjs

@@ -127,6 +127,10 @@ function getDirectiveLocationForASTPath(ancestors) {
         ? DirectiveLocation.INPUT_FIELD_DEFINITION
         : DirectiveLocation.ARGUMENT_DEFINITION;
     }
+
+    case Kind.DIRECTIVE_DEFINITION:
+    case Kind.DIRECTIVE_EXTENSION:
+      return DirectiveLocation.DIRECTIVE_DEFINITION;
     // Not reachable, all possible types have been considered.
 
     /* c8 ignore next */

package/validation/rules/UniqueDirectivesPerLocationRule.js

@@ -42,6 +42,7 @@ function UniqueDirectivesPerLocationRule(context) {
 
   const schemaDirectives = Object.create(null);
   const typeDirectivesMap = Object.create(null);
+  const directiveDirectivesMap = Object.create(null);
   return {
     // Many different AST nodes may contain directives. Rather than listing
     // them all, just listen for entering any node, and check to see if it
@@ -68,6 +69,17 @@ function UniqueDirectivesPerLocationRule(context) {
         if (seenDirectives === undefined) {
           typeDirectivesMap[typeName] = seenDirectives = Object.create(null);
         }
+      } else if (
+        node.kind === _kinds.Kind.DIRECTIVE_DEFINITION ||
+        node.kind === _kinds.Kind.DIRECTIVE_EXTENSION
+      ) {
+        const directiveName = node.name.value;
+        seenDirectives = directiveDirectivesMap[directiveName];
+
+        if (seenDirectives === undefined) {
+          directiveDirectivesMap[directiveName] = seenDirectives =
+            Object.create(null);
+        }
       } else {
         seenDirectives = Object.create(null);
       }

package/validation/rules/UniqueDirectivesPerLocationRule.mjs

@@ -35,6 +35,7 @@ export function UniqueDirectivesPerLocationRule(context) {
 
   const schemaDirectives = Object.create(null);
   const typeDirectivesMap = Object.create(null);
+  const directiveDirectivesMap = Object.create(null);
   return {
     // Many different AST nodes may contain directives. Rather than listing
     // them all, just listen for entering any node, and check to see if it
@@ -58,6 +59,17 @@ export function UniqueDirectivesPerLocationRule(context) {
         if (seenDirectives === undefined) {
           typeDirectivesMap[typeName] = seenDirectives = Object.create(null);
         }
+      } else if (
+        node.kind === Kind.DIRECTIVE_DEFINITION ||
+        node.kind === Kind.DIRECTIVE_EXTENSION
+      ) {
+        const directiveName = node.name.value;
+        seenDirectives = directiveDirectivesMap[directiveName];
+
+        if (seenDirectives === undefined) {
+          directiveDirectivesMap[directiveName] = seenDirectives =
+            Object.create(null);
+        }
       } else {
         seenDirectives = Object.create(null);
       }