Convert Reason generix syntax to ReScript

Author: DZakh

pages/docs/gentype/latest/supported-types.mdx

@@ -26,13 +26,13 @@ ReScript values e.g. `"a"`, `"b"`, `"c"` are unchanged. So they are exported to
 
 ## Optionals
 
-ReScript values of type e.g. `option(int)`, such as `None`, `Some(0)`, `Some(1)`, `Some(2)`, are exported to JS values `null`, `undefined`, `0`, `1`, `2`.
+ReScript values of type e.g. `option<int>`, such as `None`, `Some(0)`, `Some(1)`, `Some(2)`, are exported to JS values `null`, `undefined`, `0`, `1`, `2`.
 The JS values are unboxed, and `null`/`undefined` are conflated.
 So the option type is exported to JS type `null` or `undefined` or `number`.
 
 ## Nullables
 
-ReScript values of type e.g. `Js.Nullable.t(int)`, such as `Js.Nullable.null`, `Js.Nullable.undefined`, `Js.Nullable.return(0)`, `Js.Nullable.return(1)`, `Js.Nullable.return(2)`, are exported to JS values `null`, `undefined`, `0`, `1`, `2`.
+ReScript values of type e.g. `Js.Nullable.t<int>`, such as `Js.Nullable.null`, `Js.Nullable.undefined`, `Js.Nullable.return(0)`, `Js.Nullable.return(1)`, `Js.Nullable.return(2)`, are exported to JS values `null`, `undefined`, `0`, `1`, `2`.
 The JS values are identical: there is no conversion unless the argument type needs conversion.
 
 ## Records
@@ -44,7 +44,7 @@ Since records are immutable by default, their fields will be exported to readonl
 
 The `@genType.as` annotation can be used to change the name of a field on the JS side of things. So e.g. `{[@genType.as "y"] x:int}` is exported as JS type `{y:int}`.
 
-If one field of the ReScript record has option type, this is exported to an optional JS field. So for example ReScript type `{x: option(int)}` is exported as JS type `{x?: number}`.
+If one field of the ReScript record has option type, this is exported to an optional JS field. So for example ReScript type `{x: option<int>}` is exported as JS type `{x?: number}`.
 
 ## Objects
 
@@ -53,7 +53,7 @@ A conversion is required only when the type of some field requires conversions.
 
 Since objects are immutable by default, their fields will be exported to readonly property types in Flow/TS. Mutable fields are specified in ReScript by e.g. `{ @set "mutableField": string }`.
 
-It is possible to mix object and option types, so for example the ReScript type `{. "x":int, "y":option(string)}` exports to JS type `{x:number, ?y: string}`, requires no conversion, and allows option pattern matching on the ReScript side.
+It is possible to mix object and option types, so for example the ReScript type `{. "x":int, "y":option<string>}` exports to JS type `{x:number, ?y: string}`, requires no conversion, and allows option pattern matching on the ReScript side.
 
 Object field names follow ReScript's mangling convention (so e.g. `_type` in ReScript represents `type` in JS):
 
@@ -104,7 +104,7 @@ Arrays with elements of ReScript type `t` are exported to JS arrays with element
 
 Immutable arrays are supported with the additional ReScript library
 [ImmutableArray.res/.resi](https://github.com/reason-association/genType/tree/master/examples/typescript-react-example/src/ImmutableArray.resi), which currently needs to be added to your project.
-The type `ImmutableArray.t(+'a)` is covariant, and is mapped to readonly array types in TS/Flow. As opposed to TS/Flow, `ImmutableArray.t` does not allow casting in either direction with normal arrays. Instead, a copy must be performed using `fromArray` and `toArray`.
+The type `ImmutableArray.t<+'a>` is covariant, and is mapped to readonly array types in TS/Flow. As opposed to TS/Flow, `ImmutableArray.t` does not allow casting in either direction with normal arrays. Instead, a copy must be performed using `fromArray` and `toArray`.
 
 ## Functions and Function Components
 
@@ -213,5 +213,5 @@ const none = <T1>(a: T1): ?T1 => OptionBS.none;
 
 ## Promises
 
-Values of type `Js.Promise.t(arg)` are exported to JS promises of type `Promise<argJS>` where `argJS` is the JS type corresponding to `arg`.
+Values of type `Js.Promise.t<arg>` are exported to JS promises of type `Promise<argJS>` where `argJS` is the JS type corresponding to `arg`.
 If a conversion for the argument is required, the conversion functions are chained via `.then(promise => ...)`.

pages/docs/manual/latest/api/belt/result.mdx

@@ -17,7 +17,7 @@ type t<'a, 'b> =
   | Error('b)
 ```
 
-The type `Result.t(result, err)` describes a variant of two states:
+The type `Result.t<result, err>` describes a variant of two states:
 `Ok(someResult)` represents a successful operation, whereby
 ``Error(someError)` signals an erronous operation.
 

pages/docs/manual/latest/api/js/null-undefined.mdx

@@ -12,15 +12,15 @@ Provide utilities around `Js.null_undefined`.
 type t<'a> = Js.null_undefined<'a>
 ```
 
-Local alias for `Js.null_undefined('a)`.
+Local alias for `Js.null_undefined<'a>`.
 
 ## return
 
 ```res sig
 let return: 'a => t<'a>
 ```
 
-Constructs a value of `Js.null_undefined('a)` containing a value of `'a`.
+Constructs a value of `Js.null_undefined<'a>` containing a value of `'a`.
 
 ## test
 
@@ -42,15 +42,15 @@ Returns `true` if the given value is null or undefined, `false` otherwise.
 let null: t<'a>
 ```
 
-The null value of type `Js.null_undefined('a)`.
+The null value of type `Js.null_undefined<'a>`.
 
 ## undefined
 
 ```res sig
 let undefined: t<'a>
 ```
 
-The undefined value of type `Js.null_undefined('a)`.
+The undefined value of type `Js.null_undefined<'a>`.
 
 ## bind
 
@@ -59,7 +59,7 @@ let bind: (t<'a>, (. 'a) => 'b) => t<'b>
 ```
 
 Maps the contained value using the given function.
-If `Js.null_undefined('a)` contains a value, that value is unwrapped, mapped to a `'b` using the given function `a' => 'b`, then wrapped back up and returned as `Js.null_undefined('b)`.
+If `Js.null_undefined<'a>` contains a value, that value is unwrapped, mapped to a `'b` using the given function `a' => 'b`, then wrapped back up and returned as `Js.null_undefined<'b>`.
 
 ```res example
 let maybeGreetWorld = (maybeGreeting: Js.null_undefined<string>) =>
@@ -73,7 +73,7 @@ let iter: (t<'a>, (. 'a) => unit) => unit
 ```
 
 Iterates over the contained value with the given function.
-If `Js.null_undefined('a)` contains a value, that value is unwrapped and applied to the given function.
+If `Js.null_undefined<'a>` contains a value, that value is unwrapped and applied to the given function.
 
 ```res example
 let maybeSay = (maybeMessage: Js.null_undefined<string>) =>
@@ -86,7 +86,7 @@ let maybeSay = (maybeMessage: Js.null_undefined<string>) =>
 let fromOption: option<'a> => t<'a>
 ```
 
-Maps `option('a)` to `Js.null_undefined('a)`.
+Maps `option<'a>` to `Js.null_undefined<'a>`.
 `Some(a)` => `a`
 `None` => `undefined`
 
@@ -102,7 +102,7 @@ let from_opt: option<'a> => t<'a>
 let toOption: t<'a> => option<'a>
 ```
 
-Maps `Js.null_undefined('a)` to `option('a)`.
+Maps `Js.null_undefined<'a>` to `option<'a>`.
 `a` => `Some(a)`
 `undefined` => `None`
 `null` => `None`

pages/docs/manual/latest/api/js/null.mdx

@@ -2,21 +2,21 @@
 
 <Intro>
 
-Provide utilities around `null('a)`.
+Provide utilities around `null<'a>`.
 
 </Intro>
 
 ```res prelude
 type t<'a> = Js.null<'a>
 ```
 
-Local alias for `Js.null('a)`.
+Local alias for `Js.null<'a>`.
 
 ```res sig
 let return: 'a => t<'a>
 ```
 
-Constructs a value of `Js.null('a)` containing a value of `'a`.
+Constructs a value of `Js.null<'a>` containing a value of `'a`.
 
 ## test
 
@@ -53,7 +53,7 @@ let bind: (t<'a>, (. 'a) => 'b) => t<'b>
 ```
 
 Maps the contained value using the given function.
-If `Js.null('a)` contains a value, that value is unwrapped, mapped to a `'b` using the given function `'a => 'b`, then wrapped back up and returned as `Js.null('b)`.
+If `Js.null<'a>` contains a value, that value is unwrapped, mapped to a `'b` using the given function `'a => 'b`, then wrapped back up and returned as `Js.null<'b>`.
 
 ```res example
 let maybeGreetWorld = (maybeGreeting: Js.null<string>) =>
@@ -67,7 +67,7 @@ let iter: (t<'a>, (. 'a) => unit) => unit
 ```
 
 Iterates over the contained value with the given function.
-If `Js.null('a)` contains a value, that value is unwrapped and applied to the given function.
+If `Js.null<'a>` contains a value, that value is unwrapped and applied to the given function.
 
 ```res example
 let maybeSay = (maybeMessage: Js.null<string>) =>
@@ -80,7 +80,7 @@ let maybeSay = (maybeMessage: Js.null<string>) =>
 let fromOption: option<'a> => t<'a>
 ```
 
-Maps `option('a)` to `Js.null('a)`.
+Maps `option<'a>` to `Js.null<'a>`.
 `Some(a)` => `a`
 `None` => `empty`
 
@@ -96,7 +96,7 @@ let from_opt: option<'a> => t<'a>
 let toOption: t<'a> => option<'a>
 ```
 
-Maps `Js.null('a)` to `option('a)`.
+Maps `Js.null<'a>` to `option<'a>`.
 `a` => `Some(a)`
 `empty` => `None`
 

pages/docs/manual/latest/api/js/nullable.mdx

@@ -12,15 +12,15 @@ Provide utilities around `Js.null_undefined`.
 type t<'a> = Js.null_undefined<'a>
 ```
 
-Local alias for `Js.null_undefined('a)`.
+Local alias for `Js.null_undefined<'a>`.
 
 ## return
 
 ```res sig
 let return: 'a => t<'a>
 ```
 
-Constructs a value of `Js.null_undefined('a)` containing a value of `'a`.
+Constructs a value of `Js.null_undefined<'a>` containing a value of `'a`.
 
 ## test
 
@@ -42,15 +42,15 @@ Returns `true` if the given value is null or undefined, `false` otherwise.
 let null: t<'a>
 ```
 
-The null value of type `Js.null_undefined('a)`.
+The null value of type `Js.null_undefined<'a>`.
 
 ## undefined
 
 ```res sig
 let undefined: t<'a>
 ```
 
-The undefined value of type `Js.null_undefined('a)`.
+The undefined value of type `Js.null_undefined<'a>`.
 
 ## bind
 
@@ -59,7 +59,7 @@ let bind: (t<'a>, (. 'a) => 'b) => t<'b>
 ```
 
 Maps the contained value using the given function.
-If `Js.null_undefined('a)` contains a value, that value is unwrapped, mapped to a `'b` using the given function `a' => 'b`, then wrapped back up and returned as `Js.null_undefined('b)`.
+If `Js.null_undefined<'a>` contains a value, that value is unwrapped, mapped to a `'b` using the given function `a' => 'b`, then wrapped back up and returned as `Js.null_undefined<'b>`.
 
 ```res example
 let maybeGreetWorld = (maybeGreeting: Js.null_undefined<string>) =>
@@ -73,7 +73,7 @@ let iter: (t<'a>, (. 'a) => unit) => unit
 ```
 
 Iterates over the contained value with the given function.
-If `Js.null_undefined('a)` contains a value, that value is unwrapped and applied to the given function.
+If `Js.null_undefined<'a>` contains a value, that value is unwrapped and applied to the given function.
 
 ```res example
 let maybeSay = (maybeMessage: Js.null_undefined<string>) =>
@@ -86,7 +86,7 @@ let maybeSay = (maybeMessage: Js.null_undefined<string>) =>
 let fromOption: option<'a> => t<'a>
 ```
 
-Maps `option('a)` to `Js.null_undefined('a)`.
+Maps `option<'a>` to `Js.null_undefined<'a>`.
 `Some(a)` => `a`
 `None` => `undefined`
 
@@ -102,7 +102,7 @@ let from_opt: option<'a> => t<'a>
 let toOption: t<'a> => option<'a>
 ```
 
-Maps `Js.null_undefined('a)` to `option('a)`.
+Maps `Js.null_undefined<'a>` to `option<'a>`.
 `a` => `Some(a)`
 `undefined` => `None`
 `null` => `None`

pages/docs/manual/latest/api/js/string-2.mdx

@@ -97,7 +97,7 @@ let get: (t, int) => t
 ```
 
 `get(s, n)` returns as a `string` the character at the given index number.
-If `n` is out of range, this function returns `undefined`,so at some point this function may be modified to return `option(string)`.
+If `n` is out of range, this function returns `undefined`, so at some point this function may be modified to return `option<string>`.
 
 ```res example
 Js.String2.get("Reason", 0) == "R"

pages/docs/manual/latest/api/js/string.mdx

@@ -97,7 +97,7 @@ let get: (t, int) => t
 ```
 
 `get(s, n)` returns as a `string` the character at the given index number.
-If `n` is out of range, this function returns `undefined`, so at some point this function may be modified to return `option(string)`.
+If `n` is out of range, this function returns `undefined`, so at some point this function may be modified to return `option<string>`.
 
 ```res example
 Js.String2.get("Reason", 0) == "R"

pages/docs/manual/latest/api/js/undefined.mdx

@@ -20,7 +20,7 @@ Local alias for 'a Js.undefined.
 let return: 'a => t<'a>
 ```
 
-Constructs a value of `Js.undefined('a)` containing a value of `'a`.
+Constructs a value of `Js.undefined<'a>` containing a value of `'a`.
 
 ## test
 
@@ -65,7 +65,7 @@ let bind: (t<'a>, (. 'a) => 'b) => t<'b>
 ```
 
 Maps the contained value using the given function.
-If `Js.undefined('a)` contains a value, that value is unwrapped, mapped to a `'b` using the given function `a' => 'b`, then wrapped back up and returned as `Js.undefined('b)`.
+If `Js.undefined<'a>` contains a value, that value is unwrapped, mapped to a `'b` using the given function `a' => 'b`, then wrapped back up and returned as `Js.undefined<'b>`.
 
 ```res example
 let maybeGreetWorld = (maybeGreeting: Js.undefined<string>) =>
@@ -79,7 +79,7 @@ let iter: (t<'a>, (. 'a) => unit) => unit
 ```
 
 Iterates over the contained value with the given function.
-If `Js.undefined('a)` contains a value, that value is unwrapped and applied to the given function.
+If `Js.undefined<'a>` contains a value, that value is unwrapped and applied to the given function.
 
 ```res example
 let maybeSay = (maybeMessage: Js.undefined<string>) =>
@@ -92,7 +92,7 @@ let maybeSay = (maybeMessage: Js.undefined<string>) =>
 let fromOption: option<'a> => t<'a>
 ```
 
-Maps `option('a)` to `Js.undefined('a)`.
+Maps `option<'a>` to `Js.undefined<'a>`.
 `Some(a)` => `a`
 `None` => `empty`
 
@@ -108,7 +108,7 @@ let from_opt: option<'a> => t<'a>
 let toOption: t<'a> => option<'a>
 ```
 
-Maps `Js.undefined('a)` to `option('a)`
+Maps `Js.undefined<'a>` to `option<'a>`
 `a` => `Some(a)`
 `empty` => `None`
 

pages/docs/manual/latest/generate-converters-accessors.mdx

@@ -130,7 +130,7 @@ This option causes `jsConverter` to, again, generate functions of the following
 ```resi
 let fruitToJs: fruit => int;
 
-let fruitFromJs: int => option(fruit);
+let fruitFromJs: int => option<fruit>;
 ```
 
 For `fruitToJs`, each fruit variant constructor would map into an integer, starting at 0, in the order they're declared.

pages/docs/manual/latest/promise.mdx

@@ -119,9 +119,9 @@ export {
 
 ReScript has built-in support for [JavaScript promises](api/js/promise). The 3 functions you generally need are:
 
-- `Js.Promise.resolve: 'a => Js.Promise.t('a)`
-- `Js.Promise.then_: ('a => Js.Promise.t('b), Js.Promise.t('a)) => Js.Promise.t('b)`
-- `Js.Promise.catch: (Js.Promise.error => Js.Promise.t('a), Js.Promise.t('a)) => Js.Promise.t('a)`
+- `Js.Promise.resolve: 'a => Js.Promise.t<'a>`
+- `Js.Promise.then_: ('a => Js.Promise.t<'b>, Js.Promise.t<'a>) => Js.Promise.t<'b>`
+- `Js.Promise.catch: (Js.Promise.error => Js.Promise.t<'a>, Js.Promise.t<'a>) => Js.Promise.t<'a>`
 
 Additionally, here's the type signature for creating a promise on the ReScript side:
 

src/layouts/DocsLayout.res

@@ -157,7 +157,7 @@ let make = (
 }
 
 module type StaticContent = {
-  /* let categories: array(SidebarLayout.Sidebar.Category.t); */
+  /* let categories: array<SidebarLayout.Sidebar.Category.t>; */
   let tocData: SidebarLayout.Toc.raw
 }
 
@@ -171,7 +171,7 @@ module Make = (Content: StaticContent) => {
     ~frontmatter=?,
     ~version: option<string>=?,
     ~availableVersions: option<array<(string, string)>>=?,
-    /* ~activeToc: option(SidebarLayout.Toc.t)=?, */
+    /* ~activeToc: option<SidebarLayout.Toc.t>=?, */
     ~components: option<Mdx.Components.t>=?,
     ~theme: option<ColorTheme.t>=?,
     ~children: React.element,

src/layouts/DocsLayout.resi

@@ -17,7 +17,7 @@ let make: (
 ) => React.element
 
 module type StaticContent = {
-  /* let categories: array(SidebarLayout.Sidebar.Category.t); */
+  /* let categories: array<SidebarLayout.Sidebar.Category.t>; */
   let tocData: SidebarLayout.Toc.raw
 }
 
@@ -31,7 +31,7 @@ module Make: (Content: StaticContent) =>
     ~frontmatter: Js.Json.t=?,
     ~version: string=?,
     ~availableVersions: array<(string, string)>=?,
-    /* ~activeToc: option(SidebarLayout.Toc.t)=?, */
+    /* ~activeToc: option<SidebarLayout.Toc.t>=?, */
     ~components: Mdx.Components.t=?,
     ~theme: ColorTheme.t=?,
     ~children: React.element,