relay-compiler 8.0.0 → 10.0.1

package/lib/transforms/query-generators/QueryQueryGenerator.js

@@ -22,6 +22,7 @@ function buildRefetchOperation(schema, fragment, queryName) {
   }
 
   return {
+    identifierField: null,
     path: [],
     node: {
       argumentDefinitions: buildOperationArgumentDefinitions(fragment.argumentDefinitions),
@@ -42,6 +43,6 @@ function buildRefetchOperation(schema, fragment, queryName) {
 }
 
 module.exports = {
-  description: 'the query type',
+  description: 'the Query type',
   buildRefetchOperation: buildRefetchOperation
 };

package/lib/transforms/query-generators/ViewerQueryGenerator.js

@@ -36,6 +36,7 @@ function buildRefetchOperation(schema, fragment, queryName) {
   }
 
   return {
+    identifierField: null,
     path: [VIEWER_FIELD_NAME],
     node: {
       argumentDefinitions: buildOperationArgumentDefinitions(fragment.argumentDefinitions),

package/lib/transforms/query-generators/index.js

@@ -10,6 +10,14 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
+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 FetchableQueryGenerator = require('./FetchableQueryGenerator');
+
 var NodeQueryGenerator = require('./NodeQueryGenerator');
 
 var QueryQueryGenerator = require('./QueryQueryGenerator');
@@ -19,20 +27,29 @@ var ViewerQueryGenerator = require('./ViewerQueryGenerator');
 var _require = require('../../core/CompilerError'),
     createUserError = _require.createUserError;
 
-var GENERATORS = [ViewerQueryGenerator, QueryQueryGenerator, NodeQueryGenerator];
+var GENERATORS = [ViewerQueryGenerator, QueryQueryGenerator, NodeQueryGenerator, FetchableQueryGenerator];
 /**
  * Builds a query to refetch the given fragment or throws if we have not way to
  * generate one.
  */
 
 function buildRefetchOperation(schema, fragment, queryName) {
-  for (var _i = 0, _GENERATORS = GENERATORS; _i < _GENERATORS.length; _i++) {
-    var generator = _GENERATORS[_i];
-    var refetchRoot = generator.buildRefetchOperation(schema, fragment, queryName);
+  var _iterator = _createForOfIteratorHelper(GENERATORS),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var generator = _step.value;
+      var refetchRoot = generator.buildRefetchOperation(schema, fragment, queryName);
 
-    if (refetchRoot != null) {
-      return refetchRoot;
+      if (refetchRoot != null) {
+        return refetchRoot;
+      }
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
 
   throw createUserError("Invalid use of @refetchable on fragment '".concat(fragment.name, "', only ") + 'supported are fragments on:\n' + GENERATORS.map(function (generator) {

package/lib/transforms/query-generators/utils.js

@@ -10,14 +10,20 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
+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 buildFragmentSpread(fragment) {
   var args = [];
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+
+  var _iterator = _createForOfIteratorHelper(fragment.argumentDefinitions),
+      _step;
 
   try {
-    for (var _iterator = fragment.argumentDefinitions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var argDef = _step.value;
 
       if (argDef.kind !== 'LocalArgumentDefinition') {
@@ -44,18 +50,9 @@ function buildFragmentSpread(fragment) {
       });
     }
   } 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();
   }
 
   return {
@@ -72,7 +69,7 @@ function buildFragmentSpread(fragment) {
 }
 
 function buildOperationArgumentDefinitions(argumentDefinitions) {
-  return argumentDefinitions.map(function (argDef) {
+  var localArgumentDefinitions = argumentDefinitions.map(function (argDef) {
     if (argDef.kind === 'LocalArgumentDefinition') {
       return argDef;
     } else {
@@ -85,6 +82,10 @@ function buildOperationArgumentDefinitions(argumentDefinitions) {
       };
     }
   });
+  localArgumentDefinitions.sort(function (a, b) {
+    return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
+  });
+  return localArgumentDefinitions;
 }
 
 module.exports = {

package/lib/util/RelayCompilerCache.js

@@ -29,9 +29,7 @@ var path = require('path');
  */
 
 
-var RelayCompilerCache =
-/*#__PURE__*/
-function () {
+var RelayCompilerCache = /*#__PURE__*/function () {
   /**
    * @param name         Human readable identifier for the cache
    * @param cacheBreaker This should be changed in order to invalidate existing
@@ -85,7 +83,7 @@ function () {
       var value = compute();
 
       try {
-        // $FlowFixMe(>=0.95.0) JSON.stringify can return undefined
+        // $FlowFixMe[incompatible-call] JSON.stringify can return undefined
         fs.writeFileSync(cacheFile, JSON.stringify(value), 'utf8');
       } catch (_unused2) {// ignore
       }

package/lib/util/argumentContainsVariables.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * 
+ * @format
+ */
+// flowlint ambiguous-object-type:error
+'use strict';
+
+function argumentContainsVariables(arg) {
+  if (arg == null) {
+    return false;
+  }
+
+  switch (arg.kind) {
+    case 'Variable':
+      return true;
+
+    case 'Literal':
+      return false;
+
+    case 'ListValue':
+      return arg.items.some(argumentContainsVariables);
+
+    case 'ObjectValue':
+      return arg.fields.some(argumentContainsVariables);
+
+    default:
+      arg.kind;
+      return false;
+  }
+}
+
+module.exports = argumentContainsVariables;

package/lib/util/dedupeJSONStringify.js

@@ -16,10 +16,6 @@
  */
 
 function dedupeJSONStringify(jsonValue) {
-  // Clone the object to convert references to the same object instance into
-  // copies. This is needed for the WeakMap/Map to recognize them as duplicates.
-  // $FlowFixMe(>=0.95.0) JSON.stringify can return undefined
-  jsonValue = JSON.parse(JSON.stringify(jsonValue));
   var metadataForHash = new Map();
   var metadataForVal = new WeakMap();
   var varDefs = [];
@@ -33,6 +29,7 @@ function dedupeJSONStringify(jsonValue) {
 
   function collectMetadata(value) {
     if (value == null || typeof value !== 'object') {
+      // $FlowFixMe[incompatible-return] - JSON.stringify can return undefined
       return JSON.stringify(value);
     }
 
@@ -60,7 +57,7 @@ function dedupeJSONStringify(jsonValue) {
       metadata = {
         value: value,
         hash: hash,
-        isDuplicate: false
+        count: 0
       };
       metadataForHash.set(hash, metadata);
     }
@@ -78,9 +75,12 @@ function dedupeJSONStringify(jsonValue) {
 
     var metadata = metadataForVal.get(value); // Only consider duplicates with hashes longer than 2 (excludes [] and {}).
 
-    if (metadata && metadata.value !== value && metadata.hash.length > 2) {
-      metadata.isDuplicate = true;
-      return;
+    if (metadata && metadata.hash.length > 2) {
+      metadata.count++;
+
+      if (metadata.count > 1) {
+        return;
+      }
     }
 
     if (Array.isArray(value)) {
@@ -99,6 +99,7 @@ function dedupeJSONStringify(jsonValue) {
 
   function printJSCode(isDupedVar, depth, value) {
     if (value == null || typeof value !== 'object') {
+      // $FlowFixMe[incompatible-return] : JSON.stringify can return undefined
       return JSON.stringify(value);
     } // Only use variable references at depth beyond the top level.
 
@@ -106,14 +107,16 @@ function dedupeJSONStringify(jsonValue) {
     if (depth !== '') {
       var metadata = metadataForVal.get(value);
 
-      if (metadata && metadata.isDuplicate) {
-        if (!metadata.varName) {
+      if (metadata && metadata.count > 1) {
+        var varName = metadata.varName;
+
+        if (varName == null) {
           var refCode = printJSCode(true, '', value);
-          metadata.varName = 'v' + varDefs.length;
+          varName = metadata.varName = 'v' + varDefs.length;
           varDefs.push(metadata.varName + ' = ' + refCode);
         }
 
-        return '(' + metadata.varName + '/*: any*/)';
+        return '(' + varName + '/*: any*/)';
       }
     }
 

package/lib/util/generateAbstractTypeRefinementKey.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * 
+ * @format
+ */
+// flowlint ambiguous-object-type:error
+'use strict';
+
+var _require = require('../core/CompilerError'),
+    createCompilerError = _require.createCompilerError;
+
+function generateAbstractTypeRefinementKey(schema, type) {
+  if (!schema.isAbstractType(type)) {
+    throw createCompilerError('Expected an abstract type');
+  }
+
+  return "__is".concat(schema.getTypeString(type));
+}
+
+module.exports = generateAbstractTypeRefinementKey;

package/lib/util/getModuleName.js

@@ -16,13 +16,11 @@ function getModuleName(filePath) {
   // index.js -> index
   // index.js.flow -> index.js
   var filename = path.basename(filePath, path.extname(filePath)); // index.js -> index (when extension has multiple segments)
+  // index.react -> index (when extension has multiple segments)
 
-  filename = filename.replace(/(?:\.\w+)+/, ''); // /path/to/button/index.js -> button
+  filename = filename.replace(/(\.(?!ios|android)[_a-zA-Z0-9\\-]+)+/g, ''); // /path/to/button/index.js -> button
 
-  var moduleName = filename === 'index' ? path.basename(path.dirname(filePath)) : filename; // Example.ios -> Example
-  // Example.product.android -> Example
-
-  moduleName = moduleName.replace(/(?:\.\w+)+/, ''); // foo-bar -> fooBar
+  var moduleName = filename === 'index' ? path.basename(path.dirname(filePath)) : filename; // foo-bar -> fooBar
   // Relay compatibility mode splits on _, so we can't use that here.
 
   moduleName = moduleName.replace(/[^a-zA-Z0-9]+(\w?)/g, function (match, next) {

package/lib/util/joinArgumentDefinitions.js

@@ -57,7 +57,9 @@ function joinArgumentDefinition(schema, prevArgDef, nextArgDef, directiveName) {
   } else if (schema.isTypeSubTypeOf(prevArgDef.type, nextArgDef.type)) {
     return prevArgDef;
   } else {
-    throw createUserError('Cannot combine variables with incompatible types ' + "".concat(schema.getTypeString(prevArgDef.type), " and ").concat(schema.getTypeString(nextArgDef.type), " ") + "when applying ".concat(directiveName, "."), [prevArgDef.loc, nextArgDef.loc]);
+    var prevArgType = prevArgDef.type != null ? schema.getTypeString(prevArgDef.type) : 'unknown';
+    var nextArgType = nextArgDef.type != null ? schema.getTypeString(nextArgDef.type) : 'unknown';
+    throw createUserError('Cannot combine variables with incompatible types ' + "".concat(prevArgType, " and ").concat(nextArgType, " ") + "when applying ".concat(directiveName, "."), [prevArgDef.loc, nextArgDef.loc]);
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relay-compiler",
   "description": "A compiler tool for building GraphQL-driven applications.",
-  "version": "8.0.0",
+  "version": "10.0.1",
   "keywords": [
     "graphql",
     "relay"
@@ -22,17 +22,17 @@
     "@babel/traverse": "^7.0.0",
     "@babel/types": "^7.0.0",
     "babel-preset-fbjs": "^3.3.0",
-    "chalk": "^2.4.1",
-    "fast-glob": "^2.2.2",
+    "chalk": "^4.0.0",
     "fb-watchman": "^2.0.0",
     "fbjs": "^1.0.0",
+    "glob": "^7.1.1",
     "immutable": "~3.7.6",
     "nullthrows": "^1.1.1",
-    "relay-runtime": "8.0.0",
+    "relay-runtime": "10.0.1",
     "signedsource": "^1.0.0",
-    "yargs": "^14.2.0"
+    "yargs": "^15.3.1"
   },
   "peerDependencies": {
-    "graphql": "^14.2.0"
+    "graphql": "^15.0.0"
   }
 }