graphql 14.1.1 → 14.3.1

package/utilities/schemaPrinter.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,13 +7,21 @@
  * @flow strict
  */
 
+import flatMap from '../polyfills/flatMap';
 import objectValues from '../polyfills/objectValues';
-import isNullish from '../jsutils/isNullish';
-import isInvalid from '../jsutils/isInvalid';
+import inspect from '../jsutils/inspect';
 import { astFromValue } from '../utilities/astFromValue';
 import { print } from '../language/printer';
-import type { GraphQLSchema } from '../type/schema';
+import { printBlockString } from '../language/blockString';
+import { type GraphQLSchema } from '../type/schema';
 import {
+  type GraphQLNamedType,
+  type GraphQLScalarType,
+  type GraphQLEnumType,
+  type GraphQLObjectType,
+  type GraphQLInterfaceType,
+  type GraphQLUnionType,
+  type GraphQLInputObjectType,
   isScalarType,
   isObjectType,
   isInterfaceType,
@@ -21,15 +29,6 @@ import {
   isEnumType,
   isInputObjectType,
 } from '../type/definition';
-import type {
-  GraphQLNamedType,
-  GraphQLScalarType,
-  GraphQLEnumType,
-  GraphQLObjectType,
-  GraphQLInterfaceType,
-  GraphQLUnionType,
-  GraphQLInputObjectType,
-} from '../type/definition';
 import { GraphQLString, isSpecifiedScalarType } from '../type/scalars';
 import {
   GraphQLDirective,
@@ -175,8 +174,10 @@ export function printType(type: GraphQLNamedType, options?: Options): string {
   } else if (isInputObjectType(type)) {
     return printInputObject(type, options);
   }
+
+  // Not reachable. All possible types have been considered.
   /* istanbul ignore next */
-  throw new Error(`Unknown type: ${(type: empty)}.`);
+  throw new Error(`Unexpected type: "${inspect((type: empty))}".`);
 }
 
 function printScalar(type: GraphQLScalarType, options): string {
@@ -190,82 +191,67 @@ function printObject(type: GraphQLObjectType, options): string {
     : '';
   return (
     printDescription(options, type) +
-    `type ${type.name}${implementedInterfaces} {\n` +
-    printFields(options, type) +
-    '\n' +
-    '}'
+    `type ${type.name}${implementedInterfaces}` +
+    printFields(options, type)
   );
 }
 
 function printInterface(type: GraphQLInterfaceType, options): string {
   return (
     printDescription(options, type) +
-    `interface ${type.name} {\n` +
-    printFields(options, type) +
-    '\n' +
-    '}'
+    `interface ${type.name}` +
+    printFields(options, type)
   );
 }
 
 function printUnion(type: GraphQLUnionType, options): string {
-  return (
-    printDescription(options, type) +
-    `union ${type.name} = ${type.getTypes().join(' | ')}`
-  );
+  const types = type.getTypes();
+  const possibleTypes = types.length ? ' = ' + types.join(' | ') : '';
+  return printDescription(options, type) + 'union ' + type.name + possibleTypes;
 }
 
 function printEnum(type: GraphQLEnumType, options): string {
-  return (
-    printDescription(options, type) +
-    `enum ${type.name} {\n` +
-    printEnumValues(type.getValues(), options) +
-    '\n' +
-    '}'
-  );
-}
-
-function printEnumValues(values, options): string {
-  return values
+  const values = type
+    .getValues()
     .map(
       (value, i) =>
         printDescription(options, value, '  ', !i) +
         '  ' +
         value.name +
         printDeprecated(value),
-    )
-    .join('\n');
+    );
+
+  return (
+    printDescription(options, type) + `enum ${type.name}` + printBlock(values)
+  );
 }
 
 function printInputObject(type: GraphQLInputObjectType, options): string {
-  const fields = objectValues(type.getFields());
+  const fields = objectValues(type.getFields()).map(
+    (f, i) =>
+      printDescription(options, f, '  ', !i) + '  ' + printInputValue(f),
+  );
   return (
-    printDescription(options, type) +
-    `input ${type.name} {\n` +
-    fields
-      .map(
-        (f, i) =>
-          printDescription(options, f, '  ', !i) + '  ' + printInputValue(f),
-      )
-      .join('\n') +
-    '\n' +
-    '}'
+    printDescription(options, type) + `input ${type.name}` + printBlock(fields)
   );
 }
 
 function printFields(options, type) {
-  const fields = objectValues(type.getFields());
-  return fields
-    .map(
-      (f, i) =>
-        printDescription(options, f, '  ', !i) +
-        '  ' +
-        f.name +
-        printArgs(options, f.args, '  ') +
-        ': ' +
-        String(f.type) +
-        printDeprecated(f),
-    )
-    .join('\n');
+  const fields = objectValues(type.getFields()).map(
+    (f, i) =>
+      printDescription(options, f, '  ', !i) +
+      '  ' +
+      f.name +
+      printArgs(options, f.args, '  ') +
+      ': ' +
+      String(f.type) +
+      printDeprecated(f),
+  );
+  return printBlock(fields);
+}
+
+function printBlock(items) {
+  return items.length !== 0 ? ' {\n' + items.join('\n') + '\n}' : '';
 }
 
 function printArgs(options, args, indentation = '') {
@@ -296,9 +282,10 @@ function printArgs(options, args, indentation = '') {
 }
 
 function printInputValue(arg) {
+  const defaultAST = astFromValue(arg.defaultValue, arg.type);
   let argDecl = arg.name + ': ' + String(arg.type);
-  if (!isInvalid(arg.defaultValue)) {
-    argDecl += ` = ${print(astFromValue(arg.defaultValue, arg.type))}`;
+  if (defaultAST) {
+    argDecl += ` = ${print(defaultAST)}`;
   }
   return argDecl;
 }
@@ -319,16 +306,11 @@ function printDeprecated(fieldOrEnumVal) {
     return '';
   }
   const reason = fieldOrEnumVal.deprecationReason;
-  if (
-    isNullish(reason) ||
-    reason === '' ||
-    reason === DEFAULT_DEPRECATION_REASON
-  ) {
-    return ' @deprecated';
+  const reasonAST = astFromValue(reason, GraphQLString);
+  if (reasonAST && reason !== '' && reason !== DEFAULT_DEPRECATION_REASON) {
+    return ' @deprecated(reason: ' + print(reasonAST) + ')';
   }
-  return (
-    ' @deprecated(reason: ' + print(astFromValue(reason, GraphQLString)) + ')'
-  );
+  return ' @deprecated';
 }
 
 function printDescription(
@@ -346,37 +328,13 @@ function printDescription(
     return printDescriptionWithComments(lines, indentation, firstInBlock);
   }
 
-  let description =
-    indentation && !firstInBlock
-      ? '\n' + indentation + '"""'
-      : indentation + '"""';
-
-  // In some circumstances, a single line can be used for the description.
-  if (
-    lines.length === 1 &&
-    lines[0].length < 70 &&
-    lines[0][lines[0].length - 1] !== '"'
-  ) {
-    return description + escapeQuote(lines[0]) + '"""\n';
-  }
-
-  // Format a multi-line block quote to account for leading space.
-  const hasLeadingSpace = lines[0][0] === ' ' || lines[0][0] === '\t';
-  if (!hasLeadingSpace) {
-    description += '\n';
-  }
-  for (let i = 0; i < lines.length; i++) {
-    if (i !== 0 || !hasLeadingSpace) {
-      description += indentation;
-    }
-    description += escapeQuote(lines[i]) + '\n';
-  }
-  description += indentation + '"""\n';
-  return description;
-}
+  const text = lines.join('\n');
+  const preferMultipleLines = text.length > 70;
+  const blockString = printBlockString(text, '', preferMultipleLines);
+  const prefix =
+    indentation && !firstInBlock ? '\n' + indentation : indentation;
 
-function escapeQuote(line) {
-  return line.replace(/"""/g, '\\"""');
+  return prefix + blockString.replace(/\n/g, '\n' + indentation) + '\n';
 }
 
 function printDescriptionWithComments(lines, indentation, firstInBlock) {
@@ -392,27 +350,18 @@ function printDescriptionWithComments(lines, indentation, firstInBlock) {
 }
 
 function descriptionLines(description: string, maxLen: number): Array<string> {
-  const lines = [];
   const rawLines = description.split('\n');
-  for (let i = 0; i < rawLines.length; i++) {
-    if (rawLines[i] === '') {
-      lines.push(rawLines[i]);
-    } else {
-      // For > 120 character long lines, cut at space boundaries into sublines
-      // of ~80 chars.
-      const sublines = breakLine(rawLines[i], maxLen);
-      for (let j = 0; j < sublines.length; j++) {
-        lines.push(sublines[j]);
-      }
+  return flatMap(rawLines, line => {
+    if (line.length < maxLen + 5) {
+      return line;
     }
-  }
-  return lines;
+    // For > 120 character long lines, cut at space boundaries into sublines
+    // of ~80 chars.
+    return breakLine(line, maxLen);
+  });
 }
 
 function breakLine(line: string, maxLen: number): Array<string> {
-  if (line.length < maxLen + 5) {
-    return [line];
-  }
   const parts = line.split(new RegExp(`((?: |^).{15,${maxLen - 40}}(?= |$))`));
   if (parts.length < 4) {
     return [line];

package/utilities/schemaPrinter.mjs

@@ -1,16 +1,17 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * 
  */
+import flatMap from '../polyfills/flatMap';
 import objectValues from '../polyfills/objectValues';
-import isNullish from '../jsutils/isNullish';
-import isInvalid from '../jsutils/isInvalid';
+import inspect from '../jsutils/inspect';
 import { astFromValue } from '../utilities/astFromValue';
 import { print } from '../language/printer';
+import { printBlockString } from '../language/blockString';
 import { isScalarType, isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType } from '../type/definition';
 import { GraphQLString, isSpecifiedScalarType } from '../type/scalars';
 import { GraphQLDirective, DEFAULT_DEPRECATION_REASON, isSpecifiedDirective } from '../type/directives';
@@ -124,11 +125,12 @@ export function printType(type, options) {
     return printEnum(type, options);
   } else if (isInputObjectType(type)) {
     return printInputObject(type, options);
-  }
+  } // Not reachable. All possible types have been considered.
+
   /* istanbul ignore next */
 
 
-  throw new Error("Unknown type: ".concat(type, "."));
+  throw new Error("Unexpected type: \"".concat(inspect(type), "\"."));
 }
 
 function printScalar(type, options) {
@@ -140,39 +142,42 @@ function printObject(type, options) {
   var implementedInterfaces = interfaces.length ? ' implements ' + interfaces.map(function (i) {
     return i.name;
   }).join(' & ') : '';
-  return printDescription(options, type) + "type ".concat(type.name).concat(implementedInterfaces, " {\n") + printFields(options, type) + '\n' + '}';
+  return printDescription(options, type) + "type ".concat(type.name).concat(implementedInterfaces) + printFields(options, type);
 }
 
 function printInterface(type, options) {
-  return printDescription(options, type) + "interface ".concat(type.name, " {\n") + printFields(options, type) + '\n' + '}';
+  return printDescription(options, type) + "interface ".concat(type.name) + printFields(options, type);
 }
 
 function printUnion(type, options) {
-  return printDescription(options, type) + "union ".concat(type.name, " = ").concat(type.getTypes().join(' | '));
+  var types = type.getTypes();
+  var possibleTypes = types.length ? ' = ' + types.join(' | ') : '';
+  return printDescription(options, type) + 'union ' + type.name + possibleTypes;
 }
 
 function printEnum(type, options) {
-  return printDescription(options, type) + "enum ".concat(type.name, " {\n") + printEnumValues(type.getValues(), options) + '\n' + '}';
-}
-
-function printEnumValues(values, options) {
-  return values.map(function (value, i) {
+  var values = type.getValues().map(function (value, i) {
     return printDescription(options, value, '  ', !i) + '  ' + value.name + printDeprecated(value);
-  }).join('\n');
+  });
+  return printDescription(options, type) + "enum ".concat(type.name) + printBlock(values);
 }
 
 function printInputObject(type, options) {
-  var fields = objectValues(type.getFields());
-  return printDescription(options, type) + "input ".concat(type.name, " {\n") + fields.map(function (f, i) {
+  var fields = objectValues(type.getFields()).map(function (f, i) {
     return printDescription(options, f, '  ', !i) + '  ' + printInputValue(f);
-  }).join('\n') + '\n' + '}';
+  });
+  return printDescription(options, type) + "input ".concat(type.name) + printBlock(fields);
 }
 
 function printFields(options, type) {
-  var fields = objectValues(type.getFields());
-  return fields.map(function (f, i) {
+  var fields = objectValues(type.getFields()).map(function (f, i) {
     return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f);
-  }).join('\n');
+  });
+  return printBlock(fields);
+}
+
+function printBlock(items) {
+  return items.length !== 0 ? ' {\n' + items.join('\n') + '\n}' : '';
 }
 
 function printArgs(options, args) {
@@ -195,10 +200,11 @@ function printArgs(options, args) {
 }
 
 function printInputValue(arg) {
+  var defaultAST = astFromValue(arg.defaultValue, arg.type);
   var argDecl = arg.name + ': ' + String(arg.type);
 
-  if (!isInvalid(arg.defaultValue)) {
-    argDecl += " = ".concat(print(astFromValue(arg.defaultValue, arg.type)));
+  if (defaultAST) {
+    argDecl += " = ".concat(print(defaultAST));
   }
 
   return argDecl;
@@ -214,12 +220,13 @@ function printDeprecated(fieldOrEnumVal) {
   }
 
   var reason = fieldOrEnumVal.deprecationReason;
+  var reasonAST = astFromValue(reason, GraphQLString);
 
-  if (isNullish(reason) || reason === '' || reason === DEFAULT_DEPRECATION_REASON) {
-    return ' @deprecated';
+  if (reasonAST && reason !== '' && reason !== DEFAULT_DEPRECATION_REASON) {
+    return ' @deprecated(reason: ' + print(reasonAST) + ')';
   }
 
-  return ' @deprecated(reason: ' + print(astFromValue(reason, GraphQLString)) + ')';
+  return ' @deprecated';
 }
 
 function printDescription(options, def) {
@@ -236,33 +243,11 @@ function printDescription(options, def) {
     return printDescriptionWithComments(lines, indentation, firstInBlock);
   }
 
-  var description = indentation && !firstInBlock ? '\n' + indentation + '"""' : indentation + '"""'; // In some circumstances, a single line can be used for the description.
-
-  if (lines.length === 1 && lines[0].length < 70 && lines[0][lines[0].length - 1] !== '"') {
-    return description + escapeQuote(lines[0]) + '"""\n';
-  } // Format a multi-line block quote to account for leading space.
-
-
-  var hasLeadingSpace = lines[0][0] === ' ' || lines[0][0] === '\t';
-
-  if (!hasLeadingSpace) {
-    description += '\n';
-  }
-
-  for (var i = 0; i < lines.length; i++) {
-    if (i !== 0 || !hasLeadingSpace) {
-      description += indentation;
-    }
-
-    description += escapeQuote(lines[i]) + '\n';
-  }
-
-  description += indentation + '"""\n';
-  return description;
-}
-
-function escapeQuote(line) {
-  return line.replace(/"""/g, '\\"""');
+  var text = lines.join('\n');
+  var preferMultipleLines = text.length > 70;
+  var blockString = printBlockString(text, '', preferMultipleLines);
+  var prefix = indentation && !firstInBlock ? '\n' + indentation : indentation;
+  return prefix + blockString.replace(/\n/g, '\n' + indentation) + '\n';
 }
 
 function printDescriptionWithComments(lines, indentation, firstInBlock) {
@@ -280,31 +265,19 @@ function printDescriptionWithComments(lines, indentation, firstInBlock) {
 }
 
 function descriptionLines(description, maxLen) {
-  var lines = [];
   var rawLines = description.split('\n');
+  return flatMap(rawLines, function (line) {
+    if (line.length < maxLen + 5) {
+      return line;
+    } // For > 120 character long lines, cut at space boundaries into sublines
+    // of ~80 chars.
 
-  for (var i = 0; i < rawLines.length; i++) {
-    if (rawLines[i] === '') {
-      lines.push(rawLines[i]);
-    } else {
-      // For > 120 character long lines, cut at space boundaries into sublines
-      // of ~80 chars.
-      var sublines = breakLine(rawLines[i], maxLen);
-
-      for (var j = 0; j < sublines.length; j++) {
-        lines.push(sublines[j]);
-      }
-    }
-  }
 
-  return lines;
+    return breakLine(line, maxLen);
+  });
 }
 
 function breakLine(line, maxLen) {
-  if (line.length < maxLen + 5) {
-    return [line];
-  }
-
   var parts = line.split(new RegExp("((?: |^).{15,".concat(maxLen - 40, "}(?= |$))")));
 
   if (parts.length < 4) {
@@ -318,4 +291,4 @@ function breakLine(line, maxLen) {
   }
 
   return sublines;
-}
+}

package/utilities/separateOperations.js

@@ -8,7 +8,7 @@ exports.separateOperations = separateOperations;
 var _visitor = require("../language/visitor");
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -50,8 +50,8 @@ function separateOperations(documentAST) {
 
   var separatedDocumentASTs = Object.create(null);
 
-  for (var _i = 0; _i < operations.length; _i++) {
-    var operation = operations[_i];
+  for (var _i = 0, _operations = operations; _i < _operations.length; _i++) {
+    var operation = _operations[_i];
     var operationName = opName(operation);
     var dependencies = Object.create(null);
     collectTransitiveDependencies(dependencies, depGraph, operationName); // The list of definition nodes to be included for this operation, sorted
@@ -59,10 +59,8 @@ function separateOperations(documentAST) {
 
     var definitions = [operation];
 
-    var _arr = Object.keys(dependencies);
-
-    for (var _i2 = 0; _i2 < _arr.length; _i2++) {
-      var name = _arr[_i2];
+    for (var _i2 = 0, _Object$keys = Object.keys(dependencies); _i2 < _Object$keys.length; _i2++) {
+      var name = _Object$keys[_i2];
       definitions.push(fragments[name]);
     }
 
@@ -89,10 +87,8 @@ function collectTransitiveDependencies(collected, depGraph, fromName) {
   var immediateDeps = depGraph[fromName];
 
   if (immediateDeps) {
-    var _arr2 = Object.keys(immediateDeps);
-
-    for (var _i3 = 0; _i3 < _arr2.length; _i3++) {
-      var toName = _arr2[_i3];
+    for (var _i3 = 0, _Object$keys2 = Object.keys(immediateDeps); _i3 < _Object$keys2.length; _i3++) {
+      var toName = _Object$keys2[_i3];
 
       if (!collected[toName]) {
         collected[toName] = true;
@@ -100,4 +96,4 @@ function collectTransitiveDependencies(collected, depGraph, fromName) {
       }
     }
   }
-}
+}

package/utilities/separateOperations.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,8 +8,11 @@
  */
 
 import { visit } from '../language/visitor';
-import type { ObjMap } from '../jsutils/ObjMap';
-import type { DocumentNode, OperationDefinitionNode } from '../language/ast';
+import { type ObjMap } from '../jsutils/ObjMap';
+import {
+  type DocumentNode,
+  type OperationDefinitionNode,
+} from '../language/ast';
 
 /**
  * separateOperations accepts a single AST document which may contain many

package/utilities/separateOperations.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -42,8 +42,8 @@ export function separateOperations(documentAST) {
 
   var separatedDocumentASTs = Object.create(null);
 
-  for (var _i = 0; _i < operations.length; _i++) {
-    var operation = operations[_i];
+  for (var _i = 0, _operations = operations; _i < _operations.length; _i++) {
+    var operation = _operations[_i];
     var operationName = opName(operation);
     var dependencies = Object.create(null);
     collectTransitiveDependencies(dependencies, depGraph, operationName); // The list of definition nodes to be included for this operation, sorted
@@ -51,10 +51,8 @@ export function separateOperations(documentAST) {
 
     var definitions = [operation];
 
-    var _arr = Object.keys(dependencies);
-
-    for (var _i2 = 0; _i2 < _arr.length; _i2++) {
-      var name = _arr[_i2];
+    for (var _i2 = 0, _Object$keys = Object.keys(dependencies); _i2 < _Object$keys.length; _i2++) {
+      var name = _Object$keys[_i2];
       definitions.push(fragments[name]);
     }
 
@@ -81,10 +79,8 @@ function collectTransitiveDependencies(collected, depGraph, fromName) {
   var immediateDeps = depGraph[fromName];
 
   if (immediateDeps) {
-    var _arr2 = Object.keys(immediateDeps);
-
-    for (var _i3 = 0; _i3 < _arr2.length; _i3++) {
-      var toName = _arr2[_i3];
+    for (var _i3 = 0, _Object$keys2 = Object.keys(immediateDeps); _i3 < _Object$keys2.length; _i3++) {
+      var toName = _Object$keys2[_i3];
 
       if (!collected[toName]) {
         collected[toName] = true;
@@ -92,4 +88,4 @@ function collectTransitiveDependencies(collected, depGraph, fromName) {
       }
     }
   }
-}
+}