relay-compiler 1.3.0 → 1.5.0

package/lib/writeRelayGeneratedFile.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 writeRelayGeneratedFile
  * 
@@ -13,41 +11,51 @@
 
 'use strict';
 
+// TODO T21875029 ../../relay-runtime/util/RelayConcreteNode
+
 var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
 
 var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
 
 var _extends3 = _interopRequireDefault(require('babel-runtime/helpers/extends'));
 
-/**
- * Generate a module for the given document name/text.
- */
 let writeRelayGeneratedFile = (() => {
-  var _ref = (0, _asyncToGenerator3.default)(function* (codegenDir, generatedNode, formatModule, flowText, persistQuery, platform, relayRuntimeModule) {
+  var _ref = (0, _asyncToGenerator3.default)(function* (codegenDir, generatedNode, formatModule, flowText, _persistQuery, platform, relayRuntimeModule, sourceHash) {
+    // Copy to const so Flow can refine.
+    var persistQuery = _persistQuery;
     var moduleName = generatedNode.name + '.graphql';
     var platformName = platform ? moduleName + '.' + platform : moduleName;
     var filename = platformName + '.js';
-    var flowTypeName = generatedNode.kind === 'Batch' ? 'ConcreteBatch' : 'ConcreteFragment';
+    var flowTypeName = generatedNode.kind === require('./RelayConcreteNode').FRAGMENT ? 'ConcreteFragment' : generatedNode.kind === require('./RelayConcreteNode').REQUEST ? 'ConcreteRequest' : generatedNode.kind === require('./RelayConcreteNode').BATCH_REQUEST ? 'ConcreteBatchRequest' : 'empty';
     var devOnlyProperties = {};
 
-    var text = null;
+    var docText = void 0;
+    if (generatedNode.kind === require('./RelayConcreteNode').REQUEST) {
+      docText = generatedNode.text;
+    } else if (generatedNode.kind === require('./RelayConcreteNode').BATCH_REQUEST) {
+      docText = generatedNode.requests.map(function (request) {
+        return request.text;
+      }).join('\n\n');
+    }
+
     var hash = null;
-    if (generatedNode.kind === 'Batch') {
-      text = generatedNode.text;
-      require('fbjs/lib/invariant')(text, 'codegen-runner: Expected query to have text before persisting.');
-      var oldContent = codegenDir.read(filename);
-      // Hash the concrete node including the query text.
-      var hasher = require('crypto').createHash('md5');
-      hasher.update('cache-breaker-1');
-      hasher.update(JSON.stringify(generatedNode));
-      if (flowText) {
-        hasher.update(flowText);
-      }
-      if (persistQuery) {
-        hasher.update('persisted');
-      }
-      hash = hasher.digest('hex');
-      if (hash === extractHash(oldContent)) {
+    if (generatedNode.kind === require('./RelayConcreteNode').REQUEST || generatedNode.kind === require('./RelayConcreteNode').BATCH_REQUEST) {
+      var oldHash = Profiler.run('RelayFileWriter:compareHash', function () {
+        var oldContent = codegenDir.read(filename);
+        // Hash the concrete node including the query text.
+        var hasher = require('crypto').createHash('md5');
+        hasher.update('cache-breaker-6');
+        hasher.update(JSON.stringify(generatedNode));
+        if (flowText) {
+          hasher.update(flowText);
+        }
+        if (persistQuery) {
+          hasher.update('persisted');
+        }
+        hash = hasher.digest('hex');
+        return extractHash(oldContent);
+      });
+      if (hash === oldHash) {
         codegenDir.markUnchanged(filename);
         return null;
       }
@@ -56,53 +64,79 @@ let writeRelayGeneratedFile = (() => {
         return null;
       }
       if (persistQuery) {
-        generatedNode = (0, _extends3['default'])({}, generatedNode, {
-          text: null,
-          id: yield persistQuery(text)
-        });
-
-        devOnlyProperties.text = text;
+        switch (generatedNode.kind) {
+          case require('./RelayConcreteNode').REQUEST:
+            devOnlyProperties.text = generatedNode.text;
+            generatedNode = (0, _extends3['default'])({}, generatedNode, {
+              text: null,
+              id: yield persistQuery(require('fbjs/lib/nullthrows')(generatedNode.text))
+            });
+            break;
+          case require('./RelayConcreteNode').BATCH_REQUEST:
+            devOnlyProperties.requests = generatedNode.requests.map(function (request) {
+              return {
+                text: request.text
+              };
+            });
+            generatedNode = (0, _extends3['default'])({}, generatedNode, {
+              requests: yield Promise.all(generatedNode.requests.map((() => {
+                var _ref2 = (0, _asyncToGenerator3.default)(function* (request) {
+                  return (0, _extends3['default'])({}, request, {
+                    text: null,
+                    id: yield persistQuery(require('fbjs/lib/nullthrows')(request.text))
+                  });
+                });
+
+                return function (_x9) {
+                  return _ref2.apply(this, arguments);
+                };
+              })()))
+            });
+            break;
+          case require('./RelayConcreteNode').FRAGMENT:
+            // Do not persist fragments.
+            break;
+          default:
+            generatedNode.kind;
+        }
       }
     }
 
+    var devOnlyAssignments = require('./deepMergeAssignments')('node', devOnlyProperties);
+
     var moduleText = formatModule({
       moduleName: moduleName,
       documentType: flowTypeName,
-      docText: text,
+      docText: docText,
       flowText: flowText,
       hash: hash ? '@relayHash ' + hash : null,
-      concreteText: require('./prettyStringify')(generatedNode),
-      devTextGenerator: makeDevTextGenerator(devOnlyProperties),
-      relayRuntimeModule: relayRuntimeModule
+      concreteText: require('./dedupeJSONStringify')(generatedNode),
+      devOnlyAssignments: devOnlyAssignments,
+      relayRuntimeModule: relayRuntimeModule,
+      sourceHash: sourceHash
     });
 
     codegenDir.writeFile(filename, moduleText);
     return generatedNode;
   });
 
-  return function writeRelayGeneratedFile(_x, _x2, _x3, _x4, _x5, _x6, _x7) {
+  return function writeRelayGeneratedFile(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
     return _ref.apply(this, arguments);
   };
 })();
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-function makeDevTextGenerator(devOnlyProperties) {
-  return function (objectName) {
-    var assignments = Object.keys(devOnlyProperties).map(function (key) {
-      var value = devOnlyProperties[key];
-      var stringifiedValue = value === undefined ? 'undefined' : JSON.stringify(value);
+var _require = require('./GraphQLCompilerPublic'),
+    Profiler = _require.Profiler;
 
-      return '  ' + objectName + '[\'' + key + '\'] = ' + stringifiedValue + ';';
-    });
+// TODO T21875029 ../../relay-runtime/util/RelayConcreteNode
 
-    if (!assignments.length) {
-      return '';
-    }
 
-    return '\n\nif (__DEV__) {\n' + assignments.join('\n') + '\n}\n';
-  };
-}
+/**
+ * Generate a module for the given document name/text.
+ */
+
 
 function extractHash(text) {
   if (!text) {

package/package.json

@@ -1,34 +1,35 @@
 {
   "name": "relay-compiler",
   "description": "A compiler tool for building GraphQL-driven applications.",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "keywords": [
     "graphql",
     "relay"
   ],
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "homepage": "https://facebook.github.io/relay/",
   "bugs": "https://github.com/facebook/relay/issues",
   "repository": "facebook/relay",
+  "main": "RelayCompilerPublic",
   "bin": {
     "relay-compiler": "bin/relay-compiler"
   },
   "dependencies": {
-    "babel-generator": "6.25.0",
-    "babel-polyfill": "^6.23.0",
-    "babel-preset-fbjs": "^2.1.0",
+    "babel-generator": "^6.26.0",
+    "babel-polyfill": "^6.20.0",
+    "babel-preset-fbjs": "^2.1.4",
     "babel-runtime": "^6.23.0",
-    "babel-traverse": "6.25.0",
-    "babel-types": "6.25.0",
-    "babylon": "6.18.0",
-    "chalk": "^1.1.3",
-    "fast-glob": "^1.0.1",
+    "babel-traverse": "^6.26.0",
+    "babel-types": "^6.24.1",
+    "babylon": "^7.0.0-beta",
+    "chalk": "^1.1.1",
+    "fast-glob": "^2.0.0",
     "fb-watchman": "^2.0.0",
-    "fbjs": "^0.8.1",
-    "graphql": "^0.10.5",
-    "immutable": "^3.8.1",
-    "relay-runtime": "1.3.0",
+    "fbjs": "^0.8.14",
+    "graphql": "^0.13.0",
+    "immutable": "~3.7.6",
+    "relay-runtime": "1.5.0",
     "signedsource": "^1.0.0",
-    "yargs": "^7.0.2"
+    "yargs": "^9.0.0"
   }
 }