relay-compiler 8.0.0 → 10.0.1

package/lib/bin/RelayCompilerMain.js

@@ -16,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');
@@ -40,6 +48,8 @@ var crypto = require('crypto');
 
 var fs = require('fs');
 
+var glob = require('glob');
+
 var invariant = require("fbjs/lib/invariant");
 
 var path = require('path');
@@ -70,16 +80,16 @@ function getFilepathsFromGlob(baseDir, config) {
   var extensions = config.extensions,
       include = config.include,
       exclude = config.exclude;
-  var patterns = include.map(function (inc) {
-    return "".concat(inc, "/*.+(").concat(extensions.join('|'), ")");
-  });
-
-  var glob = require('fast-glob');
-
-  return glob.sync(patterns, {
-    cwd: baseDir,
-    ignore: exclude
+  var files = new Set();
+  include.forEach(function (inc) {
+    return glob.sync("".concat(inc, "/*.+(").concat(extensions.join('|'), ")"), {
+      cwd: baseDir,
+      ignore: exclude
+    }).forEach(function (file) {
+      return files.add(file);
+    });
   });
+  return Array.from(files);
 }
 
 /**
@@ -93,9 +103,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;
 
@@ -120,12 +132,13 @@ function getLanguagePlugin(language) {
     }
 
     if (languagePlugin["default"] != null) {
-      // $FlowFixMe - Flow no longer considers statics of functions as any
+      /* $FlowFixMe[incompatible-type] - Flow no longer considers statics of
+       * functions as any */
       languagePlugin = languagePlugin["default"];
     }
 
     if (typeof languagePlugin === 'function') {
-      // $FlowFixMe
+      // $FlowFixMe[incompatible-use]
       return languagePlugin();
     } else {
       throw new Error('Expected plugin to be a initializer function.');
@@ -211,7 +224,7 @@ function getPathBasedConfig(config) {
     }
   }
 
-  return (0, _objectSpread2["default"])({}, config, {
+  return _objectSpread({}, config, {
     schema: schema,
     src: src,
     persistOutput: persistOutput
@@ -229,7 +242,7 @@ function _getWatchConfig() {
     if (config.watch) {
       if (!watchman) {
         console.error('Watchman is required to watch for changes. Running with watch mode disabled.');
-        return (0, _objectSpread2["default"])({}, config, {
+        return _objectSpread({}, config, {
           watch: false,
           watchman: false
         });
@@ -243,7 +256,7 @@ function _getWatchConfig() {
       console.log('HINT: pass --watch to keep watching for changes.');
     }
 
-    return (0, _objectSpread2["default"])({}, config, {
+    return _objectSpread({}, config, {
       watchman: watchman
     });
   });
@@ -251,23 +264,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,
@@ -278,6 +293,11 @@ 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,
@@ -300,10 +320,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']
   });
@@ -325,128 +343,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 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
-            },
-            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 data = JSON.stringify(object, null, 2);
-          fs.writeFileSync(persistedQueryPath, data, 'utf8');
+        var _iterator = _createForOfIteratorHelper(queryMap.entries()),
+            _step;
+
+        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/codegen/CodegenDirectory.js

@@ -22,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;
 
@@ -152,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,
@@ -244,7 +241,7 @@ function () {
    */
   ;
 
-  _proto.deleteExtraFiles = function deleteExtraFiles() {
+  _proto.deleteExtraFiles = function deleteExtraFiles(keepExtraFile) {
     var _this3 = this;
 
     Profiler.run('CodegenDirectory.deleteExtraFiles', function () {
@@ -266,6 +263,10 @@ function () {
           }
 
           _this3._filesystem.readdirSync(firstLevelPath).forEach(function (actualFile) {
+            if (keepExtraFile && keepExtraFile(actualFile)) {
+              return;
+            }
+
             if (_this3._files.has(actualFile)) {
               return;
             }
@@ -283,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;
           }