relay-compiler 7.0.0 → 9.1.0

package/lib/core/RelayParser.js

@@ -7,14 +7,25 @@
  * 
  * @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"));
 
+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; }
+
+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; }
+
 var Profiler = require('./GraphQLCompilerProfiler');
 
 var orList = require('../util/orList');
@@ -24,7 +35,7 @@ var partitionArray = require('../util/partitionArray');
 var _require = require('../util/DefaultHandleKey'),
     DEFAULT_HANDLE_KEY = _require.DEFAULT_HANDLE_KEY;
 
-var _require2 = require('./RelayCompilerError'),
+var _require2 = require('./CompilerError'),
     createCompilerError = _require2.createCompilerError,
     createUserError = _require2.createUserError,
     eachWithCombinedError = _require2.eachWithCombinedError;
@@ -65,9 +76,8 @@ var IF = 'if';
  */
 
 function parse(schema, text, filename) {
-  var ast = parseGraphQL(new Source(text, filename)); // TODO T24511737 figure out if this is dangerous
-
-  var parser = new RelayParser(schema.DEPRECATED__extend(ast), ast.definitions);
+  var ast = parseGraphQL(new Source(text, filename));
+  var parser = new RelayParser(schema.extend(ast), ast.definitions);
   return parser.transform();
 }
 /**
@@ -87,9 +97,7 @@ function transform(schema, definitions) {
  */
 
 
-var RelayParser =
-/*#__PURE__*/
-function () {
+var RelayParser = /*#__PURE__*/function () {
   function RelayParser(schema, definitions) {
     var _this = this;
 
@@ -128,9 +136,9 @@ function () {
     // This allows the subsequent AST -> IR tranformation to reference the
     // defined arguments of referenced fragments.
 
-    eachWithCombinedError(this._definitions, function (_ref4) {
-      var name = _ref4[0],
-          definition = _ref4[1];
+    eachWithCombinedError(this._definitions, function (_ref) {
+      var name = _ref[0],
+          definition = _ref[1];
 
       var variableDefinitions = _this2._buildArgumentDefinitions(definition);
 
@@ -140,9 +148,9 @@ function () {
       });
     }); // Convert the ASTs to IR.
 
-    eachWithCombinedError(entries.values(), function (_ref5) {
-      var definition = _ref5.definition,
-          variableDefinitions = _ref5.variableDefinitions;
+    eachWithCombinedError(entries.values(), function (_ref2) {
+      var definition = _ref2.definition,
+          variableDefinitions = _ref2.variableDefinitions;
       var node = parseDefinition(_this2._schema, _this2._getFieldDefinition, entries, definition, variableDefinitions);
       nodes.push(node);
     });
@@ -203,7 +211,7 @@ function () {
 
     var variables = new Map();
     args.forEach(function (arg) {
-      var _ref;
+      var _defaultValue$value;
 
       var argName = getName(arg);
       var previousVariable = variables.get(argName);
@@ -258,7 +266,7 @@ function () {
 
       variables.set(argName, {
         ast: arg,
-        defaultValue: (_ref = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.value) !== null && _ref !== void 0 ? _ref : null,
+        defaultValue: (_defaultValue$value = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.value) !== null && _defaultValue$value !== void 0 ? _defaultValue$value : null,
         defined: true,
         name: argName,
         type: type
@@ -323,9 +331,7 @@ function parseDefinition(schema, getFieldDefinition, entries, definition, variab
  */
 
 
-var GraphQLDefinitionParser =
-/*#__PURE__*/
-function () {
+var GraphQLDefinitionParser = /*#__PURE__*/function () {
   function GraphQLDefinitionParser(schema, getFieldDefinition, entries, definition, variableDefinitions) {
     this._definition = definition;
     this._entries = entries;
@@ -416,29 +422,20 @@ function () {
       var directiveDefs = this._schema.getDirectives();
 
       this._directiveLocations = new Map();
-      var _iteratorNormalCompletion = true;
-      var _didIteratorError = false;
-      var _iteratorError = undefined;
+
+      var _iterator = _createForOfIteratorHelper(directiveDefs),
+          _step;
 
       try {
-        for (var _iterator = directiveDefs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var def = _step.value;
 
           this._directiveLocations.set(def.name, def.locations);
         }
       } 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();
       }
     }
 
@@ -498,12 +495,12 @@ function () {
     var selections = this._transformSelections(fragment.selectionSet, type, fragment.typeCondition);
 
     var argumentDefinitions = (0, _toConsumableArray2["default"])(buildArgumentDefinitions(this._variableDefinitions));
-    var _iteratorNormalCompletion2 = true;
-    var _didIteratorError2 = false;
-    var _iteratorError2 = undefined;
+
+    var _iterator2 = _createForOfIteratorHelper(this._unknownVariables),
+        _step2;
 
     try {
-      for (var _iterator2 = this._unknownVariables[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var _step2$value = _step2.value,
             name = _step2$value[0],
             variableReference = _step2$value[1];
@@ -515,18 +512,9 @@ function () {
         });
       }
     } catch (err) {
-      _didIteratorError2 = true;
-      _iteratorError2 = err;
+      _iterator2.e(err);
     } finally {
-      try {
-        if (!_iteratorNormalCompletion2 && _iterator2["return"] != null) {
-          _iterator2["return"]();
-        }
-      } finally {
-        if (_didIteratorError2) {
-          throw _iteratorError2;
-        }
-      }
+      _iterator2.f();
     }
 
     return {
@@ -638,7 +626,7 @@ function () {
           directives = _this4$_splitConditio[1];
 
       var conditionalNodes = applyConditions(conditions, // $FlowFixMe(>=0.28.0)
-      [(0, _objectSpread2["default"])({}, node, {
+      [_objectSpread({}, node, {
         directives: directives
       })]);
 
@@ -724,12 +712,12 @@ function () {
       var isDeprecatedUncheckedArguments = getName(argumentsDirective) === DEPRECATED_UNCHECKED_ARGUMENTS;
       var hasInvalidArgument = false;
       args = (argumentsDirective.arguments || []).map(function (arg) {
-        var _ref2;
+        var _argumentDefinition$t;
 
         var argName = getName(arg);
         var argValue = arg.value;
         var argumentDefinition = fragmentArgumentDefinitions.get(argName);
-        var argumentType = (_ref2 = argumentDefinition === null || argumentDefinition === void 0 ? void 0 : argumentDefinition.type) !== null && _ref2 !== void 0 ? _ref2 : null;
+        var argumentType = (_argumentDefinition$t = argumentDefinition === null || argumentDefinition === void 0 ? void 0 : argumentDefinition.type) !== null && _argumentDefinition$t !== void 0 ? _argumentDefinition$t : null;
 
         if (argValue.kind === 'Variable') {
           if (argumentDefinition == null && !isDeprecatedUncheckedArguments) {
@@ -780,7 +768,7 @@ function () {
   };
 
   _proto2._transformField = function _transformField(field, parentType) {
-    var _ref3, _field$alias;
+    var _field$alias$value, _field$alias;
 
     var schema = this._schema;
     var name = getName(field);
@@ -791,7 +779,7 @@ function () {
       throw createUserError("Unknown field '".concat(name, "' on type '").concat(schema.getTypeString(parentType), "'."), null, [field]);
     }
 
-    var alias = (_ref3 = (_field$alias = field.alias) === null || _field$alias === void 0 ? void 0 : _field$alias.value) !== null && _ref3 !== void 0 ? _ref3 : name;
+    var alias = (_field$alias$value = (_field$alias = field.alias) === null || _field$alias === void 0 ? void 0 : _field$alias.value) !== null && _field$alias$value !== void 0 ? _field$alias$value : name;
 
     var args = this._transformArguments(field.arguments || [], schema.getFieldArgs(fieldDef), fieldDef);
 
@@ -1091,29 +1079,55 @@ function transformNonNullLiteral(schema, ast, type, transformVariable, options)
 
     var itemType = schema.assertInputType(schema.getListItemType(nullableType));
     var literalList = [];
+    var items = [];
+    var areAllItemsScalar = true;
     ast.values.forEach(function (item) {
       var itemValue = transformValue(schema, item, itemType, transformVariable, options);
 
       if (itemValue.kind === 'Literal') {
         literalList.push(itemValue.value);
-      } else if (itemValue.kind === 'Variable') {
-        throw createUserError('Complex argument values (Lists or InputObjects with nested variables) are not supported.', null, [item]);
       }
+
+      items.push(itemValue);
+      areAllItemsScalar = areAllItemsScalar && itemValue.kind === 'Literal';
     });
-    return {
-      kind: 'Literal',
-      loc: buildLocation(ast.loc),
-      value: literalList
-    };
+
+    if (areAllItemsScalar) {
+      return {
+        kind: 'Literal',
+        loc: buildLocation(ast.loc),
+        value: literalList
+      };
+    } else {
+      return {
+        kind: 'ListValue',
+        loc: buildLocation(ast.loc),
+        items: items
+      };
+    }
   } else if (schema.isInputObject(nullableType)) {
     if (ast.kind !== 'ObjectValue') {
       throw createUserError("Expected a value matching type '".concat(schema.getTypeString(type), "'."), null, [ast]);
     }
 
     var literalObject = {};
+    var fields = [];
+    var areAllFieldsScalar = true;
     var inputType = schema.assertInputObjectType(nullableType);
+    var requiredFieldNames = new Set(schema.getFields(inputType).filter(function (field) {
+      return schema.isNonNull(schema.getFieldType(field));
+    }).map(function (field) {
+      return schema.getFieldName(field);
+    }));
+    var seenFields = new Map();
     ast.fields.forEach(function (field) {
       var fieldName = getName(field);
+      var seenField = seenFields.get(fieldName);
+
+      if (seenField) {
+        throw createUserError("Duplicated field name '".concat(fieldName, "' in the input object."), null, [field, seenField]);
+      }
+
       var fieldID = schema.getFieldByName(inputType, fieldName);
 
       if (!fieldID) {
@@ -1126,15 +1140,39 @@ function transformNonNullLiteral(schema, ast, type, transformVariable, options)
 
       if (fieldValue.kind === 'Literal') {
         literalObject[field.name.value] = fieldValue.value;
-      } else if (fieldValue.kind === 'Variable') {
-        throw createUserError('Complex argument values (Lists or InputObjects with nested variables) are not supported.', null, [field.value]);
       }
+
+      fields.push({
+        kind: 'ObjectFieldValue',
+        loc: buildLocation(field.loc),
+        name: fieldName,
+        value: fieldValue
+      });
+      seenFields.set(fieldName, field);
+      requiredFieldNames["delete"](fieldName);
+      areAllFieldsScalar = areAllFieldsScalar && fieldValue.kind === 'Literal';
     });
-    return {
-      kind: 'Literal',
-      loc: buildLocation(ast.loc),
-      value: literalObject
-    };
+
+    if (requiredFieldNames.size > 0) {
+      var requiredFieldStr = Array.from(requiredFieldNames).map(function (item) {
+        return "'".concat(item, "'");
+      }).join(', ');
+      throw createUserError("Missing non-optional field".concat(requiredFieldNames.size > 1 ? 's:' : '', " ").concat(requiredFieldStr, " for input type '").concat(schema.getTypeString(inputType), "'."), null, [ast]);
+    }
+
+    if (areAllFieldsScalar) {
+      return {
+        kind: 'Literal',
+        loc: buildLocation(ast.loc),
+        value: literalObject
+      };
+    } else {
+      return {
+        kind: 'ObjectValue',
+        loc: buildLocation(ast.loc),
+        fields: fields
+      };
+    }
   } else if (schema.isId(nullableType)) {
     // GraphQLID's parseLiteral() always returns the string value. However
     // the int/string distinction may be important at runtime, so this
@@ -1262,11 +1300,11 @@ function transformLiteralValue(ast, context) {
 
 
 function buildArgumentDefinitions(variables) {
-  return Array.from(variables.values(), function (_ref6) {
-    var ast = _ref6.ast,
-        name = _ref6.name,
-        defaultValue = _ref6.defaultValue,
-        type = _ref6.type;
+  return Array.from(variables.values(), function (_ref3) {
+    var ast = _ref3.ast,
+        name = _ref3.name,
+        defaultValue = _ref3.defaultValue,
+        type = _ref3.type;
     return {
       kind: 'LocalArgumentDefinition',
       loc: buildLocation(ast.loc),
@@ -1303,7 +1341,7 @@ function buildLocation(loc) {
 function applyConditions(conditions, selections) {
   var nextSelections = selections;
   conditions.forEach(function (condition) {
-    nextSelections = [(0, _objectSpread2["default"])({}, condition, {
+    nextSelections = [_objectSpread({}, condition, {
       selections: nextSelections
     })];
   });
@@ -1358,7 +1396,7 @@ function checkFragmentSpreadTypeCompatibility(schema, fragmentType, parentType,
     var suggestedTypesMessage = '';
 
     if (possibleConcreteTypes.length !== 0) {
-      suggestedTypesMessage = " Possible concrete types include ".concat(possibleConcreteTypes.slice(0, 3).map(function (type) {
+      suggestedTypesMessage = " Possible concrete types include ".concat(possibleConcreteTypes.sort().slice(0, 3).map(function (type) {
         return "'".concat(schema.getTypeString(type), "'");
       }).join(', '), ", etc.");
     }

package/lib/core/RelaySourceModuleParser.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -30,7 +31,7 @@ var _require = require('./RelayFindGraphQLTags'),
 
 var parseGraphQL = Profiler.instrument(GraphQL.parse, 'GraphQL.parse');
 
-module.exports = function (tagFinder) {
+module.exports = function (tagFinder, getFileFilter) {
   var memoizedTagFinder = memoizedFind.bind(null, tagFinder);
 
   function parseFile(baseDir, file) {
@@ -77,7 +78,7 @@ module.exports = function (tagFinder) {
     });
   }
 
-  function getFileFilter(baseDir) {
+  function defaultGetFileFilter(baseDir) {
     return function (file) {
       var filePath = path.join(baseDir, file.relPath);
       var text = '';
@@ -96,7 +97,7 @@ module.exports = function (tagFinder) {
 
   return {
     getParser: getParser,
-    getFileFilter: getFileFilter,
+    getFileFilter: getFileFilter !== null && getFileFilter !== void 0 ? getFileFilter : defaultGetFileFilter,
     parseFile: parseFile,
     parseFileWithSources: parseFileWithSources
   };