relay-compiler 1.5.0-rc.1 → 1.5.0

package/lib/RelayFlowGenerator.js

@@ -221,6 +221,7 @@ function createVisitor(options) {
     customScalars: options.customScalars,
     enumsHasteModule: options.enumsHasteModule,
     existingFragmentNames: options.existingFragmentNames,
+    generatedFragments: new Set(),
     inputFieldWhiteList: options.inputFieldWhiteList,
     relayRuntimeModule: options.relayRuntimeModule,
     usedEnums: {},
@@ -248,8 +249,9 @@ function createVisitor(options) {
           }
           return [selection];
         });
+        state.generatedFragments.add(node.name);
         var refTypeName = getRefTypeName(node.name);
-        var refType = require('babel-types').expressionStatement(require('babel-types').identifier('export opaque type ' + refTypeName + ': FragmentReference = FragmentReference'));
+        var refType = require('babel-types').expressionStatement(require('babel-types').identifier('declare export opaque type ' + refTypeName + ': FragmentReference'));
         var baseType = selectionsToBabel(selections, state, refTypeName);
         var type = isPlural(node) ? readOnlyArrayOfType(baseType) : baseType;
         return require('babel-types').program([].concat((0, _toConsumableArray3['default'])(getFragmentImports(state)), (0, _toConsumableArray3['default'])(getEnumDefinitions(state)), [importTypes(['FragmentReference'], state.relayRuntimeModule), refType, exportType(node.name, type)]));
@@ -339,7 +341,7 @@ function groupRefs(props) {
       return require('babel-types').identifier(getRefTypeName(ref));
     }));
     result.push({
-      key: '__fragments',
+      key: '$fragmentRefs',
       conditional: false,
       value: _value3
     });
@@ -360,12 +362,14 @@ function getFragmentImports(state) {
         var usedFragment = _step3.value;
 
         var refTypeName = getRefTypeName(usedFragment);
-        if (state.useHaste && state.existingFragmentNames.has(usedFragment)) {
-          // TODO(T22653277) support non-haste environments when importing
-          // fragments
-          imports.push(importTypes([refTypeName], usedFragment + '.graphql'));
-        } else {
-          imports.push(anyTypeAlias(refTypeName));
+        if (!state.generatedFragments.has(usedFragment)) {
+          if (state.useHaste && state.existingFragmentNames.has(usedFragment)) {
+            // TODO(T22653277) support non-haste environments when importing
+            // fragments
+            imports.push(importTypes([refTypeName], usedFragment + '.graphql'));
+          } else {
+            imports.push(anyTypeAlias(refTypeName));
+          }
         }
       }
     } catch (err) {

package/lib/RelayIRTransforms.js

@@ -17,7 +17,8 @@ var _require = require('./GraphQLCompilerPublic'),
     InlineFragmentsTransform = _require.InlineFragmentsTransform,
     SkipClientFieldTransform = _require.SkipClientFieldTransform,
     SkipRedundantNodesTransform = _require.SkipRedundantNodesTransform,
-    SkipUnreachableNodeTransform = _require.SkipUnreachableNodeTransform;
+    SkipUnreachableNodeTransform = _require.SkipUnreachableNodeTransform,
+    StripUnusedVariablesTransform = _require.StripUnusedVariablesTransform;
 
 // Transforms applied to the code used to process a query response.
 var relaySchemaExtensions = [require('./RelayConnectionTransform').SCHEMA_EXTENSION, require('./RelayRelayDirectiveTransform').SCHEMA_EXTENSION];
@@ -37,7 +38,7 @@ var relayQueryTransforms = [require('./RelayDeferrableFragmentTransform').transf
 var relayCodegenTransforms = [InlineFragmentsTransform.transform, FlattenTransform.transformWithOptions({ flattenAbstractTypes: true }), SkipRedundantNodesTransform.transform, require('./RelayGenerateTypeNameTransform').transform, FilterDirectivesTransform.transform];
 
 // Transforms applied before printing the query sent to the server.
-var relayPrintTransforms = [FlattenTransform.transformWithOptions({}), require('./RelayGenerateTypeNameTransform').transform, require('./RelaySkipHandleFieldTransform').transform, FilterDirectivesTransform.transform];
+var relayPrintTransforms = [FlattenTransform.transformWithOptions({}), require('./RelayGenerateTypeNameTransform').transform, require('./RelaySkipHandleFieldTransform').transform, FilterDirectivesTransform.transform, StripUnusedVariablesTransform.transform];
 
 module.exports = {
   commonTransforms: relayCommonTransforms,

package/lib/SkipRedundantNodesTransform.js

@@ -148,6 +148,7 @@ function transformNode(node, selectionMap) {
     var identifier = require('./getIdentifierForSelection')(selection);
     switch (selection.kind) {
       case 'ScalarField':
+      case 'DeferrableFragmentSpread':
       case 'FragmentSpread':
         {
           if (!selectionMap.has(identifier)) {

package/lib/SkipUnreachableNodeTransform.js

@@ -60,8 +60,8 @@ function transformNode(context, fragments, node) {
           nextSelection = transformNode(context, fragments, selection);
         }
         break;
-      case 'FragmentSpread':
-        // Skip fragment spreads if the referenced fragment is empty
+      case 'DeferrableFragmentSpread':
+        // Skip deferred fragment spreads if the referenced fragment is empty
         if (!fragments.has(selection.name)) {
           var fragment = context.getFragment(selection.name);
           var nextFragment = transformNode(context, fragments, fragment);
@@ -71,6 +71,17 @@ function transformNode(context, fragments, node) {
           nextSelection = selection;
         }
         break;
+      case 'FragmentSpread':
+        // Skip fragment spreads if the referenced fragment is empty
+        if (!fragments.has(selection.name)) {
+          var _fragment = context.getFragment(selection.name);
+          var _nextFragment = transformNode(context, fragments, _fragment);
+          fragments.set(selection.name, _nextFragment);
+        }
+        if (fragments.get(selection.name)) {
+          nextSelection = selection;
+        }
+        break;
       case 'LinkedField':
         nextSelection = transformNode(context, fragments, selection);
         break;

package/lib/StripUnusedVariablesTransform.js

@@ -20,9 +20,59 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
  * by the query itself.
  */
 function stripUnusedVariablesTransform(context) {
+  var fragmentToVariables = new Map();
+  var fragmentToFragmentSpreads = new Map();
+  var rootToVariables = new Map();
+  var rootToFragmentSpreads = new Map();
+  context.forEachDocument(function (document) {
+    var fragmentVariables = void 0;
+    var fragmentFragmentSpreads = void 0;
+    var rootVariables = void 0;
+    var rootFragmentSpreads = void 0;
+    require('./GraphQLIRVisitor').visit(document, {
+      Root: {
+        enter: function enter(root) {
+          rootVariables = new Set();
+          rootToVariables.set(root.name, rootVariables);
+          rootFragmentSpreads = new Set();
+          rootToFragmentSpreads.set(root.name, rootFragmentSpreads);
+        },
+        leave: function leave(root) {
+          rootVariables = null;
+          rootFragmentSpreads = null;
+        }
+      },
+      Fragment: {
+        enter: function enter(fragment) {
+          fragmentVariables = new Set();
+          fragmentToVariables.set(fragment.name, fragmentVariables);
+          fragmentFragmentSpreads = new Set();
+          fragmentToFragmentSpreads.set(fragment.name, fragmentFragmentSpreads);
+        },
+        leave: function leave(fragment) {
+          fragmentVariables = null;
+          fragmentFragmentSpreads = null;
+        }
+      },
+      Variable: function Variable(variable) {
+        fragmentVariables && fragmentVariables.add(variable.variableName);
+        rootVariables && rootVariables.add(variable.variableName);
+      },
+      FragmentSpread: function FragmentSpread(spread) {
+        fragmentFragmentSpreads && fragmentFragmentSpreads.add(spread.name);
+        rootFragmentSpreads && rootFragmentSpreads.add(spread.name);
+      }
+    });
+  });
+  var variablesMemo = new Map();
+  rootToVariables.forEach(function (variables, root) {
+    Array.from(require('./nullthrowsOSS')(rootToFragmentSpreads.get(root), 'root ' + root + ' wasn\'t found in StripUnusedVariablesTransform')).forEach(function (spread) {
+      return into(variables, allVariablesReferencedInFragment(variablesMemo, spread, fragmentToVariables, fragmentToFragmentSpreads));
+    });
+  });
   return require('./GraphQLIRTransformer').transform(context, {
     Root: function Root(root) {
-      return transformRoot(context, root);
+      return transformRoot(context, root, require('./nullthrowsOSS')(rootToVariables.get(root.name), 'root ' + root.name + ' wasn\'t found in StripUnusedVariablesTransform'));
     },
     // Include fragments, but do not traverse into them.
     Fragment: function Fragment(id) {
@@ -31,43 +81,32 @@ function stripUnusedVariablesTransform(context) {
   });
 }
 
-function transformRoot(context, root) {
-  var state = {
-    referencedVariables: new Set()
-  };
-  var newContext = require('./GraphQLIRTransformer').transform(require('./filterContextForNode')(root, context), {
-    Argument: visitArgument,
-    Condition: visitCondition
-  }, function () {
-    return state;
-  });
-  var transformedNode = newContext.getRoot(root.name);
-  /**
-   * Remove the extraneous arguments *after* transform returns, since fragments
-   * could be transformed after the root query.
-   */
-  return (0, _extends3['default'])({}, transformedNode, {
-    argumentDefinitions: transformedNode.argumentDefinitions.filter(function (arg) {
-      return state.referencedVariables.has(arg.name);
-    })
-  });
+function allVariablesReferencedInFragment(variablesMemo, fragment, fragmentToVariables, fragmentToFragmentSpreads) {
+  var variables = variablesMemo.get(fragment);
+  if (!variables) {
+    var directVariables = require('./nullthrowsOSS')(fragmentToVariables.get(fragment), 'fragment ' + fragment + ' wasn\'t found in StripUnusedVariablesTransform');
+    variables = Array.from(require('./nullthrowsOSS')(fragmentToFragmentSpreads.get(fragment), 'fragment ' + fragment + ' wasn\'t found in StripUnusedVariablesTransform')).reduce(function (allVariables, fragmentSpread) {
+      return into(allVariables, allVariablesReferencedInFragment(variablesMemo, fragmentSpread, fragmentToVariables, fragmentToFragmentSpreads));
+    }, directVariables);
+    variablesMemo.set(fragment, variables);
+  }
+  return variables;
 }
 
-function visitArgument(argument, state) {
-  var value = argument.value;
-
-  if (value.kind === 'Variable') {
-    state.referencedVariables.add(value.variableName);
-  }
-  return argument;
+function transformRoot(context, root, variables) {
+  return (0, _extends3['default'])({}, root, {
+    argumentDefinitions: root.argumentDefinitions.filter(function (arg) {
+      return variables.has(arg.name);
+    })
+  });
 }
 
-function visitCondition(condition, state) {
-  var innerCondition = condition.condition;
-  if (innerCondition.kind === 'Variable') {
-    state.referencedVariables.add(innerCondition.variableName);
-  }
-  return condition;
+// Returns the union of setA and setB. Modifies setA!
+function into(setA, setB) {
+  setB.forEach(function (item) {
+    return setA.add(item);
+  });
+  return setA;
 }
 
 module.exports = {

package/lib/getIdentifierForSelection.js

@@ -23,7 +23,7 @@ var _require = require('./GraphQLIRPrinter'),
 function getIdentifierForSelection(node) {
   if (node.kind === 'LinkedField' || node.kind === 'ScalarField') {
     return node.directives.length === 0 ? node.alias || node.name : (node.alias || node.name) + printDirectives(node.directives);
-  } else if (node.kind === 'FragmentSpread') {
+  } else if (node.kind === 'FragmentSpread' || node.kind === 'DeferrableFragmentSpread') {
     return node.args.length === 0 ? '...' + node.name : '...' + node.name + printArguments(node.args);
   } else if (node.kind === 'InlineFragment') {
     return 'I:' + node.typeCondition.name;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relay-compiler",
   "description": "A compiler tool for building GraphQL-driven applications.",
-  "version": "1.5.0-rc.1",
+  "version": "1.5.0",
   "keywords": [
     "graphql",
     "relay"
@@ -21,14 +21,14 @@
     "babel-runtime": "^6.23.0",
     "babel-traverse": "^6.26.0",
     "babel-types": "^6.24.1",
-    "babylon": "^6.18.0",
+    "babylon": "^7.0.0-beta",
     "chalk": "^1.1.1",
-    "fast-glob": "^1.0.1",
+    "fast-glob": "^2.0.0",
     "fb-watchman": "^2.0.0",
     "fbjs": "^0.8.14",
-    "graphql": "^0.12.3",
+    "graphql": "^0.13.0",
     "immutable": "~3.7.6",
-    "relay-runtime": "1.5.0-rc.1",
+    "relay-runtime": "1.5.0",
     "signedsource": "^1.0.0",
     "yargs": "^9.0.0"
   }