relay-compiler 1.3.0 → 1.5.0

package/index.js

@@ -1,13 +1,10 @@
 /**
- * Relay v1.3.0
+ * Relay v1.5.0
  *
  * 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.
  */
 
 module.exports = require('./lib/RelayCompilerPublic.js');

package/lib/{FileParser.js → ASTCache.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 FileParser
+ * @providesModule ASTCache
  * 
  * @format
  */
@@ -20,31 +18,36 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 var _require = require('immutable'),
     ImmutableMap = _require.Map;
 
-var FileParser = function () {
-  function FileParser(config) {
-    (0, _classCallCheck3['default'])(this, FileParser);
-    this._documents = new Map();
+var ASTCache = function () {
+  function ASTCache(config) {
+    (0, _classCallCheck3['default'])(this, ASTCache);
 
+    this._documents = new Map();
     this._baseDir = config.baseDir;
-    this._parse = config.parse;
+    this._parse = require('./GraphQLCompilerProfiler').instrument(config.parse, 'ASTCache.parseFn');
   }
 
   // Short-term: we don't do subscriptions/delta updates, instead always use all definitions
 
 
-  FileParser.prototype.documents = function documents() {
+  ASTCache.prototype.documents = function documents() {
     return ImmutableMap(this._documents);
   };
 
   // parse should return the set of changes
 
 
-  FileParser.prototype.parseFiles = function parseFiles(files) {
+  ASTCache.prototype.parseFiles = function parseFiles(files) {
     var _this = this;
 
     var documents = ImmutableMap();
 
     files.forEach(function (file) {
+      if (!file.exists) {
+        _this._documents['delete'](file.relPath);
+        return;
+      }
+
       var doc = function () {
         try {
           return _this._parse(_this._baseDir, file);
@@ -65,7 +68,7 @@ var FileParser = function () {
     return documents;
   };
 
-  return FileParser;
+  return ASTCache;
 }();
 
-module.exports = FileParser;
+module.exports = ASTCache;

package/lib/ASTConvert.js

@@ -1,10 +1,8 @@
 /**
  * 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 ASTConvert
  * 
@@ -18,7 +16,7 @@ var _toConsumableArray3 = _interopRequireDefault(require('babel-runtime/helpers/
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var _require = require('./GraphQLSchemaUtils'),
-    isOperationDefinitionAST = _require.isOperationDefinitionAST,
+    isExecutableDefinitionAST = _require.isExecutableDefinitionAST,
     isSchemaDefinitionAST = _require.isSchemaDefinitionAST;
 
 var _require2 = require('graphql'),
@@ -26,72 +24,86 @@ var _require2 = require('graphql'),
     parse = _require2.parse,
     visit = _require2.visit;
 
-function convertASTDocuments(schema, documents, validationRules) {
-  var definitions = definitionsFromDocuments(documents);
+function convertASTDocuments(schema, documents, validationRules, transform) {
+  return require('./GraphQLCompilerProfiler').run('ASTConvert.convertASTDocuments', function () {
+    var definitions = definitionsFromDocuments(documents);
 
-  var astDefinitions = [];
-  documents.forEach(function (doc) {
-    doc.definitions.forEach(function (definition) {
-      if (isOperationDefinitionAST(definition)) {
-        astDefinitions.push(definition);
-      }
+    var astDefinitions = [];
+    documents.forEach(function (doc) {
+      doc.definitions.forEach(function (definition) {
+        if (isExecutableDefinitionAST(definition)) {
+          astDefinitions.push(definition);
+        }
+      });
     });
-  });
 
-  return convertASTDefinitions(schema, definitions, validationRules);
+    return convertASTDefinitions(schema, definitions, validationRules, transform);
+  });
 }
 
-function convertASTDocumentsWithBase(schema, baseDocuments, documents, validationRules) {
-  var baseDefinitions = definitionsFromDocuments(baseDocuments);
-  var definitions = definitionsFromDocuments(documents);
+function convertASTDocumentsWithBase(schema, baseDocuments, documents, validationRules, transform) {
+  return require('./GraphQLCompilerProfiler').run('ASTConvert.convertASTDocumentsWithBase', function () {
+    var baseDefinitions = definitionsFromDocuments(baseDocuments);
+    var definitions = definitionsFromDocuments(documents);
 
-  var requiredDefinitions = new Map();
-  var baseMap = new Map();
-  baseDefinitions.forEach(function (definition) {
-    if (isOperationDefinitionAST(definition)) {
-      if (definition.name) {
+    var requiredDefinitions = new Map();
+    var baseMap = new Map();
+    baseDefinitions.forEach(function (definition) {
+      if (isExecutableDefinitionAST(definition)) {
+        var definitionName = definition.name && definition.name.value;
         // If there's no name, no reason to put in the map
-        baseMap.set(definition.name.value, definition);
+        if (definitionName) {
+          if (baseMap.has(definitionName)) {
+            throw new Error('Duplicate definition of \'' + definitionName + '\'.');
+          }
+          baseMap.set(definitionName, definition);
+        }
       }
-    }
-  });
+    });
 
-  var definitionsToVisit = [];
-  definitions.forEach(function (definition) {
-    if (isOperationDefinitionAST(definition)) {
-      definitionsToVisit.push(definition);
-    }
-  });
-  while (definitionsToVisit.length > 0) {
-    var definition = definitionsToVisit.pop();
-    var name = definition.name;
-    if (!name || requiredDefinitions.has(name.value)) {
-      continue;
-    }
-    requiredDefinitions.set(name.value, definition);
-    visit(definition, {
-      FragmentSpread: function FragmentSpread(spread) {
-        var baseDefinition = baseMap.get(spread.name.value);
-        if (baseDefinition) {
-          // We only need to add those definitions not already included
-          // in definitions
-          definitionsToVisit.push(baseDefinition);
-        }
+    var definitionsToVisit = [];
+    definitions.forEach(function (definition) {
+      if (isExecutableDefinitionAST(definition)) {
+        definitionsToVisit.push(definition);
       }
     });
-  }
+    while (definitionsToVisit.length > 0) {
+      var _definition = definitionsToVisit.pop();
+      var name = _definition.name && _definition.name.value;
+      if (!name) {
+        continue;
+      }
+      if (requiredDefinitions.has(name)) {
+        if (requiredDefinitions.get(name) !== _definition) {
+          throw new Error('Duplicate definition of \'' + name + '\'.');
+        }
+        continue;
+      }
+      requiredDefinitions.set(name, _definition);
+      visit(_definition, {
+        FragmentSpread: function FragmentSpread(spread) {
+          var baseDefinition = baseMap.get(spread.name.value);
+          if (baseDefinition) {
+            // We only need to add those definitions not already included
+            // in definitions
+            definitionsToVisit.push(baseDefinition);
+          }
+        }
+      });
+    }
 
-  var definitionsToConvert = [];
-  requiredDefinitions.forEach(function (definition) {
-    return definitionsToConvert.push(definition);
+    var definitionsToConvert = [];
+    requiredDefinitions.forEach(function (definition) {
+      return definitionsToConvert.push(definition);
+    });
+    return convertASTDefinitions(schema, definitionsToConvert, validationRules, transform);
   });
-  return convertASTDefinitions(schema, definitionsToConvert, validationRules);
 }
 
-function convertASTDefinitions(schema, definitions, validationRules) {
+function convertASTDefinitions(schema, definitions, validationRules, transform) {
   var operationDefinitions = [];
   definitions.forEach(function (definition) {
-    if (isOperationDefinitionAST(definition)) {
+    if (isExecutableDefinitionAST(definition)) {
       operationDefinitions.push(definition);
     }
   });
@@ -105,7 +117,7 @@ function convertASTDefinitions(schema, definitions, validationRules) {
   // Will throw an error if there are validation issues
   require('./GraphQLValidator').validate(validationAST, schema, validationRules);
   return operationDefinitions.map(function (definition) {
-    return require('./RelayParser').transform(schema, definition);
+    return transform(schema, definition);
   });
 }
 
@@ -120,26 +132,28 @@ function definitionsFromDocuments(documents) {
 }
 
 function transformASTSchema(schema, schemaExtensions) {
-  return schemaExtensions.length > 0 ? extendSchema(schema, parse(schemaExtensions.join('\n'))) : schema;
+  return require('./GraphQLCompilerProfiler').run('ASTConvert.transformASTSchema', function () {
+    return schemaExtensions.length > 0 ? extendSchema(schema, parse(schemaExtensions.join('\n'))) : schema;
+  });
 }
 
 function extendASTSchema(baseSchema, documents) {
-  // Should be TypeSystemDefinitionNode
-  var schemaExtensions = [];
-  documents.forEach(function (doc) {
-    // TODO: isSchemaDefinitionAST should %checks, once %checks is available
-    schemaExtensions.push.apply(schemaExtensions, (0, _toConsumableArray3['default'])(doc.definitions.filter(isSchemaDefinitionAST)));
-  });
+  return require('./GraphQLCompilerProfiler').run('ASTConvert.extendASTSchema', function () {
+    // Should be TypeSystemDefinitionNode
+    var schemaExtensions = [];
+    documents.forEach(function (doc) {
+      schemaExtensions.push.apply(schemaExtensions, (0, _toConsumableArray3['default'])(doc.definitions.filter(isSchemaDefinitionAST)));
+    });
 
-  if (schemaExtensions.length <= 0) {
-    return baseSchema;
-  }
+    if (schemaExtensions.length <= 0) {
+      return baseSchema;
+    }
 
-  return extendSchema(baseSchema, {
-    kind: 'Document',
-    // Flow doesn't recognize that TypeSystemDefinitionNode is a subset of
-    // DefinitionNode
-    definitions: schemaExtensions
+    // TODO T24511737 figure out if this is dangerous
+    return extendSchema(baseSchema, {
+      kind: 'Document',
+      definitions: schemaExtensions
+    }, { assumeValid: true });
   });
 }
 

package/lib/CodegenDirectory.js

@@ -1,10 +1,8 @@
 /**
  * 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 CodegenDirectory
  * 
@@ -13,8 +11,14 @@
 
 'use strict';
 
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
 var _classCallCheck3 = _interopRequireDefault(require('babel-runtime/helpers/classCallCheck'));
 
+var _toConsumableArray3 = _interopRequireDefault(require('babel-runtime/helpers/toConsumableArray'));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 /**
@@ -52,7 +56,15 @@ var CodegenDirectory = function () {
     if (require('fs').existsSync(dir)) {
       require('fbjs/lib/invariant')(require('fs').statSync(dir).isDirectory(), 'Expected `%s` to be a directory.', dir);
     } else if (!this.onlyValidate) {
-      require('fs').mkdirSync(dir);
+      var dirs = [dir];
+      var parent = require('path').dirname(dir);
+      while (!require('fs').existsSync(parent)) {
+        dirs.unshift(parent);
+        parent = require('path').dirname(parent);
+      }
+      dirs.forEach(function (d) {
+        return require('fs').mkdirSync(d);
+      });
     }
     this._files = new Set();
     this.changes = {
@@ -64,6 +76,82 @@ var CodegenDirectory = function () {
     this._dir = dir;
   }
 
+  CodegenDirectory.combineChanges = function combineChanges(dirs) {
+    var changes = {
+      deleted: [],
+      updated: [],
+      created: [],
+      unchanged: []
+    };
+    dirs.forEach(function (dir) {
+      var _changes$deleted, _changes$updated, _changes$created, _changes$unchanged;
+
+      (_changes$deleted = changes.deleted).push.apply(_changes$deleted, (0, _toConsumableArray3['default'])(dir.changes.deleted));
+      (_changes$updated = changes.updated).push.apply(_changes$updated, (0, _toConsumableArray3['default'])(dir.changes.updated));
+      (_changes$created = changes.created).push.apply(_changes$created, (0, _toConsumableArray3['default'])(dir.changes.created));
+      (_changes$unchanged = changes.unchanged).push.apply(_changes$unchanged, (0, _toConsumableArray3['default'])(dir.changes.unchanged));
+    });
+    return changes;
+  };
+
+  CodegenDirectory.hasChanges = function hasChanges(changes) {
+    return changes.created.length > 0 || changes.updated.length > 0 || changes.deleted.length > 0;
+  };
+
+  CodegenDirectory.printChanges = function printChanges(changes, options) {
+    require('./GraphQLCompilerProfiler').run('CodegenDirectory.printChanges', function () {
+      var output = [];
+      function printFiles(label, files) {
+        if (files.length > 0) {
+          output.push(label + ':');
+          files.forEach(function (file) {
+            output.push(' - ' + file);
+          });
+        }
+      }
+      if (options.onlyValidate) {
+        printFiles('Missing', changes.created);
+        printFiles('Out of date', changes.updated);
+        printFiles('Extra', changes.deleted);
+      } else {
+        printFiles('Created', changes.created);
+        printFiles('Updated', changes.updated);
+        printFiles('Deleted', changes.deleted);
+        output.push('Unchanged: ' + changes.unchanged.length + ' files');
+      }
+      // eslint-disable-next-line no-console
+      console.log(output.join('\n'));
+    });
+  };
+
+  CodegenDirectory.sourceControlAddRemove = (() => {
+    var _ref = (0, _asyncToGenerator3.default)(function* (sourceControl, dirs) {
+      var allAdded = [];
+      var allRemoved = [];
+      dirs.forEach(function (dir) {
+        dir.changes.created.forEach(function (name) {
+          allAdded.push(dir.getPath(name));
+        });
+        dir.changes.deleted.forEach(function (name) {
+          allRemoved.push(dir.getPath(name));
+        });
+      });
+      sourceControl.addRemove(allAdded, allRemoved);
+    });
+
+    function sourceControlAddRemove(_x2, _x3) {
+      return _ref.apply(this, arguments);
+    }
+
+    return sourceControlAddRemove;
+  })();
+
+  CodegenDirectory.prototype.printChanges = function printChanges() {
+    CodegenDirectory.printChanges(this.changes, {
+      onlyValidate: this.onlyValidate
+    });
+  };
+
   CodegenDirectory.prototype.read = function read(filename) {
     var filePath = require('path').join(this._dir, filename);
     if (require('fs').existsSync(filePath)) {
@@ -90,20 +178,24 @@ var CodegenDirectory = function () {
   };
 
   CodegenDirectory.prototype.writeFile = function writeFile(filename, content) {
-    this._addGenerated(filename);
-    var filePath = require('path').join(this._dir, filename);
-    if (require('fs').existsSync(filePath)) {
-      var existingContent = require('fs').readFileSync(filePath, 'utf8');
-      if (existingContent === content) {
-        this.changes.unchanged.push(filename);
+    var _this = this;
+
+    require('./GraphQLCompilerProfiler').run('CodegenDirectory.writeFile', function () {
+      _this._addGenerated(filename);
+      var filePath = require('path').join(_this._dir, filename);
+      if (require('fs').existsSync(filePath)) {
+        var existingContent = require('fs').readFileSync(filePath, 'utf8');
+        if (existingContent === content) {
+          _this.changes.unchanged.push(filename);
+        } else {
+          _this._writeFile(filePath, content);
+          _this.changes.updated.push(filename);
+        }
       } else {
-        this._writeFile(filePath, content);
-        this.changes.updated.push(filename);
+        _this._writeFile(filePath, content);
+        _this.changes.created.push(filename);
       }
-    } else {
-      this._writeFile(filePath, content);
-      this.changes.created.push(filename);
-    }
+    });
   };
 
   CodegenDirectory.prototype._writeFile = function _writeFile(filePath, content) {
@@ -119,19 +211,21 @@ var CodegenDirectory = function () {
 
 
   CodegenDirectory.prototype.deleteExtraFiles = function deleteExtraFiles() {
-    var _this = this;
-
-    require('fs').readdirSync(this._dir).forEach(function (actualFile) {
-      if (!_this._files.has(actualFile) && !/^\./.test(actualFile)) {
-        if (!_this.onlyValidate) {
-          try {
-            require('fs').unlinkSync(require('path').join(_this._dir, actualFile));
-          } catch (e) {
-            throw new Error('CodegenDirectory: Failed to delete `' + actualFile + '` in `' + _this._dir + '`.');
+    var _this2 = this;
+
+    require('./GraphQLCompilerProfiler').run('CodegenDirectory.deleteExtraFiles', function () {
+      require('fs').readdirSync(_this2._dir).forEach(function (actualFile) {
+        if (!_this2._files.has(actualFile) && !/^\./.test(actualFile)) {
+          if (!_this2.onlyValidate) {
+            try {
+              require('fs').unlinkSync(require('path').join(_this2._dir, actualFile));
+            } catch (e) {
+              throw new Error('CodegenDirectory: Failed to delete `' + actualFile + '` in `' + _this2._dir + '`.');
+            }
           }
+          _this2.changes.deleted.push(actualFile);
         }
-        _this.changes.deleted.push(actualFile);
-      }
+      });
     });
   };