relay-compiler 1.3.0 → 1.5.0

package/lib/{RelayCodegenRunner.js → CodegenRunner.js}

@@ -1,12 +1,10 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
- * @providesModule RelayCodegenRunner
+ * @providesModule CodegenRunner
  * 
  * @format
  */
@@ -26,20 +24,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 var _require = require('immutable'),
     ImmutableMap = _require.Map;
 
-/* eslint-disable no-console-disallow */
-
-var RelayCodegenRunner = function () {
-  // parser => writers that are affected by it
-  function RelayCodegenRunner(options) {
+var CodegenRunner = function () {
+  function CodegenRunner(options) {
     var _this = this;
 
-    (0, _classCallCheck3['default'])(this, RelayCodegenRunner);
-    this.parsers = {};
+    (0, _classCallCheck3['default'])(this, CodegenRunner);
 
+    this.parsers = {};
     this.parserConfigs = options.parserConfigs;
     this.writerConfigs = options.writerConfigs;
     this.onlyValidate = options.onlyValidate;
     this._reporter = options.reporter;
+    this._sourceControl = options.sourceControl;
 
     this.parserWriters = {};
     for (var _parser in options.parserConfigs) {
@@ -58,8 +54,10 @@ var RelayCodegenRunner = function () {
       _loop(_writer);
     }
   }
+  // parser => writers that are affected by it
+
 
-  RelayCodegenRunner.prototype.compileAll = (() => {
+  CodegenRunner.prototype.compileAll = (() => {
     var _ref = (0, _asyncToGenerator3.default)(function* () {
       // reset the parsers
       this.parsers = {};
@@ -67,7 +65,7 @@ var RelayCodegenRunner = function () {
         try {
           yield this.parseEverything(parserName);
         } catch (e) {
-          this._reporter.reportError('RelayCodegenRunner.compileAll', e);
+          this._reporter.reportError('CodegenRunner.compileAll', e);
           return 'ERROR';
         }
       }
@@ -92,7 +90,7 @@ var RelayCodegenRunner = function () {
     return compileAll;
   })();
 
-  RelayCodegenRunner.prototype.compile = (() => {
+  CodegenRunner.prototype.compile = (() => {
     var _ref2 = (0, _asyncToGenerator3.default)(function* (writerName) {
       var _this2 = this;
 
@@ -105,9 +103,11 @@ var RelayCodegenRunner = function () {
         });
       }
       // Don't bother resetting the parsers
-      yield Promise.all(parsers.map(function (parser) {
-        return _this2.parseEverything(parser);
-      }));
+      yield require('./GraphQLCompilerProfiler').asyncContext('CodegenRunner:parseEverything', function () {
+        return Promise.all(parsers.map(function (parser) {
+          return _this2.parseEverything(parser);
+        }));
+      });
 
       return yield this.write(writerName);
     });
@@ -119,15 +119,15 @@ var RelayCodegenRunner = function () {
     return compile;
   })();
 
-  RelayCodegenRunner.prototype.getDirtyWriters = (() => {
-    var _ref3 = (0, _asyncToGenerator3.default)(function* (filePaths) {
-      var _this3 = this;
+  CodegenRunner.prototype.getDirtyWriters = function getDirtyWriters(filePaths) {
+    var _this3 = this;
 
+    return require('./GraphQLCompilerProfiler').asyncContext('CodegenRunner:getDirtyWriters', (0, _asyncToGenerator3.default)(function* () {
       var dirtyWriters = new Set();
 
       // Check if any files are in the output
-      for (var configName in this.writerConfigs) {
-        var config = this.writerConfigs[configName];
+      for (var configName in _this3.writerConfigs) {
+        var config = _this3.writerConfigs[configName];
         var _iteratorNormalCompletion = true;
         var _didIteratorError = false;
         var _iteratorError = undefined;
@@ -156,11 +156,10 @@ var RelayCodegenRunner = function () {
         }
       }
 
-      var client = new (require('./RelayWatchmanClient'))();
-
       // Check for files in the input
-      yield Promise.all(Object.keys(this.parserConfigs).map((() => {
-        var _ref4 = (0, _asyncToGenerator3.default)(function* (parserConfigName) {
+      yield Promise.all(Object.keys(_this3.parserConfigs).map(function (parserConfigName) {
+        return require('./GraphQLCompilerProfiler').waitFor('Watchman:query', (0, _asyncToGenerator3.default)(function* () {
+          var client = new (require('./GraphQLWatchmanClient'))();
           var config = _this3.parserConfigs[parserConfigName];
           var dirs = yield client.watchProject(config.baseDir);
 
@@ -175,30 +174,21 @@ var RelayCodegenRunner = function () {
           };
 
           var result = yield client.command('query', dirs.root, query);
+          client.end();
+
           if (result.files.length > 0) {
             _this3.parserWriters[parserConfigName].forEach(function (writerName) {
               return dirtyWriters.add(writerName);
             });
           }
-        });
-
-        return function (_x3) {
-          return _ref4.apply(this, arguments);
-        };
-      })()));
+        }));
+      }));
 
-      client.end();
       return dirtyWriters;
-    });
-
-    function getDirtyWriters(_x2) {
-      return _ref3.apply(this, arguments);
-    }
-
-    return getDirtyWriters;
-  })();
+    }));
+  };
 
-  RelayCodegenRunner.prototype.parseEverything = (() => {
+  CodegenRunner.prototype.parseEverything = (() => {
     var _ref5 = (0, _asyncToGenerator3.default)(function* (parserName) {
       if (this.parsers[parserName]) {
         // no need to parse
@@ -215,74 +205,43 @@ var RelayCodegenRunner = function () {
 
       var files = void 0;
       if (parserConfig.watchmanExpression) {
-        files = yield require('./RelayCodegenWatcher').queryFiles(parserConfig.baseDir, parserConfig.watchmanExpression, filter);
+        files = yield require('./CodegenWatcher').queryFiles(parserConfig.baseDir, parserConfig.watchmanExpression, filter);
       } else if (parserConfig.filepaths) {
-        files = yield require('./RelayCodegenWatcher').queryFilepaths(parserConfig.baseDir, parserConfig.filepaths, filter);
+        files = yield require('./CodegenWatcher').queryFilepaths(parserConfig.baseDir, parserConfig.filepaths, filter);
       } else {
         throw new Error('Either `watchmanExpression` or `filepaths` is required to query files');
       }
       this.parseFileChanges(parserName, files);
     });
 
-    function parseEverything(_x4) {
+    function parseEverything(_x2) {
       return _ref5.apply(this, arguments);
     }
 
     return parseEverything;
   })();
 
-  RelayCodegenRunner.prototype.parseFileChanges = function parseFileChanges(parserName, files) {
-    var tStart = Date.now();
-    var parser = this.parsers[parserName];
-    // this maybe should be await parser.parseFiles(files);
-    parser.parseFiles(files);
-    var tEnd = Date.now();
-    console.log('Parsed %s in %s', parserName, toSeconds(tStart, tEnd));
+  CodegenRunner.prototype.parseFileChanges = function parseFileChanges(parserName, files) {
+    var _this4 = this;
+
+    return require('./GraphQLCompilerProfiler').run('CodegenRunner.parseFileChanges', function () {
+      var parser = _this4.parsers[parserName];
+      // this maybe should be await parser.parseFiles(files);
+      parser.parseFiles(files);
+    });
   };
 
   // We cannot do incremental writes right now.
   // When we can, this could be writeChanges(writerName, parserName, parsedDefinitions)
 
 
-  RelayCodegenRunner.prototype.write = (() => {
-    var _ref6 = (0, _asyncToGenerator3.default)(function* (writerName) {
-      var _this4 = this;
+  CodegenRunner.prototype.write = function write(writerName) {
+    var _this5 = this;
 
+    return require('./GraphQLCompilerProfiler').asyncContext('CodegenRunner.write', (0, _asyncToGenerator3.default)(function* () {
       try {
-        var combineChanges = function combineChanges(accessor) {
-          var combined = [];
-          require('fbjs/lib/invariant')(outputDirectories, 'RelayCodegenRunner: Expected outputDirectories to be set');
-          var _iteratorNormalCompletion2 = true;
-          var _didIteratorError2 = false;
-          var _iteratorError2 = undefined;
-
-          try {
-            for (var _iterator2 = outputDirectories.values()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-              var dir = _step2.value;
-
-              combined.push.apply(combined, (0, _toConsumableArray3['default'])(accessor(dir.changes)));
-            }
-          } catch (err) {
-            _didIteratorError2 = true;
-            _iteratorError2 = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion2 && _iterator2['return']) {
-                _iterator2['return']();
-              }
-            } finally {
-              if (_didIteratorError2) {
-                throw _iteratorError2;
-              }
-            }
-          }
-
-          return combined;
-        };
-
-        console.log('\nWriting %s', writerName);
-        var tStart = Date.now();
-        var _writerConfigs$writer = this.writerConfigs[writerName],
+        _this5._reporter.reportMessage('\nWriting ' + writerName);
+        var _writerConfigs$writer = _this5.writerConfigs[writerName],
             _getWriter = _writerConfigs$writer.getWriter,
             _parser2 = _writerConfigs$writer.parser,
             _baseParsers = _writerConfigs$writer.baseParsers,
@@ -292,111 +251,89 @@ var RelayCodegenRunner = function () {
         var _baseDocuments = ImmutableMap();
         if (_baseParsers) {
           _baseParsers.forEach(function (baseParserName) {
-            _baseDocuments = _baseDocuments.merge(_this4.parsers[baseParserName].documents());
+            _baseDocuments = _baseDocuments.merge(_this5.parsers[baseParserName].documents());
           });
         }
 
         // always create a new writer: we have to write everything anyways
-        var _documents = this.parsers[_parser2].documents();
-        var _schema = this.parserConfigs[_parser2].getSchema();
-        var _writer2 = _getWriter(this.onlyValidate, _schema, _documents, _baseDocuments);
-
-        var outputDirectories = yield _writer2.writeAll();
-
-        var tWritten = Date.now();
-
-        var created = combineChanges(function (_) {
-          return _.created;
-        });
-        var updated = combineChanges(function (_) {
-          return _.updated;
+        var _documents = _this5.parsers[_parser2].documents();
+        var _schema = require('./GraphQLCompilerProfiler').run('getSchema', function () {
+          return _this5.parserConfigs[_parser2].getSchema();
         });
-        var deleted = combineChanges(function (_) {
-          return _.deleted;
-        });
-        var unchanged = combineChanges(function (_) {
-          return _.unchanged;
+        var _writer2 = _getWriter({
+          onlyValidate: _this5.onlyValidate,
+          schema: _schema,
+          documents: _documents,
+          baseDocuments: _baseDocuments,
+          sourceControl: _this5._sourceControl,
+          reporter: _this5._reporter
         });
 
-        var _iteratorNormalCompletion3 = true;
-        var _didIteratorError3 = false;
-        var _iteratorError3 = undefined;
+        var outputDirectories = yield _writer2.writeAll();
+
+        var _iteratorNormalCompletion2 = true;
+        var _didIteratorError2 = false;
+        var _iteratorError2 = undefined;
 
         try {
-          for (var _iterator3 = outputDirectories.values()[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-            var dir = _step3.value;
+          for (var _iterator2 = outputDirectories.values()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+            var dir = _step2.value;
 
             var all = [].concat((0, _toConsumableArray3['default'])(dir.changes.created), (0, _toConsumableArray3['default'])(dir.changes.updated), (0, _toConsumableArray3['default'])(dir.changes.deleted), (0, _toConsumableArray3['default'])(dir.changes.unchanged));
-
-            var _iteratorNormalCompletion4 = true;
-            var _didIteratorError4 = false;
-            var _iteratorError4 = undefined;
+            var _iteratorNormalCompletion3 = true;
+            var _didIteratorError3 = false;
+            var _iteratorError3 = undefined;
 
             try {
-              for (var _iterator4 = all[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-                var filename = _step4.value;
+              for (var _iterator3 = all[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+                var filename = _step3.value;
 
                 var _filePath2 = dir.getPath(filename);
-                require('fbjs/lib/invariant')(_isGeneratedFile(_filePath2), 'RelayCodegenRunner: %s returned false for isGeneratedFile, ' + 'but was in generated directory', _filePath2);
+                require('fbjs/lib/invariant')(_isGeneratedFile(_filePath2), 'CodegenRunner: %s returned false for isGeneratedFile, ' + 'but was in generated directory', _filePath2);
               }
             } catch (err) {
-              _didIteratorError4 = true;
-              _iteratorError4 = err;
+              _didIteratorError3 = true;
+              _iteratorError3 = err;
             } finally {
               try {
-                if (!_iteratorNormalCompletion4 && _iterator4['return']) {
-                  _iterator4['return']();
+                if (!_iteratorNormalCompletion3 && _iterator3['return']) {
+                  _iterator3['return']();
                 }
               } finally {
-                if (_didIteratorError4) {
-                  throw _iteratorError4;
+                if (_didIteratorError3) {
+                  throw _iteratorError3;
                 }
               }
             }
           }
         } catch (err) {
-          _didIteratorError3 = true;
-          _iteratorError3 = err;
+          _didIteratorError2 = true;
+          _iteratorError2 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion3 && _iterator3['return']) {
-              _iterator3['return']();
+            if (!_iteratorNormalCompletion2 && _iterator2['return']) {
+              _iterator2['return']();
             }
           } finally {
-            if (_didIteratorError3) {
-              throw _iteratorError3;
+            if (_didIteratorError2) {
+              throw _iteratorError2;
             }
           }
         }
 
-        if (this.onlyValidate) {
-          printFiles('Missing', created);
-          printFiles('Out of date', updated);
-          printFiles('Extra', deleted);
-        } else {
-          printFiles('Created', created);
-          printFiles('Updated', updated);
-          printFiles('Deleted', deleted);
-          console.log('Unchanged: %s files', unchanged.length);
-        }
-
-        console.log('Written %s in %s', writerName, toSeconds(tStart, tWritten));
-
-        return created.length + updated.length + deleted.length > 0 ? 'HAS_CHANGES' : 'NO_CHANGES';
+        var combinedChanges = require('./CodegenDirectory').combineChanges(Array.from(outputDirectories.values()));
+        require('./CodegenDirectory').printChanges(combinedChanges, {
+          onlyValidate: _this5.onlyValidate
+        });
+        return require('./CodegenDirectory').hasChanges(combinedChanges) ? 'HAS_CHANGES' : 'NO_CHANGES';
       } catch (e) {
-        this._reporter.reportError('RelayCodegenRunner.write', e);
+        _this5._reporter.reportError('CodegenRunner.write', e);
         return 'ERROR';
       }
-    });
-
-    function write(_x5) {
-      return _ref6.apply(this, arguments);
-    }
-
-    return write;
-  })();
+    }));
+  };
 
-  RelayCodegenRunner.prototype.watchAll = (() => {
+  CodegenRunner.prototype.watchAll = (() => {
     var _ref7 = (0, _asyncToGenerator3.default)(function* () {
       // get everything set up for watching
       yield this.compileAll();
@@ -413,9 +350,9 @@ var RelayCodegenRunner = function () {
     return watchAll;
   })();
 
-  RelayCodegenRunner.prototype.watch = (() => {
+  CodegenRunner.prototype.watch = (() => {
     var _ref8 = (0, _asyncToGenerator3.default)(function* (parserName) {
-      var _this5 = this;
+      var _this6 = this;
 
       var parserConfig = this.parserConfigs[parserName];
 
@@ -428,66 +365,53 @@ var RelayCodegenRunner = function () {
       // we should prevent the first watch callback from doing anything.
       var firstChange = true;
 
-      yield require('./RelayCodegenWatcher').watchCompile(parserConfig.baseDir, parserConfig.watchmanExpression, parserConfig.getFileFilter ? parserConfig.getFileFilter(parserConfig.baseDir) : anyFileFilter, (() => {
+      yield require('./CodegenWatcher').watchCompile(parserConfig.baseDir, parserConfig.watchmanExpression, parserConfig.getFileFilter ? parserConfig.getFileFilter(parserConfig.baseDir) : anyFileFilter, (() => {
         var _ref9 = (0, _asyncToGenerator3.default)(function* (files) {
-          require('fbjs/lib/invariant')(_this5.parsers[parserName], 'Trying to watch an uncompiled parser config: %s', parserName);
+          require('fbjs/lib/invariant')(_this6.parsers[parserName], 'Trying to watch an uncompiled parser config: %s', parserName);
           if (firstChange) {
             firstChange = false;
             return;
           }
           var dependentWriters = [];
-          _this5.parserWriters[parserName].forEach(function (writer) {
+          _this6.parserWriters[parserName].forEach(function (writer) {
             return dependentWriters.push(writer);
           });
 
           try {
-            if (!_this5.parsers[parserName]) {
+            if (!_this6.parsers[parserName]) {
               // have to load the parser and make sure all of its dependents are set
-              yield _this5.parseEverything(parserName);
+              yield _this6.parseEverything(parserName);
             } else {
-              _this5.parseFileChanges(parserName, files);
+              _this6.parseFileChanges(parserName, files);
             }
             yield Promise.all(dependentWriters.map(function (writer) {
-              return _this5.write(writer);
+              return _this6.write(writer);
             }));
           } catch (error) {
-            _this5._reporter.reportError('RelayCodegenRunner.watch', error);
+            _this6._reporter.reportError('CodegenRunner.watch', error);
           }
-          console.log('Watching for changes to %s...', parserName);
+          _this6._reporter.reportMessage('Watching for changes to ' + parserName + '...');
         });
 
-        return function (_x7) {
+        return function (_x4) {
           return _ref9.apply(this, arguments);
         };
       })());
-      console.log('Watching for changes to %s...', parserName);
+      this._reporter.reportMessage('Watching for changes to ' + parserName + '...');
     });
 
-    function watch(_x6) {
+    function watch(_x3) {
       return _ref8.apply(this, arguments);
     }
 
     return watch;
   })();
 
-  return RelayCodegenRunner;
+  return CodegenRunner;
 }();
 
 function anyFileFilter(file) {
   return true;
 }
 
-function toSeconds(t0, t1) {
-  return ((t1 - t0) / 1000).toFixed(2) + 's';
-}
-
-function printFiles(label, files) {
-  if (files.length > 0) {
-    console.log(label + ':');
-    files.forEach(function (file) {
-      console.log(' - ' + file);
-    });
-  }
-}
-
-module.exports = RelayCodegenRunner;
+module.exports = CodegenRunner;

package/lib/CodegenTypes.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule CodegenTypes
+ * 
+ * @format
+ */
+
+'use strict';