graphql 16.9.0 → 16.10.0

package/README.md

@@ -1,3 +1,5 @@
+[![GraphQLConf 2024 Banner: September 10-12, San Francisco. Hosted by the GraphQL Foundation](https://github.com/user-attachments/assets/2d048502-e5b2-4e9d-a02a-50b841824de6)](https://graphql.org/conf/2024/?utm_source=github&utm_medium=graphql_js&utm_campaign=readme)
+
 # GraphQL.js
 
 The JavaScript reference implementation for GraphQL, a query language for APIs created by Facebook.

package/error/GraphQLError.d.ts

@@ -14,6 +14,18 @@ import type { Source } from '../language/source';
 export interface GraphQLErrorExtensions {
   [attributeName: string]: unknown;
 }
+/**
+ * Custom formatted extensions
+ *
+ * @remarks
+ * Use a unique identifier name for your extension, for example the name of
+ * your library or project. Do not use a shortened identifier as this increases
+ * the risk of conflicts. We recommend you add at most one extension field,
+ * an object which can contain all the values you need.
+ */
+export interface GraphQLFormattedErrorExtensions {
+  [attributeName: string]: unknown;
+}
 export interface GraphQLErrorOptions {
   nodes?: ReadonlyArray<ASTNode> | ASTNode | null;
   source?: Maybe<Source>;
@@ -122,9 +134,7 @@ export interface GraphQLFormattedError {
    * Reserved for implementors to extend the protocol however they see fit,
    * and hence there are no additional restrictions on its contents.
    */
-  readonly extensions?: {
-    [key: string]: unknown;
-  };
+  readonly extensions?: GraphQLFormattedErrorExtensions;
 }
 /**
  * Prints a GraphQLError to a string, representing useful location information

package/error/index.d.ts

@@ -3,6 +3,7 @@ export type {
   GraphQLErrorOptions,
   GraphQLFormattedError,
   GraphQLErrorExtensions,
+  GraphQLFormattedErrorExtensions,
 } from './GraphQLError';
 export { syntaxError } from './syntaxError';
 export { locatedError } from './locatedError';

package/index.d.ts

@@ -352,6 +352,7 @@ export type {
   GraphQLErrorOptions,
   GraphQLFormattedError,
   GraphQLErrorExtensions,
+  GraphQLFormattedErrorExtensions,
 } from './error/index';
 export {
   getIntrospectionQuery,

package/language/ast.d.ts

@@ -162,6 +162,7 @@ export interface DocumentNode {
   readonly kind: Kind.DOCUMENT;
   readonly loc?: Location;
   readonly definitions: ReadonlyArray<DefinitionNode>;
+  readonly tokenCount?: number | undefined;
 }
 export declare type DefinitionNode =
   | ExecutableDefinitionNode

package/language/parser.d.ts

@@ -149,6 +149,7 @@ export declare class Parser {
   protected _lexer: Lexer;
   protected _tokenCounter: number;
   constructor(source: string | Source, options?: ParseOptions);
+  get tokenCount(): number;
   /**
    * Converts a name lex token into a name parse node.
    */

package/language/parser.js

@@ -29,7 +29,12 @@ var _tokenKind = require('./tokenKind.js');
  */
 function parse(source, options) {
   const parser = new Parser(source, options);
-  return parser.parseDocument();
+  const document = parser.parseDocument();
+  Object.defineProperty(document, 'tokenCount', {
+    enumerable: false,
+    value: parser.tokenCount,
+  });
+  return document;
 }
 /**
  * Given a string containing a GraphQL value (ex. `[42]`), parse the AST for
@@ -100,6 +105,10 @@ class Parser {
     this._options = options;
     this._tokenCounter = 0;
   }
+
+  get tokenCount() {
+    return this._tokenCounter;
+  }
   /**
    * Converts a name lex token into a name parse node.
    */
@@ -1535,10 +1544,10 @@ class Parser {
 
     const token = this._lexer.advance();
 
-    if (maxTokens !== undefined && token.kind !== _tokenKind.TokenKind.EOF) {
+    if (token.kind !== _tokenKind.TokenKind.EOF) {
       ++this._tokenCounter;
 
-      if (this._tokenCounter > maxTokens) {
+      if (maxTokens !== undefined && this._tokenCounter > maxTokens) {
         throw (0, _syntaxError.syntaxError)(
           this._lexer.source,
           token.start,

package/language/parser.mjs

@@ -15,7 +15,12 @@ import { TokenKind } from './tokenKind.mjs';
  */
 export function parse(source, options) {
   const parser = new Parser(source, options);
-  return parser.parseDocument();
+  const document = parser.parseDocument();
+  Object.defineProperty(document, 'tokenCount', {
+    enumerable: false,
+    value: parser.tokenCount,
+  });
+  return document;
 }
 /**
  * Given a string containing a GraphQL value (ex. `[42]`), parse the AST for
@@ -84,6 +89,10 @@ export class Parser {
     this._options = options;
     this._tokenCounter = 0;
   }
+
+  get tokenCount() {
+    return this._tokenCounter;
+  }
   /**
    * Converts a name lex token into a name parse node.
    */
@@ -1494,10 +1503,10 @@ export class Parser {
 
     const token = this._lexer.advance();
 
-    if (maxTokens !== undefined && token.kind !== TokenKind.EOF) {
+    if (token.kind !== TokenKind.EOF) {
       ++this._tokenCounter;
 
-      if (this._tokenCounter > maxTokens) {
+      if (maxTokens !== undefined && this._tokenCounter > maxTokens) {
         throw syntaxError(
           this._lexer.source,
           token.start,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "16.9.0",
+  "version": "16.10.0",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "main": "index",

package/type/validate.js

@@ -175,8 +175,14 @@ function validateDirectives(context) {
       continue;
     } // Ensure they are named correctly.
 
-    validateName(context, directive); // TODO: Ensure proper locations.
-    // Ensure the arguments are valid.
+    validateName(context, directive);
+
+    if (directive.locations.length === 0) {
+      context.reportError(
+        `Directive @${directive.name} must include 1 or more locations.`,
+        directive.astNode,
+      );
+    } // Ensure the arguments are valid.
 
     for (const arg of directive.args) {
       // Ensure they are named correctly.

package/type/validate.mjs

@@ -173,8 +173,14 @@ function validateDirectives(context) {
       continue;
     } // Ensure they are named correctly.
 
-    validateName(context, directive); // TODO: Ensure proper locations.
-    // Ensure the arguments are valid.
+    validateName(context, directive);
+
+    if (directive.locations.length === 0) {
+      context.reportError(
+        `Directive @${directive.name} must include 1 or more locations.`,
+        directive.astNode,
+      );
+    } // Ensure the arguments are valid.
 
     for (const arg of directive.args) {
       // Ensure they are named correctly.

package/utilities/getIntrospectionQuery.js

@@ -39,9 +39,9 @@ function getIntrospectionQuery(options) {
     query IntrospectionQuery {
       __schema {
         ${schemaDescription}
-        queryType { name }
-        mutationType { name }
-        subscriptionType { name }
+        queryType { name kind }
+        mutationType { name kind }
+        subscriptionType { name kind }
         types {
           ...FullType
         }

package/utilities/getIntrospectionQuery.mjs

@@ -32,9 +32,9 @@ export function getIntrospectionQuery(options) {
     query IntrospectionQuery {
       __schema {
         ${schemaDescription}
-        queryType { name }
-        mutationType { name }
-        subscriptionType { name }
+        queryType { name kind }
+        mutationType { name kind }
+        subscriptionType { name kind }
         types {
           ...FullType
         }

package/validation/rules/OverlappingFieldsCanBeMergedRule.js

@@ -43,9 +43,10 @@ function reasonMessage(reason) {
  */
 
 function OverlappingFieldsCanBeMergedRule(context) {
-  // A memoization for when two fragments are compared "between" each other for
-  // conflicts. Two fragments may be compared many times, so memoizing this can
-  // dramatically improve the performance of this validator.
+  // A memoization for when fields and a fragment or two fragments are compared
+  // "between" each other for conflicts. Comparisons made be made many times,
+  // so memoizing this can dramatically improve the performance of this validator.
+  const comparedFieldsAndFragmentPairs = new OrderedPairSet();
   const comparedFragmentPairs = new PairSet(); // A cache for the "field map" and list of fragment names found in any given
   // selection set. Selection sets may be asked for this information multiple
   // times, so this improves the performance of this validator.
@@ -56,6 +57,7 @@ function OverlappingFieldsCanBeMergedRule(context) {
       const conflicts = findConflictsWithinSelectionSet(
         context,
         cachedFieldsAndFragmentNames,
+        comparedFieldsAndFragmentPairs,
         comparedFragmentPairs,
         context.getParentType(),
         selectionSet,
@@ -136,6 +138,7 @@ function OverlappingFieldsCanBeMergedRule(context) {
 function findConflictsWithinSelectionSet(
   context,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   parentType,
   selectionSet,
@@ -153,6 +156,7 @@ function findConflictsWithinSelectionSet(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     fieldMap,
   );
@@ -165,6 +169,7 @@ function findConflictsWithinSelectionSet(
         context,
         conflicts,
         cachedFieldsAndFragmentNames,
+        comparedFieldsAndFragmentPairs,
         comparedFragmentPairs,
         false,
         fieldMap,
@@ -179,6 +184,7 @@ function findConflictsWithinSelectionSet(
           context,
           conflicts,
           cachedFieldsAndFragmentNames,
+          comparedFieldsAndFragmentPairs,
           comparedFragmentPairs,
           false,
           fragmentNames[i],
@@ -196,11 +202,29 @@ function collectConflictsBetweenFieldsAndFragment(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   areMutuallyExclusive,
   fieldMap,
   fragmentName,
 ) {
+  // Memoize so the fields and fragments are not compared for conflicts more
+  // than once.
+  if (
+    comparedFieldsAndFragmentPairs.has(
+      fieldMap,
+      fragmentName,
+      areMutuallyExclusive,
+    )
+  ) {
+    return;
+  }
+
+  comparedFieldsAndFragmentPairs.add(
+    fieldMap,
+    fragmentName,
+    areMutuallyExclusive,
+  );
   const fragment = context.getFragment(fragmentName);
 
   if (!fragment) {
@@ -223,6 +247,7 @@ function collectConflictsBetweenFieldsAndFragment(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     areMutuallyExclusive,
     fieldMap,
@@ -231,26 +256,11 @@ function collectConflictsBetweenFieldsAndFragment(
   // and any fragment names found in the given fragment.
 
   for (const referencedFragmentName of referencedFragmentNames) {
-    // Memoize so two fragments are not compared for conflicts more than once.
-    if (
-      comparedFragmentPairs.has(
-        referencedFragmentName,
-        fragmentName,
-        areMutuallyExclusive,
-      )
-    ) {
-      continue;
-    }
-
-    comparedFragmentPairs.add(
-      referencedFragmentName,
-      fragmentName,
-      areMutuallyExclusive,
-    );
     collectConflictsBetweenFieldsAndFragment(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fieldMap,
@@ -264,6 +274,7 @@ function collectConflictsBetweenFragments(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   areMutuallyExclusive,
   fragmentName1,
@@ -310,6 +321,7 @@ function collectConflictsBetweenFragments(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     areMutuallyExclusive,
     fieldMap1,
@@ -322,6 +334,7 @@ function collectConflictsBetweenFragments(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fragmentName1,
@@ -335,6 +348,7 @@ function collectConflictsBetweenFragments(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       referencedFragmentName1,
@@ -348,6 +362,7 @@ function collectConflictsBetweenFragments(
 function findConflictsBetweenSubSelectionSets(
   context,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   areMutuallyExclusive,
   parentType1,
@@ -373,6 +388,7 @@ function findConflictsBetweenSubSelectionSets(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     areMutuallyExclusive,
     fieldMap1,
@@ -385,6 +401,7 @@ function findConflictsBetweenSubSelectionSets(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fieldMap1,
@@ -398,6 +415,7 @@ function findConflictsBetweenSubSelectionSets(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fieldMap2,
@@ -413,6 +431,7 @@ function findConflictsBetweenSubSelectionSets(
         context,
         conflicts,
         cachedFieldsAndFragmentNames,
+        comparedFieldsAndFragmentPairs,
         comparedFragmentPairs,
         areMutuallyExclusive,
         fragmentName1,
@@ -428,6 +447,7 @@ function collectConflictsWithin(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   fieldMap,
 ) {
@@ -445,6 +465,7 @@ function collectConflictsWithin(
           const conflict = findConflict(
             context,
             cachedFieldsAndFragmentNames,
+            comparedFieldsAndFragmentPairs,
             comparedFragmentPairs,
             false, // within one collection is never mutually exclusive
             responseName,
@@ -469,6 +490,7 @@ function collectConflictsBetween(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   parentFieldsAreMutuallyExclusive,
   fieldMap1,
@@ -488,6 +510,7 @@ function collectConflictsBetween(
           const conflict = findConflict(
             context,
             cachedFieldsAndFragmentNames,
+            comparedFieldsAndFragmentPairs,
             comparedFragmentPairs,
             parentFieldsAreMutuallyExclusive,
             responseName,
@@ -508,6 +531,7 @@ function collectConflictsBetween(
 function findConflict(
   context,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   parentFieldsAreMutuallyExclusive,
   responseName,
@@ -577,6 +601,7 @@ function findConflict(
     const conflicts = findConflictsBetweenSubSelectionSets(
       context,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       (0, _definition.getNamedType)(type1),
@@ -779,42 +804,65 @@ function subfieldConflicts(conflicts, responseName, node1, node2) {
   }
 }
 /**
- * A way to keep track of pairs of things when the ordering of the pair does not matter.
+ * A way to keep track of pairs of things where the ordering of the pair
+ * matters.
+ *
+ * Provides a third argument for has/set to allow flagging the pair as
+ * weakly or strongly present within the collection.
  */
 
-class PairSet {
+class OrderedPairSet {
   constructor() {
     this._data = new Map();
   }
 
-  has(a, b, areMutuallyExclusive) {
+  has(a, b, weaklyPresent) {
     var _this$_data$get;
 
-    const [key1, key2] = a < b ? [a, b] : [b, a];
     const result =
-      (_this$_data$get = this._data.get(key1)) === null ||
+      (_this$_data$get = this._data.get(a)) === null ||
       _this$_data$get === void 0
         ? void 0
-        : _this$_data$get.get(key2);
+        : _this$_data$get.get(b);
 
     if (result === undefined) {
       return false;
-    } // areMutuallyExclusive being false is a superset of being true, hence if
-    // we want to know if this PairSet "has" these two with no exclusivity,
-    // we have to ensure it was added as such.
+    }
 
-    return areMutuallyExclusive ? true : areMutuallyExclusive === result;
+    return weaklyPresent ? true : weaklyPresent === result;
   }
 
-  add(a, b, areMutuallyExclusive) {
-    const [key1, key2] = a < b ? [a, b] : [b, a];
-
-    const map = this._data.get(key1);
+  add(a, b, weaklyPresent) {
+    const map = this._data.get(a);
 
     if (map === undefined) {
-      this._data.set(key1, new Map([[key2, areMutuallyExclusive]]));
+      this._data.set(a, new Map([[b, weaklyPresent]]));
+    } else {
+      map.set(b, weaklyPresent);
+    }
+  }
+}
+/**
+ * A way to keep track of pairs of similar things when the ordering of the pair
+ * does not matter.
+ */
+
+class PairSet {
+  constructor() {
+    this._orderedPairSet = new OrderedPairSet();
+  }
+
+  has(a, b, weaklyPresent) {
+    return a < b
+      ? this._orderedPairSet.has(a, b, weaklyPresent)
+      : this._orderedPairSet.has(b, a, weaklyPresent);
+  }
+
+  add(a, b, weaklyPresent) {
+    if (a < b) {
+      this._orderedPairSet.add(a, b, weaklyPresent);
     } else {
-      map.set(key2, areMutuallyExclusive);
+      this._orderedPairSet.add(b, a, weaklyPresent);
     }
   }
 }

package/validation/rules/OverlappingFieldsCanBeMergedRule.mjs

@@ -37,9 +37,10 @@ function reasonMessage(reason) {
  */
 
 export function OverlappingFieldsCanBeMergedRule(context) {
-  // A memoization for when two fragments are compared "between" each other for
-  // conflicts. Two fragments may be compared many times, so memoizing this can
-  // dramatically improve the performance of this validator.
+  // A memoization for when fields and a fragment or two fragments are compared
+  // "between" each other for conflicts. Comparisons made be made many times,
+  // so memoizing this can dramatically improve the performance of this validator.
+  const comparedFieldsAndFragmentPairs = new OrderedPairSet();
   const comparedFragmentPairs = new PairSet(); // A cache for the "field map" and list of fragment names found in any given
   // selection set. Selection sets may be asked for this information multiple
   // times, so this improves the performance of this validator.
@@ -50,6 +51,7 @@ export function OverlappingFieldsCanBeMergedRule(context) {
       const conflicts = findConflictsWithinSelectionSet(
         context,
         cachedFieldsAndFragmentNames,
+        comparedFieldsAndFragmentPairs,
         comparedFragmentPairs,
         context.getParentType(),
         selectionSet,
@@ -130,6 +132,7 @@ export function OverlappingFieldsCanBeMergedRule(context) {
 function findConflictsWithinSelectionSet(
   context,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   parentType,
   selectionSet,
@@ -147,6 +150,7 @@ function findConflictsWithinSelectionSet(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     fieldMap,
   );
@@ -159,6 +163,7 @@ function findConflictsWithinSelectionSet(
         context,
         conflicts,
         cachedFieldsAndFragmentNames,
+        comparedFieldsAndFragmentPairs,
         comparedFragmentPairs,
         false,
         fieldMap,
@@ -173,6 +178,7 @@ function findConflictsWithinSelectionSet(
           context,
           conflicts,
           cachedFieldsAndFragmentNames,
+          comparedFieldsAndFragmentPairs,
           comparedFragmentPairs,
           false,
           fragmentNames[i],
@@ -190,11 +196,29 @@ function collectConflictsBetweenFieldsAndFragment(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   areMutuallyExclusive,
   fieldMap,
   fragmentName,
 ) {
+  // Memoize so the fields and fragments are not compared for conflicts more
+  // than once.
+  if (
+    comparedFieldsAndFragmentPairs.has(
+      fieldMap,
+      fragmentName,
+      areMutuallyExclusive,
+    )
+  ) {
+    return;
+  }
+
+  comparedFieldsAndFragmentPairs.add(
+    fieldMap,
+    fragmentName,
+    areMutuallyExclusive,
+  );
   const fragment = context.getFragment(fragmentName);
 
   if (!fragment) {
@@ -217,6 +241,7 @@ function collectConflictsBetweenFieldsAndFragment(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     areMutuallyExclusive,
     fieldMap,
@@ -225,26 +250,11 @@ function collectConflictsBetweenFieldsAndFragment(
   // and any fragment names found in the given fragment.
 
   for (const referencedFragmentName of referencedFragmentNames) {
-    // Memoize so two fragments are not compared for conflicts more than once.
-    if (
-      comparedFragmentPairs.has(
-        referencedFragmentName,
-        fragmentName,
-        areMutuallyExclusive,
-      )
-    ) {
-      continue;
-    }
-
-    comparedFragmentPairs.add(
-      referencedFragmentName,
-      fragmentName,
-      areMutuallyExclusive,
-    );
     collectConflictsBetweenFieldsAndFragment(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fieldMap,
@@ -258,6 +268,7 @@ function collectConflictsBetweenFragments(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   areMutuallyExclusive,
   fragmentName1,
@@ -304,6 +315,7 @@ function collectConflictsBetweenFragments(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     areMutuallyExclusive,
     fieldMap1,
@@ -316,6 +328,7 @@ function collectConflictsBetweenFragments(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fragmentName1,
@@ -329,6 +342,7 @@ function collectConflictsBetweenFragments(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       referencedFragmentName1,
@@ -342,6 +356,7 @@ function collectConflictsBetweenFragments(
 function findConflictsBetweenSubSelectionSets(
   context,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   areMutuallyExclusive,
   parentType1,
@@ -367,6 +382,7 @@ function findConflictsBetweenSubSelectionSets(
     context,
     conflicts,
     cachedFieldsAndFragmentNames,
+    comparedFieldsAndFragmentPairs,
     comparedFragmentPairs,
     areMutuallyExclusive,
     fieldMap1,
@@ -379,6 +395,7 @@ function findConflictsBetweenSubSelectionSets(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fieldMap1,
@@ -392,6 +409,7 @@ function findConflictsBetweenSubSelectionSets(
       context,
       conflicts,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       fieldMap2,
@@ -407,6 +425,7 @@ function findConflictsBetweenSubSelectionSets(
         context,
         conflicts,
         cachedFieldsAndFragmentNames,
+        comparedFieldsAndFragmentPairs,
         comparedFragmentPairs,
         areMutuallyExclusive,
         fragmentName1,
@@ -422,6 +441,7 @@ function collectConflictsWithin(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   fieldMap,
 ) {
@@ -439,6 +459,7 @@ function collectConflictsWithin(
           const conflict = findConflict(
             context,
             cachedFieldsAndFragmentNames,
+            comparedFieldsAndFragmentPairs,
             comparedFragmentPairs,
             false, // within one collection is never mutually exclusive
             responseName,
@@ -463,6 +484,7 @@ function collectConflictsBetween(
   context,
   conflicts,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   parentFieldsAreMutuallyExclusive,
   fieldMap1,
@@ -482,6 +504,7 @@ function collectConflictsBetween(
           const conflict = findConflict(
             context,
             cachedFieldsAndFragmentNames,
+            comparedFieldsAndFragmentPairs,
             comparedFragmentPairs,
             parentFieldsAreMutuallyExclusive,
             responseName,
@@ -502,6 +525,7 @@ function collectConflictsBetween(
 function findConflict(
   context,
   cachedFieldsAndFragmentNames,
+  comparedFieldsAndFragmentPairs,
   comparedFragmentPairs,
   parentFieldsAreMutuallyExclusive,
   responseName,
@@ -571,6 +595,7 @@ function findConflict(
     const conflicts = findConflictsBetweenSubSelectionSets(
       context,
       cachedFieldsAndFragmentNames,
+      comparedFieldsAndFragmentPairs,
       comparedFragmentPairs,
       areMutuallyExclusive,
       getNamedType(type1),
@@ -764,42 +789,65 @@ function subfieldConflicts(conflicts, responseName, node1, node2) {
   }
 }
 /**
- * A way to keep track of pairs of things when the ordering of the pair does not matter.
+ * A way to keep track of pairs of things where the ordering of the pair
+ * matters.
+ *
+ * Provides a third argument for has/set to allow flagging the pair as
+ * weakly or strongly present within the collection.
  */
 
-class PairSet {
+class OrderedPairSet {
   constructor() {
     this._data = new Map();
   }
 
-  has(a, b, areMutuallyExclusive) {
+  has(a, b, weaklyPresent) {
     var _this$_data$get;
 
-    const [key1, key2] = a < b ? [a, b] : [b, a];
     const result =
-      (_this$_data$get = this._data.get(key1)) === null ||
+      (_this$_data$get = this._data.get(a)) === null ||
       _this$_data$get === void 0
         ? void 0
-        : _this$_data$get.get(key2);
+        : _this$_data$get.get(b);
 
     if (result === undefined) {
       return false;
-    } // areMutuallyExclusive being false is a superset of being true, hence if
-    // we want to know if this PairSet "has" these two with no exclusivity,
-    // we have to ensure it was added as such.
+    }
 
-    return areMutuallyExclusive ? true : areMutuallyExclusive === result;
+    return weaklyPresent ? true : weaklyPresent === result;
   }
 
-  add(a, b, areMutuallyExclusive) {
-    const [key1, key2] = a < b ? [a, b] : [b, a];
-
-    const map = this._data.get(key1);
+  add(a, b, weaklyPresent) {
+    const map = this._data.get(a);
 
     if (map === undefined) {
-      this._data.set(key1, new Map([[key2, areMutuallyExclusive]]));
+      this._data.set(a, new Map([[b, weaklyPresent]]));
+    } else {
+      map.set(b, weaklyPresent);
+    }
+  }
+}
+/**
+ * A way to keep track of pairs of similar things when the ordering of the pair
+ * does not matter.
+ */
+
+class PairSet {
+  constructor() {
+    this._orderedPairSet = new OrderedPairSet();
+  }
+
+  has(a, b, weaklyPresent) {
+    return a < b
+      ? this._orderedPairSet.has(a, b, weaklyPresent)
+      : this._orderedPairSet.has(b, a, weaklyPresent);
+  }
+
+  add(a, b, weaklyPresent) {
+    if (a < b) {
+      this._orderedPairSet.add(a, b, weaklyPresent);
     } else {
-      map.set(key2, areMutuallyExclusive);
+      this._orderedPairSet.add(b, a, weaklyPresent);
     }
   }
 }

package/validation/rules/ScalarLeafsRule.js

@@ -48,6 +48,17 @@ function ScalarLeafsRule(context) {
               },
             ),
           );
+        } else if (selectionSet.selections.length === 0) {
+          const fieldName = node.name.value;
+          const typeStr = (0, _inspect.inspect)(type);
+          context.reportError(
+            new _GraphQLError.GraphQLError(
+              `Field "${fieldName}" of type "${typeStr}" must have at least one field selected.`,
+              {
+                nodes: node,
+              },
+            ),
+          );
         }
       }
     },

package/validation/rules/ScalarLeafsRule.mjs

@@ -39,6 +39,17 @@ export function ScalarLeafsRule(context) {
               },
             ),
           );
+        } else if (selectionSet.selections.length === 0) {
+          const fieldName = node.name.value;
+          const typeStr = inspect(type);
+          context.reportError(
+            new GraphQLError(
+              `Field "${fieldName}" of type "${typeStr}" must have at least one field selected.`,
+              {
+                nodes: node,
+              },
+            ),
+          );
         }
       }
     },

package/version.js

@@ -10,7 +10,7 @@ exports.versionInfo = exports.version = void 0;
 /**
  * A string containing the version of the GraphQL.js library
  */
-const version = '16.9.0';
+const version = '16.10.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -18,7 +18,7 @@ const version = '16.9.0';
 exports.version = version;
 const versionInfo = Object.freeze({
   major: 16,
-  minor: 9,
+  minor: 10,
   patch: 0,
   preReleaseTag: null,
 });

package/version.mjs

@@ -4,14 +4,14 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export const version = '16.9.0';
+export const version = '16.10.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
 
 export const versionInfo = Object.freeze({
   major: 16,
-  minor: 9,
+  minor: 10,
   patch: 0,
   preReleaseTag: null,
 });