relay-compiler 7.0.0 → 9.1.0

package/lib/codegen/CodegenTypes.js

@@ -7,4 +7,5 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';

package/lib/codegen/CodegenWatcher.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
@@ -30,14 +31,12 @@ function queryFiles(_x, _x2, _x3) {
 
 function _queryFiles() {
   _queryFiles = _asyncToGenerator(function* (baseDir, expression, filter) {
-    return yield Profiler.waitFor('Watchman:query',
-    /*#__PURE__*/
-    _asyncToGenerator(function* () {
+    return yield Profiler.waitFor('Watchman:query', /*#__PURE__*/_asyncToGenerator(function* () {
       var client = new GraphQLWatchmanClient(QUERY_RETRIES);
 
-      var _ref = yield Promise.all([client.watchProject(baseDir), getFields(client)]),
-          watchResp = _ref[0],
-          fields = _ref[1];
+      var _await$Promise$all = yield Promise.all([client.watchProject(baseDir), getFields(client)]),
+          watchResp = _await$Promise$all[0],
+          fields = _await$Promise$all[1];
 
       var resp = yield client.command('query', watchResp.root, {
         expression: expression,
@@ -57,9 +56,7 @@ function queryDirectories(_x4, _x5) {
 
 function _queryDirectories() {
   _queryDirectories = _asyncToGenerator(function* (baseDir, expression) {
-    return yield Profiler.waitFor('Watchman:query',
-    /*#__PURE__*/
-    _asyncToGenerator(function* () {
+    return yield Profiler.waitFor('Watchman:query', /*#__PURE__*/_asyncToGenerator(function* () {
       var client = new GraphQLWatchmanClient();
       var watchResp = yield client.watchProject(baseDir);
       var resp = yield client.command('query', watchResp.root, {
@@ -124,9 +121,7 @@ function watch(_x10, _x11, _x12) {
 
 function _watch() {
   _watch = _asyncToGenerator(function* (baseDir, expression, callback) {
-    return yield Profiler.waitFor('Watchman:subscribe',
-    /*#__PURE__*/
-    _asyncToGenerator(function* () {
+    return yield Profiler.waitFor('Watchman:subscribe', /*#__PURE__*/_asyncToGenerator(function* () {
       var client = new GraphQLWatchmanClient();
       var watchResp = yield client.watchProject(baseDir);
       yield makeSubscription(client, watchResp.root, watchResp.relativePath, expression, callback);
@@ -201,10 +196,8 @@ function _watchCompile() {
     var compiling = false;
     var needsCompiling = false;
     var latestFiles = null;
-    watchFiles(baseDir, expression, filter,
-    /*#__PURE__*/
-    function () {
-      var _ref6 = _asyncToGenerator(function* (files) {
+    watchFiles(baseDir, expression, filter, /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator(function* (files) {
         needsCompiling = true;
         latestFiles = files;
 
@@ -223,7 +216,7 @@ function _watchCompile() {
       });
 
       return function (_x26) {
-        return _ref6.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }());
   });
@@ -235,10 +228,10 @@ function updateFiles(files, baseDir, filter, fileChanges) {
   files.forEach(function (file) {
     file.exists && fileMap.set(file.relPath, file);
   });
-  fileChanges.forEach(function (_ref2) {
-    var name = _ref2.name,
-        exists = _ref2.exists,
-        hash = _ref2['content.sha1hex'];
+  fileChanges.forEach(function (_ref) {
+    var name = _ref.name,
+        exists = _ref.exists,
+        hash = _ref['content.sha1hex'];
     var shouldRemove = !exists;
 
     if (!shouldRemove) {

package/lib/codegen/NormalizationCodeGenerator.js

@@ -7,20 +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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _require = require('../core/RelayCompilerError'),
+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 _require = require('../core/CompilerError'),
     createCompilerError = _require.createCompilerError,
     createUserError = _require.createUserError;
 
 var _require2 = require('relay-runtime'),
-    ConnectionInterface = _require2.ConnectionInterface,
     getStorageKey = _require2.getStorageKey,
     stableCopy = _require2.stableCopy;
 
@@ -39,9 +43,9 @@ function generate(schema, node) {
 
 function generateRoot(schema, node) {
   return {
+    argumentDefinitions: generateArgumentDefinitions(schema, node.argumentDefinitions),
     kind: 'Operation',
     name: node.name,
-    argumentDefinitions: generateArgumentDefinitions(schema, node.argumentDefinitions),
     selections: generateSelections(schema, node.selections)
   };
 }
@@ -49,8 +53,8 @@ function generateRoot(schema, node) {
 function generateSplitOperation(schema, node) {
   return {
     kind: 'SplitOperation',
-    name: node.name,
     metadata: node.metadata,
+    name: node.name,
     selections: generateSelections(schema, node.selections)
   };
 }
@@ -83,14 +87,6 @@ function generateSelections(schema, selections) {
         normalizationSelections.push.apply(normalizationSelections, (0, _toConsumableArray2["default"])(generateLinkedField(schema, selection)));
         break;
 
-      case 'ConnectionField':
-        normalizationSelections.push.apply(normalizationSelections, (0, _toConsumableArray2["default"])(generateConnectionField(schema, selection)));
-        break;
-
-      case 'Connection':
-        normalizationSelections.push(generateConnection(schema, selection));
-        break;
-
       case 'Defer':
         normalizationSelections.push(generateDefer(schema, selection));
         break;
@@ -114,10 +110,10 @@ function generateSelections(schema, selections) {
 function generateArgumentDefinitions(schema, nodes) {
   return nodes.map(function (node) {
     return {
+      defaultValue: node.defaultValue,
       kind: 'LocalArgument',
       name: node.name,
-      type: schema.getTypeString(node.type),
-      defaultValue: node.defaultValue
+      type: schema.getTypeString(node.type)
     };
   });
 }
@@ -135,25 +131,24 @@ function generateCondition(schema, node) {
   }
 
   return {
+    condition: node.condition.variableName,
     kind: 'Condition',
     passingValue: node.passingValue,
-    condition: node.condition.variableName,
     selections: generateSelections(schema, node.selections)
   };
 }
 
 function generateDefer(schema, node) {
   if (!(node["if"] == null || node["if"].kind === 'Variable' || node["if"].kind === 'Literal' && node["if"].value === true)) {
-    var _ref, _node$if;
+    var _node$if$loc, _node$if;
 
-    throw createCompilerError('NormalizationCodeGenerator: Expected @defer `if` condition to be ' + 'a variable, unspecified, or the literal `true`.', [(_ref = (_node$if = node["if"]) === null || _node$if === void 0 ? void 0 : _node$if.loc) !== null && _ref !== void 0 ? _ref : node.loc]);
+    throw createCompilerError('NormalizationCodeGenerator: Expected @defer `if` condition to be ' + 'a variable, unspecified, or the literal `true`.', [(_node$if$loc = (_node$if = node["if"]) === null || _node$if === void 0 ? void 0 : _node$if.loc) !== null && _node$if$loc !== void 0 ? _node$if$loc : node.loc]);
   }
 
   return {
     "if": node["if"] != null && node["if"].kind === 'Variable' ? node["if"].variableName : null,
     kind: 'Defer',
     label: node.label,
-    metadata: node.metadata,
     selections: generateSelections(schema, node.selections)
   };
 }
@@ -161,8 +156,8 @@ function generateDefer(schema, node) {
 function generateInlineFragment(schema, node) {
   return {
     kind: 'InlineFragment',
-    type: schema.getTypeString(node.typeCondition),
-    selections: generateSelections(schema, node.selections)
+    selections: generateSelections(schema, node.selections),
+    type: schema.getTypeString(node.typeCondition)
   };
 }
 
@@ -172,13 +167,13 @@ function generateLinkedField(schema, node) {
   // which may have originally appeared in different orders across an app.
   var handles = node.handles && node.handles.map(function (handle) {
     var handleNode = {
-      kind: 'LinkedHandle',
       alias: node.alias === node.name ? null : node.alias,
-      name: node.name,
       args: generateArgs(node.args),
+      filters: handle.filters,
       handle: handle.name,
       key: handle.key,
-      filters: handle.filters
+      kind: 'LinkedHandle',
+      name: node.name
     }; // T45504512: new connection model
     // NOTE: this intentionally adds a dynamic key in order to avoid
     // triggering updates to existing queries that do not use dynamic
@@ -186,7 +181,7 @@ function generateLinkedField(schema, node) {
 
     if (handle.dynamicKey != null) {
       var dynamicKeyArgName = '__dynamicKey';
-      handleNode = (0, _objectSpread2["default"])({}, handleNode, {
+      handleNode = _objectSpread({}, handleNode, {
         dynamicKey: {
           kind: 'Variable',
           name: dynamicKeyArgName,
@@ -199,20 +194,20 @@ function generateLinkedField(schema, node) {
   }) || [];
   var type = schema.getRawType(node.type);
   var field = {
-    kind: 'LinkedField',
     alias: node.alias === node.name ? null : node.alias,
-    name: node.name,
-    storageKey: null,
     args: generateArgs(node.args),
     concreteType: !schema.isAbstractType(type) ? schema.getTypeString(type) : null,
+    kind: 'LinkedField',
+    name: node.name,
     plural: isPlural(schema, node.type),
-    selections: generateSelections(schema, node.selections)
+    selections: generateSelections(schema, node.selections),
+    storageKey: null
   }; // Precompute storageKey if possible
 
   var storageKey = getStaticStorageKey(field, node.metadata);
 
   if (storageKey != null) {
-    field = (0, _objectSpread2["default"])({}, field, {
+    field = _objectSpread({}, field, {
       storageKey: storageKey
     });
   }
@@ -220,91 +215,7 @@ function generateLinkedField(schema, node) {
   return [field].concat(handles);
 }
 
-function generateConnectionField(schema, node) {
-  return generateLinkedField(schema, {
-    name: node.name,
-    alias: node.alias,
-    loc: node.loc,
-    directives: node.directives,
-    metadata: node.metadata,
-    selections: node.selections,
-    type: node.type,
-    handles: null,
-    connection: false,
-    // this is only on the linked fields with @conneciton
-    args: node.args.filter(function (arg) {
-      return !ConnectionInterface.isConnectionCall({
-        name: arg.name,
-        value: null
-      });
-    }),
-    kind: 'LinkedField'
-  });
-}
-
-function generateConnection(schema, node) {
-  var _ConnectionInterface$ = ConnectionInterface.get(),
-      EDGES = _ConnectionInterface$.EDGES,
-      PAGE_INFO = _ConnectionInterface$.PAGE_INFO;
-
-  var selections = generateSelections(schema, node.selections);
-  var edges;
-  var pageInfo;
-  selections.forEach(function (selection) {
-    if (selection.kind === 'LinkedField') {
-      if (selection.name === EDGES) {
-        edges = selection;
-      } else if (selection.name === PAGE_INFO) {
-        pageInfo = selection;
-      }
-    } else if (selection.kind === 'Stream') {
-      selection.selections.forEach(function (subselection) {
-        if (subselection.kind === 'LinkedField' && subselection.name === EDGES) {
-          edges = subselection;
-        }
-      });
-    } else if (selection.kind === 'Defer') {
-      selection.selections.forEach(function (subselection) {
-        if (subselection.kind === 'LinkedField' && subselection.name === PAGE_INFO) {
-          pageInfo = subselection;
-        }
-      });
-    }
-  });
-
-  if (edges == null || pageInfo == null) {
-    throw createUserError("Invalid connection, expected the '".concat(EDGES, "' and '").concat(PAGE_INFO, "' fields ") + 'to exist.', [node.loc]);
-  }
-
-  var stream = null;
-
-  if (node.stream != null) {
-    var _generateArgumentValu;
-
-    var trueLiteral = {
-      kind: 'Literal',
-      name: 'if',
-      value: true
-    };
-    stream = {
-      "if": node.stream["if"] != null ? (_generateArgumentValu = generateArgumentValue('if', node.stream["if"])) !== null && _generateArgumentValu !== void 0 ? _generateArgumentValu : trueLiteral : trueLiteral,
-      deferLabel: node.stream.deferLabel,
-      streamLabel: node.stream.streamLabel
-    };
-  }
-
-  return {
-    kind: 'Connection',
-    label: node.label,
-    name: node.name,
-    args: generateArgs(node.args),
-    edges: edges,
-    pageInfo: pageInfo,
-    stream: stream
-  };
-}
-
-function generateModuleImport(node, key) {
+function generateModuleImport(node) {
   var fragmentName = node.name;
   var regExpMatch = fragmentName.match(/^([a-zA-Z][a-zA-Z0-9]*)(?:_([a-zA-Z][_a-zA-Z0-9]*))?$/);
 
@@ -319,16 +230,17 @@ function generateModuleImport(node, key) {
   }
 
   return {
-    kind: 'ModuleImport',
-    documentName: node.documentName,
+    documentName: node.key,
     fragmentName: fragmentName,
-    fragmentPropName: fragmentPropName
+    fragmentPropName: fragmentPropName,
+    kind: 'ModuleImport'
   };
 }
 
 function generateScalarField(node) {
   var _node$metadata;
 
+  // flowlint-next-line sketchy-null-mixed:off
   if ((_node$metadata = node.metadata) === null || _node$metadata === void 0 ? void 0 : _node$metadata.skipNormalizationNode) {
     return [];
   } // Note: it is important that the arguments of this field be sorted to
@@ -342,27 +254,27 @@ function generateScalarField(node) {
     }
 
     return {
-      kind: 'ScalarHandle',
       alias: node.alias === node.name ? null : node.alias,
-      name: node.name,
       args: generateArgs(node.args),
+      filters: handle.filters,
       handle: handle.name,
       key: handle.key,
-      filters: handle.filters
+      kind: 'ScalarHandle',
+      name: node.name
     };
   }) || [];
   var field = {
-    kind: 'ScalarField',
     alias: node.alias === node.name ? null : node.alias,
-    name: node.name,
     args: generateArgs(node.args),
+    kind: 'ScalarField',
+    name: node.name,
     storageKey: null
   }; // Precompute storageKey if possible
 
   var storageKey = getStaticStorageKey(field, node.metadata);
 
   if (storageKey != null) {
-    field = (0, _objectSpread2["default"])({}, field, {
+    field = _objectSpread({}, field, {
       storageKey: storageKey
     });
   }
@@ -372,9 +284,9 @@ function generateScalarField(node) {
 
 function generateStream(schema, node) {
   if (!(node["if"] == null || node["if"].kind === 'Variable' || node["if"].kind === 'Literal' && node["if"].value === true)) {
-    var _ref2, _node$if2;
+    var _node$if$loc2, _node$if2;
 
-    throw createCompilerError('NormalizationCodeGenerator: Expected @stream `if` condition to be ' + 'a variable, unspecified, or the literal `true`.', [(_ref2 = (_node$if2 = node["if"]) === null || _node$if2 === void 0 ? void 0 : _node$if2.loc) !== null && _ref2 !== void 0 ? _ref2 : node.loc]);
+    throw createCompilerError('NormalizationCodeGenerator: Expected @stream `if` condition to be ' + 'a variable, unspecified, or the literal `true`.', [(_node$if$loc2 = (_node$if2 = node["if"]) === null || _node$if2 === void 0 ? void 0 : _node$if2.loc) !== null && _node$if$loc2 !== void 0 ? _node$if$loc2 : node.loc]);
   }
 
   return {
@@ -382,7 +294,8 @@ function generateStream(schema, node) {
     kind: 'Stream',
     label: node.label,
     metadata: node.metadata,
-    selections: generateSelections(schema, node.selections)
+    selections: generateSelections(schema, node.selections),
+    useCustomizedBatch: node.useCustomizedBatch != null && node.useCustomizedBatch.kind === 'Variable' ? node.useCustomizedBatch.variableName : null
   };
 }
 
@@ -402,6 +315,46 @@ function generateArgumentValue(name, value) {
         value: stableCopy(value.value)
       };
 
+    case 'ObjectValue':
+      {
+        var objectKeys = value.fields.map(function (field) {
+          return field.name;
+        }).sort();
+        var objectValues = new Map(value.fields.map(function (field) {
+          return [field.name, field.value];
+        }));
+        return {
+          fields: objectKeys.map(function (fieldName) {
+            var _generateArgumentValu;
+
+            var fieldValue = objectValues.get(fieldName);
+
+            if (fieldValue == null) {
+              throw createCompilerError('Expected to have object field value');
+            }
+
+            return (_generateArgumentValu = generateArgumentValue(fieldName, fieldValue)) !== null && _generateArgumentValu !== void 0 ? _generateArgumentValu : {
+              kind: 'Literal',
+              name: fieldName,
+              value: null
+            };
+          }),
+          kind: 'ObjectValue',
+          name: name
+        };
+      }
+
+    case 'ListValue':
+      {
+        return {
+          items: value.items.map(function (item, index) {
+            return generateArgumentValue("".concat(name, ".").concat(index), item);
+          }),
+          kind: 'ListValue',
+          name: name
+        };
+      }
+
     default:
       throw createUserError('NormalizationCodeGenerator: Complex argument values (Lists or ' + 'InputObjects with nested variables) are not supported.', [value.loc]);
   }