relay-compiler 9.0.0 → 9.1.0

package/lib/codegen/ReaderCodeGenerator.js

@@ -12,7 +12,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+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 CodeMarker = require('../util/CodeMarker');
 
@@ -65,29 +69,33 @@ function generate(schema, node) {
       metadata.plural = plural;
     }
 
-    if (typeof refetch === 'object') {
+    if (refetch != null && typeof refetch === 'object') {
       var _metadata4;
 
       metadata = (_metadata4 = metadata) !== null && _metadata4 !== void 0 ? _metadata4 : {};
       metadata.refetch = {
-        // $FlowFixMe
         connection: refetch.connection,
-        // $FlowFixMe
-        operation: CodeMarker.moduleDependency(refetch.operation + '.graphql'),
-        // $FlowFixMe
-        fragmentPathInResult: refetch.fragmentPathInResult
+        fragmentPathInResult: refetch.fragmentPathInResult,
+        operation: CodeMarker.moduleDependency( // $FlowFixMe
+        refetch.operation + '.graphql')
       };
+
+      if (typeof refetch.identifierField === 'string') {
+        metadata.refetch = _objectSpread({}, metadata.refetch, {
+          identifierField: refetch.identifierField
+        });
+      }
     }
   }
 
   return {
+    argumentDefinitions: generateArgumentDefinitions(schema, node.argumentDefinitions),
     kind: 'Fragment',
-    name: node.name,
-    type: schema.getTypeString(node.type),
     // $FlowFixMe
     metadata: metadata,
-    argumentDefinitions: generateArgumentDefinitions(schema, node.argumentDefinitions),
-    selections: generateSelections(schema, node.selections)
+    name: node.name,
+    selections: generateSelections(schema, node.selections),
+    type: schema.getTypeString(node.type)
   };
 }
 
@@ -136,10 +144,10 @@ function generateArgumentDefinitions(schema, nodes) {
     switch (node.kind) {
       case 'LocalArgumentDefinition':
         return {
+          defaultValue: node.defaultValue,
           kind: 'LocalArgument',
           name: node.name,
-          type: schema.getTypeString(node.type),
-          defaultValue: node.defaultValue
+          type: schema.getTypeString(node.type)
         };
 
       case 'RootArgumentDefinition':
@@ -182,26 +190,26 @@ function generateCondition(schema, node) {
   }
 
   return {
+    condition: node.condition.variableName,
     kind: 'Condition',
     passingValue: node.passingValue,
-    condition: node.condition.variableName,
     selections: generateSelections(schema, node.selections)
   };
 }
 
 function generateFragmentSpread(schema, node) {
   return {
+    args: generateArgs(node.args),
     kind: 'FragmentSpread',
-    name: node.name,
-    args: generateArgs(node.args)
+    name: node.name
   };
 }
 
 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)
   };
 }
 
@@ -227,20 +235,20 @@ function generateLinkedField(schema, node) {
   //   );
   var rawType = 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(rawType) ? schema.getTypeString(rawType) : 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) {
-    field = (0, _objectSpread2["default"])({}, field, {
+    field = _objectSpread({}, field, {
       storageKey: storageKey
     });
   }
@@ -263,10 +271,10 @@ function generateModuleImport(schema, node) {
   }
 
   return {
-    kind: 'ModuleImport',
-    documentName: node.documentName,
+    documentName: node.key,
     fragmentName: fragmentName,
-    fragmentPropName: fragmentPropName
+    fragmentPropName: fragmentPropName,
+    kind: 'ModuleImport'
   };
 }
 
@@ -283,17 +291,17 @@ function generateScalarField(schema, node) {
   //     'ReaderCodeGenerator: unexpected handles',
   //   );
   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) {
-    field = (0, _objectSpread2["default"])({}, field, {
+    field = _objectSpread({}, field, {
       storageKey: storageKey
     });
   }
@@ -326,8 +334,6 @@ function generateArgument(name, value) {
           return [field.name, field.value];
         }));
         return {
-          kind: 'ObjectValue',
-          name: name,
           fields: objectKeys.map(function (fieldName) {
             var _generateArgument;
 
@@ -342,18 +348,20 @@ function generateArgument(name, value) {
               name: fieldName,
               value: null
             };
-          })
+          }),
+          kind: 'ObjectValue',
+          name: name
         };
       }
 
     case 'ListValue':
       {
         return {
-          kind: 'ListValue',
-          name: name,
           items: value.items.map(function (item, index) {
             return generateArgument("".concat(name, ".").concat(index), item);
-          })
+          }),
+          kind: 'ListValue',
+          name: name
         };
       }
 

package/lib/codegen/RelayCodeGenerator.js

@@ -14,6 +14,8 @@ var NormalizationCodeGenerator = require('./NormalizationCodeGenerator');
 
 var ReaderCodeGenerator = require('./ReaderCodeGenerator');
 
+var Rollout = require('../util/Rollout');
+
 var _require = require('../core/CompilerError'),
     createCompilerError = _require.createCompilerError;
 
@@ -33,15 +35,15 @@ function generate(schema, node) {
 
     case 'Request':
       return {
-        kind: 'Request',
         fragment: ReaderCodeGenerator.generate(schema, node.fragment),
+        kind: 'Request',
         operation: NormalizationCodeGenerator.generate(schema, node.root),
         params: {
-          operationKind: node.root.operation,
-          name: node.name,
           id: node.id,
-          text: node.text,
-          metadata: node.metadata
+          metadata: node.metadata,
+          name: node.name,
+          operationKind: node.root.operation,
+          text: node.text
         }
       };
 

package/lib/codegen/RelayFileWriter.js

@@ -16,6 +16,12 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+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 ASTConvert = require('../core/ASTConvert');
 
 var CodegenDirectory = require('./CodegenDirectory');
@@ -28,12 +34,12 @@ var RelayParser = require('../core/RelayParser');
 
 var compileRelayArtifacts = require('./compileRelayArtifacts');
 
-var crypto = require('crypto');
-
 var graphql = require('graphql');
 
 var invariant = require("fbjs/lib/invariant");
 
+var md5 = require('../util/md5');
+
 var nullthrows = require('nullthrows');
 
 var path = require('path');
@@ -79,9 +85,7 @@ function writeAll(_ref2) {
       reporter = _ref2.reporter,
       sourceControl = _ref2.sourceControl,
       languagePlugin = _ref2.languagePlugin;
-  return Profiler.asyncContext('RelayFileWriter.writeAll',
-  /*#__PURE__*/
-  _asyncToGenerator(function* () {
+  return Profiler.asyncContext('RelayFileWriter.writeAll', /*#__PURE__*/_asyncToGenerator(function* () {
     var _compileAll = compileAll({
       schema: schema,
       baseDir: writerConfig.baseDir,
@@ -118,9 +122,6 @@ function writeAll(_ref2) {
           node = _ref4[1];
       return [node.kind === 'Request' ? node.params.name : node.name, node];
     }));
-    var existingFragmentNames = new Set(definitions.map(function (definition) {
-      return definition.name;
-    }));
     var definitionsMeta = new Map();
 
     var getDefinitionMeta = function getDefinitionMeta(definitionName) {
@@ -140,11 +141,6 @@ function writeAll(_ref2) {
           });
         }
       });
-    }); // TODO(T22651734): improve this to correctly account for fragments that
-    // have generated flow types.
-
-    baseDefinitionNames.forEach(function (baseDefinitionName) {
-      existingFragmentNames["delete"](baseDefinitionName);
     });
     var allOutputDirectories = new Map();
 
@@ -157,28 +153,18 @@ function writeAll(_ref2) {
       return codegenDir;
     };
 
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
+    var _iterator = _createForOfIteratorHelper(writerConfig.generatedDirectories || []),
+        _step;
 
     try {
-      for (var _iterator = (writerConfig.generatedDirectories || [])[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var existingDirectory = _step.value;
         addCodegenDir(existingDirectory);
       }
     } 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();
     }
 
     var configOutputDirectory;
@@ -206,9 +192,7 @@ function writeAll(_ref2) {
     var persistQuery = writerConfig.persistQuery ? Profiler.instrumentWait(writerConfig.persistQuery, 'RelayFileWriter:persistQuery') : null;
 
     try {
-      yield Promise.all(artifacts.map(
-      /*#__PURE__*/
-      function () {
+      yield Promise.all(artifacts.map( /*#__PURE__*/function () {
         var _ref7 = _asyncToGenerator(function* (_ref5) {
           var _writerConfig$repersi, _writerConfig$writeQu;
 
@@ -225,7 +209,6 @@ function writeAll(_ref2) {
           var typeText = typeNode ? writerConfig.typeGenerator.generate(schema, typeNode, {
             customScalars: writerConfig.customScalars,
             enumsHasteModule: writerConfig.enumsHasteModule,
-            existingFragmentNames: existingFragmentNames,
             optionalInputFields: writerConfig.optionalInputFieldsForFlow,
             useHaste: writerConfig.useHaste,
             useSingleArtifactDirectory: !!writerConfig.outputDir,
@@ -287,10 +270,6 @@ function writeAll(_ref2) {
   }));
 }
 
-function md5(x) {
-  return crypto.createHash('md5').update(x, 'utf8').digest('hex');
-}
-
 module.exports = {
   writeAll: writeAll
 };

package/lib/codegen/compileRelayArtifacts.js

@@ -14,6 +14,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+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 Printer = require('../core/IRPrinter');
 
 var Profiler = require('../core/GraphQLCompilerProfiler');
@@ -44,12 +50,11 @@ function compile(context, fragmentContext, printContext, codeGenContext) {
   var schema = context.getSchema(); // Add everything from codeGenContext, these are the operations as well as
   // SplitOperations from @match.
 
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+  var _iterator = _createForOfIteratorHelper(codeGenContext.documents()),
+      _step;
 
   try {
-    for (var _iterator = codeGenContext.documents()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var node = _step.value;
 
       if (node.kind === 'Root') {
@@ -83,26 +88,16 @@ function compile(context, fragmentContext, printContext, codeGenContext) {
     } // Add all the Fragments from the fragmentContext for the reader ASTs.
 
   } 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();
   }
 
-  var _iteratorNormalCompletion2 = true;
-  var _didIteratorError2 = false;
-  var _iteratorError2 = undefined;
+  var _iterator2 = _createForOfIteratorHelper(fragmentContext.documents()),
+      _step2;
 
   try {
-    for (var _iterator2 = fragmentContext.documents()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _node = _step2.value;
 
       if (_node.kind === 'Fragment') {
@@ -110,18 +105,9 @@ function compile(context, fragmentContext, printContext, codeGenContext) {
       }
     }
   } 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 results;

package/lib/codegen/writeRelayGeneratedFile.js

@@ -14,20 +14,22 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var CodeMarker = require('../util/CodeMarker');
+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 Profiler = require('../core/GraphQLCompilerProfiler');
+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 createPrintRequireModuleDependency = require('./createPrintRequireModuleDependency');
+var CodeMarker = require('../util/CodeMarker');
 
-var crypto = require('crypto');
+var createPrintRequireModuleDependency = require('./createPrintRequireModuleDependency');
 
 var dedupeJSONStringify = require('../util/dedupeJSONStringify');
 
 var invariant = require("fbjs/lib/invariant");
 
+var md5 = require('../util/md5');
+
 var _require = require('relay-runtime'),
     RelayConcreteNode = _require.RelayConcreteNode;
 
@@ -51,96 +53,61 @@ function getConcreteType(node) {
   }
 }
 
-function writeRelayGeneratedFile(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9) {
-  return _writeRelayGeneratedFile.apply(this, arguments);
-}
-
-function _writeRelayGeneratedFile() {
-  _writeRelayGeneratedFile = _asyncToGenerator(function* (schema, codegenDir, definition, _generatedNode, formatModule, typeText, _persistQuery, sourceHash, extension) {
-    var printModuleDependency = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : createPrintRequireModuleDependency(extension);
-    var shouldRepersist = arguments.length > 10 ? arguments[10] : undefined;
-    var writeQueryParameters = arguments.length > 11 ? arguments[11] : undefined;
-    var languagePlugin = arguments.length > 12 ? arguments[12] : undefined;
-    var generatedNode = _generatedNode; // Copy to const so Flow can refine.
-
-    var persistQuery = _persistQuery;
-    var operationName = generatedNode.kind === 'Request' ? generatedNode.params.name : generatedNode.name;
-    var moduleName = (languagePlugin === null || languagePlugin === void 0 ? void 0 : languagePlugin.getModuleName) ? languagePlugin.getModuleName(operationName) : operationName + '.graphql';
-    var filename = moduleName + '.' + extension;
-    var queryParametersFilename = generatedNode.kind === 'Request' ? "".concat(generatedNode.params.name, "$Parameters.").concat(extension) : null;
-    var typeName = getConcreteType(generatedNode);
-    var docText;
-
-    if (generatedNode.kind === RelayConcreteNode.REQUEST) {
-      docText = generatedNode.params.text;
-    }
-
-    var hash = null;
-
-    if (generatedNode.kind === RelayConcreteNode.REQUEST) {
-      var oldContent;
-      var oldHash = Profiler.run('RelayFileWriter:compareHash', function () {
-        oldContent = codegenDir.read(filename); // Hash the concrete node including the query text.
+function writeRelayGeneratedFile(schema, codegenDir, definition, _generatedNode, formatModule, typeText, _persistQuery, sourceHash, extension) {
+  var printModuleDependency = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : createPrintRequireModuleDependency(extension);
+  var shouldRepersist = arguments.length > 10 ? arguments[10] : undefined;
+  var writeQueryParameters = arguments.length > 11 ? arguments[11] : undefined;
+  var languagePlugin = arguments.length > 12 ? arguments[12] : undefined;
+  var generatedNode = _generatedNode; // Copy to const so Flow can refine.
 
-        var hasher = crypto.createHash('md5');
-        hasher.update('cache-breaker-9');
-        hasher.update(JSON.stringify(generatedNode));
-        hasher.update(sourceHash);
+  var persistQuery = _persistQuery;
+  var operationName = generatedNode.kind === 'Request' ? generatedNode.params.name : generatedNode.name;
+  var moduleName = (languagePlugin === null || languagePlugin === void 0 ? void 0 : languagePlugin.getModuleName) ? languagePlugin.getModuleName(operationName) : operationName + '.graphql';
+  var filename = moduleName + '.' + extension;
+  var queryParametersFilename = generatedNode.kind === 'Request' ? "".concat(generatedNode.params.name, "$Parameters.").concat(extension) : null;
+  var typeName = getConcreteType(generatedNode);
+  var docText;
 
-        if (typeText) {
-          hasher.update(typeText);
-        }
-
-        if (persistQuery) {
-          hasher.update('persisted');
-        }
+  if (generatedNode.kind === RelayConcreteNode.REQUEST) {
+    docText = generatedNode.params.text;
+  } // Use `Promise.resolve` to work around a Babel 7.8/7.9 issue.
 
-        hash = hasher.digest('hex');
-        return extractHash(oldContent);
-      });
-      var oldRequestParameters = extractRelayRequestParams(oldContent);
 
-      if (!shouldRepersist && hash === oldHash) {
-        codegenDir.markUnchanged(filename);
+  return Promise.resolve().then( /*#__PURE__*/_asyncToGenerator(function* () {
+    var hash = null;
 
-        if (writeQueryParameters && oldRequestParameters && queryParametersFilename != null && generatedNode.kind === RelayConcreteNode.REQUEST && generatedNode.params.operationKind === 'query') {
-          writeQueryParameters(codegenDir, queryParametersFilename, moduleName, oldRequestParameters);
+    if (generatedNode.kind === RelayConcreteNode.REQUEST && persistQuery) {
+      var _text = generatedNode.params.text;
+      !(_text != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'writeRelayGeneratedFile: Expected `text` in order to persist query') : invariant(false) : void 0;
+      hash = md5(_text);
+      var id = null;
+
+      if (!shouldRepersist) {
+        // Unless we `shouldRepersist` the query, check if the @relayHash matches
+        // the operation text of the current text and re-use the persisted
+        // operation id.
+        var oldContent = codegenDir.read(filename);
+        var oldHash = extractHash(oldContent);
+        var oldRequestID = extractRelayRequestID(oldContent);
+
+        if (hash === oldHash && oldRequestID != null) {
+          id = oldRequestID;
         }
-
-        return oldRequestParameters ? (0, _objectSpread2["default"])({}, generatedNode, {
-          params: oldRequestParameters
-        }) : null;
       }
 
-      if (codegenDir.onlyValidate) {
-        codegenDir.markUpdated(filename);
-        return null;
+      if (id == null) {
+        id = yield persistQuery(_text);
       }
 
-      if (persistQuery) {
-        switch (generatedNode.kind) {
-          case RelayConcreteNode.REQUEST:
-            var _text = generatedNode.params.text;
-            !(_text != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'writeRelayGeneratedFile: Expected `text` in order to persist query') : invariant(false) : void 0;
-            generatedNode = (0, _objectSpread2["default"])({}, generatedNode, {
-              params: {
-                operationKind: generatedNode.params.operationKind,
-                name: generatedNode.params.name,
-                id: yield persistQuery(_text),
-                text: null,
-                metadata: generatedNode.params.metadata
-              }
-            });
-            break;
-
-          case RelayConcreteNode.FRAGMENT:
-            // Do not persist fragments.
-            break;
-
-          default:
-            generatedNode.kind;
+      generatedNode = _objectSpread({}, generatedNode, {
+        params: {
+          id: id,
+          metadata: generatedNode.params.metadata,
+          name: generatedNode.params.name,
+          operationKind: generatedNode.params.operationKind,
+          text: null
         }
-      }
+      });
     }
 
     var moduleText = formatModule({
@@ -150,7 +117,7 @@ function _writeRelayGeneratedFile() {
       kind: generatedNode.kind,
       docText: docText,
       typeText: typeText,
-      hash: hash ? "@relayHash ".concat(hash) : null,
+      hash: hash != null ? "@relayHash ".concat(hash) : null,
       concreteText: CodeMarker.postProcess(dedupeJSONStringify(generatedNode), printModuleDependency),
       sourceHash: sourceHash,
       node: generatedNode,
@@ -163,8 +130,7 @@ function _writeRelayGeneratedFile() {
     }
 
     return generatedNode;
-  });
-  return _writeRelayGeneratedFile.apply(this, arguments);
+  }));
 }
 
 function extractHash(text) {
@@ -181,7 +147,7 @@ function extractHash(text) {
   return match && match[1];
 }
 
-function extractRelayRequestParams(text) {
+function extractRelayRequestID(text) {
   if (text == null || text.length === 0) {
     return null;
   }
@@ -191,16 +157,8 @@ function extractRelayRequestParams(text) {
     return null;
   }
 
-  var match = text.match(/@relayRequestParams (.+)/);
-  var requestParams;
-
-  try {
-    var _ref;
-
-    requestParams = JSON.parse((_ref = match === null || match === void 0 ? void 0 : match[1]) !== null && _ref !== void 0 ? _ref : '');
-  } catch (_unused) {}
-
-  return requestParams;
+  var match = text.match(/@relayRequestID (.+)/);
+  return match ? match[1] : null;
 }
 
 module.exports = writeRelayGeneratedFile;

package/lib/core/ASTCache.js

@@ -16,9 +16,7 @@ var Profiler = require('./GraphQLCompilerProfiler'); // $FlowFixMe: Immutable is
 var _require = require('immutable'),
     ImmutableMap = _require.Map;
 
-var ASTCache =
-/*#__PURE__*/
-function () {
+var ASTCache = /*#__PURE__*/function () {
   function ASTCache(config) {
     this._documents = new Map();
     this._baseDir = config.baseDir;

package/lib/core/CompilerContext.js

@@ -25,9 +25,7 @@ var _require2 = require('immutable'),
  * An immutable representation of a corpus of documents being compiled together.
  * For each document, the context stores the IR and any validation errors.
  */
-var CompilerContext =
-/*#__PURE__*/
-function () {
+var CompilerContext = /*#__PURE__*/function () {
   function CompilerContext(schema) {
     this._isMutable = false;
     this._documents = new ImmutableOrderedMap();