rescript-relay 0.21.0 → 1.0.0-beta.1

package/compiler.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+"use strict";
+
+var spawn = require("child_process").spawn;
+var path = require("path");
+
+var input = process.argv.slice(2);
+
+spawn(path.join(__dirname, "rescript-relay-compiler.exe"), input, {
+  stdio: "inherit",
+}).on("exit", process.exit);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript-relay",
-  "version": "0.21.0",
+  "version": "1.0.0-beta.1",
   "main": "src/RescriptRelay.res",
   "license": "MIT",
   "author": "Gabriel Nordeborn",
@@ -20,50 +20,41 @@
     "rescript"
   ],
   "bin": {
-    "rescript-relay-compiler": "compiler/compiler-cli.js",
+    "rescript-relay-compiler": "compiler.js",
     "rescript-relay-cli": "cli/cli.js"
   },
   "scripts": {
     "build": "rescript build -with-deps",
-    "build:test": "compiler/compiler-cli.js",
+    "build:test": "./build-compiler-dev.sh && ./rescript-relay-compiler",
     "postinstall": "node postinstall.js",
     "test": "jest",
     "test:ci": "jest --ci --runInBand"
   },
   "devDependencies": {
     "@rescript/react": "0.10.3",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.4.0",
+    "@testing-library/jest-dom": "^5.16.1",
+    "@testing-library/react": "^13.0.0-alpha.5",
     "bs-fetch": "^0.5.0",
-    "graphql": "14.5.0",
     "graphql-query-test-mock": "^0.12.1",
-    "jest": "^24.9.0",
+    "jest": "^27.2.4",
     "nock": "^11.7.0",
     "node-fetch": "^2.6.0",
-    "react": "0.0.0-experimental-4e08fb10c",
-    "react-dom": "0.0.0-experimental-4e08fb10c",
-    "react-relay": "^11.0.0",
-    "reason-promise": "^1.0.2",
-    "relay-compiler": "^11.0.0",
-    "relay-config": "^11.0.0",
-    "relay-runtime": "^11.0.0"
+    "react": "^18.0.0-rc.0",
+    "react-dom": "^18.0.0-rc.0",
+    "react-relay": "12.0.0",
+    "relay-runtime": "12.0.0"
   },
   "peerDependencies": {
     "@rescript/react": "*",
-    "graphql": "*",
     "react-relay": "*",
-    "rescript": "^9.1.2",
-    "reason-promise": "^1.0.2",
-    "relay-compiler": "*",
-    "relay-config": "*",
-    "relay-runtime": "*"
+    "relay-runtime": "*",
+    "rescript": "^9.1.2"
   },
   "dependencies": {
-    "mkdirp-sync": "^0.0.3",
     "rescript": "^9.1.2"
   },
   "resolutions": {
-    "react": "0.0.0-experimental-4e08fb10c",
-    "react-dom": "0.0.0-experimental-4e08fb10c"
+    "react": "18.0.0-rc.0",
+    "react-dom": "18.0.0-rc.0"
   }
 }

package/postinstall.js

@@ -10,16 +10,27 @@
 var path = require("path");
 var cp = require("child_process");
 var fs = require("fs");
-var os = require("os");
 var platform = process.platform;
 
+function getRelayCompilerPlatformSuffix() {
+  if (process.platform === "darwin" && process.arch === "x64") {
+    return "macos-x64";
+  } else if (process.platform === "darwin" && process.arch === "arm64") {
+    return "macos-arm64";
+  } else if (process.platform === "linux" && process.arch === "x64") {
+    return "linux-x64";
+  }
+
+  return "linux-x64";
+}
+
 /**
  * Since os.arch returns node binary's target arch, not
  * the system arch.
  * Credits: https://github.com/feross/arch/blob/af080ff61346315559451715c5393d8e86a6d33c/index.js#L10-L58
  */
 
-function arch() {
+function ppxArch() {
   /**
    * Use Rosetta for ARM on macOS
    */
@@ -80,39 +91,55 @@ function arch() {
 }
 
 function copyPlatformBinaries(platform) {
+  /**
+   * Copy the PPX
+   */
   fs.copyFileSync(
     path.join(__dirname, "ppx-" + platform),
     path.join(__dirname, "ppx")
   );
   fs.chmodSync(path.join(__dirname, "ppx"), 0777);
 
+  /**
+   * Copy the Relay compiler
+   */
+
   fs.copyFileSync(
-    path.join(__dirname, "bin-" + platform),
-    path.join(__dirname, "language-plugin", "RescriptRelayBin.exe")
-  );
-  fs.chmodSync(
-    path.join(__dirname, "language-plugin", "RescriptRelayBin.exe"),
-    0777
+    path.join(
+      __dirname,
+      "relay-compiler-" + getRelayCompilerPlatformSuffix(),
+      "relay"
+    ),
+    path.join(__dirname, "rescript-relay-compiler.exe")
   );
+  fs.chmodSync(path.join(__dirname, "rescript-relay-compiler.exe"), 0777);
 }
 
 function removeInitialBinaries() {
   fs.unlinkSync(path.join(__dirname, "ppx-darwin"));
   fs.unlinkSync(path.join(__dirname, "ppx-linux"));
-  fs.unlinkSync(path.join(__dirname, "bin-darwin"));
-  fs.unlinkSync(path.join(__dirname, "bin-linux"));
+  fs.rmSync(path.join(__dirname, "relay-compiler-linux-x64"), {
+    recursive: true,
+    force: true,
+  });
+  fs.rmSync(path.join(__dirname, "relay-compiler-macos-x64"), {
+    recursive: true,
+    force: true,
+  });
+  fs.rmSync(path.join(__dirname, "relay-compiler-macos-arm64"), {
+    recursive: true,
+    force: true,
+  });
 }
 
 switch (platform) {
   case "win32": {
-    if (arch() !== "x64") {
+    if (ppxArch() !== "x64") {
       console.warn("error: x86 is currently not supported on Windows");
       process.exit(1);
     }
 
     throw new Error("Windows currently not supported.");
-    copyPlatformBinaries("windows");
-    break;
   }
   case "linux":
   case "darwin":

package/src/ReactDOMExperimental.bs.js

@@ -1,2 +1,20 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+var ReactDom = require("react-dom");
+
+function renderConcurrentRootAtElementWithId(content, id) {
+  var element = document.getElementById(id);
+  if (element == null) {
+    throw {
+          RE_EXN_ID: "Invalid_argument",
+          _1: "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " + id + " found in the HTML.",
+          Error: new Error()
+        };
+  }
+  ReactDom.createRoot(element).render(content);
+  
+}
+
+exports.renderConcurrentRootAtElementWithId = renderConcurrentRootAtElementWithId;
+/* react-dom Not a pure module */

package/src/ReactDOMExperimental.res

@@ -1,7 +1,20 @@
 include ReactDOM.Experimental
 
 @module("react-dom")
-external unstable_createRoot: Dom.element => root = "unstable_createRoot"
+external createRoot: Dom.element => root = "createRoot"
 
-@module("react-dom")
-external unstable_createBlockingRoot: Dom.element => root = "unstable_createBlockingRoot"
+@val @return(nullable)
+external getElementById: string => option<Dom.element> = "document.getElementById"
+
+let renderConcurrentRootAtElementWithId: (React.element, string) => unit = (content, id) =>
+  switch getElementById(id) {
+  | None =>
+    raise(
+      Invalid_argument(
+        "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " ++
+        id ++ " found in the HTML.",
+      ),
+    )
+  | Some(element) =>
+    createRoot(element)->render(content)
+  }

package/src/ReactExperimental.bs.js

@@ -1,23 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var ReactDom = require("react-dom");
 
 var SuspenseList = {};
 
-function renderConcurrentRootAtElementWithId(content, id) {
-  var element = document.getElementById(id);
-  if (element == null) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " + id + " found in the HTML.",
-          Error: new Error()
-        };
-  }
-  ReactDom.unstable_createRoot(element).render(content);
-  
-}
-
 exports.SuspenseList = SuspenseList;
-exports.renderConcurrentRootAtElementWithId = renderConcurrentRootAtElementWithId;
-/* react-dom Not a pure module */
+/* No side effect */

package/src/ReactExperimental.res

@@ -1,32 +1,16 @@
 type callback<'input, 'output> = 'input => 'output
 
 @module("react")
-external unstable_useDeferredValue: 'value => 'value = "unstable_useDeferredValue"
+external useDeferredValue: 'value => 'value = "useDeferredValue"
 
 @module("react")
-external unstable_useTransition: unit => (callback<callback<unit, unit>, unit>, bool) =
-  "unstable_useTransition"
+external useTransition: unit => (bool, callback<callback<unit, unit>, unit>) =
+  "useTransition"
 
 module SuspenseList = {
   @module("react") @react.component
   external make: (
     ~children: React.element,
     ~revealOrder: [#forwards | #backwards | #together]=?,
-  ) => React.element = "unstable_SuspenseList"
+  ) => React.element = "SuspenseList"
 }
-
-@val @return(nullable)
-external getElementById: string => option<Dom.element> = "document.getElementById"
-
-let renderConcurrentRootAtElementWithId: (React.element, string) => unit = (content, id) =>
-  switch getElementById(id) {
-  | None =>
-    raise(
-      Invalid_argument(
-        "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " ++
-        id ++ " found in the HTML.",
-      ),
-    )
-  | Some(element) =>
-    ReactDOMExperimental.unstable_createRoot(element)->ReactDOMExperimental.render(content)
-  }

package/src/RescriptRelay.bs.js

@@ -4,7 +4,6 @@
 var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Utils = require("./utils");
-var $$Promise = require("reason-promise/src/js/promise.bs.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var ReactRelay = require("react-relay");
@@ -220,25 +219,25 @@ function MakeLoadQuery(C) {
     return Caml_option.nullable_to_opt(token.source);
   };
   var queryRefToPromise = function (token) {
-    var match = $$Promise.pending(undefined);
-    var resolve = match[1];
-    var o = queryRefToObservable(token);
-    if (o !== undefined) {
-      Caml_option.valFromOption(o).subscribe({
-            complete: (function (param) {
-                return Curry._1(resolve, {
-                            TAG: /* Ok */0,
-                            _0: undefined
-                          });
-              })
-          });
-    } else {
-      Curry._1(resolve, {
-            TAG: /* Error */1,
-            _0: undefined
-          });
-    }
-    return match[0];
+    return new Promise((function (resolve, param) {
+                  var o = queryRefToObservable(token);
+                  if (o !== undefined) {
+                    Caml_option.valFromOption(o).subscribe({
+                          complete: (function (param) {
+                              return resolve({
+                                          TAG: /* Ok */0,
+                                          _0: undefined
+                                        });
+                            })
+                        });
+                    return ;
+                  } else {
+                    return resolve({
+                                TAG: /* Error */1,
+                                _0: undefined
+                              });
+                  }
+                }));
   };
   return {
           load: load,

package/src/RescriptRelay.res

@@ -39,6 +39,8 @@ type featureFlags = {
   mutable enableRelayContainersSuspense: bool,
   @as("ENABLE_PRECISE_TYPE_REFINEMENT")
   mutable enablePrecisTypeRefinement: bool,
+  @as("ENABLE_REQUIRED_DIRECTIVES")
+  mutable enableRequiredDirective: bool,
 }
 
 @module("relay-runtime")
@@ -371,12 +373,16 @@ module MissingFieldHandler = {
 }
 
 // This handler below enables automatic resolution of all cached items through the Node interface
-let nodeInterfaceMissingFieldHandler = MissingFieldHandler.makeLinkedMissingFieldHandler(
-  (field, record, args, _store) =>
-    switch (Js.Nullable.toOption(record), field["name"], Js.Nullable.toOption(args["id"])) {
-    | (Some(record), "node", argsId) when record["__typename"] == storeRootType => argsId
-    | _ => None
-    },
+let nodeInterfaceMissingFieldHandler = MissingFieldHandler.makeLinkedMissingFieldHandler((
+  field,
+  record,
+  args,
+  _store,
+) =>
+  switch (Js.Nullable.toOption(record), field["name"], Js.Nullable.toOption(args["id"])) {
+  | (Some(record), "node", argsId) if record["__typename"] == storeRootType => argsId
+  | _ => None
+  }
 )
 
 module ConnectionHandler = {
@@ -443,9 +449,9 @@ module Observable = {
   }
 
   type sink<'response> = {
-    next: 'response => unit,
-    error: Js.Exn.t => unit,
-    complete: unit => unit,
+    next: (. 'response) => unit,
+    error: (. Js.Exn.t) => unit,
+    complete: (. unit) => unit,
     closed: bool,
   }
 
@@ -453,11 +459,11 @@ module Observable = {
 
   @obj
   external makeObserver: (
-    ~start: subscription => unit=?,
-    ~next: 'response => unit=?,
-    ~error: Js.Exn.t => unit=?,
-    ~complete: unit => unit=?,
-    ~unsubscribe: subscription => unit=?,
+    ~start: @uncurry subscription => unit=?,
+    ~next: @uncurry 'response => unit=?,
+    ~error: @uncurry Js.Exn.t => unit=?,
+    ~complete: @uncurry unit => unit=?,
+    ~unsubscribe: @uncurry subscription => unit=?,
     unit,
   ) => observer<'response> = ""
 
@@ -467,7 +473,7 @@ module Observable = {
   @send
   external subscribe: (t<'response>, observer<'response>) => subscription = "subscribe"
 
-  @send external toPromise: t<'t> => Promise.t<'t> = "toPromise"
+  @send external toPromise: t<'t> => Js.Promise.t<'t> = "toPromise"
 }
 
 module Network = {
@@ -705,18 +711,16 @@ module MakeLoadQuery = (C: MakeLoadQueryConfig) => {
   }
 
   let queryRefToPromise = token => {
-    let (promise, resolve) = Promise.pending()
-
-    switch token->queryRefToObservable {
-    | None => resolve(Error())
-    | Some(o) =>
-      let _: Observable.subscription = o->{
-        open Observable
-        subscribe(makeObserver(~complete=() => resolve(Ok()), ()))
+    Js.Promise.make((~resolve, ~reject as _) => {
+      switch token->queryRefToObservable {
+      | None => resolve(. Error())
+      | Some(o) =>
+        let _: Observable.subscription = o->{
+          open Observable
+          subscribe(makeObserver(~complete=() => resolve(. Ok()), ()))
+        }
       }
-    }
-
-    promise
+    })
   }
 }
 

package/src/RescriptRelay.resi

@@ -3,14 +3,12 @@
 )
 type arguments
 
-@ocaml.doc(
-  "Abstract type for uploadables.
+@ocaml.doc("Abstract type for uploadables.
 
 ### Constructing an `uploadables`
 Use `makeUploadable`: `makeUploadable({ \"someFile\": theFileYouWantToUpload })` to construct an `uploadables`, and then pass it to your mutation via the `uploadables` prop.
 
-Please note that you'll need to handle _sending_ the uploadables to your server yourself in the network layer. [Here's an example](https://github.com/facebook/relay/issues/1844#issuecomment-316893590) in regular JS that you can adapt to ReScript as you need/want."
-)
+Please note that you'll need to handle _sending_ the uploadables to your server yourself in the network layer. [Here's an example](https://github.com/facebook/relay/issues/1844#issuecomment-316893590) in regular JS that you can adapt to ReScript as you need/want.")
 type uploadables
 
 @ocaml.doc(
@@ -55,12 +53,10 @@ external dataIdToString: dataId => string = "%identity"
 @ocaml.doc("Turns a `string` into a `dataId`.")
 external makeDataId: string => dataId = "%identity"
 
-@ocaml.doc(
-  "Construct an `arguments` object for use with certain Relay store APIs.
+@ocaml.doc("Construct an `arguments` object for use with certain Relay store APIs.
 
 ### Usage
-Use it like this: `makeArguments({ \"someArgument\": someValue, \"anotherArgument\": anotherValue })`. Notice the \"\" surrounding the property names - these are important and tells ReScript that we want this to be a JS object."
-)
+Use it like this: `makeArguments({ \"someArgument\": someValue, \"anotherArgument\": anotherValue })`. Notice the \"\" surrounding the property names - these are important and tells ReScript that we want this to be a JS object.")
 external makeArguments: {..} => arguments = "%identity"
 
 @ocaml.doc(
@@ -102,6 +98,8 @@ type featureFlags = {
   mutable enableRelayContainersSuspense: bool,
   @as("ENABLE_PRECISE_TYPE_REFINEMENT")
   mutable enablePrecisTypeRefinement: bool,
+  @as("ENABLE_REQUIRED_DIRECTIVES")
+  mutable enableRequiredDirective: bool,
 }
 
 @ocaml.doc(
@@ -110,11 +108,9 @@ type featureFlags = {
 @module("relay-runtime")
 external relayFeatureFlags: featureFlags = "RelayFeatureFlags"
 
-@ocaml.doc(
-  "An abstract type representing all records in the store serialized to JSON in a way that you can use to re-hydrate the store. 
+@ocaml.doc("An abstract type representing all records in the store serialized to JSON in a way that you can use to re-hydrate the store. 
 
-See `RecordSource.toJSON` for how to produce it."
-)
+See `RecordSource.toJSON` for how to produce it.")
 type recordSourceRecords
 
 @ocaml.doc(
@@ -357,13 +353,11 @@ module RecordProxy: {
     unit,
   ) => t = "setLinkedRecords"
 
-  @ocaml.doc(
-    "Invalidates this record.
+  @ocaml.doc("Invalidates this record.
 
 Invalidating a record means that the _next_ time Relay evaluates this record, it'll be treated as missing.
 
-_Beware_ that this doesn't mean that queries using this record will refetch immediately. Rather, it'll happen the next time the query _renders_. Have a look at `useSubscribeToInvalidationState`, that'll allow you to subscribe to whenever records are invalidated, if you're looking for a way to refetch immediately as something invalidates."
-  )
+_Beware_ that this doesn't mean that queries using this record will refetch immediately. Rather, it'll happen the next time the query _renders_. Have a look at `useSubscribeToInvalidationState`, that'll allow you to subscribe to whenever records are invalidated, if you're looking for a way to refetch immediately as something invalidates.")
   @send
   external invalidateRecord: t => unit = "invalidateRecord"
 }
@@ -426,11 +420,9 @@ module ReadOnlyRecordSourceProxy: {
   external getRoot: t => RecordProxy.t = "getRoot"
 }
 
-@ocaml.doc(
-  "A missing field handler, which is a way of teaching Relay more about the relations in your schema, so it can fulfill more things from the cache. Read more [in this section of the Relay docs](https://relay.dev/docs/guided-tour/reusing-cached-data/filling-in-missing-data/).
+@ocaml.doc("A missing field handler, which is a way of teaching Relay more about the relations in your schema, so it can fulfill more things from the cache. Read more [in this section of the Relay docs](https://relay.dev/docs/guided-tour/reusing-cached-data/filling-in-missing-data/).
 
-Feed a list of missing field handlers into `Environment.make` if you want to use them."
-)
+Feed a list of missing field handlers into `Environment.make` if you want to use them.")
 module MissingFieldHandler: {
   @@ocaml.warning("-30")
 
@@ -607,9 +599,9 @@ module Observable: {
 
   @ocaml.doc("This sink can be used to give the observable new data.")
   type sink<'response> = {
-    next: 'response => unit,
-    error: Js.Exn.t => unit,
-    complete: unit => unit,
+    next: (. 'response) => unit,
+    error: (. Js.Exn.t) => unit,
+    complete: (. unit) => unit,
     closed: bool,
   }
 
@@ -624,10 +616,10 @@ module Observable: {
 
   @ocaml.doc("Create an observer.") @obj
   external makeObserver: (
-    ~start: subscription => unit=?,
-    ~next: 'response => unit=?,
-    ~error: Js.Exn.t => unit=?,
-    ~complete: unit => unit=?,
+    ~start: @uncurry subscription => unit=?,
+    ~next: @uncurry 'response => unit=?,
+    ~error: @uncurry Js.Exn.t => unit=?,
+    ~complete: @uncurry unit => unit=?,
     ~unsubscribe: subscription => unit=?,
     unit,
   ) => observer<'response> = ""
@@ -646,7 +638,7 @@ module Observable: {
     "Turns an `Observable` into a promise. _Beware_ that reading the response in the resulting promise is currently _not safe_ due to some internals of how ReScript Relay works. This will be resolved in the future."
   )
   @send
-  external toPromise: t<'t> => Promise.t<'t> = "toPromise"
+  external toPromise: t<'t> => Js.Promise.t<'t> = "toPromise"
 }
 
 @ocaml.doc("Represents the network layer.")
@@ -737,7 +729,7 @@ module Store: {
     ~source: RecordSource.t,
     ~gcReleaseBufferSize: /* `gcReleaseBufferSize` controls how many queries are allowed to be cached by default. Increase this to increase the size of the cache. */
     int=?,
-    ~queryCacheExpirationTime: int /* `queryCacheExpirationTime` sets a TTL (time to live) for all queries. If that time passes, the data is considered stale and is evicted from the store. Default is no TTL. */=?,
+    ~queryCacheExpirationTime: int=? /* `queryCacheExpirationTime` sets a TTL (time to live) for all queries. If that time passes, the data is considered stale and is evicted from the store. Default is no TTL. */,
     unit,
   ) => t
 
@@ -790,10 +782,8 @@ module Environment: {
   @ocaml.doc("Given an `operationDescriptor`, commits the corresponding payload.") @send
   external commitPayload: (t, operationDescriptor, 'payload) => unit = "commitPayload"
 
-  @ocaml.doc(
-    "Given an `operationDescriptor`, retains the corresponding operation so any data referenced by it isn't garbage collected.
-You should use the generated `Query.retain` function on your queries instead of using this directly."
-  )
+  @ocaml.doc("Given an `operationDescriptor`, retains the corresponding operation so any data referenced by it isn't garbage collected.
+You should use the generated `Query.retain` function on your queries instead of using this directly.")
   @send
   external retain: (t, operationDescriptor) => Disposable.t = "retain"
 }
@@ -897,5 +887,5 @@ module MakeLoadQuery: (C: MakeLoadQueryConfig) =>
   ) => C.loadedQueryRef
 
   let queryRefToObservable: C.loadedQueryRef => option<Observable.t<C.response>>
-  let queryRefToPromise: C.loadedQueryRef => Promise.t<Belt.Result.t<unit, unit>>
+  let queryRefToPromise: C.loadedQueryRef => Js.Promise.t<Belt.Result.t<unit, unit>>
 }

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

@@ -242,8 +242,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 = React.useTransition();
+  var startTransition = match$1[1];
   var match$2 = React.useState(function () {
         return Curry._1(router.get, undefined);
       });
@@ -281,7 +281,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 +315,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 +371,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 +394,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);
   }