relay-compiler 7.0.0 → 9.1.0

package/lib/bin/RelayCompilerMain.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -15,10 +16,18 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
-
 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; }
+
+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 CodegenRunner = require('../codegen/CodegenRunner');
 
 var ConsoleReporter = require('../reporters/ConsoleReporter');
@@ -53,7 +62,7 @@ var commonTransforms = RelayIRTransforms.commonTransforms,
     fragmentTransforms = RelayIRTransforms.fragmentTransforms,
     printTransforms = RelayIRTransforms.printTransforms,
     queryTransforms = RelayIRTransforms.queryTransforms,
-    schemaExtensions = RelayIRTransforms.schemaExtensions;
+    relaySchemaExtensions = RelayIRTransforms.schemaExtensions;
 
 function buildWatchExpression(config) {
   return ['allof', ['type', 'f'], ['anyof'].concat((0, _toConsumableArray2["default"])(config.extensions.map(function (ext) {
@@ -92,9 +101,11 @@ function getFilepathsFromGlob(baseDir, config) {
  * replaced with `__webpack_require__` when bundled using webpack, by using
  * `eval` to get it at runtime.
  */
-function getLanguagePlugin(language) {
+function getLanguagePlugin(language, options) {
   if (language === 'javascript') {
-    return RelayLanguagePluginJavaScript();
+    return RelayLanguagePluginJavaScript({
+      eagerESModules: Boolean(options && options.eagerESModules)
+    });
   } else {
     var languagePlugin;
 
@@ -210,7 +221,7 @@ function getPathBasedConfig(config) {
     }
   }
 
-  return (0, _objectSpread2["default"])({}, config, {
+  return _objectSpread({}, config, {
     schema: schema,
     src: src,
     persistOutput: persistOutput
@@ -227,7 +238,11 @@ function _getWatchConfig() {
 
     if (config.watch) {
       if (!watchman) {
-        throw new Error('Watchman is required to watch for changes.');
+        console.error('Watchman is required to watch for changes. Running with watch mode disabled.');
+        return _objectSpread({}, config, {
+          watch: false,
+          watchman: false
+        });
       }
 
       if (!module.exports.hasWatchmanRootFile(config.src)) {
@@ -238,7 +253,7 @@ function _getWatchConfig() {
       console.log('HINT: pass --watch to keep watching for changes.');
     }
 
-    return (0, _objectSpread2["default"])({}, config, {
+    return _objectSpread({}, config, {
       watchman: watchman
     });
   });
@@ -246,23 +261,25 @@ function _getWatchConfig() {
 }
 
 function getCodegenRunner(config) {
-  var _artifactDirectory, _parserConfigs;
+  var _parserConfigs;
 
   var reporter = new ConsoleReporter({
     verbose: config.verbose,
     quiet: config.quiet
   });
   var schema = getSchemaSource(config.schema);
-  var languagePlugin = getLanguagePlugin(config.language);
+  var languagePlugin = getLanguagePlugin(config.language, {
+    eagerESModules: config.eagerESModules === true
+  });
   var persistQueryFunction = getPersistQueryFunction(config);
   var inputExtensions = config.extensions || languagePlugin.inputExtensions;
   var outputExtension = languagePlugin.outputExtension;
   var sourceParserName = inputExtensions.join('/');
   var sourceWriterName = outputExtension;
-  var sourceModuleParser = RelaySourceModuleParser(languagePlugin.findGraphQLTags);
+  var sourceModuleParser = RelaySourceModuleParser(languagePlugin.findGraphQLTags, languagePlugin.getFileFilter);
   var providedArtifactDirectory = config.artifactDirectory;
   var artifactDirectory = providedArtifactDirectory != null ? path.resolve(process.cwd(), providedArtifactDirectory) : null;
-  var generatedDirectoryName = (_artifactDirectory = artifactDirectory) !== null && _artifactDirectory !== void 0 ? _artifactDirectory : '__generated__';
+  var generatedDirectoryName = artifactDirectory !== null && artifactDirectory !== void 0 ? artifactDirectory : '__generated__';
   var sourceSearchOptions = {
     extensions: inputExtensions,
     include: config.include,
@@ -273,6 +290,12 @@ function getCodegenRunner(config) {
     include: config.include,
     exclude: [path.relative(config.src, config.schema)].concat(config.exclude)
   };
+
+  var defaultIsGeneratedFile = function defaultIsGeneratedFile(filePath) {
+    return filePath.endsWith('.graphql.' + outputExtension) && filePath.includes(generatedDirectoryName);
+  };
+
+  var schemaExtensions = languagePlugin.schemaExtensions ? [].concat((0, _toConsumableArray2["default"])(languagePlugin.schemaExtensions), (0, _toConsumableArray2["default"])(relaySchemaExtensions)) : relaySchemaExtensions;
   var parserConfigs = (_parserConfigs = {}, (0, _defineProperty2["default"])(_parserConfigs, sourceParserName, {
     baseDir: config.src,
     getFileFilter: sourceModuleParser.getFileFilter,
@@ -294,10 +317,8 @@ function getCodegenRunner(config) {
     filepaths: config.watchman ? null : getFilepathsFromGlob(config.src, graphqlSearchOptions)
   }), _parserConfigs);
   var writerConfigs = (0, _defineProperty2["default"])({}, sourceWriterName, {
-    writeFiles: getRelayFileWriter(config.src, languagePlugin, config.noFutureProofEnums, artifactDirectory, config.persistOutput, config.customScalars, persistQueryFunction),
-    isGeneratedFile: function isGeneratedFile(filePath) {
-      return filePath.endsWith('.graphql.' + outputExtension) && filePath.includes(generatedDirectoryName);
-    },
+    writeFiles: getRelayFileWriter(config.src, languagePlugin, config.noFutureProofEnums, artifactDirectory, config.persistOutput, config.customScalars, persistQueryFunction, config.repersist),
+    isGeneratedFile: languagePlugin.isGeneratedFile ? languagePlugin.isGeneratedFile : defaultIsGeneratedFile,
     parser: sourceParserName,
     baseParsers: ['graphql']
   });
@@ -319,127 +340,115 @@ function defaultPersistFunction(text) {
   return Promise.resolve(id);
 }
 
-function getRelayFileWriter(baseDir, languagePlugin, noFutureProofEnums, outputDir, persistedQueryPath, customScalars, persistFunction) {
-  return (
-    /*#__PURE__*/
-    function () {
-      var _ref2 = _asyncToGenerator(function* (_ref) {
-        var onlyValidate = _ref.onlyValidate,
-            schema = _ref.schema,
-            documents = _ref.documents,
-            baseDocuments = _ref.baseDocuments,
-            sourceControl = _ref.sourceControl,
-            reporter = _ref.reporter;
-        var persistQuery;
-        var queryMap;
-
-        if (persistFunction != null || persistedQueryPath != null) {
-          queryMap = new Map();
-          var persistImplmentation = persistFunction || defaultPersistFunction;
-
-          persistQuery =
-          /*#__PURE__*/
-          function () {
-            var _persistQuery = _asyncToGenerator(function* (text) {
-              var id = yield persistImplmentation(text);
-              !(typeof id === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected persist function to return a string, got `%s`.', id) : invariant(false) : void 0;
-              queryMap.set(id, text);
-              return id;
-            });
-
-            function persistQuery(_x4) {
-              return _persistQuery.apply(this, arguments);
-            }
+function getRelayFileWriter(baseDir, languagePlugin, noFutureProofEnums, outputDir, persistedQueryPath, customScalars, persistFunction, repersist) {
+  return /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(function* (_ref) {
+      var onlyValidate = _ref.onlyValidate,
+          schema = _ref.schema,
+          documents = _ref.documents,
+          baseDocuments = _ref.baseDocuments,
+          sourceControl = _ref.sourceControl,
+          reporter = _ref.reporter;
+      var persistQuery;
+      var queryMap;
+
+      if (persistFunction != null || persistedQueryPath != null) {
+        queryMap = new Map();
+        var persistImplmentation = persistFunction || defaultPersistFunction;
+
+        persistQuery = /*#__PURE__*/function () {
+          var _persistQuery = _asyncToGenerator(function* (text) {
+            var id = yield persistImplmentation(text);
+            !(typeof id === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected persist function to return a string, got `%s`.', id) : invariant(false) : void 0;
+            queryMap.set(id, text);
+            return id;
+          });
+
+          function persistQuery(_x4) {
+            return _persistQuery.apply(this, arguments);
+          }
 
-            return persistQuery;
-          }();
-        }
+          return persistQuery;
+        }();
+      }
 
-        var results = yield RelayFileWriter.writeAll({
-          config: {
-            baseDir: baseDir,
-            compilerTransforms: {
-              commonTransforms: commonTransforms,
-              codegenTransforms: codegenTransforms,
-              fragmentTransforms: fragmentTransforms,
-              printTransforms: printTransforms,
-              queryTransforms: queryTransforms
-            },
-            customScalars: customScalars || {},
-            formatModule: languagePlugin.formatModule,
-            optionalInputFieldsForFlow: [],
-            schemaExtensions: schemaExtensions,
-            useHaste: false,
-            noFutureProofEnums: noFutureProofEnums,
-            extension: languagePlugin.outputExtension,
-            typeGenerator: languagePlugin.typeGenerator,
-            outputDir: outputDir,
-            persistQuery: persistQuery
+      var schemaExtensions = languagePlugin.schemaExtensions ? [].concat((0, _toConsumableArray2["default"])(languagePlugin.schemaExtensions), (0, _toConsumableArray2["default"])(relaySchemaExtensions)) : relaySchemaExtensions;
+      var results = yield RelayFileWriter.writeAll({
+        config: {
+          baseDir: baseDir,
+          compilerTransforms: {
+            commonTransforms: commonTransforms,
+            codegenTransforms: codegenTransforms,
+            fragmentTransforms: fragmentTransforms,
+            printTransforms: printTransforms,
+            queryTransforms: queryTransforms
           },
-          onlyValidate: onlyValidate,
-          schema: schema,
-          baseDocuments: baseDocuments,
-          documents: documents,
-          reporter: reporter,
-          sourceControl: sourceControl
-        });
-
-        if (queryMap != null && persistedQueryPath != null) {
-          var object = {};
-
-          if (fs.existsSync(persistedQueryPath)) {
-            try {
-              var prevText = fs.readFileSync(persistedQueryPath, 'utf8');
-              var prevData = JSON.parse(prevText);
-
-              if (prevData != null && typeof prevData === 'object') {
-                object = prevData;
-              } else {
-                console.error("Invalid data in persisted query file '".concat(persistedQueryPath, "', expected an object."));
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          }
+          customScalars: customScalars || {},
+          formatModule: languagePlugin.formatModule,
+          optionalInputFieldsForFlow: [],
+          schemaExtensions: schemaExtensions,
+          useHaste: false,
+          noFutureProofEnums: noFutureProofEnums,
+          extension: languagePlugin.outputExtension,
+          typeGenerator: languagePlugin.typeGenerator,
+          outputDir: outputDir,
+          persistQuery: persistQuery,
+          repersist: repersist
+        },
+        onlyValidate: onlyValidate,
+        schema: schema,
+        baseDocuments: baseDocuments,
+        documents: documents,
+        reporter: reporter,
+        sourceControl: sourceControl,
+        languagePlugin: languagePlugin
+      });
 
-          var _iteratorNormalCompletion = true;
-          var _didIteratorError = false;
-          var _iteratorError = undefined;
+      if (queryMap != null && persistedQueryPath != null) {
+        var object = {};
 
+        if (fs.existsSync(persistedQueryPath)) {
           try {
-            for (var _iterator = queryMap.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var _step$value = _step.value,
-                  id = _step$value[0],
-                  _text = _step$value[1];
-              object[id] = _text;
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator["return"] != null) {
-                _iterator["return"]();
-              }
-            } finally {
-              if (_didIteratorError) {
-                throw _iteratorError;
-              }
+            var prevText = fs.readFileSync(persistedQueryPath, 'utf8');
+            var prevData = JSON.parse(prevText);
+
+            if (prevData != null && typeof prevData === 'object') {
+              object = prevData;
+            } else {
+              console.error("Invalid data in persisted query file '".concat(persistedQueryPath, "', expected an object."));
             }
+          } catch (error) {
+            console.error(error);
           }
+        }
+
+        var _iterator = _createForOfIteratorHelper(queryMap.entries()),
+            _step;
 
-          var data = JSON.stringify(object, null, 2);
-          fs.writeFileSync(persistedQueryPath, data, 'utf8');
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var _step$value = _step.value,
+                id = _step$value[0],
+                _text = _step$value[1];
+            object[id] = _text;
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
 
-        return results;
-      });
+        var data = JSON.stringify(object, null, 2);
+        fs.writeFileSync(persistedQueryPath, data, 'utf8');
+      }
+
+      return results;
+    });
 
-      return function (_x3) {
-        return _ref2.apply(this, arguments);
-      };
-    }()
-  );
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
 }
 
 function getSchemaSource(schemaPath) {

package/lib/bin/__fixtures__/plugin-module.js

@@ -8,6 +8,7 @@
  * @format
  * @emails oncall+relay
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var RelayLanguagePluginJavaScript = require('../../language/javascript/RelayLanguagePluginJavaScript');

package/lib/codegen/CodegenDirectory.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -21,11 +22,10 @@ var crypto = require('crypto');
 
 var invariant = require("fbjs/lib/invariant");
 
-var path = require('path');
+var path = require('path'); // flowlint nonstrict-import:warn
 
-var CodegenDirectory =
-/*#__PURE__*/
-function () {
+
+var CodegenDirectory = /*#__PURE__*/function () {
   function CodegenDirectory(dir, options) {
     var _this = this;
 
@@ -151,9 +151,7 @@ function () {
     };
   };
 
-  CodegenDirectory.sourceControlAddRemove =
-  /*#__PURE__*/
-  function () {
+  CodegenDirectory.sourceControlAddRemove = /*#__PURE__*/function () {
     var _sourceControlAddRemove = _asyncToGenerator(function* (sourceControl, dirs) {
       var _CodegenDirectory$get = CodegenDirectory.getAddedRemovedFiles(dirs),
           added = _CodegenDirectory$get.added,
@@ -243,7 +241,7 @@ function () {
    */
   ;
 
-  _proto.deleteExtraFiles = function deleteExtraFiles() {
+  _proto.deleteExtraFiles = function deleteExtraFiles(keepExtraFile) {
     var _this3 = this;
 
     Profiler.run('CodegenDirectory.deleteExtraFiles', function () {
@@ -265,6 +263,10 @@ function () {
           }
 
           _this3._filesystem.readdirSync(firstLevelPath).forEach(function (actualFile) {
+            if (keepExtraFile && keepExtraFile(actualFile)) {
+              return;
+            }
+
             if (_this3._files.has(actualFile)) {
               return;
             }
@@ -282,6 +284,10 @@ function () {
         });
       } else {
         _this3._filesystem.readdirSync(_this3._dir).forEach(function (actualFile) {
+          if (keepExtraFile && keepExtraFile(actualFile)) {
+            return;
+          }
+
           if (actualFile.startsWith('.') || _this3._files.has(actualFile)) {
             return;
           }

package/lib/codegen/CodegenRunner.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -15,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');
@@ -34,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;
@@ -70,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 = {};
@@ -111,9 +114,7 @@ function () {
     return compileAll;
   }();
 
-  _proto.compile =
-  /*#__PURE__*/
-  function () {
+  _proto.compile = /*#__PURE__*/function () {
     var _compile = _asyncToGenerator(function* (writerName) {
       var _this2 = this;
 
@@ -145,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)) {
@@ -165,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);
@@ -210,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
@@ -262,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));
 
@@ -309,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);
@@ -330,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;
@@ -380,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();
@@ -399,9 +363,7 @@ function () {
     return watchAll;
   }();
 
-  _proto.watch =
-  /*#__PURE__*/
-  function () {
+  _proto.watch = /*#__PURE__*/function () {
     var _watch = _asyncToGenerator(function* (parserName) {
       var _this6 = this;
 
@@ -415,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;