graphql 0.12.3 → 0.13.2

package/utilities/lexicographicSortSchema.mjs

@@ -0,0 +1,225 @@
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+import keyValMap from '../jsutils/keyValMap'; /**
+                                               * Copyright (c) 2015-present, Facebook, Inc.
+                                               *
+                                               * This source code is licensed under the MIT license found in the
+                                               * LICENSE file in the root directory of this source tree.
+                                               *
+                                               *  strict
+                                               */
+
+import objectValues from '../jsutils/objectValues';
+import { GraphQLSchema } from '../type/schema';
+import { GraphQLDirective } from '../type/directives';
+
+import { GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, GraphQLList, GraphQLNonNull, isListType, isNonNullType, isScalarType, isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType } from '../type/definition';
+import { isSpecifiedScalarType } from '../type/scalars';
+import { isIntrospectionType } from '../type/introspection';
+
+/**
+ * Sort GraphQLSchema.
+ */
+export function lexicographicSortSchema(schema) {
+  var cache = Object.create(null);
+
+  var sortMaybeType = function sortMaybeType(maybeType) {
+    return maybeType && sortNamedType(maybeType);
+  };
+  return new GraphQLSchema({
+    types: sortTypes(objectValues(schema.getTypeMap())),
+    directives: sortByName(schema.getDirectives()).map(sortDirective),
+    query: sortMaybeType(schema.getQueryType()),
+    mutation: sortMaybeType(schema.getMutationType()),
+    subscription: sortMaybeType(schema.getSubscriptionType()),
+    astNode: schema.astNode
+  });
+
+  function sortDirective(directive) {
+    return new GraphQLDirective({
+      name: directive.name,
+      description: directive.description,
+      locations: sortBy(directive.locations, function (x) {
+        return x;
+      }),
+      args: sortArgs(directive.args),
+      astNode: directive.astNode
+    });
+  }
+
+  function sortArgs(args) {
+    return keyValMap(sortByName(args), function (arg) {
+      return arg.name;
+    }, function (arg) {
+      return _extends({}, arg, {
+        type: sortType(arg.type)
+      });
+    });
+  }
+
+  function sortFields(fieldsMap) {
+    return sortObjMap(fieldsMap, function (field) {
+      return {
+        type: sortType(field.type),
+        args: sortArgs(field.args),
+        resolve: field.resolve,
+        subscribe: field.subscribe,
+        deprecationReason: field.deprecationReason,
+        description: field.description,
+        astNode: field.astNode
+      };
+    });
+  }
+
+  function sortInputFields(fieldsMap) {
+    return sortObjMap(fieldsMap, function (field) {
+      return {
+        type: sortType(field.type),
+        defaultValue: field.defaultValue,
+        description: field.description,
+        astNode: field.astNode
+      };
+    });
+  }
+
+  function sortType(type) {
+    if (isListType(type)) {
+      return new GraphQLList(sortType(type.ofType));
+    } else if (isNonNullType(type)) {
+      return new GraphQLNonNull(sortType(type.ofType));
+    }
+    return sortNamedType(type);
+  }
+
+  function sortTypes(arr) {
+    return sortByName(arr).map(sortNamedType);
+  }
+
+  function sortNamedType(type) {
+    if (isSpecifiedScalarType(type) || isIntrospectionType(type)) {
+      return type;
+    }
+
+    var sortedType = cache[type.name];
+    if (!sortedType) {
+      sortedType = sortNamedTypeImpl(type);
+      cache[type.name] = sortedType;
+    }
+    return sortedType;
+  }
+
+  function sortNamedTypeImpl(type) {
+    if (isScalarType(type)) {
+      return type;
+    } else if (isObjectType(type)) {
+      return new GraphQLObjectType({
+        name: type.name,
+        interfaces: function interfaces() {
+          return sortTypes(type.getInterfaces());
+        },
+        fields: function fields() {
+          return sortFields(type.getFields());
+        },
+        isTypeOf: type.isTypeOf,
+        description: type.description,
+        astNode: type.astNode,
+        extensionASTNodes: type.extensionASTNodes
+      });
+    } else if (isInterfaceType(type)) {
+      return new GraphQLInterfaceType({
+        name: type.name,
+        fields: function fields() {
+          return sortFields(type.getFields());
+        },
+        resolveType: type.resolveType,
+        description: type.description,
+        astNode: type.astNode,
+        extensionASTNodes: type.extensionASTNodes
+      });
+    } else if (isUnionType(type)) {
+      return new GraphQLUnionType({
+        name: type.name,
+        types: function types() {
+          return sortTypes(type.getTypes());
+        },
+        resolveType: type.resolveType,
+        description: type.description,
+        astNode: type.astNode
+      });
+    } else if (isEnumType(type)) {
+      return new GraphQLEnumType({
+        name: type.name,
+        values: keyValMap(sortByName(type.getValues()), function (val) {
+          return val.name;
+        }, function (val) {
+          return {
+            value: val.value,
+            deprecationReason: val.deprecationReason,
+            description: val.description,
+            astNode: val.astNode
+          };
+        }),
+        description: type.description,
+        astNode: type.astNode
+      });
+    } else if (isInputObjectType(type)) {
+      return new GraphQLInputObjectType({
+        name: type.name,
+        fields: function fields() {
+          return sortInputFields(type.getFields());
+        },
+        description: type.description,
+        astNode: type.astNode
+      });
+    }
+    throw new Error('Unknown type: "' + type + '"');
+  }
+}
+
+function sortObjMap(map, sortValueFn) {
+  var sortedMap = Object.create(null);
+  var sortedKeys = sortBy(Object.keys(map), function (x) {
+    return x;
+  });
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = sortedKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var key = _step.value;
+
+      var value = map[key];
+      sortedMap[key] = sortValueFn ? sortValueFn(value) : value;
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  return sortedMap;
+}
+
+function sortByName(array) {
+  return sortBy(array, function (obj) {
+    return obj.name;
+  });
+}
+
+function sortBy(array, mapToKey) {
+  return array.slice().sort(function (obj1, obj2) {
+    var key1 = mapToKey(obj1);
+    var key2 = mapToKey(obj2);
+    return key1.localeCompare(key2);
+  });
+}

package/utilities/schemaPrinter.js

@@ -15,6 +15,10 @@ var _isInvalid = require('../jsutils/isInvalid');
 
 var _isInvalid2 = _interopRequireDefault(_isInvalid);
 
+var _objectValues = require('../jsutils/objectValues');
+
+var _objectValues2 = _interopRequireDefault(_objectValues);
+
 var _astFromValue = require('../utilities/astFromValue');
 
 var _printer = require('../language/printer');
@@ -36,20 +40,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *        Provide true to use preceding comments as the description.
  *
  */
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- */
-
 function printSchema(schema, options) {
   return printFilteredSchema(schema, function (n) {
     return !(0, _directives.isSpecifiedDirective)(n);
   }, isDefinedType, options);
-}
+} /**
+   * Copyright (c) 2015-present, Facebook, Inc.
+   *
+   * This source code is licensed under the MIT license found in the
+   * LICENSE file in the root directory of this source tree.
+   *
+   *  strict
+   */
 
 function printIntrospectionSchema(schema, options) {
   return printFilteredSchema(schema, _directives.isSpecifiedDirective, _introspection.isIntrospectionType, options);
@@ -62,10 +64,8 @@ function isDefinedType(type) {
 function printFilteredSchema(schema, directiveFilter, typeFilter, options) {
   var directives = schema.getDirectives().filter(directiveFilter);
   var typeMap = schema.getTypeMap();
-  var types = Object.keys(typeMap).sort(function (name1, name2) {
-    return name1.localeCompare(name2);
-  }).map(function (typeName) {
-    return typeMap[typeName];
+  var types = (0, _objectValues2.default)(typeMap).sort(function (type1, type2) {
+    return type1.name.localeCompare(type2.name);
   }).filter(typeFilter);
 
   return [printSchemaDefinition(schema)].concat(directives.map(function (directive) {
@@ -157,7 +157,7 @@ function printObject(type, options) {
   var interfaces = type.getInterfaces();
   var implementedInterfaces = interfaces.length ? ' implements ' + interfaces.map(function (i) {
     return i.name;
-  }).join(', ') : '';
+  }).join(' & ') : '';
   return printDescription(options, type) + ('type ' + type.name + implementedInterfaces + ' {\n') + printFields(options, type) + '\n' + '}';
 }
 
@@ -180,20 +180,14 @@ function printEnumValues(values, options) {
 }
 
 function printInputObject(type, options) {
-  var fieldMap = type.getFields();
-  var fields = Object.keys(fieldMap).map(function (fieldName) {
-    return fieldMap[fieldName];
-  });
+  var fields = (0, _objectValues2.default)(type.getFields());
   return printDescription(options, type) + ('input ' + type.name + ' {\n') + fields.map(function (f, i) {
     return printDescription(options, f, '  ', !i) + '  ' + printInputValue(f);
   }).join('\n') + '\n' + '}';
 }
 
 function printFields(options, type) {
-  var fieldMap = type.getFields();
-  var fields = Object.keys(fieldMap).map(function (fieldName) {
-    return fieldMap[fieldName];
-  });
+  var fields = (0, _objectValues2.default)(type.getFields());
   return fields.map(function (f, i) {
     return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f);
   }).join('\n');
@@ -254,15 +248,23 @@ function printDescription(options, def) {
     return printDescriptionWithComments(lines, indentation, firstInBlock);
   }
 
-  var description = indentation && !firstInBlock ? '\n' : '';
-  if (lines.length === 1 && lines[0].length < 70) {
-    description += indentation + '"""' + escapeQuote(lines[0]) + '"""\n';
-    return description;
+  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';
   }
 
-  description += indentation + '"""\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++) {
-    description += indentation + escapeQuote(lines[i]) + '\n';
+    if (i !== 0 || !hasLeadingSpace) {
+      description += indentation;
+    }
+    description += escapeQuote(lines[i]) + '\n';
   }
   description += indentation + '"""\n';
   return description;

package/utilities/schemaPrinter.js.flow

@@ -4,11 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import isNullish from '../jsutils/isNullish';
 import isInvalid from '../jsutils/isInvalid';
+import objectValues from '../jsutils/objectValues';
 import { astFromValue } from '../utilities/astFromValue';
 import { print } from '../language/printer';
 import type { GraphQLSchema } from '../type/schema';
@@ -79,9 +80,8 @@ function printFilteredSchema(
 ): string {
   const directives = schema.getDirectives().filter(directiveFilter);
   const typeMap = schema.getTypeMap();
-  const types = Object.keys(typeMap)
-    .sort((name1, name2) => name1.localeCompare(name2))
-    .map(typeName => typeMap[typeName])
+  const types = objectValues(typeMap)
+    .sort((type1, type2) => type1.name.localeCompare(type2.name))
     .filter(typeFilter);
 
   return (
@@ -176,7 +176,7 @@ function printScalar(type: GraphQLScalarType, options): string {
 function printObject(type: GraphQLObjectType, options): string {
   const interfaces = type.getInterfaces();
   const implementedInterfaces = interfaces.length
-    ? ' implements ' + interfaces.map(i => i.name).join(', ')
+    ? ' implements ' + interfaces.map(i => i.name).join(' & ')
     : '';
   return (
     printDescription(options, type) +
@@ -227,8 +227,7 @@ function printEnumValues(values, options): string {
 }
 
 function printInputObject(type: GraphQLInputObjectType, options): string {
-  const fieldMap = type.getFields();
-  const fields = Object.keys(fieldMap).map(fieldName => fieldMap[fieldName]);
+  const fields = objectValues(type.getFields());
   return (
     printDescription(options, type) +
     `input ${type.name} {\n` +
@@ -244,8 +243,7 @@ function printInputObject(type: GraphQLInputObjectType, options): string {
 }
 
 function printFields(options, type) {
-  const fieldMap = type.getFields();
-  const fields = Object.keys(fieldMap).map(fieldName => fieldMap[fieldName]);
+  const fields = objectValues(type.getFields());
   return fields
     .map(
       (f, i) =>
@@ -338,15 +336,30 @@ function printDescription(
     return printDescriptionWithComments(lines, indentation, firstInBlock);
   }
 
-  let description = indentation && !firstInBlock ? '\n' : '';
-  if (lines.length === 1 && lines[0].length < 70) {
-    description += indentation + '"""' + escapeQuote(lines[0]) + '"""\n';
-    return description;
+  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';
   }
 
-  description += indentation + '"""\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++) {
-    description += indentation + escapeQuote(lines[i]) + '\n';
+    if (i !== 0 || !hasLeadingSpace) {
+      description += indentation;
+    }
+    description += escapeQuote(lines[i]) + '\n';
   }
   description += indentation + '"""\n';
   return description;

package/{module/utilities/schemaPrinter.js → utilities/schemaPrinter.mjs}

@@ -4,11 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import isNullish from '../jsutils/isNullish';
 import isInvalid from '../jsutils/isInvalid';
+import objectValues from '../jsutils/objectValues';
 import { astFromValue } from '../utilities/astFromValue';
 import { print } from '../language/printer';
 
@@ -42,10 +43,8 @@ function isDefinedType(type) {
 function printFilteredSchema(schema, directiveFilter, typeFilter, options) {
   var directives = schema.getDirectives().filter(directiveFilter);
   var typeMap = schema.getTypeMap();
-  var types = Object.keys(typeMap).sort(function (name1, name2) {
-    return name1.localeCompare(name2);
-  }).map(function (typeName) {
-    return typeMap[typeName];
+  var types = objectValues(typeMap).sort(function (type1, type2) {
+    return type1.name.localeCompare(type2.name);
   }).filter(typeFilter);
 
   return [printSchemaDefinition(schema)].concat(directives.map(function (directive) {
@@ -137,7 +136,7 @@ function printObject(type, options) {
   var interfaces = type.getInterfaces();
   var implementedInterfaces = interfaces.length ? ' implements ' + interfaces.map(function (i) {
     return i.name;
-  }).join(', ') : '';
+  }).join(' & ') : '';
   return printDescription(options, type) + ('type ' + type.name + implementedInterfaces + ' {\n') + printFields(options, type) + '\n' + '}';
 }
 
@@ -160,20 +159,14 @@ function printEnumValues(values, options) {
 }
 
 function printInputObject(type, options) {
-  var fieldMap = type.getFields();
-  var fields = Object.keys(fieldMap).map(function (fieldName) {
-    return fieldMap[fieldName];
-  });
+  var fields = objectValues(type.getFields());
   return printDescription(options, type) + ('input ' + type.name + ' {\n') + fields.map(function (f, i) {
     return printDescription(options, f, '  ', !i) + '  ' + printInputValue(f);
   }).join('\n') + '\n' + '}';
 }
 
 function printFields(options, type) {
-  var fieldMap = type.getFields();
-  var fields = Object.keys(fieldMap).map(function (fieldName) {
-    return fieldMap[fieldName];
-  });
+  var fields = objectValues(type.getFields());
   return fields.map(function (f, i) {
     return printDescription(options, f, '  ', !i) + '  ' + f.name + printArgs(options, f.args, '  ') + ': ' + String(f.type) + printDeprecated(f);
   }).join('\n');
@@ -234,15 +227,23 @@ function printDescription(options, def) {
     return printDescriptionWithComments(lines, indentation, firstInBlock);
   }
 
-  var description = indentation && !firstInBlock ? '\n' : '';
-  if (lines.length === 1 && lines[0].length < 70) {
-    description += indentation + '"""' + escapeQuote(lines[0]) + '"""\n';
-    return description;
+  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';
   }
 
-  description += indentation + '"""\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++) {
-    description += indentation + escapeQuote(lines[i]) + '\n';
+    if (i !== 0 || !hasLeadingSpace) {
+      description += indentation;
+    }
+    description += escapeQuote(lines[i]) + '\n';
   }
   description += indentation + '"""\n';
   return description;

package/utilities/separateOperations.js

@@ -70,7 +70,7 @@ function separateOperations(documentAST) {
    * This source code is licensed under the MIT license found in the
    * LICENSE file in the root directory of this source tree.
    *
-   * 
+   *  strict
    */
 
 // Provides the empty string for anonymous operations.

package/utilities/separateOperations.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import { visit } from '../language/visitor';

package/{module/utilities/separateOperations.js → utilities/separateOperations.mjs}

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import { visit } from '../language/visitor';

package/utilities/typeComparators.js

@@ -42,7 +42,7 @@ function isEqualType(typeA, typeB) {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 function isTypeSubTypeOf(schema, maybeSubType, superType) {
@@ -95,29 +95,26 @@ function isTypeSubTypeOf(schema, maybeSubType, superType) {
  * This function is commutative.
  */
 function doTypesOverlap(schema, typeA, typeB) {
-  // So flow is aware this is constant
-  var _typeB = typeB;
-
   // Equivalent types overlap
-  if (typeA === _typeB) {
+  if (typeA === typeB) {
     return true;
   }
 
   if ((0, _definition.isAbstractType)(typeA)) {
-    if ((0, _definition.isAbstractType)(_typeB)) {
+    if ((0, _definition.isAbstractType)(typeB)) {
       // If both types are abstract, then determine if there is any intersection
       // between possible concrete types of each.
       return schema.getPossibleTypes(typeA).some(function (type) {
-        return schema.isPossibleType(_typeB, type);
+        return schema.isPossibleType(typeB, type);
       });
     }
     // Determine if the latter type is a possible concrete type of the former.
-    return schema.isPossibleType(typeA, _typeB);
+    return schema.isPossibleType(typeA, typeB);
   }
 
-  if ((0, _definition.isAbstractType)(_typeB)) {
+  if ((0, _definition.isAbstractType)(typeB)) {
     // Determine if the former type is a possible concrete type of the latter.
-    return schema.isPossibleType(_typeB, typeA);
+    return schema.isPossibleType(typeB, typeA);
   }
 
   // Otherwise the types do not overlap.

package/utilities/typeComparators.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  */
 
 import {
@@ -105,29 +105,26 @@ export function doTypesOverlap(
   typeA: GraphQLCompositeType,
   typeB: GraphQLCompositeType,
 ): boolean {
-  // So flow is aware this is constant
-  const _typeB = typeB;
-
   // Equivalent types overlap
-  if (typeA === _typeB) {
+  if (typeA === typeB) {
     return true;
   }
 
   if (isAbstractType(typeA)) {
-    if (isAbstractType(_typeB)) {
+    if (isAbstractType(typeB)) {
       // If both types are abstract, then determine if there is any intersection
       // between possible concrete types of each.
       return schema
         .getPossibleTypes(typeA)
-        .some(type => schema.isPossibleType(_typeB, type));
+        .some(type => schema.isPossibleType(typeB, type));
     }
     // Determine if the latter type is a possible concrete type of the former.
-    return schema.isPossibleType(typeA, _typeB);
+    return schema.isPossibleType(typeA, typeB);
   }
 
-  if (isAbstractType(_typeB)) {
+  if (isAbstractType(typeB)) {
     // Determine if the former type is a possible concrete type of the latter.
-    return schema.isPossibleType(_typeB, typeA);
+    return schema.isPossibleType(typeB, typeA);
   }
 
   // Otherwise the types do not overlap.