relay-compiler 9.0.0 → 9.1.0

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 - 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: 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/getModuleName.js

@@ -18,7 +18,7 @@ function getModuleName(filePath) {
   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(/(?:\.js|\.react|\.react-test|\.example|\.jsx?|\.tsx?|\.flow|\.brands)+$/, ''); // /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; // foo-bar -> fooBar
   // Relay compatibility mode splits on _, so we can't use that here.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relay-compiler",
   "description": "A compiler tool for building GraphQL-driven applications.",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "keywords": [
     "graphql",
     "relay"
@@ -28,7 +28,7 @@
     "fbjs": "^1.0.0",
     "immutable": "~3.7.6",
     "nullthrows": "^1.1.1",
-    "relay-runtime": "9.0.0",
+    "relay-runtime": "9.1.0",
     "signedsource": "^1.0.0",
     "yargs": "^14.2.0"
   },