relay-compiler 1.5.0-rc.1 → 1.5.0

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v1.5.0-rc.1
+ * Relay v1.5.0
  *
  * Copyright (c) 2013-present, Facebook, Inc.
  *

package/lib/ASTCache.js

@@ -43,6 +43,11 @@ var ASTCache = function () {
     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);

package/lib/ASTConvert.js

@@ -16,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'),
@@ -31,7 +31,7 @@ function convertASTDocuments(schema, documents, validationRules, transform) {
     var astDefinitions = [];
     documents.forEach(function (doc) {
       doc.definitions.forEach(function (definition) {
-        if (isOperationDefinitionAST(definition)) {
+        if (isExecutableDefinitionAST(definition)) {
           astDefinitions.push(definition);
         }
       });
@@ -49,7 +49,7 @@ function convertASTDocumentsWithBase(schema, baseDocuments, documents, validatio
     var requiredDefinitions = new Map();
     var baseMap = new Map();
     baseDefinitions.forEach(function (definition) {
-      if (isOperationDefinitionAST(definition)) {
+      if (isExecutableDefinitionAST(definition)) {
         var definitionName = definition.name && definition.name.value;
         // If there's no name, no reason to put in the map
         if (definitionName) {
@@ -63,7 +63,7 @@ function convertASTDocumentsWithBase(schema, baseDocuments, documents, validatio
 
     var definitionsToVisit = [];
     definitions.forEach(function (definition) {
-      if (isOperationDefinitionAST(definition)) {
+      if (isExecutableDefinitionAST(definition)) {
         definitionsToVisit.push(definition);
       }
     });
@@ -103,7 +103,7 @@ function convertASTDocumentsWithBase(schema, baseDocuments, documents, validatio
 function convertASTDefinitions(schema, definitions, validationRules, transform) {
   var operationDefinitions = [];
   definitions.forEach(function (definition) {
-    if (isOperationDefinitionAST(definition)) {
+    if (isExecutableDefinitionAST(definition)) {
       operationDefinitions.push(definition);
     }
   });

package/lib/CodegenDirectory.js

@@ -56,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 = {

package/lib/CodegenRunner.js

@@ -240,8 +240,7 @@ var CodegenRunner = function () {
 
     return require('./GraphQLCompilerProfiler').asyncContext('CodegenRunner.write', (0, _asyncToGenerator3.default)(function* () {
       try {
-        // eslint-disable-next-line no-console
-        console.log('\nWriting %s', writerName);
+        _this5._reporter.reportMessage('\nWriting ' + writerName);
         var _writerConfigs$writer = _this5.writerConfigs[writerName],
             _getWriter = _writerConfigs$writer.getWriter,
             _parser2 = _writerConfigs$writer.parser,
@@ -391,16 +390,14 @@ var CodegenRunner = function () {
           } catch (error) {
             _this6._reporter.reportError('CodegenRunner.watch', error);
           }
-          // eslint-disable-next-line no-console
-          console.log('Watching for changes to %s...', parserName);
+          _this6._reporter.reportMessage('Watching for changes to ' + parserName + '...');
         });
 
         return function (_x4) {
           return _ref9.apply(this, arguments);
         };
       })());
-      // eslint-disable-next-line no-console
-      console.log('Watching for changes to %s...', parserName);
+      this._reporter.reportMessage('Watching for changes to ' + parserName + '...');
     });
 
     function watch(_x3) {

package/lib/CodegenWatcher.js

@@ -191,7 +191,7 @@ var SUBSCRIPTION_NAME = 'graphql-codegen';
 function updateFiles(files, baseDir, filter, fileChanges) {
   var fileMap = new Map();
   files.forEach(function (file) {
-    fileMap.set(file.relPath, file);
+    file.exists && fileMap.set(file.relPath, file);
   });
 
   fileChanges.forEach(function (_ref2) {
@@ -199,15 +199,23 @@ function updateFiles(files, baseDir, filter, fileChanges) {
         exists = _ref2.exists,
         hash = _ref2['content.sha1hex'];
 
-    var file = {
-      relPath: name,
-      hash: hash || hashFile(require('path').join(baseDir, name))
-    };
-    if (exists && filter(file)) {
-      fileMap.set(name, file);
-    } else {
-      fileMap['delete'](name);
+    var shouldRemove = !exists;
+    if (!shouldRemove) {
+      var _file = {
+        exists: true,
+        relPath: name,
+        hash: hash || hashFile(require('path').join(baseDir, name))
+      };
+      if (filter(_file)) {
+        fileMap.set(name, _file);
+      } else {
+        shouldRemove = true;
+      }
     }
+    shouldRemove && fileMap.set(name, {
+      exists: false,
+      relPath: name
+    });
   });
   return new Set(fileMap.values());
 }

package/lib/DotGraphQLParser.js

@@ -17,7 +17,9 @@ var _require = require('graphql'),
 
 function parseFile(baseDir, file) {
   var text = require('fs').readFileSync(require('path').join(baseDir, file.relPath), 'utf8');
-  return parse(new Source(text, file.relPath));
+  return parse(new Source(text, file.relPath), {
+    experimentalFragmentVariables: true
+  });
 }
 
 exports.getParser = function getParser(baseDir) {

package/lib/FindGraphQLTags.js

@@ -84,17 +84,18 @@ function find(text, filePath, _ref) {
 var cache = new (require('./RelayCompilerCache'))('FindGraphQLTags', 'v1');
 
 function memoizedFind(text, baseDir, file, options) {
+  !file.exists ? process.env.NODE_ENV !== 'production' ? invariant(false, 'FindGraphQLTags: Called with non-existent file `%s`', file.relPath) : invariant(false) : void 0;
   return cache.getOrCompute(file.hash + (options.validateNames ? '1' : '0'), function () {
     var absPath = require('path').join(baseDir, file.relPath);
     return find(text, absPath, options);
   });
 }
 
-var CREATE_CONTAINER_FUNCTIONS = {
-  createFragmentContainer: true,
-  createPaginationContainer: true,
-  createRefetchContainer: true
-};
+var CREATE_CONTAINER_FUNCTIONS = Object.create(null, {
+  createFragmentContainer: { value: true },
+  createPaginationContainer: { value: true },
+  createRefetchContainer: { value: true }
+});
 
 var IGNORED_KEYS = {
   comments: true,

package/lib/FlattenTransform.js

@@ -102,7 +102,7 @@ function flattenSelectionsInto(flattenedSelections, node, state, type) {
       flattenedSelections.set(nodeIdentifier, (0, _extends3['default'])({}, flattenedSelection, {
         selections: mergeSelections(flattenedSelection, selection, state, type)
       }));
-    } else if (flattenedSelection.kind === 'FragmentSpread') {
+    } else if (flattenedSelection.kind === 'FragmentSpread' || flattenedSelection.kind === 'DeferrableFragmentSpread') {
       // Ignore duplicate fragment spreads.
     } else if (flattenedSelection.kind === 'LinkedField') {
       require('fbjs/lib/invariant')(selection.kind === 'LinkedField', 'FlattenTransform: Expected a LinkedField, got a %s', selection.kind);

package/lib/GraphQLConsoleReporter.js

@@ -20,21 +20,30 @@ var GraphQLConsoleReporter = function () {
     (0, _classCallCheck3['default'])(this, GraphQLConsoleReporter);
 
     this._verbose = options.verbose;
+    this._quiet = options.quiet;
   }
 
+  GraphQLConsoleReporter.prototype.reportMessage = function reportMessage(message) {
+    if (!this._quiet) {
+      process.stdout.write(message + '\n');
+    }
+  };
+
   GraphQLConsoleReporter.prototype.reportTime = function reportTime(name, ms) {
-    if (this._verbose) {
+    if (this._verbose && !this.quiet) {
       var time = ms === 0 ? require('chalk').gray(' <1ms') : ms < 1000 ? require('chalk').blue(leftPad(5, ms + 'ms')) : require('chalk').red(Math.floor(ms / 10) / 100 + 's');
       process.stdout.write('  ' + time + ' ' + require('chalk').gray(name) + '\n');
     }
   };
 
   GraphQLConsoleReporter.prototype.reportError = function reportError(caughtLocation, error) {
-    process.stdout.write(require('chalk').red('ERROR:\n' + error.message + '\n'));
-    if (this._verbose) {
-      var frames = error.stack.match(/^ {4}at .*$/gm);
-      if (frames) {
-        process.stdout.write(require('chalk').gray('From: ' + caughtLocation + '\n' + frames.join('\n') + '\n'));
+    if (!this._quiet) {
+      process.stdout.write(require('chalk').red('ERROR:\n' + error.message + '\n'));
+      if (this._verbose) {
+        var frames = error.stack.match(/^ {4}at .*$/gm);
+        if (frames) {
+          process.stdout.write(require('chalk').gray('From: ' + caughtLocation + '\n' + frames.join('\n') + '\n'));
+        }
       }
     }
   };

package/lib/GraphQLIRPrinter.js

@@ -76,6 +76,8 @@ function printSelection(selection, indent, parentCondition) {
     str += parentCondition;
     str += printFragmentArguments(selection.args);
     str += printDirectives(selection.directives);
+  } else if (selection.kind === 'DeferrableFragmentSpread') {
+    str = selection.alias + ': ' + selection.storageKey;
   } else if (selection.kind === 'Condition') {
     var value = printValue(selection.condition);
     // For Flow

package/lib/GraphQLIRTransformer.js

@@ -194,12 +194,20 @@ var Transformer = function () {
         nextNode = this._traverseChildren(prevNode, ['fields']);
         break;
       case 'Condition':
+        nextNode = this._traverseChildren(prevNode, ['directives', 'selections'], ['condition']);
+        if (!nextNode.selections.length) {
+          nextNode = null;
+        }
+        break;
       case 'InlineFragment':
         nextNode = this._traverseChildren(prevNode, ['directives', 'selections']);
         if (!nextNode.selections.length) {
           nextNode = null;
         }
         break;
+      case 'DeferrableFragmentSpread':
+        nextNode = this._traverseChildren(prevNode, ['args', 'fragmentArgs', 'directives']);
+        break;
       case 'Fragment':
       case 'Root':
         nextNode = this._traverseChildren(prevNode, ['argumentDefinitions', 'directives', 'selections']);

package/lib/GraphQLIRVisitor.js

@@ -28,7 +28,7 @@ var NodeKeys = {
   RootArgumentDefinition: [],
   ScalarField: ['args', 'directives'],
   Variable: [],
-  DeferrableFragmentSpread: ['args']
+  DeferrableFragmentSpread: ['args', 'directives', 'fragmentArgs']
 };
 
 function visitIR(root, visitor) {

package/lib/GraphQLMultiReporter.js

@@ -26,6 +26,12 @@ var GraphQLMultiReporter = function () {
     this._reporters = reporters;
   }
 
+  GraphQLMultiReporter.prototype.reportMessage = function reportMessage(message) {
+    this._reporters.forEach(function (reporter) {
+      reporter.reportMessage(message);
+    });
+  };
+
   GraphQLMultiReporter.prototype.reportTime = function reportTime(name, ms) {
     this._reporters.forEach(function (reporter) {
       reporter.reportTime(name, ms);

package/lib/GraphQLParser.js

@@ -24,7 +24,7 @@ var _require2 = require('./GraphQLSchemaUtils'),
     getNullableType = _require2.getNullableType,
     getRawType = _require2.getRawType,
     getTypeFromAST = _require2.getTypeFromAST,
-    isOperationDefinitionAST = _require2.isOperationDefinitionAST;
+    isExecutableDefinitionAST = _require2.isExecutableDefinitionAST;
 
 var _require3 = require('graphql'),
     assertCompositeType = _require3.assertCompositeType,
@@ -75,7 +75,7 @@ var GraphQLParser = function () {
     // TODO T24511737 figure out if this is dangerous
     schema = extendSchema(schema, ast, { assumeValid: true });
     ast.definitions.forEach(function (definition) {
-      if (isOperationDefinitionAST(definition)) {
+      if (isExecutableDefinitionAST(definition)) {
         nodes.push(_this.transform(schema, definition));
       }
     }, this);

package/lib/GraphQLSchemaUtils.js

@@ -132,7 +132,7 @@ function getInterfaces(type) {
  *
  * Determine if an AST node contains a fragment/operation definition.
  */
-function isOperationDefinitionAST(ast) {
+function isExecutableDefinitionAST(ast) {
   return ast.kind === 'FragmentDefinition' || ast.kind === 'OperationDefinition';
 }
 
@@ -172,7 +172,7 @@ module.exports = {
   implementsInterface: implementsInterface,
   isAbstractType: isAbstractType,
   isUnionType: isUnionType,
-  isOperationDefinitionAST: isOperationDefinitionAST,
+  isExecutableDefinitionAST: isExecutableDefinitionAST,
   isSchemaDefinitionAST: isSchemaDefinitionAST,
   mayImplement: mayImplement
 };

package/lib/GraphQLValidator.js

@@ -17,7 +17,6 @@ var _require = require('graphql'),
     KnownArgumentNamesRule = _require.KnownArgumentNamesRule,
     KnownTypeNamesRule = _require.KnownTypeNamesRule,
     LoneAnonymousOperationRule = _require.LoneAnonymousOperationRule,
-    NoFragmentCyclesRule = _require.NoFragmentCyclesRule,
     NoUnusedVariablesRule = _require.NoUnusedVariablesRule,
     PossibleFragmentSpreadsRule = _require.PossibleFragmentSpreadsRule,
     ProvidedNonNullArgumentsRule = _require.ProvidedNonNullArgumentsRule,
@@ -51,8 +50,10 @@ module.exports = {
   GLOBAL_RULES: [KnownArgumentNamesRule,
   // TODO #19327202 Relay Classic generates some fragments in runtime, so Relay
   // Modern queries might reference fragments unknown in build time
-  //KnownFragmentNamesRule,
-  NoFragmentCyclesRule,
+  // KnownFragmentNamesRule,
+  // TODO: #25618795 Because of @argumentDefinitions, this validation
+  // incorrectly flags a subset of fragments using @include/@skip as recursive.
+  // NoFragmentCyclesRule,
   // TODO #19327144 Because of @argumentDefinitions, this validation
   // incorrectly marks some fragment variables as undefined.
   // NoUndefinedVariablesRule,

package/lib/RelayApplyFragmentArgumentTransform.js

@@ -99,6 +99,20 @@ function transformFragmentSpread(context, fragments, scope, spread) {
   });
 }
 
+function transformDeferrableFragmentSpread(context, fragments, scope, spread) {
+  var directives = transformDirectives(scope, spread.directives);
+  var fragment = context.getFragment(spread.name);
+  var appliedFragment = transformFragment(context, fragments, scope, fragment, spread.fragmentArgs);
+  if (!appliedFragment) {
+    return null;
+  }
+  return (0, _extends3['default'])({}, spread, {
+    fragmentArgs: [],
+    directives: directives,
+    name: appliedFragment.name
+  });
+}
+
 function transformField(context, fragments, scope, field) {
   var args = transformArguments(scope, field.args);
   var directives = transformDirectives(scope, field.directives);
@@ -150,6 +164,8 @@ function transformSelections(context, fragments, scope, selections) {
       nextSelection = transformNode(context, fragments, scope, selection);
     } else if (selection.kind === 'FragmentSpread') {
       nextSelection = transformFragmentSpread(context, fragments, scope, selection);
+    } else if (selection.kind === 'DeferrableFragmentSpread') {
+      nextSelection = transformDeferrableFragmentSpread(context, fragments, scope, selection);
     } else if (selection.kind === 'Condition') {
       var conditionSelections = transformCondition(context, fragments, scope, selection);
       if (conditionSelections) {

package/lib/RelayCodeGenerator.js

@@ -43,13 +43,6 @@ function generate(node) {
 }
 
 var RelayCodeGenVisitor = {
-  enter: function enter(node) {
-    if ((node.kind === 'FragmentSpread' || node.kind === 'ScalarField') && node.metadata && node.metadata.deferred) {
-      return deferrableFragmentSpread(node.metadata.deferredFragmentName, node.metadata.deferredArgumentName, node.metadata.deferredArgumentStorageKey, node.metadata.idType);
-    }
-    return node;
-  },
-
   leave: {
     Batch: function Batch(node) {
       require('fbjs/lib/invariant')(node.requests.length !== 0, 'Batch must contain Requests.');
@@ -294,25 +287,4 @@ function getStaticStorageKey(field) {
   return getStorageKey(field, {});
 }
 
-function deferrableFragmentSpread(fragmentName, argumentName, storageKey, idType) {
-  return {
-    kind: 'DeferrableFragmentSpread',
-    name: fragmentName,
-    args: [{
-      kind: 'Argument',
-      name: argumentName,
-      metadata: null,
-      value: {
-        kind: 'Variable',
-        variableName: argumentName,
-        metadata: null,
-        type: idType
-      },
-      type: idType
-    }],
-    rootFieldVariable: argumentName,
-    storageKey: storageKey
-  };
-}
-
 module.exports = { generate: generate };

package/lib/RelayCompilerBin.js

@@ -33,30 +33,55 @@ let run = (() => {
     if (options.watch && !hasWatchmanRootFile(srcDir)) {
       throw new Error(('\n--watch requires that the src directory have a valid watchman "root" file.\n\nRoot files can include:\n- A .git/ Git folder\n- A .hg/ Mercurial folder\n- A .watchmanconfig file\n\nEnsure that one such file exists in ' + srcDir + ' or its parents.\n    ').trim());
     }
+    if (options.verbose && options.quiet) {
+      throw new Error("I can't be quiet and verbose at the same time");
+    }
 
-    var reporter = new ConsoleReporter({ verbose: options.verbose });
+    var reporter = new ConsoleReporter({
+      verbose: options.verbose,
+      quiet: options.quiet
+    });
 
     var useWatchman = options.watchman && (yield WatchmanClient.isAvailable());
 
+    var schema = getSchema(schemaPath);
     var parserConfigs = {
-      'default': {
+      js: {
         baseDir: srcDir,
         getFileFilter: require('./RelayJSModuleParser').getFileFilter,
         getParser: require('./RelayJSModuleParser').getParser,
         getSchema: function getSchema() {
-          return _getSchema(schemaPath);
+          return schema;
         },
         watchmanExpression: useWatchman ? buildWatchExpression(options) : null,
         filepaths: useWatchman ? null : getFilepathsFromGlob(srcDir, options)
+      },
+      graphql: {
+        baseDir: srcDir,
+        getParser: DotGraphQLParser.getParser,
+        getSchema: function getSchema() {
+          return schema;
+        },
+        watchmanExpression: useWatchman ? buildWatchExpression({
+          extensions: ['graphql'],
+          include: options.include,
+          exclude: options.exclude
+        }) : null,
+        filepaths: useWatchman ? null : getFilepathsFromGlob(srcDir, {
+          extensions: ['graphql'],
+          include: options.include,
+          exclude: options.exclude
+        })
       }
     };
     var writerConfigs = {
-      'default': {
+      js: {
         getWriter: getRelayFileWriter(srcDir),
         isGeneratedFile: function isGeneratedFile(filePath) {
           return filePath.endsWith('.js') && filePath.includes('__generated__');
         },
-        parser: 'default'
+        parser: 'js',
+        baseParsers: ['graphql']
       }
     };
     var codegenRunner = new CodegenRunner({
@@ -93,7 +118,8 @@ require('babel-polyfill');
 var _require = require('./GraphQLCompilerPublic'),
     CodegenRunner = _require.CodegenRunner,
     ConsoleReporter = _require.ConsoleReporter,
-    WatchmanClient = _require.WatchmanClient;
+    WatchmanClient = _require.WatchmanClient,
+    DotGraphQLParser = _require.DotGraphQLParser;
 
 var _require2 = require('graphql'),
     buildASTSchema = _require2.buildASTSchema,
@@ -130,8 +156,6 @@ function getFilepathsFromGlob(baseDir, options) {
   var glob = require('fast-glob');
   return glob.sync(patterns, {
     cwd: baseDir,
-    bashNative: [],
-    onlyFiles: true,
     ignore: exclude
   });
 }
@@ -170,7 +194,7 @@ function getRelayFileWriter(baseDir) {
   };
 }
 
-function _getSchema(schemaPath) {
+function getSchema(schemaPath) {
   try {
     var source = require('fs').readFileSync(schemaPath, 'utf8');
     if (require('path').extname(schemaPath) === '.json') {
@@ -232,6 +256,10 @@ var argv = require('yargs').usage('Create Relay generated files\n\n' + '$0 --sch
     describe: 'More verbose logging',
     type: 'boolean'
   },
+  quiet: {
+    describe: 'No output to stdout',
+    type: 'boolean'
+  },
   watchman: {
     describe: 'Use watchman when not in watch mode',
     type: 'boolean',

package/lib/RelayDeferrableFragmentTransform.js

@@ -23,7 +23,7 @@ var _require = require('graphql'),
     isInputType = _require.isInputType,
     GraphQLInterfaceType = _require.GraphQLInterfaceType,
     GraphQLList = _require.GraphQLList,
-    GraphQLScalarType = _require.GraphQLScalarType;
+    GraphQLInputType = _require.GraphQLInputType;
 
 var _require2 = require('./GraphQLCompilerPublic'),
     IRTransformer = _require2.IRTransformer,
@@ -89,8 +89,6 @@ function transformOperations(context) {
     return context;
   }
 
-  var idType = getIdType(context.clientSchema);
-
   // Next, transform any existing root operations to include references to
   // their dependent requests.
   var transformedContext = IRTransformer.transform(context, {
@@ -121,18 +119,8 @@ function transformOperations(context) {
     });
     return completeDeferrableOperation;
   });
-  var transformedContextPostFragments = IRTransformer.transform(transformedContext, {
-    FragmentSpread: function FragmentSpread(spread) {
-      if (isDeferrable(spread)) {
-        return (0, _extends3['default'])({}, spread, {
-          metadata: (0, _extends3['default'])({}, spread.metadata, deferrableFragmentSpreadMetadata(spread.name, idType))
-        });
-      }
-      return spread;
-    }
-  });
 
-  return transformedContextPostFragments.addAll(deferrableOperations);
+  return transformedContext.addAll(deferrableOperations);
 }
 
 /**
@@ -364,16 +352,7 @@ function createDeferrableReference(context, spread) {
       metadata: null,
       typeCondition: nodeType,
       directives: [],
-      selections: [{
-        kind: 'ScalarField',
-        name: 'id',
-        alias: deferrableAlias(spread.name),
-        args: [],
-        handles: null,
-        directives: spread.directives,
-        metadata: (0, _extends3['default'])({}, spread.metadata, deferrableFragmentSpreadMetadata(spread.name, idType)),
-        type: idType
-      }]
+      selections: [deferrableFragmentSpread(spread, idType)]
     }]
   };
 }
@@ -427,7 +406,7 @@ function createDeferrableOperation(context, fragment) {
         kind: 'FragmentSpread',
         args: [],
         name: fragment.name,
-        metadata: deferrableFragmentSpreadMetadata(fragment.name, idType),
+        metadata: null,
         directives: []
       }],
       type: nodeField.type
@@ -436,20 +415,34 @@ function createDeferrableOperation(context, fragment) {
   };
 }
 
-function deferrableFragmentSpreadMetadata(name, idType) {
-  return {
-    deferred: true,
-    deferredFragmentName: name,
-    deferredArgumentName: DEFERRABLE_ARGUMENT_NAME,
-    deferredArgumentStorageKey: 'id',
-    idType: idType
-  };
-}
-
 function deferrableAlias(name) {
   return name + '_' + DEFERRABLE_ARGUMENT_NAME;
 }
 
+function deferrableFragmentSpread(spread, idType) {
+  return {
+    kind: 'DeferrableFragmentSpread',
+    name: spread.name,
+    directives: [],
+    fragmentArgs: spread.args,
+    args: [{
+      kind: 'Argument',
+      name: DEFERRABLE_ARGUMENT_NAME,
+      metadata: null,
+      value: {
+        kind: 'Variable',
+        variableName: DEFERRABLE_ARGUMENT_NAME,
+        metadata: null,
+        type: idType
+      },
+      type: idType
+    }],
+    rootFieldVariable: DEFERRABLE_ARGUMENT_NAME,
+    storageKey: 'id',
+    alias: deferrableAlias(spread.name)
+  };
+}
+
 function getNodeType(schema) {
   var nodeType = schema.getType('Node');
   require('fbjs/lib/invariant')(nodeType instanceof GraphQLInterfaceType, 'RelayDeferrableFragmentTransform: Schema must define the interface "Node".');
@@ -461,7 +454,7 @@ function getIdType(schema) {
   var idField = nodeType.getFields().id;
   require('fbjs/lib/invariant')(idField, 'RelayDeferrableFragmentTransform: "Node" must define the field "id"');
   var idType = getNamedType(idField.type);
-  require('fbjs/lib/invariant')(idType instanceof GraphQLScalarType, 'RelayDeferrableFragmentTransform: "Node" must define the scalar field "id"');
+  require('fbjs/lib/invariant')(isInputType(idType), 'RelayDeferrableFragmentTransform: "Node" must define the scalar field "id"');
   return idType;
 }
 

package/lib/RelayFileWriter.js

@@ -31,7 +31,7 @@ var _require = require('./GraphQLCompilerPublic'),
 var _require2 = require('immutable'),
     ImmutableMap = _require2.Map;
 
-var isOperationDefinitionAST = SchemaUtils.isOperationDefinitionAST;
+var isExecutableDefinitionAST = SchemaUtils.isExecutableDefinitionAST;
 
 var RelayFileWriter = function () {
   function RelayFileWriter(_ref) {
@@ -67,7 +67,7 @@ var RelayFileWriter = function () {
       var baseDefinitionNames = new Set();
       _this._baseDocuments.forEach(function (doc) {
         doc.definitions.forEach(function (def) {
-          if (isOperationDefinitionAST(def) && def.name) {
+          if (isExecutableDefinitionAST(def) && def.name) {
             baseDefinitionNames.add(def.name.value);
           }
         });