relay-compiler 9.0.0 → 9.1.0

package/lib/codegen/CodegenRunner.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 CodegenDirectory = require('./CodegenDirectory');
 
 var CodegenWatcher = require('./CodegenWatcher');
@@ -35,9 +41,7 @@ var _require = require('../core/Schema'),
 var _require2 = require('immutable'),
     ImmutableMap = _require2.Map;
 
-var CodegenRunner =
-/*#__PURE__*/
-function () {
+var CodegenRunner = /*#__PURE__*/function () {
   // parser => writers that are affected by it
   function CodegenRunner(options) {
     var _this = this;
@@ -71,9 +75,7 @@ function () {
 
   var _proto = CodegenRunner.prototype;
 
-  _proto.compileAll =
-  /*#__PURE__*/
-  function () {
+  _proto.compileAll = /*#__PURE__*/function () {
     var _compileAll = _asyncToGenerator(function* () {
       // reset the parsers
       this.parsers = {};
@@ -112,9 +114,7 @@ function () {
     return compileAll;
   }();
 
-  _proto.compile =
-  /*#__PURE__*/
-  function () {
+  _proto.compile = /*#__PURE__*/function () {
     var _compile = _asyncToGenerator(function* (writerName) {
       var _this2 = this;
 
@@ -146,19 +146,17 @@ function () {
   _proto.getDirtyWriters = function getDirtyWriters(filePaths) {
     var _this3 = this;
 
-    return Profiler.asyncContext('CodegenRunner:getDirtyWriters',
-    /*#__PURE__*/
-    _asyncToGenerator(function* () {
+    return Profiler.asyncContext('CodegenRunner:getDirtyWriters', /*#__PURE__*/_asyncToGenerator(function* () {
       var dirtyWriters = new Set(); // Check if any files are in the output
 
       for (var configName in _this3.writerConfigs) {
         var config = _this3.writerConfigs[configName];
-        var _iteratorNormalCompletion = true;
-        var _didIteratorError = false;
-        var _iteratorError = undefined;
+
+        var _iterator = _createForOfIteratorHelper(filePaths),
+            _step;
 
         try {
-          for (var _iterator = filePaths[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var _filePath = _step.value;
 
             if (config.isGeneratedFile(_filePath)) {
@@ -166,26 +164,15 @@ function () {
             }
           }
         } 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();
         }
       } // Check for files in the input
 
 
       yield Promise.all(Object.keys(_this3.parserConfigs).map(function (parserConfigName) {
-        return Profiler.waitFor('Watchman:query',
-        /*#__PURE__*/
-        _asyncToGenerator(function* () {
+        return Profiler.waitFor('Watchman:query', /*#__PURE__*/_asyncToGenerator(function* () {
           var client = new GraphQLWatchmanClient();
           var config = _this3.parserConfigs[parserConfigName];
           var dirs = yield client.watchProject(config.baseDir);
@@ -211,9 +198,7 @@ function () {
     }));
   };
 
-  _proto.parseEverything =
-  /*#__PURE__*/
-  function () {
+  _proto.parseEverything = /*#__PURE__*/function () {
     var _parseEverything = _asyncToGenerator(function* (parserName) {
       if (this.parsers[parserName]) {
         // no need to parse
@@ -263,9 +248,7 @@ function () {
   _proto.write = function write(writerName) {
     var _this5 = this;
 
-    return Profiler.asyncContext('CodegenRunner.write',
-    /*#__PURE__*/
-    _asyncToGenerator(function* () {
+    return Profiler.asyncContext('CodegenRunner.write', /*#__PURE__*/_asyncToGenerator(function* () {
       try {
         _this5._reporter.reportMessage("\nWriting ".concat(writerName));
 
@@ -310,20 +293,20 @@ function () {
           sourceControl: _this5._sourceControl,
           reporter: _this5._reporter
         });
-        var _iteratorNormalCompletion2 = true;
-        var _didIteratorError2 = false;
-        var _iteratorError2 = undefined;
+
+        var _iterator2 = _createForOfIteratorHelper(outputDirectories.values()),
+            _step2;
 
         try {
-          for (var _iterator2 = outputDirectories.values()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var dir = _step2.value;
             var all = [].concat((0, _toConsumableArray2["default"])(dir.changes.created), (0, _toConsumableArray2["default"])(dir.changes.updated), (0, _toConsumableArray2["default"])(dir.changes.deleted), (0, _toConsumableArray2["default"])(dir.changes.unchanged));
-            var _iteratorNormalCompletion3 = true;
-            var _didIteratorError3 = false;
-            var _iteratorError3 = undefined;
+
+            var _iterator3 = _createForOfIteratorHelper(all),
+                _step3;
 
             try {
-              for (var _iterator3 = all[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                 var filename = _step3.value;
 
                 var _filePath2 = dir.getPath(filename);
@@ -331,33 +314,15 @@ function () {
                 !isGeneratedFile(_filePath2) ? process.env.NODE_ENV !== "production" ? invariant(false, 'CodegenRunner: %s returned false for isGeneratedFile, ' + 'but was in generated directory', _filePath2) : invariant(false) : void 0;
               }
             } catch (err) {
-              _didIteratorError3 = true;
-              _iteratorError3 = err;
+              _iterator3.e(err);
             } finally {
-              try {
-                if (!_iteratorNormalCompletion3 && _iterator3["return"] != null) {
-                  _iterator3["return"]();
-                }
-              } finally {
-                if (_didIteratorError3) {
-                  throw _iteratorError3;
-                }
-              }
+              _iterator3.f();
             }
           }
         } 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();
         }
 
         var onCompleteCallback = _this5.onComplete;
@@ -381,9 +346,7 @@ function () {
     }));
   };
 
-  _proto.watchAll =
-  /*#__PURE__*/
-  function () {
+  _proto.watchAll = /*#__PURE__*/function () {
     var _watchAll = _asyncToGenerator(function* () {
       // get everything set up for watching
       yield this.compileAll();
@@ -400,9 +363,7 @@ function () {
     return watchAll;
   }();
 
-  _proto.watch =
-  /*#__PURE__*/
-  function () {
+  _proto.watch = /*#__PURE__*/function () {
     var _watch = _asyncToGenerator(function* (parserName) {
       var _this6 = this;
 
@@ -416,9 +377,7 @@ function () {
 
 
       var firstChange = true;
-      yield CodegenWatcher.watchCompile(parserConfig.baseDir, parserConfig.watchmanExpression, parserConfig.getFileFilter ? parserConfig.getFileFilter(parserConfig.baseDir) : anyFileFilter,
-      /*#__PURE__*/
-      function () {
+      yield CodegenWatcher.watchCompile(parserConfig.baseDir, parserConfig.watchmanExpression, parserConfig.getFileFilter ? parserConfig.getFileFilter(parserConfig.baseDir) : anyFileFilter, /*#__PURE__*/function () {
         var _ref4 = _asyncToGenerator(function* (files) {
           !(_this6.parsers[parserName] != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Trying to watch an uncompiled parser config: %s', parserName) : invariant(false) : void 0;
 

package/lib/codegen/CodegenWatcher.js

@@ -31,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,
@@ -58,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, {
@@ -125,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);
@@ -202,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;
 
@@ -224,7 +216,7 @@ function _watchCompile() {
       });
 
       return function (_x26) {
-        return _ref6.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }());
   });
@@ -236,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

@@ -12,10 +12,14 @@
 
 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; }
+
 var _require = require('../core/CompilerError'),
     createCompilerError = _require.createCompilerError,
     createUserError = _require.createUserError;
@@ -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)
   };
 }
@@ -106,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)
     };
   });
 }
@@ -127,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)
   };
 }
@@ -153,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)
   };
 }
 
@@ -164,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
@@ -178,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,
@@ -191,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
     });
   }
@@ -212,7 +215,7 @@ function generateLinkedField(schema, node) {
   return [field].concat(handles);
 }
 
-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]*))?$/);
 
@@ -227,10 +230,10 @@ function generateModuleImport(node, key) {
   }
 
   return {
-    kind: 'ModuleImport',
-    documentName: node.documentName,
+    documentName: node.key,
     fragmentName: fragmentName,
-    fragmentPropName: fragmentPropName
+    fragmentPropName: fragmentPropName,
+    kind: 'ModuleImport'
   };
 }
 
@@ -251,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
     });
   }
@@ -281,18 +284,18 @@ 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 {
     "if": node["if"] != null && node["if"].kind === 'Variable' ? node["if"].variableName : null,
     kind: 'Stream',
-    useCustomizedBatch: node.useCustomizedBatch != null && node.useCustomizedBatch.kind === 'Variable' ? node.useCustomizedBatch.variableName : null,
     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
   };
 }
 
@@ -321,8 +324,6 @@ function generateArgumentValue(name, value) {
           return [field.name, field.value];
         }));
         return {
-          kind: 'ObjectValue',
-          name: name,
           fields: objectKeys.map(function (fieldName) {
             var _generateArgumentValu;
 
@@ -337,18 +338,20 @@ function generateArgumentValue(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 generateArgumentValue("".concat(name, ".").concat(index), item);
-          })
+          }),
+          kind: 'ListValue',
+          name: name
         };
       }