relay-compiler 7.0.0 → 9.1.0

package/lib/transforms/FlattenTransform.js

@@ -7,19 +7,24 @@
  * @format
  * 
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var GraphQLIRTransformer = require('../core/GraphQLIRTransformer');
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var IRTransformer = require('../core/IRTransformer');
 
 var areEqual = require('../util/areEqualOSS');
 
 var getIdentifierForSelection = require('../core/getIdentifierForSelection');
 
-var _require = require('../core/RelayCompilerError'),
+var _require = require('../core/CompilerError'),
     createCompilerError = _require.createCompilerError,
     createUserError = _require.createUserError;
 
@@ -27,20 +32,19 @@ var _require = require('../core/RelayCompilerError'),
  * Transform that flattens inline fragments, fragment spreads, and conditionals.
  *
  * Inline fragments are inlined (replaced with their selections) when:
- * - The fragment type matches the type of its parent.
- * - The fragment has an abstract type and the `flattenAbstractTypes` option has
+ * - The fragment type matches the type of its parent, and its `isForCodegen`,
+ *   or if it's for printing, there is no directive on the inline fragment.
+ * - The fragment has an abstract type and the `isForCodegen` option has
  *   been set.
  */
 function flattenTransformImpl(context, options) {
   var state = {
-    flattenAbstractTypes: !!(options && options.flattenAbstractTypes),
+    isForCodegen: !!(options && options.isForCodegen),
     parentType: null
   };
   var visitorFn = memoizedFlattenSelection(new Map());
-  return GraphQLIRTransformer.transform(context, {
+  return IRTransformer.transform(context, {
     Condition: visitorFn,
-    Connection: visitorFn,
-    ConnectionField: visitorFn,
     Defer: visitorFn,
     Fragment: visitorFn,
     InlineFragment: visitorFn,
@@ -82,7 +86,7 @@ function memoizedFlattenSelection(cache) {
 
     var nextSelections = new Map();
     var hasFlattened = flattenSelectionsInto(context.getSchema(), nextSelections, node, state, type);
-    var flattenedNode = hasFlattened ? (0, _objectSpread2["default"])({}, node, {
+    var flattenedNode = hasFlattened ? _objectSpread({}, node, {
       selections: Array.from(nextSelections.values())
     }) : node;
     state.parentType = type;
@@ -122,7 +126,7 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
         throw createCompilerError("FlattenTransform: Expected an InlineFragment, got a '".concat(selection.kind, "'"), [selection.loc]);
       }
 
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({}, flattenedSelection, {
+      flattenedSelections.set(nodeIdentifier, _objectSpread({}, flattenedSelection, {
         selections: mergeSelections(schema, flattenedSelection, selection, state, selection.typeCondition)
       }));
     } else if (flattenedSelection.kind === 'Condition') {
@@ -130,7 +134,7 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
         throw createCompilerError("FlattenTransform: Expected a Condition, got a '".concat(selection.kind, "'"), [selection.loc]);
       }
 
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({}, flattenedSelection, {
+      flattenedSelections.set(nodeIdentifier, _objectSpread({}, flattenedSelection, {
         selections: mergeSelections(schema, flattenedSelection, selection, state, type)
       }));
     } else if (flattenedSelection.kind === 'ClientExtension') {
@@ -138,7 +142,7 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
         throw createCompilerError("FlattenTransform: Expected a ClientExtension, got a '".concat(selection.kind, "'"), [selection.loc]);
       }
 
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({}, flattenedSelection, {
+      flattenedSelections.set(nodeIdentifier, _objectSpread({}, flattenedSelection, {
         selections: mergeSelections(schema, flattenedSelection, selection, state, type)
       }));
     } else if (flattenedSelection.kind === 'FragmentSpread') {// Ignore duplicate fragment spreads.
@@ -147,11 +151,11 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
         throw createCompilerError("FlattenTransform: Expected a ModuleImport, got a '".concat(selection.kind, "'"), [selection.loc]);
       }
 
-      if (selection.name !== flattenedSelection.name || selection.module !== flattenedSelection.module || selection.documentName !== flattenedSelection.documentName) {
+      if (selection.name !== flattenedSelection.name || selection.module !== flattenedSelection.module || selection.key !== flattenedSelection.key) {
         throw createUserError('Found conflicting @module selections: use a unique alias on the ' + 'parent fields.', [selection.loc, flattenedSelection.loc]);
       }
 
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({}, flattenedSelection, {
+      flattenedSelections.set(nodeIdentifier, _objectSpread({}, flattenedSelection, {
         selections: mergeSelections(schema, flattenedSelection, selection, state, type)
       }));
     } else if (flattenedSelection.kind === 'Defer') {
@@ -159,7 +163,7 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
         throw createCompilerError("FlattenTransform: Expected a Defer, got a '".concat(selection.kind, "'"), [selection.loc]);
       }
 
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({
+      flattenedSelections.set(nodeIdentifier, _objectSpread({
         kind: 'Defer'
       }, flattenedSelection, {
         selections: mergeSelections(schema, flattenedSelection, selection, state, type)
@@ -169,7 +173,7 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
         throw createCompilerError("FlattenTransform: Expected a Stream, got a '".concat(selection.kind, "'"), [selection.loc]);
       }
 
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({
+      flattenedSelections.set(nodeIdentifier, _objectSpread({
         kind: 'Stream'
       }, flattenedSelection, {
         selections: mergeSelections(schema, flattenedSelection, selection, state, type)
@@ -202,42 +206,14 @@ function flattenSelectionsInto(schema, flattenedSelections, node, state, type) {
       assertUniqueArgsForAlias(selection, flattenedSelection);
 
       if (selection.handles && selection.handles.length > 0) {
-        flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({
+        flattenedSelections.set(nodeIdentifier, _objectSpread({
           kind: 'ScalarField'
         }, flattenedSelection, {
           handles: mergeHandles(selection, flattenedSelection)
         }));
       }
-    } else if (flattenedSelection.kind === 'ConnectionField') {
-      if (selection.kind !== 'ConnectionField') {
-        throw createCompilerError("FlattenTransform: Expected a ConnectionField, got a '".concat(selection.kind, "'"), [selection.loc]);
-      }
-
-      assertUniqueArgsForAlias(selection, flattenedSelection); // NOTE: not using object spread here as this code is pretty hot
-
-      flattenedSelections.set(nodeIdentifier, {
-        kind: 'ConnectionField',
-        alias: flattenedSelection.alias,
-        args: flattenedSelection.args,
-        directives: flattenedSelection.directives,
-        loc: flattenedSelection.loc,
-        metadata: flattenedSelection.metadata,
-        name: flattenedSelection.name,
-        selections: mergeSelections(schema, flattenedSelection, selection, state, selection.type),
-        type: flattenedSelection.type
-      });
     } else if (flattenedSelection.kind === 'InlineDataFragmentSpread') {
       throw createCompilerError('FlattenTransform: did not expect an InlineDataFragmentSpread node. ' + 'Only expecting InlineDataFragmentSpread in reader ASTs and this ' + 'transform to run only on normalization ASTs.', [selection.loc]);
-    } else if (flattenedSelection.kind === 'Connection') {
-      if (selection.kind !== 'Connection') {
-        throw createCompilerError("FlattenTransform: Expected a Connection, got a '".concat(selection.kind, "'"), [selection.loc]);
-      }
-
-      flattenedSelections.set(nodeIdentifier, (0, _objectSpread2["default"])({
-        kind: 'Connection'
-      }, flattenedSelection, {
-        selections: mergeSelections(schema, flattenedSelection, selection, state, selection.type)
-      }));
     } else {
       flattenedSelection.kind;
       throw createCompilerError("FlattenTransform: Unknown kind '".concat(flattenedSelection.kind, "'"));
@@ -274,7 +250,7 @@ function assertUniqueArgsForAlias(field, otherField) {
 
 
 function shouldFlattenInlineFragment(schema, fragment, state, type) {
-  return schema.areEqualTypes(fragment.typeCondition, schema.getRawType(type)) || state.flattenAbstractTypes && schema.isAbstractType(fragment.typeCondition);
+  return schema.areEqualTypes(fragment.typeCondition, schema.getRawType(type)) && (state.isForCodegen || fragment.directives.length === 0) || state.isForCodegen && schema.isAbstractType(fragment.typeCondition);
 }
 /**
  * @private

package/lib/transforms/GenerateIDFieldTransform.js

@@ -7,15 +7,20 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var IRTransformer = require('../core/GraphQLIRTransformer');
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var IRTransformer = require('../core/IRTransformer');
 
 var SchemaUtils = require('../core/SchemaUtils');
 
@@ -56,7 +61,7 @@ function visitLinkedField(field, state) {
   var unmodifiedType = schema.assertCompositeType(schema.getRawType(field.type)); // If the field type has an `id` subfield add an `id` selection
 
   if (schema.canHaveSelections(unmodifiedType) && schema.hasId(unmodifiedType)) {
-    return (0, _objectSpread2["default"])({}, transformedNode, {
+    return _objectSpread({}, transformedNode, {
       selections: [].concat((0, _toConsumableArray2["default"])(transformedNode.selections), [state.idField])
     });
   } // If the field type is abstract, then generate a `... on Node { id }`
@@ -85,7 +90,7 @@ function visitLinkedField(field, state) {
         selections.push(buildIDFragment(possibleType, state.idField));
       }
     });
-    return (0, _objectSpread2["default"])({}, transformedNode, {
+    return _objectSpread({}, transformedNode, {
       selections: selections
     });
   }

package/lib/transforms/GenerateTypeNameTransform.js

@@ -7,15 +7,20 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var IRTransformer = require('../core/GraphQLIRTransformer');
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var IRTransformer = require('../core/IRTransformer');
 
 var _require = require('./TransformUtils'),
     hasUnaliasedSelection = _require.hasUnaliasedSelection;
@@ -64,7 +69,7 @@ function visitLinkedField(field, state) {
   transformedNode = this.traverse(field, state);
 
   if (schema.isAbstractType(schema.getRawType(transformedNode.type)) && !hasUnaliasedSelection(transformedNode, TYPENAME_KEY)) {
-    transformedNode = (0, _objectSpread2["default"])({}, transformedNode, {
+    transformedNode = _objectSpread({}, transformedNode, {
       selections: [state.typenameField].concat((0, _toConsumableArray2["default"])(transformedNode.selections))
     });
   }

package/lib/transforms/InlineDataFragmentTransform.js

@@ -7,15 +7,20 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var GraphQLIRTransformer = require('../core/GraphQLIRTransformer');
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-var _require = require('../core/RelayCompilerError'),
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var IRTransformer = require('../core/IRTransformer');
+
+var _require = require('../core/CompilerError'),
     createUserError = _require.createUserError;
 
 var SCHEMA_EXTENSION = "\ndirective @inline on FRAGMENT_DEFINITION\n";
@@ -26,7 +31,7 @@ var SCHEMA_EXTENSION = "\ndirective @inline on FRAGMENT_DEFINITION\n";
  */
 
 function inlineDataFragmentTransform(context) {
-  return GraphQLIRTransformer.transform(context, {
+  return IRTransformer.transform(context, {
     // $FlowFixMe - this visitor intentionally changes node types
     FragmentSpread: visitFragmentSpread,
     Fragment: visitFragment
@@ -43,11 +48,11 @@ function visitFragment(fragment) {
     return transformedFragment;
   }
 
-  return (0, _objectSpread2["default"])({}, transformedFragment, {
+  return _objectSpread({}, transformedFragment, {
     directives: transformedFragment.directives.filter(function (directive) {
       return directive !== inlineDirective;
     }),
-    metadata: (0, _objectSpread2["default"])({}, transformedFragment.metadata || {}, {
+    metadata: _objectSpread({}, transformedFragment.metadata || {}, {
       inlineData: true
     })
   });

package/lib/transforms/InlineFragmentsTransform.js

@@ -7,9 +7,10 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
-var GraphQLIRTransformer = require('../core/GraphQLIRTransformer');
+var IRTransformer = require('../core/IRTransformer');
 
 var invariant = require("fbjs/lib/invariant");
 
@@ -18,7 +19,7 @@ var invariant = require("fbjs/lib/invariant");
  */
 function inlineFragmentsTransform(context) {
   var visitFragmentSpread = fragmentSpreadVisitor(new Map());
-  return GraphQLIRTransformer.transform(context, {
+  return IRTransformer.transform(context, {
     Fragment: visitFragment,
     FragmentSpread: visitFragmentSpread
   });

package/lib/transforms/MaskTransform.js

@@ -7,19 +7,30 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var IRTransformer = require('../core/GraphQLIRTransformer');
+function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(n); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var IRTransformer = require('../core/IRTransformer');
 
 var invariant = require("fbjs/lib/invariant");
 
 var joinArgumentDefinitions = require('../util/joinArgumentDefinitions');
 
-var _require = require('../core/RelayCompilerError'),
+var _require = require('../core/CompilerError'),
     createUserError = _require.createUserError;
 
 /**
@@ -45,7 +56,7 @@ function visitFragment(fragment, state) {
   }
 
   var joinedArgumentDefinitions = joinArgumentDefinitions(this.getContext().getSchema(), fragment, state.reachableArguments, '@relay(unmask: true)');
-  return (0, _objectSpread2["default"])({}, result, {
+  return _objectSpread({}, result, {
     argumentDefinitions: joinedArgumentDefinitions
   });
 }
@@ -84,28 +95,18 @@ function visitFragmentSpread(fragmentSpread, state) {
   // to list all invalid variables/arguments instead of only one.
 
 
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+  var _iterator = _createForOfIteratorHelper(fragment.argumentDefinitions),
+      _step;
 
   try {
-    for (var _iterator = fragment.argumentDefinitions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var argDef = _step.value;
       state.reachableArguments.push(argDef);
     }
   } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
+    _iterator.e(err);
   } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator["return"] != null) {
-        _iterator["return"]();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
+    _iterator.f();
   }
 
   return this.traverse(result, state);