rescript-relay 0.0.0-cli-61b2cdf6 → 0.0.0-next-af0f6500

package/src/experimental-router/RescriptRelayRouter.bs.js

@@ -9,6 +9,7 @@ var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
+var ReactExperimental = require("../ReactExperimental.bs.js");
 var RescriptReactRouter = require("@rescript/react/src/RescriptReactRouter.bs.js");
 
 function matchesUrl(t, url) {
@@ -242,8 +243,8 @@ function RescriptRelayRouter$RouteRenderer(Props) {
       });
   var initialized = match[0];
   var router = React.useContext(context);
-  var match$1 = React.unstable_useTransition();
-  var startTransition = match$1[0];
+  var match$1 = ReactExperimental.useTransition(undefined);
+  var startTransition = match$1[1];
   var match$2 = React.useState(function () {
         return Curry._1(router.get, undefined);
       });
@@ -281,7 +282,7 @@ function RescriptRelayRouter$RouteRenderer(Props) {
   var match$4 = routeEntry.route;
   var renderedContent = initialized && match$4 !== undefined ? Caml_option.some(Curry._1(match$4.render, routeEntry.url)) : undefined;
   if (initialized) {
-    return React.createElement(React.Fragment, undefined, renderPending !== undefined ? Curry._1(renderPending, match$1[1]) : null, React.createElement(React.Suspense, {
+    return React.createElement(React.Fragment, undefined, renderPending !== undefined ? Curry._1(renderPending, match$1[0]) : null, React.createElement(React.Suspense, {
                     children: renderedContent !== undefined ? Caml_option.valFromOption(renderedContent) : (
                         renderNotFound !== undefined ? Curry._1(renderNotFound, routeEntry.url) : null
                       ),
@@ -315,10 +316,12 @@ function RescriptRelayRouter$Link(Props) {
   var className = Props.className;
   var classNameDynamic = Props.classNameDynamic;
   var browserTarget = Props.target;
+  var tabIndex = Props.tabIndex;
   var mode = Props.mode;
   var render = Props.render;
   var preloadOnHover = Props.preloadOnHover;
   var children = Props.children;
+  var onClick = Props.onClick;
   var router = React.useContext(context);
   var url = RescriptReactRouter.useUrl(undefined, undefined);
   var changeRoute = React.useCallback((function (e) {
@@ -369,7 +372,13 @@ function RescriptRelayRouter$Link(Props) {
     target: browserTarget !== undefined ? (
         browserTarget === "blank" ? "_blank" : "_self"
       ) : "",
-    onClick: changeRoute,
+    onClick: (function (e) {
+        Curry._1(changeRoute, e);
+        if (onClick !== undefined) {
+          return Curry._1(onClick, undefined);
+        }
+        
+      }),
     onMouseDown: (function (param) {
         return Curry._1(preload, undefined);
       }),
@@ -386,6 +395,9 @@ function RescriptRelayRouter$Link(Props) {
   if (id !== undefined) {
     tmp.id = Caml_option.valFromOption(id);
   }
+  if (tabIndex !== undefined) {
+    tmp.tabIndex = Caml_option.valFromOption(tabIndex);
+  }
   if (title !== undefined) {
     tmp.title = Caml_option.valFromOption(title);
   }

package/src/experimental-router/RescriptRelayRouter.res

@@ -233,7 +233,7 @@ module RouteRenderer = {
     let (initialized, setInitialized) = React.useState(() => false)
     let router = use()
 
-    let (startTransition, isPending) = ReactExperimental.unstable_useTransition()
+    let (isPending, startTransition) = ReactExperimental.useTransition()
 
     let (routeEntry, setRouteEntry) = React.useState(() => router.get())
 
@@ -306,10 +306,12 @@ module Link = {
     ~className=?,
     ~classNameDynamic=?,
     ~target as browserTarget=?,
+    ~tabIndex=?,
     ~mode=?,
     ~render=?,
     ~preloadOnHover=?,
     ~children,
+    ~onClick=?,
     (),
   ) => {
     let router = use()
@@ -350,12 +352,19 @@ module Link = {
         }}
         ?title
         ?id
+        ?tabIndex
         className={className->Belt.Option.getWithDefault("") ++
           switch classNameDynamic {
           | Some(f) => " " ++ f(url, to_->Url.make)
           | None => ""
           }}
-        onClick=changeRoute
+        onClick={e => {
+          changeRoute(e)
+          switch onClick {
+          | None => ()
+          | Some(onClick) => onClick()
+          }
+        }}
         onMouseDown={_ => preload()}
         onTouchStart={_ => preload()}
         onMouseEnter={_ =>

package/src/experimental-router/RescriptRelayRouter.resi

@@ -56,6 +56,7 @@ module Link: {
     ~className: string=?,
     ~classNameDynamic: (RescriptReactRouter.url, RescriptReactRouter.url) => string=?,
     ~target: [#self | #blank]=?,
+    ~tabIndex: int=?,
     ~mode: [#push | #replace]=?,
     ~render: (
       ~preload: unit => unit,
@@ -65,6 +66,7 @@ module Link: {
     ) => React.element=?,
     ~preloadOnHover: bool=?,
     ~children: React.element,
+    ~onClick: unit => unit=?,
     unit,
   ) => React.element
 }

package/src/utils.js

@@ -10,6 +10,19 @@ function makeNewPath(currentPath, newKeys) {
   return [].concat(currentPath, newKeys);
 }
 
+function getTypename(v) {
+  if (v != null && typeof v === "object") {
+    if (v.__typename) {
+      return v.__typename;
+    }
+
+    // `v.VAL` relies on internal implementation details in ReScript.
+    if (v.VAL != null && typeof v.VAL === "object") {
+      return v.VAL.__typename;
+    }
+  }
+}
+
 /**
  * Runs on each object in the tree and follows the provided instructions
  * to apply transforms etc.
@@ -24,6 +37,10 @@ function traverse(
   instructionPaths,
   addFragmentOnRoot
 ) {
+  // We lazily set up a new object for each "level", as we don't want to mutate
+  // what comes back from the Relay store, and nor do we want to create new
+  // objects unless we need to. And we only need to when we need to change
+  // something.
   var newObj;
 
   if (addFragmentOnRoot) {
@@ -32,6 +49,8 @@ function traverse(
   }
 
   for (var key in currentObj) {
+    if (key === "VAL" || key === "NAME") continue;
+
     var isUnion = false;
     var originalValue = currentObj[key];
 
@@ -39,157 +58,73 @@ function traverse(
     var thisPath = makeNewPath(currentPath, [key]);
     var path = getPathName(thisPath);
 
-    var instructions = instructionMap[path];
-
-    var hasDeeperInstructions =
-      instructionPaths.filter(function (p) {
-        return p.indexOf(path) === 0 && p.length > path.length;
-      }).length > 0;
+    var instructions = instructionMap[path] || {};
 
-    if (instructions) {
-      if (currentObj[key] == null) {
-        if (instructions["n"] === "") {
-          newObj = getNewObj(newObj, currentObj);
-          newObj[key] = nullableValue;
-        }
-      } else {
-        var shouldConvertRootObj =
-          typeof instructions["r"] === "string" &&
-          fullInstructionMap[instructions["r"]];
+    if (currentObj[key] == null) {
+      newObj = getNewObj(newObj, currentObj);
+      newObj[key] = nullableValue;
+      continue;
+    }
 
-        var shouldAddFragmentFn = instructions["f"] === "";
+    var shouldConvertRootObj =
+      typeof instructions["r"] === "string" &&
+      fullInstructionMap[instructions["r"]];
 
-        var shouldConvertEnum =
-          typeof instructions["e"] === "string" &&
-          !!converters[instructions["e"]];
+    var shouldAddFragmentFn = instructions["f"] === "";
 
-        var shouldConvertCustomField =
-          typeof instructions["c"] === "string" &&
-          !!converters[instructions["c"]];
+    var shouldConvertEnum =
+      typeof instructions["e"] === "string" && !!converters[instructions["e"]];
 
-        var shouldConvertUnion =
-          typeof instructions["u"] === "string" &&
-          !!converters[instructions["u"]];
+    var shouldConvertCustomField =
+      typeof instructions["c"] === "string" && !!converters[instructions["c"]];
 
-        var isTopLevelNodeField = typeof instructions["tnf"] === "string";
+    var shouldConvertUnion =
+      typeof instructions["u"] === "string" && !!converters[instructions["u"]];
 
-        /**
-         * Handle arrays
-         */
-        if (Array.isArray(currentObj[key])) {
-          newObj = getNewObj(newObj, currentObj);
-          newObj[key] = currentObj[key].map(function (v) {
-            if (v == null) {
-              return nullableValue;
-            }
+    var isTopLevelNodeField = typeof instructions["tnf"] === "string";
 
-            if (shouldConvertRootObj) {
-              return traverser(
-                v,
-                fullInstructionMap,
-                converters,
-                nullableValue,
-                instructions["r"]
-              );
-            }
+    /**
+     * Handle arrays
+     */
+    if (Array.isArray(currentObj[key])) {
+      newObj = getNewObj(newObj, currentObj);
+      newObj[key] = currentObj[key].map(function (v) {
+        if (v == null) {
+          return nullableValue;
+        }
 
-            if (shouldConvertEnum) {
-              return converters[instructions["e"]](v);
-            }
+        if (shouldConvertRootObj) {
+          return traverser(
+            v,
+            fullInstructionMap,
+            converters,
+            nullableValue,
+            instructions["r"]
+          );
+        }
 
-            if (shouldConvertCustomField) {
-              return converters[instructions["c"]](v);
-            }
+        if (shouldConvertEnum) {
+          return converters[instructions["e"]](v);
+        }
 
-            if (
-              shouldConvertUnion &&
-              typeof v === "object" &&
-              typeof v.__typename === "string"
-            ) {
-              isUnion = true;
-
-              var newPath = makeNewPath(currentPath, [
-                key,
-                v.__typename.toLowerCase(),
-              ]);
-
-              var unionRootHasFragment =
-                (instructionMap[getPathName(newPath)] || {}).f === "";
-
-              var traversedValue = traverse(
-                fullInstructionMap,
-                newPath,
-                v,
-                instructionMap,
-                converters,
-                nullableValue,
-                instructionPaths,
-                unionRootHasFragment
-              );
-
-              return converters[instructions["u"]](traversedValue);
-            }
+        if (shouldConvertCustomField) {
+          return converters[instructions["c"]](v);
+        }
 
-            if (shouldAddFragmentFn && typeof v === "object") {
-              var objWithFragmentFn = Object.assign({}, v);
-              objWithFragmentFn.fragmentRefs = Object.assign(
-                {},
-                objWithFragmentFn
-              );
-              return objWithFragmentFn;
-            }
+        if (shouldConvertUnion && v != null && typeof v === "object") {
+          var typename = getTypename(v);
 
-            return v;
-          });
-        } else {
-          /**
-           * Handle normal values.
-           */
-          var v = currentObj[key];
-
-          if (shouldConvertRootObj) {
-            newObj = getNewObj(newObj, currentObj);
-            newObj[key] = traverser(
-              v,
-              fullInstructionMap,
-              converters,
-              nullableValue,
-              instructions["r"]
-            );
-          }
+          if (typename != null) {
+            isUnion = true;
+            var unionObj = v;
 
-          if (isTopLevelNodeField) {
-            if (
-              !v ||
-              !v.hasOwnProperty("__typename") ||
-              v.__typename !== instructions["tnf"]
-            ) {
-              newObj = getNewObj(newObj, currentObj);
-              newObj[key] = nullableValue;
+            // Means we're wrapping, and this will be a ReScript value.
+            if (nullableValue === null) {
+              // Convert it back to a flat JS value
+              unionObj = converters[instructions["u"]](v);
             }
-          }
 
-          if (shouldConvertEnum) {
-            newObj = getNewObj(newObj, currentObj);
-            newObj[key] = converters[instructions["e"]](v);
-          }
-
-          if (shouldConvertCustomField) {
-            newObj = getNewObj(newObj, currentObj);
-            newObj[key] = converters[instructions["c"]](v);
-          }
-
-          if (
-            shouldConvertUnion &&
-            typeof v === "object" &&
-            typeof v.__typename === "string"
-          ) {
-            isUnion = true;
-
-            var newPath = makeNewPath(currentPath, [
-              key,
-              v.__typename.toLowerCase(),
-            ]);
+            var newPath = makeNewPath(currentPath, [key, typename]);
 
             var unionRootHasFragment =
               (instructionMap[getPathName(newPath)] || {}).f === "";
@@ -197,7 +132,7 @@ function traverse(
             var traversedValue = traverse(
               fullInstructionMap,
               newPath,
-              v,
+              unionObj,
               instructionMap,
               converters,
               nullableValue,
@@ -205,27 +140,113 @@ function traverse(
               unionRootHasFragment
             );
 
-            newObj = getNewObj(newObj, currentObj);
-            newObj[key] = converters[instructions["u"]](traversedValue);
+            // Undefined means we're going from JS to ReScript, in which case we
+            // need to run the conversion here rather than earlier.
+            return nullableValue === undefined
+              ? converters[instructions["u"]](traversedValue)
+              : traversedValue;
           }
+        }
 
-          if (shouldAddFragmentFn && typeof v === "object") {
-            newObj = getNewObj(newObj, currentObj);
+        if (shouldAddFragmentFn && typeof v === "object") {
+          var objWithFragmentFn = Object.assign({}, v);
+          objWithFragmentFn.fragmentRefs = Object.assign({}, objWithFragmentFn);
+          return objWithFragmentFn;
+        }
 
-            var objWithFragmentFn = Object.assign({}, v);
+        return v;
+      });
+    } else {
+      /**
+       * Handle normal values.
+       */
+      var v = currentObj[key];
 
-            objWithFragmentFn.fragmentRefs = Object.assign(
-              {},
-              objWithFragmentFn
-            );
+      if (shouldConvertRootObj) {
+        newObj = getNewObj(newObj, currentObj);
+        newObj[key] = traverser(
+          v,
+          fullInstructionMap,
+          converters,
+          nullableValue,
+          instructions["r"]
+        );
+      }
+
+      if (isTopLevelNodeField) {
+        // If this is a top level node field we should try and convert, ensure
+        // it conforms to the desired shape (has the correct typename). If not,
+        // null it and return right away.
+        if (
+          v == null ||
+          !v.hasOwnProperty("__typename") ||
+          v.__typename !== instructions["tnf"]
+        ) {
+          newObj = getNewObj(newObj, currentObj);
+          newObj[key] = nullableValue;
+          return newObj;
+        }
+      }
+
+      if (shouldConvertEnum) {
+        newObj = getNewObj(newObj, currentObj);
+        newObj[key] = converters[instructions["e"]](v);
+      }
 
-            newObj[key] = objWithFragmentFn;
+      if (shouldConvertCustomField) {
+        newObj = getNewObj(newObj, currentObj);
+        newObj[key] = converters[instructions["c"]](v);
+      }
+
+      if (shouldConvertUnion && v != null && typeof v === "object") {
+        var typename = getTypename(v);
+
+        if (typename != null) {
+          isUnion = true;
+          var unionObj = v;
+
+          // Means we're wrapping, and this will be a ReScript value.
+          if (nullableValue === null) {
+            // Convert it back to a flat JS value
+            unionObj = converters[instructions["u"]](v);
           }
+
+          var newPath = makeNewPath(currentPath, [key, typename]);
+
+          var unionRootHasFragment =
+            (instructionMap[getPathName(newPath)] || {}).f === "";
+
+          var traversedValue = traverse(
+            fullInstructionMap,
+            newPath,
+            unionObj,
+            instructionMap,
+            converters,
+            nullableValue,
+            instructionPaths,
+            unionRootHasFragment
+          );
+
+          newObj = getNewObj(newObj, currentObj);
+
+          newObj[key] =
+            // Undefined means we're going from JS to ReScript, in which case we
+            // need to run the conversion here rather than earlier.
+            nullableValue === undefined
+              ? converters[instructions["u"]](traversedValue)
+              : traversedValue;
         }
       }
+
+      if (shouldAddFragmentFn && typeof v === "object") {
+        newObj = getNewObj(newObj, currentObj);
+        var objWithFragmentFn = Object.assign({}, v);
+        objWithFragmentFn.fragmentRefs = Object.assign({}, objWithFragmentFn);
+        newObj[key] = objWithFragmentFn;
+      }
     }
 
-    if (hasDeeperInstructions && originalValue != null && !isUnion) {
+    if (originalValue != null && !isUnion) {
       var nextObj = (newObj && newObj[key]) || currentObj[key];
 
       if (typeof nextObj === "object" && !Array.isArray(originalValue)) {
@@ -246,17 +267,21 @@ function traverse(
       } else if (Array.isArray(originalValue)) {
         newObj = getNewObj(newObj, currentObj);
         newObj[key] = nextObj.map(function (o) {
-          return typeof o === "object" && o != null
-            ? traverse(
-                fullInstructionMap,
-                thisPath,
-                o,
-                instructionMap,
-                converters,
-                nullableValue,
-                instructionPaths
-              )
-            : o;
+          if (typeof o === "object" && o != null) {
+            return traverse(
+              fullInstructionMap,
+              thisPath,
+              o,
+              instructionMap,
+              converters,
+              nullableValue,
+              instructionPaths
+            );
+          } else if (o == null) {
+            return nullableValue;
+          } else {
+            return o;
+          }
         });
       }
     }
@@ -276,7 +301,7 @@ function traverse(
  */
 function traverser(
   root,
-  _instructionMaps,
+  instructionMaps_,
   theConverters,
   nullableValue,
   rootObjectKey
@@ -285,22 +310,12 @@ function traverser(
     return nullableValue;
   }
 
-  var instructionMaps = _instructionMaps || {};
-  var instructionMap = instructionMaps[rootObjectKey || "__root"];
-
-  // No instructions
-  if (!instructionMap) {
-    return root;
-  }
+  var instructionMaps = instructionMaps_ || {};
+  var instructionMap = instructionMaps[rootObjectKey || "__root"] || {};
 
   var converters = theConverters == null ? {} : theConverters;
   var instructionPaths = Object.keys(instructionMap);
 
-  // Nothing to convert, bail early
-  if (instructionPaths.length === 0) {
-    return root;
-  }
-
   // We'll add the fragmentRefs reference to the root if needed here.
   var fragmentsOnRoot = (instructionMap[""] || {}).f === "";
   var unionRootConverter = converters[(instructionMap[""] || {}).u];
@@ -311,9 +326,19 @@ function traverser(
         return nullableValue;
       }
 
+      var n = [];
+
+      // Since a root level union is treated as a "new root level", we'll need
+      // to do a separate check here of whether there's a fragment on the root
+      // we need to account for, or not.
+      if (unionRootConverter != null) {
+        n = [v.__typename];
+        fragmentsOnRoot = (instructionMap[v.__typename] || {}).f === "";
+      }
+
       var traversedObj = traverse(
         instructionMaps,
-        [],
+        n,
         v,
         instructionMap,
         converters,
@@ -330,9 +355,18 @@ function traverser(
 
   var newObj = Object.assign({}, root);
 
+  var n = [];
+
+  // Same as in the union array check above - if there's a fragment in the new
+  // root created by the union, we need to account for that separately here.
+  if (unionRootConverter != null) {
+    n = [newObj.__typename];
+    fragmentsOnRoot = (instructionMap[newObj.__typename] || {}).f === "";
+  }
+
   var v = traverse(
     instructionMaps,
-    [],
+    n,
     newObj,
     instructionMap,
     converters,