rescript-relay 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # master
 
+# 1.0.2
+
+## Bug Fixes
+
+- `private` is now correctly marked as a reserved word.
+
+## Improvements
+
+- Add ReScript 10 compat in peerDependencies https://github.com/zth/rescript-relay/pull/397 @MoOx
+- `makeConnectionId` helpers are now marked as `@live` to not trigger the dead code analysis.
+
+# 1.0.1
+
+## Bug Fixes
+
+- Fix issue with custom scalar of JSON values being accidentally mangled https://github.com/zth/rescript-relay/pull/395 @tsnobip
+
 # 1.0.0
 
 _[Here's a commit showing a project being upgraded to this version](https://github.com/zth/rescript-relay/commit/5831c2f1f0f13eedc1cb60468c32fd32b2dc01d3)_

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript-relay",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "src/RescriptRelay.res",
   "license": "MIT",
   "author": "Gabriel Nordeborn",
@@ -39,7 +39,7 @@
     "test:ci": "jest --ci --runInBand"
   },
   "devDependencies": {
-    "rescript": "^9.1.2",
+    "rescript": "^10.0.0",
     "@rescript/react": "0.10.3",
     "@testing-library/jest-dom": "^5.16.3",
     "@testing-library/react": "^13.0.0-alpha.6",
@@ -57,7 +57,7 @@
     "@rescript/react": "*",
     "react-relay": ">=11.0.0",
     "relay-runtime": "*",
-    "rescript": "^9.1.2"
+    "rescript": ">=9.1.2"
   },
   "dependencies": {
     "detect-libc": "^2.0.1"

package/src/ReactDOMExperimental.bs.js

@@ -13,7 +13,6 @@ function renderConcurrentRootAtElementWithId(content, id) {
         };
   }
   Client.createRoot(element).render(content);
-  
 }
 
 exports.renderConcurrentRootAtElementWithId = renderConcurrentRootAtElementWithId;

package/src/ReactExperimental.bs.js

@@ -9,7 +9,7 @@ function useTransition(param) {
   return [
           match[0],
           React.useCallback((function (cb) {
-                  return startTransition(cb, undefined);
+                  startTransition(cb, undefined);
                 }), [startTransition])
         ];
 }

package/src/RescriptRelay.bs.js

@@ -131,7 +131,7 @@ var Store = {
 };
 
 function toJs(f, arg) {
-  return Curry._3(f, arg.kind, arg.owner, arg.fieldPath);
+  Curry._3(f, arg.kind, arg.owner, arg.fieldPath);
 }
 
 function make$1(network, store, getDataID, treatMissingFieldsAsNull, missingFieldHandlers, requiredFieldLogger, isServer, param) {
@@ -238,10 +238,10 @@ function MakeLoadQuery(C) {
                   if (o !== undefined) {
                     Caml_option.valFromOption(o).subscribe({
                           complete: (function (param) {
-                              return resolve({
-                                          TAG: /* Ok */0,
-                                          _0: undefined
-                                        });
+                              resolve({
+                                    TAG: /* Ok */0,
+                                    _0: undefined
+                                  });
                             })
                         });
                     return ;

package/src/RescriptRelayUtils.bs.js

@@ -36,38 +36,37 @@ function resolveNestedRecordFromRoot(store, path) {
 }
 
 function removeNodeFromConnections(store, node, connections) {
-  return Belt_List.forEach(connections, (function (connectionConfig) {
-                var owner = store.get(connectionConfig.parentID);
-                if (owner == null) {
-                  return ;
-                }
-                var connection = RelayRuntime.ConnectionHandler.getConnection(owner, connectionConfig.key, connectionConfig.filters !== undefined ? Caml_option.valFromOption(connectionConfig.filters) : undefined);
-                if (!(connection == null)) {
-                  RelayRuntime.ConnectionHandler.deleteNode(connection, node.getDataID());
-                  return ;
-                }
-                
-              }));
+  Belt_List.forEach(connections, (function (connectionConfig) {
+          var owner = store.get(connectionConfig.parentID);
+          if (owner == null) {
+            return ;
+          }
+          var connection = RelayRuntime.ConnectionHandler.getConnection(owner, connectionConfig.key, connectionConfig.filters !== undefined ? Caml_option.valFromOption(connectionConfig.filters) : undefined);
+          if (!(connection == null)) {
+            RelayRuntime.ConnectionHandler.deleteNode(connection, node.getDataID());
+            return ;
+          }
+          
+        }));
 }
 
 function createAndAddEdgeToConnections(store, node, connections, edgeName, insertAt) {
-  return Belt_List.forEach(connections, (function (connectionConfig) {
-                var connectionOwner = store.get(connectionConfig.parentID);
-                if (connectionOwner == null) {
-                  return ;
-                }
-                var connection = RelayRuntime.ConnectionHandler.getConnection(connectionOwner, connectionConfig.key, connectionConfig.filters !== undefined ? Caml_option.valFromOption(connectionConfig.filters) : undefined);
-                if (connection == null) {
-                  return ;
-                }
-                var edge = RelayRuntime.ConnectionHandler.createEdge(store, connection, node, edgeName);
-                if (insertAt) {
-                  RelayRuntime.ConnectionHandler.insertEdgeBefore(connection, edge, undefined);
-                } else {
-                  RelayRuntime.ConnectionHandler.insertEdgeAfter(connection, edge, undefined);
-                }
-                
-              }));
+  Belt_List.forEach(connections, (function (connectionConfig) {
+          var connectionOwner = store.get(connectionConfig.parentID);
+          if (connectionOwner == null) {
+            return ;
+          }
+          var connection = RelayRuntime.ConnectionHandler.getConnection(connectionOwner, connectionConfig.key, connectionConfig.filters !== undefined ? Caml_option.valFromOption(connectionConfig.filters) : undefined);
+          if (connection == null) {
+            return ;
+          }
+          var edge = RelayRuntime.ConnectionHandler.createEdge(store, connection, node, edgeName);
+          if (insertAt) {
+            RelayRuntime.ConnectionHandler.insertEdgeBefore(connection, edge, undefined);
+          } else {
+            RelayRuntime.ConnectionHandler.insertEdgeAfter(connection, edge, undefined);
+          }
+        }));
 }
 
 exports.resolveNestedRecord = resolveNestedRecord;

package/src/RescriptRelay_Internal.bs.js

@@ -37,7 +37,7 @@ function internal_removeUndefinedAndConvertNullsRaw(record) {
   return internal_keepMapFieldsRaw(record, (function (param) {
                 var value = param[1];
                 var key = param[0];
-                var match = Caml_obj.caml_equal(value, Caml_option.some(undefined));
+                var match = Caml_obj.equal(value, Caml_option.some(undefined));
                 if (value !== undefined) {
                   return [
                           key,

package/src/utils.js

@@ -78,6 +78,16 @@ function traverse(
     var shouldConvertCustomField =
       typeof instructions["c"] === "string" && !!converters[instructions["c"]];
 
+    var shouldBlockTraversal = typeof instructions["b"] === "string";
+    var allowGoingIntoArray = shouldBlockTraversal
+      ? instructions["b"] === "a"
+      : true;
+
+    if (shouldBlockTraversal && !allowGoingIntoArray) {
+      newObj = getNewObj(newObj, currentObj);
+      continue;
+    }
+
     var shouldConvertUnion =
       typeof instructions["u"] === "string" && !!converters[instructions["u"]];
 
@@ -92,7 +102,6 @@ function traverse(
         if (v == null) {
           return nullableValue;
         }
-
         if (shouldConvertRootObj) {
           return traverser(
             v,
@@ -148,7 +157,7 @@ function traverse(
           }
         }
 
-        if (shouldAddFragmentFn && typeof v === "object") {
+        if (shouldAddFragmentFn && typeof v === "object" && !Array.isArray(v)) {
           var objWithFragmentFn = Object.assign({}, v);
           objWithFragmentFn.fragmentRefs = Object.assign({}, objWithFragmentFn);
           return objWithFragmentFn;
@@ -171,6 +180,7 @@ function traverse(
           nullableValue,
           instructions["r"]
         );
+        continue;
       }
 
       if (isTopLevelNodeField) {
@@ -238,7 +248,7 @@ function traverse(
         }
       }
 
-      if (shouldAddFragmentFn && typeof v === "object") {
+      if (shouldAddFragmentFn && typeof v === "object" && !Array.isArray(v)) {
         newObj = getNewObj(newObj, currentObj);
         var objWithFragmentFn = Object.assign({}, v);
         objWithFragmentFn.fragmentRefs = Object.assign({}, objWithFragmentFn);
@@ -264,10 +274,10 @@ function traverse(
           newObj = getNewObj(newObj, currentObj);
           newObj[key] = traversedObj;
         }
-      } else if (Array.isArray(originalValue)) {
+      } else if (Array.isArray(originalValue) && !shouldBlockTraversal) {
         newObj = getNewObj(newObj, currentObj);
         newObj[key] = nextObj.map(function (o) {
-          if (typeof o === "object" && o != null) {
+          if (typeof o === "object" && o != null && !Array.isArray(o)) {
             return traverse(
               fullInstructionMap,
               thisPath,

package/src/utils.mjs

@@ -78,6 +78,16 @@ function traverse(
     var shouldConvertCustomField =
       typeof instructions["c"] === "string" && !!converters[instructions["c"]];
 
+    var shouldBlockTraversal = typeof instructions["b"] === "string";
+    var allowGoingIntoArray = shouldBlockTraversal
+      ? instructions["b"] === "a"
+      : true;
+
+    if (shouldBlockTraversal && !allowGoingIntoArray) {
+      newObj = getNewObj(newObj, currentObj);
+      continue;
+    }
+
     var shouldConvertUnion =
       typeof instructions["u"] === "string" && !!converters[instructions["u"]];
 
@@ -92,7 +102,6 @@ function traverse(
         if (v == null) {
           return nullableValue;
         }
-
         if (shouldConvertRootObj) {
           return traverser(
             v,
@@ -148,7 +157,7 @@ function traverse(
           }
         }
 
-        if (shouldAddFragmentFn && typeof v === "object") {
+        if (shouldAddFragmentFn && typeof v === "object" && !Array.isArray(v)) {
           var objWithFragmentFn = Object.assign({}, v);
           objWithFragmentFn.fragmentRefs = Object.assign({}, objWithFragmentFn);
           return objWithFragmentFn;
@@ -171,6 +180,7 @@ function traverse(
           nullableValue,
           instructions["r"]
         );
+        continue;
       }
 
       if (isTopLevelNodeField) {
@@ -238,7 +248,7 @@ function traverse(
         }
       }
 
-      if (shouldAddFragmentFn && typeof v === "object") {
+      if (shouldAddFragmentFn && typeof v === "object" && !Array.isArray(v)) {
         newObj = getNewObj(newObj, currentObj);
         var objWithFragmentFn = Object.assign({}, v);
         objWithFragmentFn.fragmentRefs = Object.assign({}, objWithFragmentFn);
@@ -264,10 +274,10 @@ function traverse(
           newObj = getNewObj(newObj, currentObj);
           newObj[key] = traversedObj;
         }
-      } else if (Array.isArray(originalValue)) {
+      } else if (Array.isArray(originalValue) && !shouldBlockTraversal) {
         newObj = getNewObj(newObj, currentObj);
         newObj[key] = nextObj.map(function (o) {
-          if (typeof o === "object" && o != null) {
+          if (typeof o === "object" && o != null && !Array.isArray(o)) {
             return traverse(
               fullInstructionMap,
               thisPath,