graphql 0.12.3 → 0.13.2

package/language/printer.js.flow

@@ -85,7 +85,7 @@ const printDocASTReducer = {
     isBlockString
       ? printBlockString(value, key === 'description')
       : JSON.stringify(value),
-  BooleanValue: ({ value }) => JSON.stringify(value),
+  BooleanValue: ({ value }) => (value ? 'true' : 'false'),
   NullValue: () => 'null',
   EnumValue: ({ value }) => value,
   ListValue: ({ values }) => '[' + join(values, ', ') + ']',
@@ -110,113 +110,68 @@ const printDocASTReducer = {
 
   OperationTypeDefinition: ({ operation, type }) => operation + ': ' + type,
 
-  ScalarTypeDefinition: ({ description, name, directives }) =>
-    join(
-      [description, join(['scalar', name, join(directives, ' ')], ' ')],
-      '\n',
-    ),
-
-  ObjectTypeDefinition: ({
-    description,
-    name,
-    interfaces,
-    directives,
-    fields,
-  }) =>
-    join(
-      [
-        description,
-        join(
-          [
-            'type',
-            name,
-            wrap('implements ', join(interfaces, ', ')),
-            join(directives, ' '),
-            block(fields),
-          ],
-          ' ',
-        ),
-      ],
-      '\n',
-    ),
-
-  FieldDefinition: ({ description, name, arguments: args, type, directives }) =>
-    join(
-      [
-        description,
-        name +
-          wrap('(', join(args, ', '), ')') +
-          ': ' +
-          type +
-          wrap(' ', join(directives, ' ')),
-      ],
-      '\n',
-    ),
-
-  InputValueDefinition: ({
-    description,
-    name,
-    type,
-    defaultValue,
-    directives,
-  }) =>
-    join(
-      [
-        description,
-        join(
-          [name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')],
-          ' ',
-        ),
-      ],
-      '\n',
-    ),
-
-  InterfaceTypeDefinition: ({ description, name, directives, fields }) =>
+  ScalarTypeDefinition: addDescription(({ name, directives }) =>
+    join(['scalar', name, join(directives, ' ')], ' '),
+  ),
+
+  ObjectTypeDefinition: addDescription(
+    ({ name, interfaces, directives, fields }) =>
+      join(
+        [
+          'type',
+          name,
+          wrap('implements ', join(interfaces, ' & ')),
+          join(directives, ' '),
+          block(fields),
+        ],
+        ' ',
+      ),
+  ),
+
+  FieldDefinition: addDescription(
+    ({ name, arguments: args, type, directives }) =>
+      name +
+      wrap('(', join(args, ', '), ')') +
+      ': ' +
+      type +
+      wrap(' ', join(directives, ' ')),
+  ),
+
+  InputValueDefinition: addDescription(
+    ({ name, type, defaultValue, directives }) =>
+      join(
+        [name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')],
+        ' ',
+      ),
+  ),
+
+  InterfaceTypeDefinition: addDescription(({ name, directives, fields }) =>
+    join(['interface', name, join(directives, ' '), block(fields)], ' '),
+  ),
+
+  UnionTypeDefinition: addDescription(({ name, directives, types }) =>
     join(
       [
-        description,
-        join(['interface', name, join(directives, ' '), block(fields)], ' '),
+        'union',
+        name,
+        join(directives, ' '),
+        types && types.length !== 0 ? '= ' + join(types, ' | ') : '',
       ],
-      '\n',
+      ' ',
     ),
+  ),
 
-  UnionTypeDefinition: ({ description, name, directives, types }) =>
-    join(
-      [
-        description,
-        join(
-          [
-            'union',
-            name,
-            join(directives, ' '),
-            types && types.length !== 0 ? '= ' + join(types, ' | ') : '',
-          ],
-          ' ',
-        ),
-      ],
-      '\n',
-    ),
+  EnumTypeDefinition: addDescription(({ name, directives, values }) =>
+    join(['enum', name, join(directives, ' '), block(values)], ' '),
+  ),
 
-  EnumTypeDefinition: ({ description, name, directives, values }) =>
-    join(
-      [
-        description,
-        join(['enum', name, join(directives, ' '), block(values)], ' '),
-      ],
-      '\n',
-    ),
+  EnumValueDefinition: addDescription(({ name, directives }) =>
+    join([name, join(directives, ' ')], ' '),
+  ),
 
-  EnumValueDefinition: ({ description, name, directives }) =>
-    join([description, join([name, join(directives, ' ')], ' ')], '\n'),
-
-  InputObjectTypeDefinition: ({ description, name, directives, fields }) =>
-    join(
-      [
-        description,
-        join(['input', name, join(directives, ' '), block(fields)], ' '),
-      ],
-      '\n',
-    ),
+  InputObjectTypeDefinition: addDescription(({ name, directives, fields }) =>
+    join(['input', name, join(directives, ' '), block(fields)], ' '),
+  ),
 
   ScalarTypeExtension: ({ name, directives }) =>
     join(['extend scalar', name, join(directives, ' ')], ' '),
@@ -226,7 +181,7 @@ const printDocASTReducer = {
       [
         'extend type',
         name,
-        wrap('implements ', join(interfaces, ', ')),
+        wrap('implements ', join(interfaces, ' & ')),
         join(directives, ' '),
         block(fields),
       ],
@@ -253,20 +208,20 @@ const printDocASTReducer = {
   InputObjectTypeExtension: ({ name, directives, fields }) =>
     join(['extend input', name, join(directives, ' '), block(fields)], ' '),
 
-  DirectiveDefinition: ({ description, name, arguments: args, locations }) =>
-    join(
-      [
-        description,
-        'directive @' +
-          name +
-          wrap('(', join(args, ', '), ')') +
-          ' on ' +
-          join(locations, ' | '),
-      ],
-      '\n',
-    ),
+  DirectiveDefinition: addDescription(
+    ({ name, arguments: args, locations }) =>
+      'directive @' +
+      name +
+      wrap('(', join(args, ', '), ')') +
+      ' on ' +
+      join(locations, ' | '),
+  ),
 };
 
+function addDescription(cb) {
+  return node => join([node.description, cb(node)], '\n');
+}
+
 /**
  * Given maybeArray, print an empty string if it is null or empty, otherwise
  * print all items together separated by separator if provided
@@ -281,7 +236,7 @@ function join(maybeArray, separator) {
  */
 function block(array) {
   return array && array.length !== 0
-    ? indent('{\n' + join(array, '\n')) + '\n}'
+    ? '{\n' + indent(join(array, '\n')) + '\n}'
     : '';
 }
 
@@ -294,7 +249,7 @@ function wrap(start, maybeString, end) {
 }
 
 function indent(maybeString) {
-  return maybeString && maybeString.replace(/\n/g, '\n  ');
+  return maybeString && '  ' + maybeString.replace(/\n/g, '\n  ');
 }
 
 /**
@@ -303,9 +258,8 @@ function indent(maybeString) {
  * a single-line, adding a leading blank line would strip that whitespace.
  */
 function printBlockString(value, isDescription) {
+  const escaped = value.replace(/"""/g, '\\"""');
   return (value[0] === ' ' || value[0] === '\t') && value.indexOf('\n') === -1
-    ? `"""${value.replace(/"""/g, '\\"""')}"""`
-    : isDescription
-      ? '"""\n' + value.replace(/"""/g, '\\"""') + '\n"""'
-      : indent('"""\n' + value.replace(/"""/g, '\\"""')) + '\n"""';
+    ? `"""${escaped.replace(/"$/, '"\n')}"""`
+    : `"""\n${isDescription ? escaped : indent(escaped)}\n"""`;
 }

package/{module/language/printer.js → language/printer.mjs}

@@ -113,7 +113,7 @@ var printDocASTReducer = {
   },
   BooleanValue: function BooleanValue(_ref11) {
     var value = _ref11.value;
-    return JSON.stringify(value);
+    return value ? 'true' : 'false';
   },
   NullValue: function NullValue() {
     return 'null';
@@ -173,78 +173,69 @@ var printDocASTReducer = {
     return operation + ': ' + type;
   },
 
-  ScalarTypeDefinition: function ScalarTypeDefinition(_ref22) {
-    var description = _ref22.description,
-        name = _ref22.name,
+  ScalarTypeDefinition: addDescription(function (_ref22) {
+    var name = _ref22.name,
         directives = _ref22.directives;
-    return join([description, join(['scalar', name, join(directives, ' ')], ' ')], '\n');
-  },
+    return join(['scalar', name, join(directives, ' ')], ' ');
+  }),
 
-  ObjectTypeDefinition: function ObjectTypeDefinition(_ref23) {
-    var description = _ref23.description,
-        name = _ref23.name,
+  ObjectTypeDefinition: addDescription(function (_ref23) {
+    var name = _ref23.name,
         interfaces = _ref23.interfaces,
         directives = _ref23.directives,
         fields = _ref23.fields;
-    return join([description, join(['type', name, wrap('implements ', join(interfaces, ', ')), join(directives, ' '), block(fields)], ' ')], '\n');
-  },
+    return join(['type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
+  }),
 
-  FieldDefinition: function FieldDefinition(_ref24) {
-    var description = _ref24.description,
-        name = _ref24.name,
+  FieldDefinition: addDescription(function (_ref24) {
+    var name = _ref24.name,
         args = _ref24.arguments,
         type = _ref24.type,
         directives = _ref24.directives;
-    return join([description, name + wrap('(', join(args, ', '), ')') + ': ' + type + wrap(' ', join(directives, ' '))], '\n');
-  },
+    return name + wrap('(', join(args, ', '), ')') + ': ' + type + wrap(' ', join(directives, ' '));
+  }),
 
-  InputValueDefinition: function InputValueDefinition(_ref25) {
-    var description = _ref25.description,
-        name = _ref25.name,
+  InputValueDefinition: addDescription(function (_ref25) {
+    var name = _ref25.name,
         type = _ref25.type,
         defaultValue = _ref25.defaultValue,
         directives = _ref25.directives;
-    return join([description, join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' ')], '\n');
-  },
+    return join([name + ': ' + type, wrap('= ', defaultValue), join(directives, ' ')], ' ');
+  }),
 
-  InterfaceTypeDefinition: function InterfaceTypeDefinition(_ref26) {
-    var description = _ref26.description,
-        name = _ref26.name,
+  InterfaceTypeDefinition: addDescription(function (_ref26) {
+    var name = _ref26.name,
         directives = _ref26.directives,
         fields = _ref26.fields;
-    return join([description, join(['interface', name, join(directives, ' '), block(fields)], ' ')], '\n');
-  },
+    return join(['interface', name, join(directives, ' '), block(fields)], ' ');
+  }),
 
-  UnionTypeDefinition: function UnionTypeDefinition(_ref27) {
-    var description = _ref27.description,
-        name = _ref27.name,
+  UnionTypeDefinition: addDescription(function (_ref27) {
+    var name = _ref27.name,
         directives = _ref27.directives,
         types = _ref27.types;
-    return join([description, join(['union', name, join(directives, ' '), types && types.length !== 0 ? '= ' + join(types, ' | ') : ''], ' ')], '\n');
-  },
+    return join(['union', name, join(directives, ' '), types && types.length !== 0 ? '= ' + join(types, ' | ') : ''], ' ');
+  }),
 
-  EnumTypeDefinition: function EnumTypeDefinition(_ref28) {
-    var description = _ref28.description,
-        name = _ref28.name,
+  EnumTypeDefinition: addDescription(function (_ref28) {
+    var name = _ref28.name,
         directives = _ref28.directives,
         values = _ref28.values;
-    return join([description, join(['enum', name, join(directives, ' '), block(values)], ' ')], '\n');
-  },
+    return join(['enum', name, join(directives, ' '), block(values)], ' ');
+  }),
 
-  EnumValueDefinition: function EnumValueDefinition(_ref29) {
-    var description = _ref29.description,
-        name = _ref29.name,
+  EnumValueDefinition: addDescription(function (_ref29) {
+    var name = _ref29.name,
         directives = _ref29.directives;
-    return join([description, join([name, join(directives, ' ')], ' ')], '\n');
-  },
+    return join([name, join(directives, ' ')], ' ');
+  }),
 
-  InputObjectTypeDefinition: function InputObjectTypeDefinition(_ref30) {
-    var description = _ref30.description,
-        name = _ref30.name,
+  InputObjectTypeDefinition: addDescription(function (_ref30) {
+    var name = _ref30.name,
         directives = _ref30.directives,
         fields = _ref30.fields;
-    return join([description, join(['input', name, join(directives, ' '), block(fields)], ' ')], '\n');
-  },
+    return join(['input', name, join(directives, ' '), block(fields)], ' ');
+  }),
 
   ScalarTypeExtension: function ScalarTypeExtension(_ref31) {
     var name = _ref31.name,
@@ -257,7 +248,7 @@ var printDocASTReducer = {
         interfaces = _ref32.interfaces,
         directives = _ref32.directives,
         fields = _ref32.fields;
-    return join(['extend type', name, wrap('implements ', join(interfaces, ', ')), join(directives, ' '), block(fields)], ' ');
+    return join(['extend type', name, wrap('implements ', join(interfaces, ' & ')), join(directives, ' '), block(fields)], ' ');
   },
 
   InterfaceTypeExtension: function InterfaceTypeExtension(_ref33) {
@@ -288,15 +279,20 @@ var printDocASTReducer = {
     return join(['extend input', name, join(directives, ' '), block(fields)], ' ');
   },
 
-  DirectiveDefinition: function DirectiveDefinition(_ref37) {
-    var description = _ref37.description,
-        name = _ref37.name,
+  DirectiveDefinition: addDescription(function (_ref37) {
+    var name = _ref37.name,
         args = _ref37.arguments,
         locations = _ref37.locations;
-    return join([description, 'directive @' + name + wrap('(', join(args, ', '), ')') + ' on ' + join(locations, ' | ')], '\n');
-  }
+    return 'directive @' + name + wrap('(', join(args, ', '), ')') + ' on ' + join(locations, ' | ');
+  })
 };
 
+function addDescription(cb) {
+  return function (node) {
+    return join([node.description, cb(node)], '\n');
+  };
+}
+
 /**
  * Given maybeArray, print an empty string if it is null or empty, otherwise
  * print all items together separated by separator if provided
@@ -312,7 +308,7 @@ function join(maybeArray, separator) {
  * indented "{ }" block.
  */
 function block(array) {
-  return array && array.length !== 0 ? indent('{\n' + join(array, '\n')) + '\n}' : '';
+  return array && array.length !== 0 ? '{\n' + indent(join(array, '\n')) + '\n}' : '';
 }
 
 /**
@@ -324,7 +320,7 @@ function wrap(start, maybeString, end) {
 }
 
 function indent(maybeString) {
-  return maybeString && maybeString.replace(/\n/g, '\n  ');
+  return maybeString && '  ' + maybeString.replace(/\n/g, '\n  ');
 }
 
 /**
@@ -333,5 +329,6 @@ function indent(maybeString) {
  * a single-line, adding a leading blank line would strip that whitespace.
  */
 function printBlockString(value, isDescription) {
-  return (value[0] === ' ' || value[0] === '\t') && value.indexOf('\n') === -1 ? '"""' + value.replace(/"""/g, '\\"""') + '"""' : isDescription ? '"""\n' + value.replace(/"""/g, '\\"""') + '\n"""' : indent('"""\n' + value.replace(/"""/g, '\\"""')) + '\n"""';
+  var escaped = value.replace(/"""/g, '\\"""');
+  return (value[0] === ' ' || value[0] === '\t') && value.indexOf('\n') === -1 ? '"""' + escaped.replace(/"$/, '"\n') + '"""' : '"""\n' + (isDescription ? escaped : indent(escaped)) + '\n"""';
 }

package/language/source.js

@@ -17,7 +17,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                                                                                                                                                            * This source code is licensed under the MIT license found in the
                                                                                                                                                            * LICENSE file in the root directory of this source tree.
                                                                                                                                                            *
-                                                                                                                                                           * 
+                                                                                                                                                           *  strict
                                                                                                                                                            */
 
 /**

package/language/source.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 invariant from '../jsutils/invariant';

package/{module/language/source.js → language/source.mjs}

@@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import invariant from '../jsutils/invariant';

package/language/visitor.js

@@ -25,7 +25,7 @@ exports.getVisitFn = getVisitFn;
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 var QueryDocumentKeys = exports.QueryDocumentKeys = {

package/language/visitor.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 type { ASTNode, ASTKindToNode } from './ast';

package/{module/language/visitor.js → language/visitor.mjs}

@@ -16,7 +16,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 export var QueryDocumentKeys = {

package/package.json

@@ -1,15 +1,10 @@
 {
   "name": "graphql",
-  "version": "0.12.3",
+  "version": "0.13.2",
   "description": "A Query Language and Runtime which can target any service.",
-  "contributors": [
-    "Lee Byron <lee@leebyron.com> (http://leebyron.com/)",
-    "Nicholas Schrock <schrockn@fb.com>",
-    "Daniel Schafer <dschafer@fb.com>"
-  ],
   "license": "MIT",
-  "main": "index.js",
-  "module": "module/index.js",
+  "main": "index",
+  "module": "index.mjs",
   "homepage": "https://github.com/graphql/graphql-js",
   "bugs": {
     "url": "https://github.com/graphql/graphql-js/issues"
@@ -19,6 +14,6 @@
     "url": "http://github.com/graphql/graphql-js.git"
   },
   "dependencies": {
-    "iterall": "1.1.3"
+    "iterall": "^1.2.1"
   }
 }

package/subscription/asyncIteratorReject.js

@@ -13,7 +13,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
                                                                                                                                                                                                                    * This source code is licensed under the MIT license found in the
                                                                                                                                                                                                                    * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                    *
-                                                                                                                                                                                                                   * 
+                                                                                                                                                                                                                   *  strict
                                                                                                                                                                                                                    */
 
 /**

package/subscription/asyncIteratorReject.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 { $$asyncIterator } from 'iterall';

package/{module/subscription/asyncIteratorReject.js → subscription/asyncIteratorReject.mjs}

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * 
+ *  strict
  */
 
 import { $$asyncIterator } from 'iterall';

package/subscription/index.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
  */
 
 export { subscribe, createSourceEventStream } from './subscribe';

package/{module/subscription/index.js → subscription/index.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
  */
 
 export { subscribe, createSourceEventStream } from './subscribe';

package/subscription/mapAsyncIterator.js

@@ -13,7 +13,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
                                                                                                                                                                                                                    * This source code is licensed under the MIT license found in the
                                                                                                                                                                                                                    * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                    *
-                                                                                                                                                                                                                   * 
+                                                                                                                                                                                                                   *  strict
                                                                                                                                                                                                                    */
 
 /**
@@ -24,6 +24,7 @@ function mapAsyncIterator(iterable, callback, rejectCallback) {
   var iterator = (0, _iterall.getAsyncIterator)(iterable);
   var $return = void 0;
   var abruptClose = void 0;
+  // $FlowFixMe(>=0.68.0)
   if (typeof iterator.return === 'function') {
     $return = iterator.return;
     abruptClose = function abruptClose(error) {
@@ -57,6 +58,7 @@ function mapAsyncIterator(iterable, callback, rejectCallback) {
       return $return ? $return.call(iterator).then(mapResult, mapReject) : Promise.resolve({ value: undefined, done: true });
     },
     throw: function _throw(error) {
+      // $FlowFixMe(>=0.68.0)
       if (typeof iterator.throw === 'function') {
         return iterator.throw(error).then(mapResult, mapReject);
       }

package/subscription/mapAsyncIterator.js.flow

@@ -4,10 +4,11 @@
  * 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 { $$asyncIterator, getAsyncIterator } from 'iterall';
+import type { MaybePromise } from '../jsutils/MaybePromise';
 
 /**
  * Given an AsyncIterable and a callback function, return an AsyncIterator
@@ -15,12 +16,13 @@ import { $$asyncIterator, getAsyncIterator } from 'iterall';
  */
 export default function mapAsyncIterator<T, U>(
   iterable: AsyncIterable<T>,
-  callback: T => Promise<U> | U,
-  rejectCallback?: any => Promise<U> | U,
+  callback: T => MaybePromise<U>,
+  rejectCallback?: any => MaybePromise<U>,
 ): AsyncGenerator<U, void, void> {
   const iterator = getAsyncIterator(iterable);
   let $return;
   let abruptClose;
+  // $FlowFixMe(>=0.68.0)
   if (typeof iterator.return === 'function') {
     $return = iterator.return;
     abruptClose = error => {
@@ -55,6 +57,7 @@ export default function mapAsyncIterator<T, U>(
         : Promise.resolve({ value: undefined, done: true });
     },
     throw(error) {
+      // $FlowFixMe(>=0.68.0)
       if (typeof iterator.throw === 'function') {
         return iterator.throw(error).then(mapResult, mapReject);
       }
@@ -68,7 +71,7 @@ export default function mapAsyncIterator<T, U>(
 
 function asyncMapValue<T, U>(
   value: T,
-  callback: T => Promise<U> | U,
+  callback: T => MaybePromise<U>,
 ): Promise<U> {
   return new Promise(resolve => resolve(callback(value)));
 }