relay-compiler 1.3.0 → 1.5.0

package/lib/{RelayPrinter.js → GraphQLIRPrinter.js}

@@ -1,13 +1,11 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * 
- * @providesModule RelayPrinter
+ * @providesModule GraphQLIRPrinter
  * @format
  */
 
@@ -25,7 +23,7 @@ var _require2 = require('graphql'),
 var INDENT = '  ';
 
 /**
- * Converts a Relay IR node into a GraphQL string. Custom Relay
+ * Converts a GraphQLIR node into a GraphQL string. Custom Relay
  * extensions (directives) are not supported; to print fragments with
  * variables or fragment spreads with arguments, transform the node
  * prior to printing.
@@ -36,7 +34,7 @@ function print(node) {
   } else if (node.kind === 'Root') {
     return node.operation + ' ' + node.name + printArgumentDefinitions(node.argumentDefinitions) + printDirectives(node.directives) + printSelections(node, '') + '\n';
   } else {
-    require('fbjs/lib/invariant')(false, 'RelayPrinter: Unsupported IR node `%s`.', node.kind);
+    require('fbjs/lib/invariant')(false, 'GraphQLIRPrinter: Unsupported IR node `%s`.', node.kind);
   }
 }
 
@@ -51,42 +49,39 @@ function printSelections(node, indent, parentCondition) {
   return printed.length ? ' {\n' + (indent + INDENT) + printed.join('\n' + indent + INDENT) + '\n' + indent + '}' : '';
 }
 
+/**
+ * Prints a field without subselections.
+ */
+function printField(field) {
+  var parentCondition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
+  return (field.alias != null ? field.alias + ': ' + field.name : field.name) + printArguments(field.args) + parentCondition + printDirectives(field.directives) + printHandles(field);
+}
+
 function printSelection(selection, indent, parentCondition) {
   parentCondition = parentCondition || '';
-  var str = '';
+  var str = void 0;
   if (selection.kind === 'LinkedField') {
-    if (selection.alias != null) {
-      str += selection.alias + ': ';
-    }
-    str += selection.name;
-    str += printArguments(selection.args);
-    str += parentCondition;
-    str += printDirectives(selection.directives);
-    str += printHandles(selection);
+    str = printField(selection, parentCondition);
     str += printSelections(selection, indent + INDENT);
   } else if (selection.kind === 'ScalarField') {
-    if (selection.alias != null) {
-      str += selection.alias + ': ';
-    }
-    str += selection.name;
-    str += printArguments(selection.args);
-    str += parentCondition;
-    str += printDirectives(selection.directives);
-    str += printHandles(selection);
+    str = printField(selection, parentCondition);
   } else if (selection.kind === 'InlineFragment') {
-    str += '... on ' + selection.typeCondition.toString();
+    str = '... on ' + selection.typeCondition.toString();
     str += parentCondition;
     str += printDirectives(selection.directives);
     str += printSelections(selection, indent + INDENT);
   } else if (selection.kind === 'FragmentSpread') {
-    str += '...' + selection.name;
+    str = '...' + selection.name;
     str += parentCondition;
     str += printFragmentArguments(selection.args);
     str += printDirectives(selection.directives);
+  } else if (selection.kind === 'DeferrableFragmentSpread') {
+    str = selection.alias + ': ' + selection.storageKey;
   } else if (selection.kind === 'Condition') {
     var value = printValue(selection.condition);
     // For Flow
-    require('fbjs/lib/invariant')(value != null, 'RelayPrinter: Expected a variable for condition, got a literal `null`.');
+    require('fbjs/lib/invariant')(value != null, 'GraphQLIRPrinter: Expected a variable for condition, got a literal `null`.');
     var condStr = selection.passingValue ? ' @include' : ' @skip';
     condStr += '(if: ' + value + ')';
     condStr += parentCondition;
@@ -94,9 +89,9 @@ function printSelection(selection, indent, parentCondition) {
     var subSelections = selection.selections.map(function (sel) {
       return printSelection(sel, indent, condStr);
     });
-    str += subSelections.join('\n' + INDENT);
+    str = subSelections.join('\n' + INDENT);
   } else {
-    require('fbjs/lib/invariant')(false, 'RelayPrinter: Unknown selection kind `%s`.', selection.kind);
+    require('fbjs/lib/invariant')(false, 'GraphQLIRPrinter: Unknown selection kind `%s`.', selection.kind);
   }
   return str;
 }
@@ -169,10 +164,13 @@ function printArguments(args) {
 }
 
 function printValue(value, type) {
+  if (type instanceof GraphQLNonNull) {
+    type = type.ofType;
+  }
   if (value.kind === 'Variable') {
     return '$' + value.variableName;
   } else if (value.kind === 'ObjectValue') {
-    require('fbjs/lib/invariant')(type instanceof GraphQLInputObjectType, 'RelayPrinter: Need an InputObject type to print objects.');
+    require('fbjs/lib/invariant')(type instanceof GraphQLInputObjectType, 'GraphQLIRPrinter: Need an InputObject type to print objects.');
 
     var typeFields = type.getFields();
     var pairs = value.fields.map(function (field) {
@@ -182,7 +180,7 @@ function printValue(value, type) {
 
     return '{' + pairs.join(', ') + '}';
   } else if (value.kind === 'ListValue') {
-    require('fbjs/lib/invariant')(type instanceof GraphQLList, 'RelayPrinter: Need a type in order to print arrays.');
+    require('fbjs/lib/invariant')(type instanceof GraphQLList, 'GraphQLIRPrinter: Need a type in order to print arrays.');
     var innerType = type.ofType;
     return '[' + value.items.map(function (i) {
       return printValue(i, innerType);
@@ -199,26 +197,32 @@ function printLiteral(value, type) {
     type = type.ofType;
   }
   if (type instanceof GraphQLEnumType) {
-    require('fbjs/lib/invariant')(typeof value === 'string', 'RelayPrinter: Expected value of type %s to be a string, got `%s`.', type.name, value);
+    require('fbjs/lib/invariant')(typeof value === 'string', 'GraphQLIRPrinter: Expected value of type %s to be a string, got `%s`.', type.name, value);
     return value;
   }
   if (Array.isArray(value)) {
-    require('fbjs/lib/invariant')(type instanceof GraphQLList, 'RelayPrinter: Need a type in order to print arrays.');
+    require('fbjs/lib/invariant')(type instanceof GraphQLList, 'GraphQLIRPrinter: Need a type in order to print arrays.');
     var itemType = type.ofType;
     return '[' + value.map(function (item) {
       return printLiteral(item, itemType);
     }).join(', ') + ']';
   } else if (typeof value === 'object' && value) {
     var fields = [];
-    require('fbjs/lib/invariant')(type instanceof GraphQLInputObjectType, 'RelayPrinter: Need an InputObject type to print objects.');
+    require('fbjs/lib/invariant')(type instanceof GraphQLInputObjectType, 'GraphQLIRPrinter: Need an InputObject type to print objects.');
     var typeFields = type.getFields();
-    require('fbjs/lib/forEachObject')(value, function (val, key) {
-      fields.push(key + ': ' + printLiteral(val, typeFields[key].type));
-    });
+    for (var key in value) {
+      if (value.hasOwnProperty(key)) {
+        fields.push(key + ': ' + printLiteral(value[key], typeFields[key].type));
+      }
+    }
     return '{' + fields.join(', ') + '}';
+  } else if (type instanceof GraphQLList && value != null) {
+    // Not an array, but still a list. Treat as list-of-one as per spec 3.1.7:
+    // http://facebook.github.io/graphql/October2016/#sec-Lists
+    return printLiteral(value, type.ofType);
   } else {
     return JSON.stringify(value);
   }
 }
 
-module.exports = { print: print };
+module.exports = { print: print, printField: printField, printArguments: printArguments, printDirectives: printDirectives };

package/lib/{RelayIRTransformer.js → GraphQLIRTransformer.js}

@@ -1,12 +1,10 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
- * @providesModule RelayIRTransformer
+ * @providesModule GraphQLIRTransformer
  * 
  * @format
  */
@@ -36,21 +34,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
  * If a visitor function is *not* defined for a kind, a default traversal is
  * used to evaluate its children.
  *
- * The `stateInitializer` argument accepts a function to construct the state for
- * each document (fragment or root) in the context. Any documents for which the
- * initializer returns null/undefined is deleted from the context without being
- * traversed.
+ * The `stateInitializer` argument accepts an optional function to construct the
+ * state for each document (fragment or root) in the context. Any documents for
+ * which the initializer returns null/undefined is deleted from the context
+ * without being traversed.
  *
  * Example: Alias all scalar fields with the reverse of their name:
  *
  * ```
- * transform(
- *   context,
- *   {
- *     ScalarField: visitScalarField,
- *   },
- *   () => ({}) // dummy non-null state
- * );
+ * transform(context, {
+ *   ScalarField: visitScalarField,
+ * });
  *
  * function visitScalarField(field: ScalarField, state: State): ?ScalarField {
  *   // Traverse child nodes - for a scalar field these are the arguments &
@@ -66,21 +60,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
  */
 function transform(context, visitor, stateInitializer) {
   var transformer = new Transformer(context, visitor);
-  var nextContext = context;
-  context.documents().forEach(function (prevNode) {
-    var state = stateInitializer(prevNode);
-    var nextNode = void 0;
-    if (state != null) {
-      nextNode = transformer.visit(prevNode, state);
-    }
-    if (!nextNode) {
-      nextContext = nextContext.remove(prevNode.name);
-    } else if (nextNode !== prevNode) {
-      nextContext = nextContext.remove(prevNode.name);
-      nextContext = nextContext.add(nextNode);
-    }
+  return context.withMutations(function (nextContext) {
+    context.forEachDocument(function (prevNode) {
+      var nextNode = void 0;
+      if (stateInitializer === undefined) {
+        nextNode = transformer.visit(prevNode, undefined);
+      } else {
+        var _state = stateInitializer(prevNode);
+        if (_state != null) {
+          nextNode = transformer.visit(prevNode, _state);
+        }
+      }
+      if (!nextNode) {
+        nextContext = nextContext.remove(prevNode.name);
+      } else if (nextNode !== prevNode) {
+        nextContext = nextContext.replace(nextNode);
+      }
+    });
+    return nextContext;
   });
-  return nextContext;
 }
 
 /**
@@ -150,8 +148,8 @@ var Transformer = function () {
     if (nodeVisitor) {
       // If a handler for the kind is defined, it is responsible for calling
       // `traverse` to transform children as necessary.
-      var _state = this._getState();
-      var nextNode = nodeVisitor.call(this, node, _state);
+      var _state2 = this._getState();
+      var nextNode = nodeVisitor.call(this, node, _state2);
       return nextNode;
     }
     // Otherwise traverse is called automatically.
@@ -164,6 +162,9 @@ var Transformer = function () {
       case 'Argument':
         nextNode = this._traverseChildren(prevNode, null, ['value']);
         break;
+      case 'Batch':
+        nextNode = this._traverseChildren(prevNode, ['requests'], ['fragment']);
+        break;
       case 'Literal':
       case 'LocalArgumentDefinition':
       case 'RootArgumentDefinition':
@@ -193,21 +194,29 @@ var Transformer = function () {
         nextNode = this._traverseChildren(prevNode, ['fields']);
         break;
       case 'Condition':
+        nextNode = this._traverseChildren(prevNode, ['directives', 'selections'], ['condition']);
+        if (!nextNode.selections.length) {
+          nextNode = null;
+        }
+        break;
       case 'InlineFragment':
         nextNode = this._traverseChildren(prevNode, ['directives', 'selections']);
         if (!nextNode.selections.length) {
           nextNode = null;
         }
         break;
+      case 'DeferrableFragmentSpread':
+        nextNode = this._traverseChildren(prevNode, ['args', 'fragmentArgs', 'directives']);
+        break;
       case 'Fragment':
       case 'Root':
         nextNode = this._traverseChildren(prevNode, ['argumentDefinitions', 'directives', 'selections']);
-        if (!nextNode.selections.length) {
-          nextNode = null;
-        }
+        break;
+      case 'Request':
+        nextNode = this._traverseChildren(prevNode, null, ['root']);
         break;
       default:
-        require('fbjs/lib/invariant')(false, 'RelayIRTransformer: Unknown kind `%s`.', prevNode.kind);
+        require('fbjs/lib/invariant')(false, 'GraphQLIRTransformer: Unknown kind `%s`.', prevNode.kind);
     }
     return nextNode;
   };
@@ -221,7 +230,7 @@ var Transformer = function () {
       if (!prevItems) {
         return;
       }
-      require('fbjs/lib/invariant')(Array.isArray(prevItems), 'RelayIRTransformer: Expected data for `%s` to be an array, got `%s`.', key, prevItems);
+      require('fbjs/lib/invariant')(Array.isArray(prevItems), 'GraphQLIRTransformer: Expected data for `%s` to be an array, got `%s`.', key, prevItems);
       var nextItems = _this._map(prevItems);
       if (nextNode || nextItems !== prevItems) {
         nextNode = nextNode || (0, _extends3['default'])({}, prevNode);
@@ -259,7 +268,7 @@ var Transformer = function () {
   };
 
   Transformer.prototype._getState = function _getState() {
-    require('fbjs/lib/invariant')(this._states.length, 'RelayIRTransformer: Expected a current state to be set but found none. ' + 'This is usually the result of mismatched number of pushState()/popState() ' + 'calls.');
+    require('fbjs/lib/invariant')(this._states.length, 'GraphQLIRTransformer: Expected a current state to be set but found none. ' + 'This is usually the result of mismatched number of pushState()/popState() ' + 'calls.');
     return this._states[this._states.length - 1];
   };
 

package/lib/GraphQLIRTransforms.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule GraphQLIRTransforms
  * 
@@ -14,23 +12,16 @@
 'use strict';
 
 // Transforms applied to fragments used for reading data from a store
-var FRAGMENT_TRANSFORMS = [function (ctx) {
-  return require('./RelayFlattenTransform').transform(ctx, {
-    flattenAbstractTypes: true
-  });
-}, require('./SkipRedundantNodesTransform').transform];
+var FRAGMENT_TRANSFORMS = [require('./FlattenTransform').transformWithOptions({ flattenAbstractTypes: true }), require('./SkipRedundantNodesTransform').transform];
 
 // Transforms applied to queries/mutations/subscriptions that are used for
 // fetching data from the server and parsing those responses.
 var QUERY_TRANSFORMS = [require('./SkipClientFieldTransform').transform, require('./SkipUnreachableNodeTransform').transform];
 
 // Transforms applied to the code used to process a query response.
-var CODEGEN_TRANSFORMS = [function (ctx) {
-  return require('./RelayFlattenTransform').transform(ctx, {
-    flattenAbstractTypes: true,
-    flattenFragmentSpreads: true
-  });
-}, require('./SkipRedundantNodesTransform').transform, require('./FilterDirectivesTransform').transform];
+var CODEGEN_TRANSFORMS = [require('./InlineFragmentsTransform').transform, require('./FlattenTransform').transformWithOptions({
+  flattenAbstractTypes: true
+}), require('./SkipRedundantNodesTransform').transform, require('./FilterDirectivesTransform').transform];
 
 module.exports = {
   codegenTransforms: CODEGEN_TRANSFORMS,

package/lib/{RelayIRVisitor.js → GraphQLIRVisitor.js}

@@ -1,12 +1,10 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
- * @providesModule RelayIRVisitor
+ * @providesModule GraphQLIRVisitor
  * 
  * @format
  */
@@ -16,6 +14,7 @@ var visit = require('graphql').visit;
 
 var NodeKeys = {
   Argument: ['value'],
+  Batch: ['requests', 'fragment'],
   Condition: ['condition', 'selections'],
   Directive: ['args'],
   Fragment: ['argumentDefinitions', 'directives', 'selections'],
@@ -24,10 +23,12 @@ var NodeKeys = {
   LinkedField: ['args', 'directives', 'selections'],
   Literal: [],
   LocalArgumentDefinition: [],
+  Request: ['root'],
   Root: ['argumentDefinitions', 'directives', 'selections'],
   RootArgumentDefinition: [],
   ScalarField: ['args', 'directives'],
-  Variable: []
+  Variable: [],
+  DeferrableFragmentSpread: ['args', 'directives', 'fragmentArgs']
 };
 
 function visitIR(root, visitor) {

package/lib/GraphQLMultiReporter.js

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2013-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.
+ *
+ * @providesModule GraphQLMultiReporter
+ * 
+ * @format
+ */
+
+'use strict';
+
+var _classCallCheck3 = _interopRequireDefault(require('babel-runtime/helpers/classCallCheck'));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var GraphQLMultiReporter = function () {
+  function GraphQLMultiReporter() {
+    (0, _classCallCheck3['default'])(this, GraphQLMultiReporter);
+
+    for (var _len = arguments.length, reporters = Array(_len), _key = 0; _key < _len; _key++) {
+      reporters[_key] = arguments[_key];
+    }
+
+    this._reporters = reporters;
+  }
+
+  GraphQLMultiReporter.prototype.reportMessage = function reportMessage(message) {
+    this._reporters.forEach(function (reporter) {
+      reporter.reportMessage(message);
+    });
+  };
+
+  GraphQLMultiReporter.prototype.reportTime = function reportTime(name, ms) {
+    this._reporters.forEach(function (reporter) {
+      reporter.reportTime(name, ms);
+    });
+  };
+
+  GraphQLMultiReporter.prototype.reportError = function reportError(caughtLocation, error) {
+    this._reporters.forEach(function (reporter) {
+      reporter.reportError(caughtLocation, error);
+    });
+  };
+
+  return GraphQLMultiReporter;
+}();
+
+module.exports = GraphQLMultiReporter;