-
content
+ {content}
-
{node.children
@@ -172,7 +172,7 @@ module SidebarTree = {
- */
/*
*/ /* {React.string("Writing Bindings & Libraries")} */ @@ -310,6 +312,7 @@ type state = | All | Filtered(string) // search term +@react.componentWithProps let make = (props: props) => { open Markdown @@ -369,7 +372,7 @@ let make = (props: props) => { }) let onKeywordSelect = keyword => { - WebAPI.Window.scrollTo(window, ~options={left: 0.0, top: 0.0, behavior: Smooth}) + WebAPI.Window.scrollTo(WebAPI.DOM.window, ~options={left: 0.0, top: 0.0, behavior: Smooth}) setState(_ => { Filtered(keyword) }) @@ -443,8 +446,8 @@ let make = (props: props) => { value={searchValue} /> - officialCategory - communityCategory + {officialCategory} + {communityCategory} - ,
- ~children: option
=React.null, - ~activeItem: option - =?, -) => { +let make = (~mdxSources: array
- , ~children=React.null, ~activeItem: option
- =?) => { let allItems = mdxSources->Array.map(mdxSource => { let {id, keywords, category, summary, name, status, href} = mdxSource { @@ -184,22 +180,21 @@ let make = ( } }) - let fuseOpts = Fuse.Options.t( - ~shouldSort=false, - ~includeScore=true, - ~threshold=0.2, - ~location=0, - ~distance=30, - ~minMatchCharLength=1, - ~keys=["keywords", "name"], - (), - ) + let fuseOpts: Fuse.Options.t = { + shouldSort: false, + includeScore: true, + threshold: 0.2, + location: 0, + distance: 30, + minMatchCharLength: 1, + keys: ["keywords", "name"], + } let fuse: Fuse.t
= Fuse.make(allItems, fuseOpts) let (state, setState) = React.useState(_ => { switch activeItem { - | Some(item) => ShowDetails((item :> Item.t)) + | Some(item) => ShowDetails(item :> Item.t) | None => ShowAll } }) @@ -237,17 +232,15 @@ let make = ( navigate("/syntax-lookup") | value => switch findItemByExactName(value) { - | None => { - let filtered = searchItems(value) - setState(_ => ShowFiltered(value, filtered)) - } - | Some(item) => { - let target = "/syntax-lookup/" ++ item.href - - // This makes sure we don't double navigate - if (pathname :> string) != target { - navigate(target) - } + | None => + let filtered = searchItems(value) + setState(_ => ShowFiltered(value, filtered)) + | Some(item) => + let target = "/syntax-lookup/" ++ item.href + + // This makes sure we don't double navigate + if (pathname :> string) != target { + navigate(target) } } } @@ -262,7 +255,7 @@ let make = ( {React.string("Syntax Lookup")} {React.string(item.name)}
-children +{children} - =?, -) => { +let make = (~mdxSources: array
- {React.string(todo.content)}
- content +
- {content} } } module Strong = { @react.component - let make = (~children) => children + let make = (~children) => {children} } module Image = { diff --git a/apps/docs/src/components/MarkdownComponents.res b/apps/docs/src/components/MarkdownComponents.res index ebd829c92..f73ebf980 100644 --- a/apps/docs/src/components/MarkdownComponents.res +++ b/apps/docs/src/components/MarkdownComponents.res @@ -3,44 +3,41 @@ open Markdown type t = { /* MDX shortnames for more advanced components */ @as("Cite") - cite?: React.componentLike
-
authorImg
+ {authorImg}
- archivedNote
+ {archivedNote}
{React.string("Blog")}
- children
+ {children}
diff --git a/apps/docs/app/routes/BlogArticleRoute.res b/apps/docs/app/routes/BlogArticleRoute.res
index 6644a1509..557d5c2e0 100644
--- a/apps/docs/app/routes/BlogArticleRoute.res
+++ b/apps/docs/app/routes/BlogArticleRoute.res
@@ -7,7 +7,7 @@ type loaderData = {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/blog",
~alias="blog",
)
diff --git a/apps/docs/app/routes/CommunityRoute.res b/apps/docs/app/routes/CommunityRoute.res
index 9fc078338..2d03e3a06 100644
--- a/apps/docs/app/routes/CommunityRoute.res
+++ b/apps/docs/app/routes/CommunityRoute.res
@@ -22,7 +22,7 @@ let communityTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/community",
~alias="community",
)
diff --git a/apps/docs/app/routes/DocsGuidesRoute.res b/apps/docs/app/routes/DocsGuidesRoute.res
index 820e81d92..1174b4981 100644
--- a/apps/docs/app/routes/DocsGuidesRoute.res
+++ b/apps/docs/app/routes/DocsGuidesRoute.res
@@ -22,7 +22,7 @@ let guidesTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/docs/guides",
~alias="docs/guides",
)
diff --git a/apps/docs/app/routes/DocsManualRoute.res b/apps/docs/app/routes/DocsManualRoute.res
index 9c163bb03..91280d01c 100644
--- a/apps/docs/app/routes/DocsManualRoute.res
+++ b/apps/docs/app/routes/DocsManualRoute.res
@@ -33,7 +33,7 @@ let manualTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/docs/manual",
~alias="docs/manual",
)
diff --git a/apps/docs/app/routes/DocsOverview.res b/apps/docs/app/routes/DocsOverview.res
index dbffbd735..05b00e61c 100644
--- a/apps/docs/app/routes/DocsOverview.res
+++ b/apps/docs/app/routes/DocsOverview.res
@@ -15,7 +15,7 @@ module Card = {
}
@react.component
-let default = (~showVersionSelect=true) => {
+let default = () => {
let languageManual = Constants.languageManual
let ecosystem = [
@@ -27,7 +27,7 @@ let default = (~showVersionSelect=true) => {
,
}
-let make: props => React.element
+let make: React.component
let getStaticProps: unit => promise
diff --git a/apps/docs/app/routes/SyntaxLookup.res b/apps/docs/app/routes/SyntaxLookup.res
index 2c88212aa..27df79e8c 100644
--- a/apps/docs/app/routes/SyntaxLookup.res
+++ b/apps/docs/app/routes/SyntaxLookup.res
@@ -137,15 +137,15 @@ module DetailBox = {
React.string(third),
]
->Array.mapWithIndex((el, i) => {
- el
+ {el}
})
->React.array
| more => Array.map(more, s => React.string(s))->React.array
}
}
@@ -433,7 +426,7 @@ let make = (
diff --git a/apps/docs/app/routes/SyntaxLookupDetailRoute.res b/apps/docs/app/routes/SyntaxLookupDetailRoute.res
index b5bdfda99..fd35b580c 100644
--- a/apps/docs/app/routes/SyntaxLookupDetailRoute.res
+++ b/apps/docs/app/routes/SyntaxLookupDetailRoute.res
@@ -9,7 +9,7 @@ type loaderData = {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/syntax-lookup",
~alias="syntax-lookup",
)
diff --git a/apps/docs/app/routes/TryRoute.res b/apps/docs/app/routes/TryRoute.res
index 22785fe5b..478d2e963 100644
--- a/apps/docs/app/routes/TryRoute.res
+++ b/apps/docs/app/routes/TryRoute.res
@@ -16,11 +16,10 @@ let loader = async () => {
Node.Process.Env.nodeEnv,
) {
| (Some(baseUrl), _) => (baseUrl, baseUrl)
- | (None, "development") => {
- // Use remote bundles in dev
- let baseUrl = "https://cdn.rescript-lang.org"
- (baseUrl, baseUrl)
- }
+ | (None, "development") =>
+ // Use remote bundles in dev
+ let baseUrl = "https://cdn.rescript-lang.org"
+ (baseUrl, baseUrl)
| (None, _) => (
// Use same-origin requests for the bundle
"/playground-bundles",
@@ -31,7 +30,7 @@ let loader = async () => {
try {
let versions = {
- let response = await fetch(versionsBaseUrl + "/playground-bundles/versions.json")
+ let response = await WebAPI.Fetch.fetch(versionsBaseUrl + "/playground-bundles/versions.json")
let json = await WebAPI.Response.json(response)
json
->JSON.Decode.array
@@ -49,6 +48,7 @@ let loader = async () => {
None
}
}
+
module ClientOnly = {
@react.component
let make = (~bundleBaseUrl, ~versions) => {
diff --git a/apps/docs/e2e/Playground.cy.res b/apps/docs/e2e/Playground.cy.res
index 165510c1e..60980eead 100644
--- a/apps/docs/e2e/Playground.cy.res
+++ b/apps/docs/e2e/Playground.cy.res
@@ -166,7 +166,10 @@ Console.log(isRetriable(HttpError({status: 500})))`
->shouldCss("background-color", "rgb(255, 255, 255)")
->ignore
cyWindow()
- ->thenMap(window => window.localStorage->WebAPI.Storage.getItem("playgroundTheme"))
+ ->thenMap(
+ window =>
+ window->asWebWindow->WebAPI.Window.localStorage->WebAPI.Storage.getItem("playgroundTheme"),
+ )
->shouldEqual(Null.make("light"))
->ignore
@@ -183,7 +186,10 @@ Console.log(isRetriable(HttpError({status: 500})))`
get("main")->shouldCss("background-color", "rgb(11, 13, 34)")->ignore
get(".cm-editor")->shouldCss("background-color", "rgb(11, 13, 34)")->ignore
cyWindow()
- ->thenMap(window => window.localStorage->WebAPI.Storage.getItem("playgroundTheme"))
+ ->thenMap(
+ window =>
+ window->asWebWindow->WebAPI.Window.localStorage->WebAPI.Storage.getItem("playgroundTheme"),
+ )
->shouldEqual(Null.make("dark"))
->ignore
})
diff --git a/apps/docs/e2e/bindings/Cypress.res b/apps/docs/e2e/bindings/Cypress.res
index 02c77791d..1f56626e3 100644
--- a/apps/docs/e2e/bindings/Cypress.res
+++ b/apps/docs/e2e/bindings/Cypress.res
@@ -8,14 +8,16 @@ type consoleCall = {args: array}
@val external consoleArgumentString: option => string = "String"
type console
type history
+
type rec window = {
document: Dom.document,
console: console,
navigator: {clipboard: clipboard},
scrollY: float,
- localStorage: WebAPI.WebStorageAPI.storage,
}
and clipboard
+
+external asWebWindow: window => WebAPI.Window.t = "%identity"
@get external windowHistory: window => history = "history"
@send external replaceState: (history, JSON.t, string, string) => unit = "replaceState"
type response = {status: int, body: string, headers: Dict.t}
@@ -61,19 +63,26 @@ type cssStyle
@val @scope("cy") external intercept: (routeMatcher, request => unit) => chain = "intercept"
@val @scope("cy") external interceptAll: (string, request => unit) => chain = "intercept"
@val @scope("cy") external interceptRoute: routeMatcher => chain = "intercept"
+
@val @scope("cy")
external interceptStatic: (searchRouteMatcher, staticResponse) => chain = "intercept"
+
@val @scope("cy")
external interceptPattern: (RegExp.t, request => unit) => chain = "intercept"
+
@val @scope("cy")
external interceptFailurePattern: (RegExp.t, networkError) => chain = "intercept"
+
@val @scope("cy")
external interceptFailureString: (string, networkError) => chain = "intercept"
+
@val @scope("cy")
external interceptDeferred: (RegExp.t, unit => promise) => chain = "intercept"
+
@val @scope("cy")
external interceptDeferredRequest: (routeMatcher, request => promise) => chain =
"intercept"
+
@val @scope("cy") external wait: string => chain = "wait"
@val @scope("cy") external wrap: 'a => chain<'a> = "wrap"
@val @scope("cy") external wrapWithOptions: ('a, wrapOptions) => chain<'a> = "wrap"
@@ -83,11 +92,15 @@ external interceptDeferredRequest: (routeMatcher, request => promise) => c
@val @scope("cy") external realPressKey: string => chain = "realPress"
@val @scope("cy") external realPressKeys: array => chain = "realPress"
@val @scope("cy") external reload: unit => unit = "reload"
+
@val @scope("cy")
external onBeforeLoad: (@as("window:before:load") _, window => unit) => unit = "on"
+
@val @scope("cy") external spy: (console, @as("error") _) => spy = "spy"
+
@val @scope("Cypress")
external automate: (@as("remote:debugger:protocol") _, automation) => promise = "automation"
+
@val @scope("Cypress") external baseUrl: @as("baseUrl") _ => string = "config"
@val @scope("Cypress") external isInteractive: @as("isInteractive") _ => bool = "config"
@val @scope("mocha") external forbidOnly: bool => unit = "forbidOnly"
@@ -97,38 +110,51 @@ external automate: (@as("remote:debugger:protocol") _, automation) => promise, 'a => 'b) => chain<'b> = "then"
@send external thenPromise: (chain<'a>, 'a => promise<'b>) => chain<'b> = "then"
@send external should: (chain<'a>, string) => chain<'a> = "should"
+
@send
external shouldCss: (chain, @as("have.css") _, string, string) => chain =
"should"
+
@send
external shouldCssProperty: (chain, @as("have.css") _, string) => chain = "should"
+
@send external shouldInt: (chain<'a>, string, int) => chain<'a> = "should"
+
@send
external shouldValue: (chain, @as("have.value") _, string) => chain = "should"
+
@send
external shouldText: (chain, @as("have.text") _, string) => chain = "should"
+
@send external shouldEqual: (chain<'a>, @as("equal") _, 'a) => chain<'a> = "should"
@send external shouldDeepEqual: (chain<'a>, @as("deep.equal") _, 'a) => chain<'a> = "should"
@send external shouldMatch: (chain<'a>, @as("match") _, RegExp.t) => chain<'a> = "should"
@send external andMatch: (chain, @as("match") _, RegExp.t) => chain = "and"
@send external shouldWithin: (chain, @as("be.within") _, int, int) => chain = "should"
+
@send
external shouldAttribute: (chain, @as("have.attr") _, string, string) => chain =
"should"
+
@send
external shouldProperty: (chain, @as("have.prop") _, string, string) => chain =
"should"
+
@send external attribute: (chain, @as("attr") _, string) => chain = "invoke"
@send external propertyInt: (chain<'a>, string) => chain = "its"
@send external propertyString: (chain<'a>, string) => chain = "its"
+
@send
external shouldPropertyExist: (chain<'a>, @as("have.property") _, string) => chain<'a> = "should"
+
@send external shouldSatisfy: (chain<'a>, 'a => unit) => chain<'a> = "should"
@send external click: chain => chain = "click"
@send external first: chain => chain = "first"
@send external typeText: (chain, string) => chain = "type"
+
@send
external containsChildRegex: (chain, string, RegExp.t) => chain = "contains"
+
@send external focusElement: chain => chain = "focus"
@send external realClick: chain => chain = "realClick"
@send external realPress: (chain, string) => chain = "realPress"
@@ -160,13 +186,17 @@ type parser
@send external parseHtml: (parser, string, @as("text/html") _) => Dom.document = "parseFromString"
@send external querySelector: (Dom.document, string) => Null.t = "querySelector"
@send external querySelectorAll: (Dom.document, string) => elementList = "querySelectorAll"
+
@send
external querySelectorFromElement: (Dom.element, string) => Null.t = "querySelector"
+
@send
external querySelectorAllFromElement: (Dom.element, string) => elementList = "querySelectorAll"
+
@send
external addEventListenerOnce: (Dom.document, string, unit => unit, listenerOptions) => unit =
"addEventListener"
+
@get external body: Dom.document => Dom.element = "body"
@get external documentElement: Dom.document => Dom.element = "documentElement"
@get external currentScript: Dom.document => Null.t = "currentScript"
@@ -226,16 +256,20 @@ external addEventListenerOnce: (Dom.document, string, unit => unit, listenerOpti
@send external containsChild: (chain, string) => chain = "contains"
@send external containsChildIn: (chain, string, string) => chain = "contains"
@send external select: (chain, string) => chain = "select"
+
@send
external typeWithOptions: (
chain,
string,
{"force": bool, "delay": int},
) => chain = "type"
+
@send
external shouldContainText: (chain, @as("contain.text") _, string) => chain =
"should"
+
@send external shouldInclude: (chain, @as("include") _, string) => chain = "should"
+
@send
external shouldClass: (chain, @as("have.class") _, string) => chain = "should"
diff --git a/apps/docs/functions/ogimage/[[path]]/index.png.res b/apps/docs/functions/ogimage/[[path]]/index.png.res
index 8191170d8..1d524dd2c 100644
--- a/apps/docs/functions/ogimage/[[path]]/index.png.res
+++ b/apps/docs/functions/ogimage/[[path]]/index.png.res
@@ -2,20 +2,20 @@ open WebAPI
let loadGoogleFont = async (family: string) => {
let url = `https://fonts.googleapis.com/css2?family=${family}`
- let css = await (await fetch(url))->Response.text
+ let css = await (await WebAPI.Fetch.fetch(url))->Response.text
// this function should fail if we can't load the font
let resource =
css->String.match(/src: url\((.+)\) format\('(opentype|truetype)'\)/)->Option.getOrThrow
- let response = await fetch(resource[1]->Option.getOrThrow->Option.getOrThrow)
+ let response = await WebAPI.Fetch.fetch(resource[1]->Option.getOrThrow->Option.getOrThrow)
await response->Response.arrayBuffer
}
type assets
type env = {@as("ASSETS") assets: assets}
-type context = {request: FetchAPI.request, params: {path: array}, env: env}
+type context = {request: Request.t, params: {path: array}, env: env}
-@send external fetchAsset: (assets, string) => promise = "fetch"
+@send external fetchAsset: (assets, string) => promise = "fetch"
let textResponse = (~status, message) => Response.fromString(message, ~init={status: status})
@@ -111,14 +111,14 @@ let splitPreviewText = (~title, ~description) => {
(titleSegments[0]->Option.getOr("")->normalizeText, subTitle, description->normalizeText)
}
-let requestedUrl = (~requestUrl: URLAPI.url, ~params) => {
- switch requestUrl.searchParams->URLSearchParams.get("url")->Nullable.make->Nullable.toOption {
+let requestedUrl = (~searchParams, ~path) => {
+ switch searchParams->URLSearchParams.get("url")->Null.toOption {
| Some(url) => Some(url)
- | None => params.path[0]->Option.map(decodeURIComponent)
+ | None => path[0]->Option.map(decodeURIComponent)
}
}
-let isHtmlResponse = (response: FetchAPI.response) =>
+let isHtmlResponse = (response: Response.t) =>
response.headers
->Headers.get("content-type")
->Null.toOption
@@ -126,14 +126,14 @@ let isHtmlResponse = (response: FetchAPI.response) =>
contentType->String.toLowerCase->String.includes("text/html")
)
-let renderImage = async (~assets, ~requestUrl: URLAPI.url, ~targetUrl: URLAPI.url) => {
- if targetUrl.origin != requestUrl.origin {
+let renderImage = async (~assets, ~origin, ~targetOrigin, ~targetPathname, ~targetHref) => {
+ if targetOrigin != origin {
textResponse(~status=400, "Open Graph image URL must be same-origin")
- } else if targetUrl.pathname->String.startsWith("/ogimage/") {
+ } else if targetPathname->String.startsWith("/ogimage/") {
textResponse(~status=400, "Open Graph image URL cannot point at the image endpoint")
} else {
let pageResponse = try {
- Some(await assets->fetchAsset(targetUrl.href))
+ Some(await assets->fetchAsset(targetHref))
} catch {
| _ => None
}
@@ -144,7 +144,7 @@ let renderImage = async (~assets, ~requestUrl: URLAPI.url, ~targetUrl: URLAPI.ur
textResponse(~status=pageResponse.status, "Could not fetch Open Graph image URL")
| Some(pageResponse) =>
switch pageResponse.url->parseUrl {
- | Some(responseUrl) if responseUrl.origin != requestUrl.origin =>
+ | Some(responseUrl) if responseUrl.origin != origin =>
textResponse(~status=400, "Fetched Open Graph image URL must be same-origin")
| Some(_) | None =>
if !(pageResponse->isHtmlResponse) {
@@ -256,8 +256,17 @@ let renderImage = async (~assets, ~requestUrl: URLAPI.url, ~targetUrl: URLAPI.ur
let onRequest = async ({request, params, env}: context) => {
let requestUrl = URL.make(~url=request.url)
- switch requestedUrl(~requestUrl, ~params)->Option.flatMap(parseUrl) {
+ switch requestedUrl(~searchParams=requestUrl.searchParams, ~path=params.path)->Option.flatMap(
+ parseUrl,
+ ) {
| None => textResponse(~status=400, "Missing or invalid url")
- | Some(targetUrl) => await renderImage(~assets=env.assets, ~requestUrl, ~targetUrl)
+ | Some(targetUrl) =>
+ await renderImage(
+ ~assets=env.assets,
+ ~origin=requestUrl.origin,
+ ~targetOrigin=targetUrl.origin,
+ ~targetPathname=targetUrl.pathname,
+ ~targetHref=targetUrl.href,
+ )
}
}
diff --git a/apps/docs/markdown-pages/docs/manual/array-and-list.mdx b/apps/docs/markdown-pages/docs/manual/array-and-list.mdx
index 730504fb7..ae51fef23 100644
--- a/apps/docs/markdown-pages/docs/manual/array-and-list.mdx
+++ b/apps/docs/markdown-pages/docs/manual/array-and-list.mdx
@@ -102,15 +102,15 @@ let x3 = [...y]
```
```javascript
-import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
+import * as Primitive_array from "@rescript/runtime/lib/es6/Primitive_array.mjs";
let y = [1, 2];
-let x = Belt_Array.concatMany([[4, 5], y]);
+let x = Primitive_array.spread([[4, 5], y]);
-let x2 = Belt_Array.concatMany([[4, 5], y, [7], y]);
+let x2 = Primitive_array.spread([[4, 5], y, [7], y]);
-let x3 = Belt_Array.concatMany([y]);
+let x3 = Primitive_array.spread([y]);
export { y, x, x2, x3 };
```
diff --git a/apps/docs/markdown-pages/docs/manual/async-await.mdx b/apps/docs/markdown-pages/docs/manual/async-await.mdx
index 4330c31dc..4210c0daa 100644
--- a/apps/docs/markdown-pages/docs/manual/async-await.mdx
+++ b/apps/docs/markdown-pages/docs/manual/async-await.mdx
@@ -48,8 +48,8 @@ let logUserDetails = async (userId: string) => {
```js
async function logUserDetails(userId) {
let email = await GlobalAPI.fetchUserMail(userId);
- await GlobalAPI.sendAnalytics(`User details have been logged for ` + userId);
- console.log(`Email address for user ` + userId + `: ` + email);
+ await GlobalAPI.sendAnalytics(`User details have been logged for ${userId}`);
+ console.log(`Email address for user ${userId}: ${email}`);
}
export { logUserDetails };
@@ -191,7 +191,7 @@ let fetchData = async () => {
```js
async function fetchData() {
let mail = (await GlobalAPI.fetchUserMail("1234")).toUpperCase();
- console.log(`All upper-cased mail: ` + mail);
+ console.log(`All upper-cased mail: ${mail}`);
}
export { fetchData };
@@ -223,7 +223,7 @@ let fetchData = async () => {
```
```js
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
async function fetchData() {
let val;
diff --git a/apps/docs/markdown-pages/docs/manual/bind-to-global-js-values.mdx b/apps/docs/markdown-pages/docs/manual/bind-to-global-js-values.mdx
index 840553d4b..a1ab20216 100644
--- a/apps/docs/markdown-pages/docs/manual/bind-to-global-js-values.mdx
+++ b/apps/docs/markdown-pages/docs/manual/bind-to-global-js-values.mdx
@@ -104,25 +104,24 @@ This binds to `window.location.ancestorOrigins.length`.
## Special Global Values
-Global values like `__filename` and `__DEV__` don't always exist; you can't even model them as an `option`, since the mere act of referring to them in ReScript (then compiled into JS) would trigger the usual `Uncaught ReferenceError: __filename is not defined` error in e.g. the browser environment.
+Application globals like `__DEV__` don't always exist. Referring to an undeclared identifier directly would trigger a JavaScript `ReferenceError`.
-For these troublesome global values, ReScript provides a special approach: `%external(a_single_identifier)`.
+Bind optional properties of `globalThis` instead. Reading a missing property returns `undefined`, which ReScript represents as `None`:
```res
-switch %external(__DEV__) {
+@scope("globalThis")
+external dev: option = "__DEV__"
+
+switch dev {
| Some(_) => Console.log("dev mode")
| None => Console.log("production mode")
}
```
```js
-import * as Js from "@rescript/runtime/lib/es6/Js.js";
-
-let match = Js.undefinedToOption(
- typeof __DEV__ === "undefined" ? undefined : __DEV__,
-);
+let match = globalThis.__DEV__;
if (match !== undefined) {
console.log("dev mode");
@@ -133,34 +132,30 @@ if (match !== undefined) {
-That first line's `typeof` check won't trigger a JS ReferenceError.
+This approach works for properties set on the global object. Module-scoped values, such as CommonJS's `__filename`, and identifiers replaced by a bundler are not necessarily properties of `globalThis`.
Another example:
```res
-switch %external(__filename) {
+@scope("globalThis")
+external appVersion: option = "__APP_VERSION__"
+
+switch appVersion {
| Some(f) => Console.log(f)
-| None => Console.log("non-node environment")
+| None => Console.log("application version not provided")
};
```
```js
-import * as Js from "@rescript/runtime/lib/es6/Js.js";
-import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
-
-let f = Js.undefinedToOption(
- typeof __filename === "undefined" ? undefined : __filename,
-);
+let f = globalThis.__APP_VERSION__;
if (f !== undefined) {
- console.log(Primitive_option.valFromOption(f));
+ console.log(f);
} else {
- console.log("non-node environment");
+ console.log("application version not provided");
}
```
-
-{/* TODO: revamp this page. Not good. Tell to use globalThis["foo"], and look in our stdlib */}
diff --git a/apps/docs/markdown-pages/docs/manual/bind-to-js-function.mdx b/apps/docs/markdown-pages/docs/manual/bind-to-js-function.mdx
index 8108b5c0a..50836c941 100644
--- a/apps/docs/markdown-pages/docs/manual/bind-to-js-function.mdx
+++ b/apps/docs/markdown-pages/docs/manual/bind-to-js-function.mdx
@@ -154,7 +154,7 @@ let session = stripe->createCheckoutSession({})
```js
import Stripe from "stripe";
-let stripe = new Stripe("sk\_...");
+let stripe = new Stripe("sk_...");
let session = stripe.checkout.sessions.create({});
@@ -536,19 +536,17 @@ Currently 4 directives are supported: `null_to_opt`, `undefined_to_opt`, `nullab
**Since 11.1**
-**Experimental** You can easily bind to [JS tagged template functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#tagged_templates).
+You can bind to [JS tagged template functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#tagged_templates).
Tag functions in JS expect as input an array of strings and variadic parameters for the arguments of the interpolation.
-To bind to those functions in ReScript, the binding signature must have two arrays as arguments,
-the first one being an array of strings and the second can be an array of anything.
-You add the `@taggedTemplate` annotation and you're good to go!
+Use the built-in `taggedTemplate<'param, 'output>` type. The first type parameter describes the interpolated values, and the second describes the return value. This replaces the `@taggedTemplate` decorator removed in v13.
```res
// see https://bun.sh/docs/runtime/shell
type result = {exitCode: int}
-@module("bun") @taggedTemplate
-external sh: (array, array) => promise = "$"
+@module("bun")
+external sh: taggedTemplate> = "$"
let filename = "index.res"
let result = await sh`ls ${filename}`
diff --git a/apps/docs/markdown-pages/docs/manual/control-flow.mdx b/apps/docs/markdown-pages/docs/manual/control-flow.mdx
index e5278b3ba..0ac4da5bb 100644
--- a/apps/docs/markdown-pages/docs/manual/control-flow.mdx
+++ b/apps/docs/markdown-pages/docs/manual/control-flow.mdx
@@ -207,16 +207,16 @@ while (testCondition) {
### Tips & Tricks
-There's no loop-breaking `break` keyword (nor early `return` from functions, for that matter) in ReScript. However, we can break out of a while loop easily through using a [mutable binding](./mutation.mdx).
+A [mutable binding](./mutation.mdx) can control whether a while loop continues:
```res
-let break = ref(false)
+let shouldStop = ref(false)
-while !break.contents {
+while !shouldStop.contents {
if Math.random() > 0.3 {
- break := true
+ shouldStop := true
} else {
Console.log("Still running")
}
@@ -224,17 +224,17 @@ while !break.contents {
```
```js
-let $$break = { contents: false };
+let shouldStop = { contents: false };
-while (!$$break.contents) {
+while (!shouldStop.contents) {
if (Math.random() > 0.3) {
- $$break.contents = true;
+ shouldStop.contents = true;
} else {
console.log("Still running");
}
}
-export { $$break };
+export { shouldStop };
```
diff --git a/apps/docs/markdown-pages/docs/manual/equality-comparison.mdx b/apps/docs/markdown-pages/docs/manual/equality-comparison.mdx
index 325d7a327..5efcf28f2 100644
--- a/apps/docs/markdown-pages/docs/manual/equality-comparison.mdx
+++ b/apps/docs/markdown-pages/docs/manual/equality-comparison.mdx
@@ -61,7 +61,7 @@ let doStringsMatch = (s1: string, s2: string) => s1 == s2
```
```js
-import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
+import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.mjs";
let t2 = true;
@@ -122,7 +122,7 @@ let compareOptions = (a: option, b: option) => a < b
```
```js
-import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
+import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.mjs";
function compareInt(a, b) {
return a > b;
diff --git a/apps/docs/markdown-pages/docs/manual/exception.mdx b/apps/docs/markdown-pages/docs/manual/exception.mdx
index 3aa56ba22..1fdad9651 100644
--- a/apps/docs/markdown-pages/docs/manual/exception.mdx
+++ b/apps/docs/markdown-pages/docs/manual/exception.mdx
@@ -21,7 +21,7 @@ throw(InputClosed("The stream has closed!"))
```
```js
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
let InputClosed = /* @__PURE__ */ Primitive_exceptions.create(
"Example.InputClosed",
@@ -64,7 +64,7 @@ let result =
```
```js
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -105,8 +105,8 @@ switch list{1, 2, 3}->List.getOrThrow(4) {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -177,9 +177,9 @@ try divide(2, 0)->Console.log catch {
````
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -276,8 +276,8 @@ try decodeUser(%raw("{}"))->Console.log catch {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -385,8 +385,8 @@ false
````
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -479,9 +479,9 @@ Console.log(result) // None
````
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -593,9 +593,9 @@ let myTest = () => {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -673,8 +673,8 @@ let myTest = () => {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
@@ -754,8 +754,8 @@ let myTest = () => {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function getItem(item) {
if (item === 3) {
diff --git a/apps/docs/markdown-pages/docs/manual/extensible-variant.mdx b/apps/docs/markdown-pages/docs/manual/extensible-variant.mdx
index c82a4d7ec..d2cea7161 100644
--- a/apps/docs/markdown-pages/docs/manual/extensible-variant.mdx
+++ b/apps/docs/markdown-pages/docs/manual/extensible-variant.mdx
@@ -25,7 +25,7 @@ type t +=
```
```js
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
let Other = /* @__PURE__ */ Primitive_exceptions.create("Example.Other");
@@ -59,7 +59,7 @@ let print = v =>
```
```js
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
let Other = /* @__PURE__ */ Primitive_exceptions.create("Example.Other");
diff --git a/apps/docs/markdown-pages/docs/manual/function.mdx b/apps/docs/markdown-pages/docs/manual/function.mdx
index 97da51115..d40b2c1c1 100644
--- a/apps/docs/markdown-pages/docs/manual/function.mdx
+++ b/apps/docs/markdown-pages/docs/manual/function.mdx
@@ -777,8 +777,8 @@ let someAsyncFn = async () => {
```
```js
-import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
function greet(name) {
return "Hello " + name;
@@ -849,7 +849,7 @@ setTimeout(myFunc, 1000)->ignore
```
```js
-import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
+import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.mjs";
function greet(name) {
return "Hello " + name;
diff --git a/apps/docs/markdown-pages/docs/manual/generalized-algebraic-data-types.mdx b/apps/docs/markdown-pages/docs/manual/generalized-algebraic-data-types.mdx
index e923e4f0f..99bb4ed30 100644
--- a/apps/docs/markdown-pages/docs/manual/generalized-algebraic-data-types.mdx
+++ b/apps/docs/markdown-pages/docs/manual/generalized-algebraic-data-types.mdx
@@ -38,7 +38,7 @@ let convertToDaylight = tz => {
switch tz {
| EST => EDT
| CST => CDT
- | EDT | CDT /* or, _ */ => failwith("Invalid timezone provided!")
+ | EDT | CDT /* or, _ */ => panic("Invalid timezone provided!")
}
}
```
@@ -191,7 +191,7 @@ let flexible_find = (
switch Array.find(arr, f) {
| None =>
switch ifNotFound {
- | Raise => failwith("No matching item found")
+ | Raise => panic("No matching item found")
| ReturnNone => None
| DefaultTo(x) => x
}
diff --git a/apps/docs/markdown-pages/docs/manual/generate-converters-accessors.mdx b/apps/docs/markdown-pages/docs/manual/generate-converters-accessors.mdx
index efd9ea9af..8f63f950e 100644
--- a/apps/docs/markdown-pages/docs/manual/generate-converters-accessors.mdx
+++ b/apps/docs/markdown-pages/docs/manual/generate-converters-accessors.mdx
@@ -12,17 +12,17 @@ order: 12
- `@deriving(jsConverter)` for records
- `@deriving({jsConverter: newType})` for records
-- `@deriving(abstract)` for records
- `@deriving(jsConverter)` for plain and polymorphic variants
These particular ones are no longer needed. Select a doc version lower than `9.0` in the sidebar to see their old docs.
+The `@deriving(abstract)` decorator for records was removed in v13. Use record literals to construct JavaScript objects and direct field access to read or update them. Optional fields, mutable fields, and `@as` field renaming are supported directly on records.
+
{/* TODO: genType */}
When using ReScript, you will sometimes come into situations where you want to
- Automatically generate functions that convert between ReScript's internal and JS runtime values (e.g. variants).
-- Convert a record type into an abstract type with generated creation, accessor and method functions.
- Generate some other helper functions, such as functions from record attribute names.
You can use the `@deriving` decorator for different code generation scenarios. All different options and configurations will be discussed on this page.
@@ -91,7 +91,7 @@ let pets = [{name: "bob"}, {name: "bob2"}]
pets
->Array.map(name)
- ->Array.joinWith("&")
+ ->Array.join("&")
->Console.log
```
diff --git a/apps/docs/markdown-pages/docs/manual/interop-cheatsheet.mdx b/apps/docs/markdown-pages/docs/manual/interop-cheatsheet.mdx
index dad4ab130..ea648ac48 100644
--- a/apps/docs/markdown-pages/docs/manual/interop-cheatsheet.mdx
+++ b/apps/docs/markdown-pages/docs/manual/interop-cheatsheet.mdx
@@ -38,7 +38,7 @@ This is a glossary with examples. All the features are described by later pages.
- [`@uncurry`](./bind-to-js-function.mdx#extra-solution)
- [`@unwrap`](./bind-to-js-function.mdx#trick-2-polymorphic-variant--bsunwrap)
- [`@val`](./bind-to-global-js-values.mdx#global-modules)
-- [`@taggedTemplate`](./bind-to-js-function.mdx#tagged_template-functions)
+- [`taggedTemplate`](./bind-to-js-function.mdx#tagged-template-functions)
- [`@deprecated`](./attribute.mdx#usage)
- [`genType`](https://github.com/reason-association/genType)
- [`@JSX`](./jsx.mdx)
@@ -49,7 +49,6 @@ This is a glossary with examples. All the features are described by later pages.
### Extension Points
- [`%debugger`](./embed-raw-javascript.mdx#debugger)
-- [`%external`](./bind-to-global-js-values.mdx#special-global-values)
- [`%raw`](./embed-raw-javascript.mdx#paste-raw-js-code)
- [`%todo`](../../syntax-lookup/extension_todo.mdx)
@@ -140,8 +139,8 @@ let result3: option = Nullable.toOption(Nullable.make(10))
```
```js
-import * as Stdlib_Nullable from "@rescript/runtime/lib/es6/Stdlib_Nullable.js";
-import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as Stdlib_Nullable from "@rescript/runtime/lib/es6/Stdlib_Nullable.mjs";
+import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.mjs";
let result2 = Stdlib_Nullable.fromOption(10);
@@ -207,8 +206,8 @@ external join: array => string = "join"
```res
// see https://bun.sh/docs/runtime/shell
type result = {exitCode: int}
-@module("bun") @taggedTemplate
-external sh: (array, array) => promise = "$"
+@module("bun")
+external sh: taggedTemplate> = "$"
let filename = "index.res"
let result = await sh`ls ${filename}`
diff --git a/apps/docs/markdown-pages/docs/manual/jsx.mdx b/apps/docs/markdown-pages/docs/manual/jsx.mdx
index 2fe3e6aa1..a38122e1e 100644
--- a/apps/docs/markdown-pages/docs/manual/jsx.mdx
+++ b/apps/docs/markdown-pages/docs/manual/jsx.mdx
@@ -388,6 +388,8 @@ type component<'props> = Jsx.component<'props>
type componentLike<'props, 'return> = Jsx.componentLike<'props, 'return>
+external component: componentLike<'props, element> => component<'props> = "%component_identity"
+
@module("preact/jsx-runtime")
external jsx: (component<'props>, 'props) => element = "jsx"
diff --git a/apps/docs/markdown-pages/docs/manual/lazy-values.mdx b/apps/docs/markdown-pages/docs/manual/lazy-values.mdx
index 7c555d5b3..83facd799 100644
--- a/apps/docs/markdown-pages/docs/manual/lazy-values.mdx
+++ b/apps/docs/markdown-pages/docs/manual/lazy-values.mdx
@@ -25,7 +25,7 @@ let expensiveFilesRead = Lazy.make(() => {
```js
import * as Nodefs from "node:fs";
-import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.js";
+import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.mjs";
let expensiveFilesRead = Stdlib_Lazy.make(() => {
console.log("Reading dir");
@@ -55,7 +55,7 @@ Console.log(Lazy.get(expensiveFilesRead)) // logs the directory content
```js
import * as Nodefs from "node:fs";
-import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.js";
+import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.mjs";
let expensiveFilesRead = Stdlib_Lazy.make(() => {
console.log("Reading dir");
@@ -91,8 +91,8 @@ let result = try {
```js
import * as Nodefs from "node:fs";
-import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_Lazy from "@rescript/runtime/lib/es6/Stdlib_Lazy.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
let expensiveFilesRead = Stdlib_Lazy.make(() => {
console.log("Reading dir");
diff --git a/apps/docs/markdown-pages/docs/manual/module.mdx b/apps/docs/markdown-pages/docs/manual/module.mdx
index 789ccc686..4bae0ba80 100644
--- a/apps/docs/markdown-pages/docs/manual/module.mdx
+++ b/apps/docs/markdown-pages/docs/manual/module.mdx
@@ -317,7 +317,7 @@ let BaseComponent = { defaultGreeting: "Hello", getAudience: getAudience };
let defaultGreeting = "Hey";
function render() {
- return defaultGreeting + " world!";
+ return "Hey world!";
}
let ActualComponent = {
@@ -608,7 +608,7 @@ module MakeSet = (Item: Comparable) => {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
function getProfession(person) {
if (person === "Teacher") {
@@ -653,7 +653,7 @@ module SetOfIntPairs = MakeSet(IntPair)
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
function getProfession(person) {
if (person === "Teacher") {
diff --git a/apps/docs/markdown-pages/docs/manual/pattern-matching-destructuring.mdx b/apps/docs/markdown-pages/docs/manual/pattern-matching-destructuring.mdx
index 7a1f6e919..ff3c8f025 100644
--- a/apps/docs/markdown-pages/docs/manual/pattern-matching-destructuring.mdx
+++ b/apps/docs/markdown-pages/docs/manual/pattern-matching-destructuring.mdx
@@ -256,34 +256,29 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
@@ -321,34 +316,29 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
@@ -409,50 +399,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
export { person1, message, myStatus };
@@ -481,50 +462,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
if (person1.TAG === "Teacher") {
@@ -555,50 +527,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
if (typeof myStatus !== "object" || myStatus.TAG !== "Vacations") {
@@ -629,50 +592,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
if (typeof myStatus !== "object" || myStatus.TAG !== "Vacations") {
@@ -712,50 +666,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
if (person1.TAG !== "Teacher") {
@@ -792,50 +737,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
if (person1.TAG !== "Teacher") {
@@ -892,50 +828,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
function greetPet(pet) {
@@ -1003,50 +930,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
function isPet(animal) {
@@ -1092,50 +1010,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
function isPet(animal) {
@@ -1179,50 +1088,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
function isPet(animal) {
@@ -1261,58 +1161,49 @@ switch findItem() {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
-import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let myItems = { hd: 1, tl: { hd: 2, tl: { hd: 3, tl: /* [] */ 0 } } };
@@ -1325,13 +1216,13 @@ function findItem() {
throw { RE_EXN_ID: "Not_found", Error: new Error() };
}
-let exit$2 = 0;
+let exit$1 = 0;
let item;
try {
item = findItem();
- exit$2 = 1;
+ exit$1 = 1;
} catch (raw_exn) {
let exn = Primitive_exceptions.internalToException(raw_exn);
if (exn.RE_EXN_ID === "Not_found") {
@@ -1341,7 +1232,7 @@ try {
}
}
-if (exit$2 === 1) {
+if (exit$1 === 1) {
console.log(item);
}
@@ -1374,50 +1265,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let students = ["Jane", "Harvey", "Patrick"];
@@ -1465,50 +1347,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
function printStudents(_students) {
@@ -1563,50 +1436,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
@@ -1639,50 +1503,41 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
@@ -1718,58 +1573,49 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
-console.log(10);
-
let b = d.B;
+console.log(10);
+
let coordinates = [10, 20, 30];
let centerY = 20;
@@ -1814,54 +1660,47 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
+let b = d.B;
+
function messageFor(person) {
if (person.TAG === "Teacher") {
switch (person.name) {
@@ -1881,32 +1720,24 @@ function messageFor(person) {
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- return (
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`
- );
+ return `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
}
if (typeof match$1 !== "object") {
if (match$1 === "Sick") {
return `How are you feeling?`;
} else {
- return `Good luck next semester ` + name + `!`;
+ return `Good luck next semester ${name}!`;
}
}
match$1.TAG === "Vacations";
if (match.reportCard.gpa !== 0.0) {
- return `Good luck next semester ` + name + `!`;
+ return `Good luck next semester ${name}!`;
} else {
- return `Come back in ` + match$1._0.toString() + ` days!`;
+ return `Come back in ${match$1._0.toString()} days!`;
}
}
}
-let b = d.B;
-
export { person1, message, myStatus, d, b, messageFor };
```
@@ -1941,58 +1772,49 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
-console.log("value is present");
-
let b = d.B;
+console.log("value is present");
+
let myNullableValue = 5;
export { person1, message, myStatus, d, b, myNullableValue };
@@ -2034,54 +1856,47 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
+let b = d.B;
+
function optionBoolToBool(opt) {
if (opt === undefined) {
return false;
@@ -2090,8 +1905,6 @@ function optionBoolToBool(opt) {
}
}
-let b = d.B;
-
export { person1, message, myStatus, d, b, optionBoolToBool };
```
@@ -2116,54 +1929,47 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
+let b = d.B;
+
function optionBoolToBool(opt) {
if (opt !== undefined) {
return opt;
@@ -2172,8 +1978,6 @@ function optionBoolToBool(opt) {
}
}
-let b = d.B;
-
export { person1, message, myStatus, d, b, optionBoolToBool };
```
@@ -2199,54 +2003,47 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
+let b = d.B;
+
function optionBoolToBool(opt) {
if (opt !== undefined) {
return opt;
@@ -2255,8 +2052,6 @@ function optionBoolToBool(opt) {
}
}
-let b = d.B;
-
export { person1, message, myStatus, d, b, optionBoolToBool };
```
@@ -2281,54 +2076,47 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
+let b = d.B;
+
function optionBoolToBool(opt) {
if (opt !== undefined) {
return opt;
@@ -2337,8 +2125,6 @@ function optionBoolToBool(opt) {
}
}
-let b = d.B;
-
export { person1, message, myStatus, d, b, optionBoolToBool };
```
@@ -2363,54 +2149,47 @@ let person1 = { TAG: "Teacher", name: "Jane", age: 35 };
let message;
if (person1.TAG === "Teacher") {
- message = `Hello ` + "Jane" + `.`;
+ message = `Hello Jane.`;
} else {
let match = "Jane";
let match$1 = match.status;
let name = match.name;
let match$2 = match.reportCard;
if (match$2.passing) {
- message =
- `Congrats ` +
- name +
- `, nice GPA of ` +
- match$2.gpa.toString() +
- ` you got there!`;
+ message = `Congrats ${name}, nice GPA of ${match$2.gpa.toString()} you got there!`;
} else {
let exit = 0;
if (typeof match$1 !== "object") {
message =
match$1 === "Sick"
? `How are you feeling?`
- : `Good luck next semester ` + name + `!`;
+ : `Good luck next semester ${name}!`;
} else {
exit = 1;
}
if (exit === 1) {
message =
match.reportCard.gpa !== 0.0
- ? `Good luck next semester ` + name + `!`
- : `Come back in ` + match$1._0.toString() + ` days!`;
+ ? `Good luck next semester ${name}!`
+ : `Come back in ${match$1._0.toString()} days!`;
}
}
}
let myStatus = { TAG: "Vacations", _0: 10 };
-let exit$1 = 0;
-
if (typeof myStatus !== "object") {
console.log("Hey! How are you?");
+} else if (myStatus.TAG === "Vacations") {
+ console.log(`Come back in ${(10).toString()} days!`);
} else {
- exit$1 = 1;
-}
-
-if (exit$1 === 1) {
- console.log(`Come back in ` + (10).toString() + ` days!`);
+ console.log(`Come back in ${(10).toString()} days!`);
}
let d = { A: 5, B: 6 };
+let b = d.B;
+
function optionBoolToBool(opt) {
if (opt !== undefined) {
return opt;
@@ -2419,8 +2198,6 @@ function optionBoolToBool(opt) {
}
}
-let b = d.B;
-
export { person1, message, myStatus, d, b, optionBoolToBool };
```
diff --git a/apps/docs/markdown-pages/docs/manual/polymorphic-variant.mdx b/apps/docs/markdown-pages/docs/manual/polymorphic-variant.mdx
index f19c537e0..600390d41 100644
--- a/apps/docs/markdown-pages/docs/manual/polymorphic-variant.mdx
+++ b/apps/docs/markdown-pages/docs/manual/polymorphic-variant.mdx
@@ -406,7 +406,7 @@ let message = "Hello " ++ (theCompany :> string)
```
```js
-let message = "Hello " + "Apple";
+let message = "Hello Apple";
let myColor = "Ruby";
diff --git a/apps/docs/markdown-pages/docs/manual/primitive-types.mdx b/apps/docs/markdown-pages/docs/manual/primitive-types.mdx
index cdd353066..50e4a136a 100644
--- a/apps/docs/markdown-pages/docs/manual/primitive-types.mdx
+++ b/apps/docs/markdown-pages/docs/manual/primitive-types.mdx
@@ -75,13 +75,10 @@ ${name}
```js
let name = "Joe";
-let greeting =
- `Hello
+let greeting = `Hello
World
👋
-` +
- name +
- `
+${name}
`;
export { name, greeting };
diff --git a/apps/docs/markdown-pages/docs/manual/promise.mdx b/apps/docs/markdown-pages/docs/manual/promise.mdx
index e64cbf5f4..a281e69fb 100644
--- a/apps/docs/markdown-pages/docs/manual/promise.mdx
+++ b/apps/docs/markdown-pages/docs/manual/promise.mdx
@@ -50,19 +50,18 @@ let p3 = Promise.reject(MyOwnError("some rejection"))
```res
let logAsyncMessage = () => {
- open Promise
Promise.resolve("hello world")
- ->then(msg => {
+ ->Promise.then(msg => {
// then callbacks require the result to be resolved explicitly
- resolve("Message: " ++ msg)
+ Promise.resolve("Message: " ++ msg)
})
- ->then(msg => {
+ ->Promise.then(msg => {
Console.log(msg)
// Even if there is no result, we need to use resolve() to return a promise
- resolve()
+ Promise.resolve()
})
- ->ignore // Requires ignoring due to unhandled return value
+ ->Promise.ignore // Handle the discarded promise explicitly
}
```
@@ -94,7 +93,7 @@ external fetchMessage: string => promise = "global.fetchMessage"
let logAsyncMessage = async () => {
let messages = await Promise.all([fetchMessage("message1"), fetchMessage("message2")])
- Console.log(messages->Array.joinWith(", "))
+ Console.log(messages->Array.join(", "))
}
```
diff --git a/apps/docs/markdown-pages/docs/manual/tagged-templates.mdx b/apps/docs/markdown-pages/docs/manual/tagged-templates.mdx
index 7af778b41..1692036ee 100644
--- a/apps/docs/markdown-pages/docs/manual/tagged-templates.mdx
+++ b/apps/docs/markdown-pages/docs/manual/tagged-templates.mdx
@@ -18,13 +18,13 @@ to learn more about them.
## Define a tag function
-Tag functions in ReScript have the following signature:
+Tagged template values in ReScript have the following type:
```res sig
-let myTagFunction : (array, array<'param>) => 'output
+let myTagFunction: taggedTemplate<'param, 'output>
```
-As you can see, you can have any type you want both for the placeholder array and for the output.
+The type parameters describe the interpolated values and the output. Use `TaggedTemplate.make` to lift a ReScript function that takes the string segments and an array of interpolated values into a tagged template value.
Given how string interpolation works, you'll always have the following invariant:
@@ -44,7 +44,7 @@ type params =
| S(string)
| Bool(bool)
-let s = (strings, parameters) => {
+let s = TaggedTemplate.make((strings, parameters) => {
let text = Array.reduceWithIndex(parameters, Array.getUnsafe(strings, 0), (
acc,
param,
@@ -61,35 +61,32 @@ let s = (strings, parameters) => {
acc ++ p ++ s
})
React.string(text)
-}
+})
```
```js
-import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
-
-function s(strings, parameters) {
- return Stdlib_Array.reduceWithIndex(
- parameters,
- strings[0],
- (acc, param, i) => {
- let s = strings[(i + 1) | 0];
- let p;
- switch (param.TAG) {
- case "I":
- case "F":
- p = param._0.toString();
- break;
- case "S":
- p = param._0;
- break;
- case "Bool":
- p = param._0 ? "true" : "false";
- break;
- }
- return acc + p + s;
- },
- );
-}
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.mjs";
+import * as Stdlib_TaggedTemplate from "@rescript/runtime/lib/es6/Stdlib_TaggedTemplate.mjs";
+
+let s = Stdlib_TaggedTemplate.make((strings, parameters) =>
+ Stdlib_Array.reduceWithIndex(parameters, strings[0], (acc, param, i) => {
+ let s = strings[(i + 1) | 0];
+ let p;
+ switch (param.TAG) {
+ case "I":
+ case "F":
+ p = param._0.toString();
+ break;
+ case "S":
+ p = param._0;
+ break;
+ case "Bool":
+ p = param._0 ? "true" : "false";
+ break;
+ }
+ return acc + p + s;
+ }),
+);
export { s };
```
@@ -112,42 +109,36 @@ module Greetings = {
```
```js
-import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.mjs";
import * as JsxRuntime from "react/jsx-runtime";
-
-function s(strings, parameters) {
- return Stdlib_Array.reduceWithIndex(
- parameters,
- strings[0],
- (acc, param, i) => {
- let s = strings[(i + 1) | 0];
- let p;
- switch (param.TAG) {
- case "I":
- case "F":
- p = param._0.toString();
- break;
- case "S":
- p = param._0;
- break;
- case "Bool":
- p = param._0 ? "true" : "false";
- break;
- }
- return acc + p + s;
- },
- );
-}
+import * as Stdlib_TaggedTemplate from "@rescript/runtime/lib/es6/Stdlib_TaggedTemplate.mjs";
+
+let s = Stdlib_TaggedTemplate.make((strings, parameters) =>
+ Stdlib_Array.reduceWithIndex(parameters, strings[0], (acc, param, i) => {
+ let s = strings[(i + 1) | 0];
+ let p;
+ switch (param.TAG) {
+ case "I":
+ case "F":
+ p = param._0.toString();
+ break;
+ case "S":
+ p = param._0;
+ break;
+ case "Bool":
+ p = param._0 ? "true" : "false";
+ break;
+ }
+ return acc + p + s;
+ }),
+);
function Example$Greetings(props) {
return JsxRuntime.jsx("div", {
- children: s(
- [`hello `, ` you're `, ` year old!`],
- [
- { TAG: "S", _0: props.name },
- { TAG: "I", _0: props.age },
- ],
- ),
+ children: s`hello ${{ TAG: "S", _0: props.name }} you're ${{
+ TAG: "I",
+ _0: props.age,
+ }} year old!`,
});
}
@@ -157,43 +148,37 @@ export { s, Greetings };
```
```jsx
-import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.mjs";
import * as JsxRuntime from "react/jsx-runtime";
-
-function s(strings, parameters) {
- return Stdlib_Array.reduceWithIndex(
- parameters,
- strings[0],
- (acc, param, i) => {
- let s = strings[(i + 1) | 0];
- let p;
- switch (param.TAG) {
- case "I":
- case "F":
- p = param._0.toString();
- break;
- case "S":
- p = param._0;
- break;
- case "Bool":
- p = param._0 ? "true" : "false";
- break;
- }
- return acc + p + s;
- },
- );
-}
+import * as Stdlib_TaggedTemplate from "@rescript/runtime/lib/es6/Stdlib_TaggedTemplate.mjs";
+
+let s = Stdlib_TaggedTemplate.make((strings, parameters) =>
+ Stdlib_Array.reduceWithIndex(parameters, strings[0], (acc, param, i) => {
+ let s = strings[(i + 1) | 0];
+ let p;
+ switch (param.TAG) {
+ case "I":
+ case "F":
+ p = param._0.toString();
+ break;
+ case "S":
+ p = param._0;
+ break;
+ case "Bool":
+ p = param._0 ? "true" : "false";
+ break;
+ }
+ return acc + p + s;
+ }),
+);
function Example$Greetings(props) {
return (
{"Docs"} ;
diff --git a/apps/docs/markdown-pages/docs/react/elements-and-jsx.mdx b/apps/docs/markdown-pages/docs/react/elements-and-jsx.mdx
index 4bc92f07d..2631716b6 100644
--- a/apps/docs/markdown-pages/docs/react/elements-and-jsx.mdx
+++ b/apps/docs/markdown-pages/docs/react/elements-and-jsx.mdx
@@ -142,7 +142,7 @@ Sometimes it's necessary to pass around component functions to have more control
```res
type props = {name: string}
-let render = (myComp: props => React.element) => {
+let render = (myComp: React.component) => {
) => {
let children = [React.string("Introduction"), React.string("Body")]
let props = {title: "Article #1", children: React.null}
diff --git a/apps/docs/markdown-pages/docs/react/extensions-of-props.mdx b/apps/docs/markdown-pages/docs/react/extensions-of-props.mdx
index 10a302a3e..6e64403a5 100644
--- a/apps/docs/markdown-pages/docs/react/extensions-of-props.mdx
+++ b/apps/docs/markdown-pages/docs/react/extensions-of-props.mdx
@@ -42,9 +42,7 @@ let Comp = { make: make };
let props = { b: "b" };
-let newrecord = { ...props };
-
-JsxRuntime.jsx(make, ((newrecord.a = "a"), newrecord));
+JsxRuntime.jsx(make, { ...props, a: "a" });
export { Comp, props };
```
@@ -59,9 +57,7 @@ let Comp = { make: make };
let props = { b: "b" };
-let newrecord = { ...props };
-
-, ~activeToc, ~route) => {
@@ -10,7 +10,7 @@ let make = (~categories: array, ~activeToc, ~route) => {
switch node {
| Nullable.Value(element) =>
let dialog = element->elementToDialog
- let breakpoint = window->WebAPI.Window.matchMedia("(min-width: 768px)")
+ let breakpoint = WebAPI.DOM.window->WebAPI.Window.matchMedia("(min-width: 768px)")
let handleClose = _ => {
// StrictMode can reopen the dialog before a cleanup's close event arrives.
if !dialog.open_ {
diff --git a/apps/docs/src/components/Docson.res b/apps/docs/src/components/Docson.res
index d7e35ad0f..aaac39980 100644
--- a/apps/docs/src/components/Docson.res
+++ b/apps/docs/src/components/Docson.res
@@ -20,7 +20,7 @@ let make = (~tag) => {
// The api for docson is a little bit funky, so you need to check out the source to understand what it's doing
// See: https://github.com/lbovet/docson/blob/master/src/index.js
let _ =
- fetch(segment)
+ WebAPI.Fetch.fetch(segment)
->Promise.then(WebAPI.Response.json)
->Promise.then(schema => {
let _ = switch element.current->Nullable.toOption {
diff --git a/apps/docs/src/components/LandingPageCopyButton.res b/apps/docs/src/components/LandingPageCopyButton.res
index c9dbd90a3..573f0607b 100644
--- a/apps/docs/src/components/LandingPageCopyButton.res
+++ b/apps/docs/src/components/LandingPageCopyButton.res
@@ -5,14 +5,17 @@ type state =
| Failed
let useFeedbackRef = setState => React.useCallback(_ => {
- let timer = setTimeout(~handler=() => setState(_ => Idle), ~timeout=2000)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => setState(_ => Idle),
+ ~timeout=2000,
+ )
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
}, [])
@react.component
let make =
- @directive("'use memo'")
- (~code, ~writeClipboard=Clipboard.writeText) => {
+ @directive("'use memo'") (~code, ~writeClipboard=Clipboard.writeText) => {
let (state, setState) = React.useState(_ => Idle)
let feedbackRef = useFeedbackRef(setState)
@@ -54,6 +57,6 @@ let make =
>
- //
+ /* */
{React.string("Docs")}
{
- // setFilter(prev => {
- // {...prev, Filter.includeNpm: !filter.includeNpm}
- // })
- // }}>
- // {React.string("NPM package")}
- //
+
+ /* { */
+ /* setFilter(prev => { */
+ /* {...prev, Filter.includeNpm: !filter.includeNpm} */
+ /* }) */
+ /* }}> */
+ /* {React.string("NPM package")} */
+ /* */
+
{
@@ -290,6 +291,7 @@ module InfoSidebar = {
{React.string("Publishing ReScript npm packages")}
+
/*
@@ -519,9 +522,9 @@ let getStaticProps = async (): props => {
let baseUrl = "https://registry.npmjs.org/-/v1/search?text=keywords:rescript&size=250&maintenance=1.0&popularity=0.5&quality=0.9"
let (one, two, three) = await Promise.all3((
- fetch(baseUrl),
- fetch(baseUrl ++ "&from=250"),
- fetch(baseUrl ++ "&from=500"),
+ WebAPI.Fetch.fetch(baseUrl),
+ WebAPI.Fetch.fetch(baseUrl ++ "&from=250"),
+ WebAPI.Fetch.fetch(baseUrl ++ "&from=500"),
))
let responseToOption = async response => {
diff --git a/apps/docs/app/routes/Packages.resi b/apps/docs/app/routes/Packages.resi
index a89c521d5..4fe6f38bc 100644
--- a/apps/docs/app/routes/Packages.resi
+++ b/apps/docs/app/routes/Packages.resi
@@ -22,6 +22,6 @@ type props = {
unmaintained: array
diff --git a/apps/docs/app/routes/DocsOverview.resi b/apps/docs/app/routes/DocsOverview.resi
index 45deeeacb..47fa1ac2e 100644
--- a/apps/docs/app/routes/DocsOverview.resi
+++ b/apps/docs/app/routes/DocsOverview.resi
@@ -1,2 +1,2 @@
@react.component
-let default: (~showVersionSelect: bool=?) => React.element
+let default: unit => React.element
diff --git a/apps/docs/app/routes/DocsReactRoute.res b/apps/docs/app/routes/DocsReactRoute.res
index 8e3dcb073..75e319ca5 100644
--- a/apps/docs/app/routes/DocsReactRoute.res
+++ b/apps/docs/app/routes/DocsReactRoute.res
@@ -26,7 +26,7 @@ let reactTableOfContents = async () => {
let loader: ReactRouter.Loader.t = async ({request}) => {
let {pathname} = WebAPI.URL.make(~url=request.url)
let filePath = MdxFile.resolveFilePath(
- (pathname :> string),
+ pathname :> string,
~dir="markdown-pages/docs/react",
~alias="docs/react",
)
diff --git a/apps/docs/app/routes/LandingPage.res b/apps/docs/app/routes/LandingPage.res
index 5fbaf7240..46a81eded 100644
--- a/apps/docs/app/routes/LandingPage.res
+++ b/apps/docs/app/routes/LandingPage.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- (~playgroundData) => {
+ @directive("'use memo'") (~playgroundData) => {
<>
, pattern: string): array<
Fuse.match,
> => {
- let fuseOpts = Fuse.Options.t(
- ~shouldSort=true,
- ~includeScore=true,
- ~threshold=0.2,
- ~ignoreLocation=true,
- ~minMatchCharLength=1,
- ~keys=["meta.uid", "name", "keywords"],
- (),
- )
+ let fuseOpts: Fuse.Options.t = {
+ shouldSort: true,
+ includeScore: true,
+ threshold: 0.2,
+ ignoreLocation: true,
+ minMatchCharLength: 1,
+ keys: ["meta.uid", "name", "keywords"],
+ }
let fuser = Fuse.make(packages, fuseOpts)
@@ -204,7 +203,7 @@ module Category = {
}
}
@@ -230,7 +229,7 @@ module InfoSidebar = {
toggle()
}
-
+
}
}
@@ -263,15 +262,17 @@ module InfoSidebar = {
>
{React.string("Community")}
- // {React.string(title)}
- children
+ {children}
-
}
}
@@ -166,11 +166,7 @@ type item = {
}
@react.component
-let make = (
- ~mdxSources: array summaryEl
- children
+ {summaryEl}
+ {children}
- {s(
- [`hello `, ` you're `, ` year old!`],
- [
- { TAG: "S", _0: props.name },
- { TAG: "I", _0: props.age },
- ],
- )}
+ {s`hello ${{ TAG: "S", _0: props.name }} you're ${{
+ TAG: "I",
+ _0: props.age,
+ }} year old!`}
);
}
diff --git a/apps/docs/markdown-pages/docs/manual/variant.mdx b/apps/docs/markdown-pages/docs/manual/variant.mdx
index 714914497..22215b69b 100644
--- a/apps/docs/markdown-pages/docs/manual/variant.mdx
+++ b/apps/docs/markdown-pages/docs/manual/variant.mdx
@@ -578,7 +578,7 @@ switch animal {
```javascript
function greetAnimal(animal) {
if (animal !== "Dog" && animal !== "Bird" && animal !== "Cat") {
- return `I don't know how to greet animal ` + animal;
+ return `I don't know how to greet animal ${animal}`;
}
switch (animal) {
case "Dog":
diff --git a/apps/docs/markdown-pages/docs/react/arrays-and-keys.mdx b/apps/docs/markdown-pages/docs/react/arrays-and-keys.mdx
index 600596ae5..ea5bdcbbf 100644
--- a/apps/docs/markdown-pages/docs/react/arrays-and-keys.mdx
+++ b/apps/docs/markdown-pages/docs/react/arrays-and-keys.mdx
@@ -394,7 +394,7 @@ let make = () => {
```
```js
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
import * as JsxRuntime from "react/jsx-runtime";
let todos = [
@@ -420,7 +420,7 @@ export { todos, items, make };
```
```jsx
-import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.js";
+import * as Stdlib_List from "@rescript/runtime/lib/es6/Stdlib_List.mjs";
import * as JsxRuntime from "react/jsx-runtime";
let todos = [
diff --git a/apps/docs/markdown-pages/docs/react/components-and-props.mdx b/apps/docs/markdown-pages/docs/react/components-and-props.mdx
index d4b040548..8703bbbb4 100644
--- a/apps/docs/markdown-pages/docs/react/components-and-props.mdx
+++ b/apps/docs/markdown-pages/docs/react/components-and-props.mdx
@@ -80,7 +80,7 @@ In ReactJS, props are usually described as a single `props` record. In ReScript,
// src/Article.res
@react.component
let make = (~title: string, ~visitorCount: int, ~children: React.element) => {
- let visitorCountMsg = "You are visitor number: " ++ Belt.Int.toString(visitorCount);
+ let visitorCountMsg = "You are visitor number: " ++ Int.toString(visitorCount);
{React.string(title)}
{React.string(visitorCountMsg)}
@@ -93,7 +93,8 @@ let make = (~title: string, ~visitorCount: int, ~children: React.element) => {
import * as JsxRuntime from "react/jsx-runtime";
function Example(props) {
- let visitorCountMsg = "You are visitor number: " + String(props.visitorCount);
+ let visitorCountMsg =
+ "You are visitor number: " + props.visitorCount.toString();
return JsxRuntime.jsxs("div", {
children: [
JsxRuntime.jsx("div", { children: props.title }),
@@ -112,7 +113,8 @@ export { make };
import * as JsxRuntime from "react/jsx-runtime";
function Example(props) {
- let visitorCountMsg = "You are visitor number: " + String(props.visitorCount);
+ let visitorCountMsg =
+ "You are visitor number: " + props.visitorCount.toString();
return (
{props.title}
@@ -201,7 +203,7 @@ let name = Some("Andrea")
```
```js
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -218,7 +220,7 @@ export { Greeting, name };
```
```jsx
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -282,7 +284,7 @@ module MyList = {
```
```js
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -308,7 +310,7 @@ export { Greeting, MyList };
```
```jsx
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -446,7 +448,7 @@ let make = (props: props) => {
```
```js
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -465,7 +467,7 @@ export { Greeting, make };
```
```jsx
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -530,7 +532,7 @@ let make = () => {
```
```js
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -551,7 +553,7 @@ export { Greeting, make };
```
```jsx
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -577,9 +579,9 @@ export { Greeting, make };
**Note:** React components are capitalized; primitive DOM elements like `div` or `button` are uncapitalized. More infos on the JSX specifics and code transformations can be found in our [JSX language manual section](../manual/jsx.mdx#capitalized-tag).
-### Handwritten Components
+### Components with a Props Record
-You don't need to use the `@react.component` decorator to write components that can be used in JSX. Instead you can write the `make` function with type `props` and these will always work as React components. But then you will have the issue with the component name being "make" in the React dev tools.
+Use `@react.componentWithProps` when a component takes a single props record instead of labeled arguments.
For example:
@@ -589,6 +591,7 @@ For example:
module Link = {
type props = {href: string, children: React.element};
+ @react.componentWithProps
let make = (props: props) => {
{props.children}
@@ -600,7 +603,7 @@ module Link = {
```
```js
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -609,19 +612,19 @@ function Example$Greeting(props) {
let Greeting = { make: Example$Greeting };
-function make(props) {
+function Example$Link(props) {
return JsxRuntime.jsx("a", { children: props.children, href: props.href });
}
-let Link = { make: make };
+let Link = { make: Example$Link };
-JsxRuntime.jsx(make, { href: "/docs", children: "Docs" });
+JsxRuntime.jsx(Example$Link, { href: "/docs", children: "Docs" });
export { Greeting, Link };
```
```jsx
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.mjs";
import * as JsxRuntime from "react/jsx-runtime";
function Example$Greeting(props) {
@@ -630,11 +633,11 @@ function Example$Greeting(props) {
let Greeting = { make: Example$Greeting };
-function make(props) {
+function Example$Link(props) {
return {props.children};
}
-let Link = { make: make };
+let Link = { make: Example$Link };
{React.createElement(myComp, {name: "Franz"})}
}
```
@@ -164,7 +164,7 @@ There is also a `React.createElementVariadic` function, which takes an array of
```res
type props = {title: string, children: React.element}
-let render = (article: props => React.element) => {
+let render = (article: React.component{React.string(msg)}
@@ -55,7 +55,7 @@ function Example(props) { let match = React.useState(() => 0); let setCount = match[1]; let onClick = (_evt) => setCount((prev) => (prev + 1) | 0); - let msg = "You clicked" + String(match[0]) + "times"; + let msg = "You clicked" + match[0].toString() + "times"; return JsxRuntime.jsxs("div", { children: [ JsxRuntime.jsx("p", { children: msg }), @@ -77,7 +77,7 @@ function Example(props) { let match = React.useState(() => 0); let setCount = match[1]; let onClick = (_evt) => setCount((prev) => (prev + 1) | 0); - let msg = "You clicked" + String(match[0]) + "times"; + let msg = "You clicked" + match[0].toString() + "times"; return ({msg}
diff --git a/apps/docs/markdown-pages/docs/react/hooks-reducer.mdx b/apps/docs/markdown-pages/docs/react/hooks-reducer.mdx index 4a39ddf79..e232ed274 100644 --- a/apps/docs/markdown-pages/docs/react/hooks-reducer.mdx +++ b/apps/docs/markdown-pages/docs/react/hooks-reducer.mdx @@ -64,7 +64,7 @@ let make = () => { let (state, dispatch) = React.useReducer(reducer, {count: 0}) <> - {React.string("Count:" ++ Belt.Int.toString(state.count))} + {React.string("Count:" ++ Int.toString(state.count))} @@ -88,7 +88,7 @@ function Example(props) { let dispatch = match[1]; return JsxRuntime.jsxs(JsxRuntime.Fragment, { children: [ - "Count:" + String(match[0].count), + "Count:" + match[0].count.toString(), JsxRuntime.jsx("button", { children: "-", onClick: (param) => dispatch("Dec"), @@ -123,7 +123,7 @@ function Example(props) { let dispatch = match[1]; return ( <> - {"Count:" + String(match[0].count)} + {"Count:" + match[0].count.toString()} @@ -176,7 +176,7 @@ let reducer = (state, action) => let todos = Array.filter(state.todos, todo => todo.id !== id) {...state, todos: todos} | ToggleTodo(id) => - let todos = Belt.Array.map(state.todos, todo => + let todos = Array.map(state.todos, todo => if todo.id === id { { ...todo, @@ -198,7 +198,7 @@ let make = () => { {todos: initialTodos, nextId: 2}, ) - let todos = Belt.Array.map(state.todos, todo => + let todos = Array.map(state.todos, todo =>
- playgroundLinkButton
- copyButton
+ {playgroundLinkButton}
+ {copyButton}
| None => React.null
}
- //text within code-box
+ /* text within code-box */
}
diff --git a/apps/docs/src/components/CommunityMobileSidebar.res b/apps/docs/src/components/CommunityMobileSidebar.res
index 551aa546b..3c29d5ca1 100644
--- a/apps/docs/src/components/CommunityMobileSidebar.res
+++ b/apps/docs/src/components/CommunityMobileSidebar.res
@@ -1,4 +1,4 @@
-external elementToDialog: Dom.element => WebAPI.DOMAPI.htmlDialogElement = "%identity"
+external elementToDialog: Dom.element => WebAPI.HTMLDialogElement.t = "%identity"
@react.component
let make = (~categories: array {React.array(tabElements)}
- buttonDiv
+ {buttonDiv}
-
children+
{children}
{React.string("Quick Install")}
diff --git a/apps/docs/src/components/LandingPageIntro.res b/apps/docs/src/components/LandingPageIntro.res
index 01767bd75..bc25e13cc 100644
--- a/apps/docs/src/components/LandingPageIntro.res
+++ b/apps/docs/src/components/LandingPageIntro.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
diff --git a/apps/docs/src/components/LandingPageTrustedBy.res b/apps/docs/src/components/LandingPageTrustedBy.res
index 3041a1134..07dd2cf32 100644
--- a/apps/docs/src/components/LandingPageTrustedBy.res
+++ b/apps/docs/src/components/LandingPageTrustedBy.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let ourUsersSourcePath = "apps/docs/src/data/OurUsers.res"
diff --git a/apps/docs/src/components/LandingPageTrustedBy.res b/apps/docs/src/components/LandingPageTrustedBy.res
index 3041a1134..07dd2cf32 100644
--- a/apps/docs/src/components/LandingPageTrustedBy.res
+++ b/apps/docs/src/components/LandingPageTrustedBy.res
@@ -1,7 +1,6 @@
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let ourUsersSourcePath = "apps/docs/src/data/OurUsers.res"
diff --git a/apps/docs/src/components/Markdown.res b/apps/docs/src/components/Markdown.res
index 9840ee22d..56134da9f 100644
--- a/apps/docs/src/components/Markdown.res
+++ b/apps/docs/src/components/Markdown.res
@@ -4,14 +4,14 @@
module P = {
@react.component
let make = (~children) =>
- children
+ {children}
}
// Used for hero like introduction text in
// e.g Doc sections
module Intro = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Cite = {
@@ -20,7 +20,7 @@ module Cite = {
// For semantics, check out
// https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
- children
+ {children}
{Option.mapOr(author, React.null, author =>
{React.string(author)}
)}
@@ -30,13 +30,13 @@ module Cite = {
module Info = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Warn = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module UrlBox = {
@@ -47,7 +47,7 @@ module UrlBox = {
let elements = React.Children.toArray(children)
let content = if typeof(children) == #string || React.isValidElement(children) {
- imgEl
+ {imgEl}
{MdxLegacy.getChildren(children)}
} else {
@@ -57,7 +57,7 @@ module UrlBox = {
let rest = elements->Array.slice(~start=1)
<>
- imgEl
+ {imgEl}
{MdxLegacy.getChildren(head)}
{React.array(rest)}
@@ -82,8 +82,8 @@ module UrlBox = {
}
- content
- link
+ {content}
+ {link}
}
}
@@ -103,12 +103,13 @@ module Anchor = {
}
}
+
//*--- HEADLINES ---*//
module H1 = {
@react.component
let make = (~id=?, ~title=?, ~children) =>
- children
+ {children}
}
module H2 = {
@@ -118,7 +119,7 @@ module H2 = {
<>
- children
+ {children}
- children
+ {children}
- children
+ {children}
children
+ let make = (~children) => {children}
}
module InlineCode = {
@@ -177,7 +178,7 @@ module InlineCode = {
- children
+ {children}
}
@@ -185,13 +186,13 @@ module Table = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Thead = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Th = {
@@ -200,13 +201,13 @@ module Th = {
- children
+ {children}
}
module Td = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Code = {
@@ -233,16 +234,16 @@ module Code = {
let highlightedLines = parseNumericRangeMeta(metastring)
- if List.has(metaSplits, "example", String.equal) {
+ if metaSplits->List.some(value => value == "example") {
- children
+ {children}
}
@@ -353,13 +354,13 @@ module A = {
?target
dataTestId="absolute-url"
>
- children
+ {children}
} else {
- children
+ {children}
}
}
@@ -367,12 +368,12 @@ module A = {
module Ul = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Ol = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Li = {
@@ -397,7 +398,7 @@ module Li = {
| [child] =>
switch getType(child) {
| "pre" | "p" => child
- | _ =>
child
+ | _ => {child}
}
| _ =>
let first = elements[0]->Option.getOrThrow
@@ -407,18 +408,18 @@ module Li = {
| "ul" | "ol" | "li" | "pre" =>
<>
{getType(first) == "p" ? React.array(head) : {React.array(head)}
}
- last
+ {last}
- | _ => children
+ | _ => {children}
}
}
- , React.element>, React.element>,
+ cite?: React.component, React.element>>,
@as("Info")
- info?: React.componentLike, React.element>,
+ info?: React.component>,
@as("Warn")
- warn?: React.componentLike, React.element>,
+ warn?: React.component>,
@as("Intro")
- intro?: React.componentLike, React.element>,
+ intro?: React.component>,
@as("Image")
- image?: React.componentLike<
- Image.props,
- React.element,
- >,
+ image?: React.component>,
@as("Video")
- video?: React.componentLike, React.element>,
+ video?: React.component>,
@as("UrlBox")
- urlBox?: React.componentLike, React.element>,
+ urlBox?: React.component>,
@as("CodeTab")
- codeTab?: CodeTab.props> => React.element,
+ codeTab?: React.component>>,
/* Common markdown elements */
- p?: P.props => React.element,
- li?: Li.props => React.element,
- h1?: H1.props => React.element,
- h2?: H2.props => React.element,
- h3?: H3.props => React.element,
- h4?: H4.props => React.element,
- h5?: H5.props => React.element,
- ul?: Ul.props => React.element,
- ol?: Ol.props => React.element,
- table?: Table.props => React.element,
- thead?: Thead.props => React.element,
- th?: Th.props => React.element,
- td?: Td.props => React.element,
- blockquote?: Blockquote.props => React.element,
- strong?: Strong.props => React.element,
- hr?: Hr.props => React.element,
- code?: React.componentLike, React.element>, React.element>,
- pre?: Pre.props => React.element,
- a?: A.props => React.element,
+ p?: React.component>,
+ li?: React.component>,
+ h1?: React.component>,
+ h2?: React.component>,
+ h3?: React.component>,
+ h4?: React.component>,
+ h5?: React.component>,
+ ul?: React.component>,
+ ol?: React.component>,
+ table?: React.component>,
+ thead?: React.component>,
+ th?: React.component>,
+ td?: React.component>,
+ blockquote?: React.component>,
+ strong?: React.component>,
+ hr?: React.component,
+ code?: React.component, React.element>>,
+ pre?: React.component>,
+ a?: React.component>,
}
let default = {
diff --git a/apps/docs/src/components/NavbarPrimary.res b/apps/docs/src/components/NavbarPrimary.res
index a8e5d1c6a..d9b5c5dd1 100644
--- a/apps/docs/src/components/NavbarPrimary.res
+++ b/apps/docs/src/components/NavbarPrimary.res
@@ -10,8 +10,7 @@ let isActive = (~url, ~pathname: Path.t) => {
module LeftContent = {
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let {pathname} = useLocation()
{
+ @directive("'use memo'") () => {
let iconClasses = "w-6 h-6 opacity-50 hover:opacity-100"
let linkClasses = "hidden md:block"
{
+ @directive("'use memo'") () => {
let scrollDirection = Hooks.useScrollDirection(~topMargin=64, ~threshold=32)
let navbarClasses = switch scrollDirection {
diff --git a/apps/docs/src/components/NavbarUtils.res b/apps/docs/src/components/NavbarUtils.res
index 0f639ffdb..2677b3a3e 100644
--- a/apps/docs/src/components/NavbarUtils.res
+++ b/apps/docs/src/components/NavbarUtils.res
@@ -16,35 +16,36 @@ let isActiveLink = (~includes: string, ~excludes: option=?, ~route: Path
let linkOrActiveLink = (~target: Path.t, ~route: Path.t) => target === route ? activeLink : link
let linkOrActiveLinkSubroute = (~target: Path.t, ~route: Path.t) =>
- String.startsWith((route :> string), (target :> string)) ? activeLink : link
+ String.startsWith(route :> string, target :> string) ? activeLink : link
-external elementToDialog: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmlDialogElement = "%identity"
+external elementToDialog: WebAPI.Element.t => WebAPI.HTMLDialogElement.t = "%identity"
let getMobileOverlayDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-overlay")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-overlay")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
-@get external _open: WebAPI.DOMAPI.htmlDialogElement => bool = "open"
+@get external _open: WebAPI.HTMLDialogElement.t => bool = "open"
let openMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileOverlay = _ => {
let isOpen = switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
@@ -55,28 +56,29 @@ let toggleMobileOverlay = _ => {
}
let getMobileTertiaryDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-tertiary-drawer")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-tertiary-drawer")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
let openMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileTertiaryDrawer = _ => {
let isOpen = switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
diff --git a/apps/docs/src/components/Search.res b/apps/docs/src/components/Search.res
index 4669666eb..5dac83c13 100644
--- a/apps/docs/src/components/Search.res
+++ b/apps/docs/src/components/Search.res
@@ -12,12 +12,12 @@ let reduce = (state, action) =>
let unavailableText = "Search unavailable"
let unavailableLabel = "Search unavailable for this build"
-@get external isContentEditable: WebAPI.DOMAPI.element => option = "isContentEditable"
-@get external focusMethod: WebAPI.DOMAPI.element => option unit> = "focus"
-@get external inputValue: WebAPI.DOMAPI.element => option = "value"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
+@get external isContentEditable: WebAPI.Element.t => option = "isContentEditable"
+@get external focusMethod: WebAPI.Element.t => option unit> = "focus"
+@get external inputValue: WebAPI.Element.t => option = "value"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-let isEditable = (element: WebAPI.DOMAPI.element) =>
+let isEditable = (element: WebAPI.Element.t) =>
switch element.tagName {
| "TEXTAREA" | "SELECT" | "INPUT" => true
| _ => element->isContentEditable->Option.getOr(false)
@@ -30,16 +30,17 @@ let restoreFocus = element =>
}
let hasSearchQuery = () =>
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) =>
WebAPI.DOMTokenList.contains(element.classList, "DocSearch-Input") &&
element->inputValue->Option.map(value => value !== "")->Option.getOr(false)
| Null => false
}
-let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
+let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
if returnFocus.current->Option.isNone {
- returnFocus.current = document.activeElement->Null.toOption
+ returnFocus.current =
+ WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement->Null.toOption
}
dispatch(Open(React.lazy_(() => import(SearchModal.make))))
}
@@ -51,7 +52,7 @@ let make = () => {
let algoliaConfig = Env.algoliaPublicConfig
let onClose = React.useCallback(() => {
- switch WebAPI.Document.querySelector(document, "body") {
+ switch WebAPI.Document.querySelector(WebAPI.DOM.window->WebAPI.Window.document, "body") {
| Value(body) => WebAPI.DOMTokenList.remove(body.classList, "DocSearch--active")
| Null => ()
}
@@ -65,24 +66,30 @@ let make = () => {
switch algoliaConfig {
| None => None
| Some(_) =>
- let handleGlobalKeyDown = (event: WebAPI.UIEventsAPI.keyboardEvent) => {
+ let handleGlobalKeyDown = event => {
+ let preventDefault = () => event->WebAPI.KeyboardEvent.preventDefault
if event.key === "Escape" && !hasSearchQuery() {
onClose()
} else if event.key === "/" || (event.key === "k" && (event.ctrlKey || event.metaKey)) {
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) if isEditable(element) => ()
| _ =>
activateSearch(~dispatch, ~returnFocus)
- WebAPI.KeyboardEvent.preventDefault(event)
+ preventDefault()
}
}
}
// Read Escape's query before autocomplete clears it at the input.
- WebAPI.Window.addEventListener(window, Keydown, handleGlobalKeyDown, ~options={capture: true})
+ WebAPI.Window.addEventListener(
+ WebAPI.DOM.window,
+ Keydown,
+ handleGlobalKeyDown,
+ ~options={capture: true},
+ )
Some(
() =>
WebAPI.Window.removeEventListener(
- window,
+ WebAPI.DOM.window,
Keydown,
handleGlobalKeyDown,
~options={capture: true},
diff --git a/apps/docs/src/components/SearchModal.res b/apps/docs/src/components/SearchModal.res
index 9101eac9e..ee9603ecf 100644
--- a/apps/docs/src/components/SearchModal.res
+++ b/apps/docs/src/components/SearchModal.res
@@ -17,7 +17,7 @@ let make = (~apiKey, ~appId, ~indexName, ~onClose: unit => unit) => {
hitComponent
onClose
insights=true
- initialScrollY={window.scrollY->Float.toInt}
+ initialScrollY={WebAPI.DOM.window->WebAPI.Window.scrollY->Float.toInt}
searchParameters={
distinct: 3,
hitsPerPage: 20,
diff --git a/apps/docs/src/components/SidebarNav.res b/apps/docs/src/components/SidebarNav.res
index cc2c4ba34..9d75b1022 100644
--- a/apps/docs/src/components/SidebarNav.res
+++ b/apps/docs/src/components/SidebarNav.res
@@ -11,9 +11,9 @@ module Toc = {
onClick={evt => {
evt->ReactEvent.Mouse.preventDefault
WebAPI.Document.getElementById(
- document,
+ WebAPI.DOM.window->WebAPI.Window.document,
href->String.replace("#", ""),
- )->WebAPI.Element.scrollIntoView_alignToTop
+ )->Null.forEach(WebAPI.Element.scrollIntoViewAlignToTop)
onClick()
}}
to={"#" ++ href->Url.normalizeAnchor}
@@ -36,7 +36,7 @@ module Title = {
let make = (~children) => {
let className = "hl-overline text-gray-80 mt-5" //overline
- children
+ {children}
}
}
@@ -142,10 +142,10 @@ let make = (
className="h-full relative top-0 px-4 w-full block md:top-40 md:sticky border-r border-gray-20 overflow-y-auto pb-24 max-h-[calc(100vh-10rem)] pt-8"
>
- toplevelNav
+ {toplevelNav}
- preludeSection
+ {preludeSection}
/* Firefox ignores padding in scroll containers, so we need margin
to make a bottom gap for the sidebar.
diff --git a/apps/docs/src/layouts/CommunityLayout.res b/apps/docs/src/layouts/CommunityLayout.res
index f704be1c9..a1dc6310e 100644
--- a/apps/docs/src/layouts/CommunityLayout.res
+++ b/apps/docs/src/layouts/CommunityLayout.res
@@ -15,7 +15,7 @@ let make = (~children, ~categories, ~entries) => {
<>
string)} route={(pathname :> string)} categories activeToc
+ key={pathname :> string} route={pathname :> string} categories activeToc
/>
=?,
~categories: array,
- ~components=MarkdownComponents.default,
~docSearchLvl0=?,
~children,
) => {
@@ -20,5 +19,5 @@ let make = (
let sidebar = children
+ {children}
}
diff --git a/apps/docs/src/layouts/MainLayout.res b/apps/docs/src/layouts/MainLayout.res
index 059e9f8d4..9de35dc42 100644
--- a/apps/docs/src/layouts/MainLayout.res
+++ b/apps/docs/src/layouts/MainLayout.res
@@ -1,11 +1,11 @@
@react.component
-let make = (~components=MarkdownComponents.default, ~children) => {
+let make = (~children) => {
<>
- children
+ {children}
diff --git a/apps/docs/src/layouts/MainLayout.resi b/apps/docs/src/layouts/MainLayout.resi
index e76a5ba10..940ed3d87 100644
--- a/apps/docs/src/layouts/MainLayout.resi
+++ b/apps/docs/src/layouts/MainLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
+let make: (~children: React.element) => React.element
diff --git a/apps/docs/src/layouts/SidebarPageLayout.res b/apps/docs/src/layouts/SidebarPageLayout.res
index 8445b4572..a2c95e940 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.res
+++ b/apps/docs/src/layouts/SidebarPageLayout.res
@@ -2,8 +2,6 @@ module Link = ReactRouter.Link
@react.component
let make = (
- ~sidebarState: (bool, (bool => bool) => unit)=(false, _ => ()),
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
~sidebar: React.element,
~rightSidebar: option=?,
~categories: option>=?,
@@ -45,8 +43,8 @@ let make = (
| None => React.null
}
- previous
- next
+ {previous}
+ {next}
}
| None => React.null
@@ -56,7 +54,7 @@ let make = (
- sidebar
+ {sidebar}
| None => React.null
}}
- children
- pagination
+ {children}
+ {pagination}
{switch rightSidebar {
| Some(ele) => ele
diff --git a/apps/docs/src/layouts/SidebarPageLayout.resi b/apps/docs/src/layouts/SidebarPageLayout.resi
index d9730f135..acf6130f8 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.resi
+++ b/apps/docs/src/layouts/SidebarPageLayout.resi
@@ -1,7 +1,5 @@
@react.component
let make: (
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
- ~sidebarState: (bool, (bool => bool) => unit)=?,
~sidebar: React.element,
~rightSidebar: React.element=?,
~categories: array=?,
diff --git a/apps/docs/src/markdown/Mdx.res b/apps/docs/src/markdown/Mdx.res
index e17226a6a..1e1e1eb40 100644
--- a/apps/docs/src/markdown/Mdx.res
+++ b/apps/docs/src/markdown/Mdx.res
@@ -68,7 +68,7 @@ let sortSection = mdxPages =>
)
let groupBySection = mdxPages =>
- Array.reduce(mdxPages, (Dict.make() :> Dict.t>), (acc, item) => {
+ Array.reduce(mdxPages, Dict.make() :> Dict.t>, (acc, item) => {
let section = item.section->Option.flatMap(Dict.get(acc, _))
switch section {
// If the section already exists, add this item to it
diff --git a/apps/docs/src/markdown/MdxLegacy.res b/apps/docs/src/markdown/MdxLegacy.res
index 5ee546bd3..46239dc3e 100644
--- a/apps/docs/src/markdown/MdxLegacy.res
+++ b/apps/docs/src/markdown/MdxLegacy.res
@@ -21,15 +21,14 @@ let getType = element => {
if React.isValidElement(element) {
switch props(element).mdxType {
| Some(tag) => tag
- | None => {
- let tag = elementType(element)
- typeof(tag) == #string ? String.make(tag) : "unknown"
- }
+ | None =>
+ let tag = elementType(element)
+ typeof(tag) == #string ? String.make(tag) : "unknown"
}
} else {
"unknown"
}
}
-@get external component: React.element => React.componentLike<'props, React.element> = "type"
+@get external component: React.element => React.component<'props> = "type"
let isComponent = (element, make) => React.isValidElement(element) && component(element) === make
diff --git a/apps/docs/test-utils/TestUtils.res b/apps/docs/test-utils/TestUtils.res
index 1edc1da72..3c0f6c7c3 100644
--- a/apps/docs/test-utils/TestUtils.res
+++ b/apps/docs/test-utils/TestUtils.res
@@ -1,16 +1,18 @@
-external imageFromNode: WebAPI.DOMAPI.node => WebAPI.DOMAPI.htmlImageElement = "%identity"
+external imageFromElement: WebAPI.Element.t => WebAPI.HTMLImageElement.t = "%identity"
let waitForImages = async (selector: string) => {
- let root = switch document->WebAPI.Document.querySelector(selector) {
+ let root = switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(selector) {
| Value(root) => root
- | Null => failwith(`expected to find screenshot target ${selector}`)
+ | Null => panic(`expected to find screenshot target ${selector}`)
}
let images = root->WebAPI.Element.querySelectorAll("img")
if images.length > 0 {
for i in 0 to images.length - 1 {
- let image = images->WebAPI.NodeList.item(i)->imageFromNode
+ let image = images->WebAPI.NodeList.item(i)->Null.getOrThrow->imageFromElement
await image->WebAPI.HTMLImageElement.decode
}
}
diff --git a/apps/guide/app/GuideCompilerBridgeHook.res b/apps/guide/app/GuideCompilerBridgeHook.res
index 2b19d1a1b..b64874e6d 100644
--- a/apps/guide/app/GuideCompilerBridgeHook.res
+++ b/apps/guide/app/GuideCompilerBridgeHook.res
@@ -30,11 +30,15 @@ let useCompilerBridge = (
React.useEffect(() => {
switch compilerState {
| Ready({targetLang}) if code !== lastCompiledCode.current =>
- let timer = setTimeout(~handler=() => {
- lastCompiledCode.current = code
- compilerDispatch(CompileCode(targetLang, code))
- }, ~timeout=150)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ lastCompiledCode.current = code
+ compilerDispatch(CompileCode(targetLang, code))
+ },
+ ~timeout=150,
+ )
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
| _ => None
}
}, (code, compilerState, compilerDispatch))
@@ -59,8 +63,8 @@ let useCompilerBridge = (
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [setOutput])
React.useEffect(() => {
@@ -102,14 +106,15 @@ let useCompilerBridge = (
imports->Dict.mapValues(path =>
path->GuideRuntimeImport.url(~bundleBaseUrl, ~compilerVersion=selected.id)
)
- let timer = setTimeout(
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
~handler=() => EvalIFrame.sendOutput(runtimeCode, imports),
~timeout=50,
)
Some(
() => {
isWaitingForRuntimeOutput.current = false
- clearTimeout(timer)
+ WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
},
)
| None => None
diff --git a/apps/guide/app/GuideCompilerData.res b/apps/guide/app/GuideCompilerData.res
index d4a32be91..ce7f3cdc5 100644
--- a/apps/guide/app/GuideCompilerData.res
+++ b/apps/guide/app/GuideCompilerData.res
@@ -5,12 +5,13 @@ type t = {
module Env = {
@scope(("process", "env")) external nodeEnv: string = "NODE_ENV"
+
@scope(("process", "env"))
external playgroundBundleEndpoint: option = "PLAYGROUND_BUNDLE_ENDPOINT"
}
let fetchVersions = async versionsBaseUrl => {
- let response = await fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
+ let response = await WebAPI.Fetch.fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
let json = await WebAPI.Response.json(response)
json
->JSON.Decode.array
diff --git a/apps/guide/app/GuideDom.res b/apps/guide/app/GuideDom.res
index 406bf1246..90f33b2f7 100644
--- a/apps/guide/app/GuideDom.res
+++ b/apps/guide/app/GuideDom.res
@@ -1,3 +1,3 @@
-external domElementToWebElement: Dom.element => WebAPI.DOMAPI.element = "%identity"
+external domElementToWebElement: Dom.element => WebAPI.Element.t = "%identity"
let toWebElement = domElementToWebElement
diff --git a/apps/guide/app/GuideHome.res b/apps/guide/app/GuideHome.res
index 1462ecde6..0906944aa 100644
--- a/apps/guide/app/GuideHome.res
+++ b/apps/guide/app/GuideHome.res
@@ -1,4 +1,5 @@
-let navigateToDocsIntro = url => window.location->WebAPI.Location.assign(url)
+let navigateToDocsIntro = url =>
+ WebAPI.DOM.window->WebAPI.Window.location->WebAPI.Location.assign(url)
@react.component
let make = (
@@ -39,7 +40,7 @@ let make = (
{React.string(lesson.title)}
- lesson.content
+ {lesson.content}
// for the guide, so storage failures fall back to the current UI state.
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -115,7 +115,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -123,7 +123,7 @@ let setLocalStorageItem = (~key, ~value) => {
let removeLocalStorageItem = key => {
try {
- WebAPI.Storage.removeItem(window.localStorage, key)
+ WebAPI.Storage.removeItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)
} catch {
| JsExn(_) => ()
}
diff --git a/apps/guide/app/GuideLayoutHook.res b/apps/guide/app/GuideLayoutHook.res
index 211dad3cc..dfc5d137c 100644
--- a/apps/guide/app/GuideLayoutHook.res
+++ b/apps/guide/app/GuideLayoutHook.res
@@ -12,7 +12,9 @@ type t = {
}
let syncThemeColor = theme =>
- switch document->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
+ switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
| Value(element) =>
WebAPI.Element.setAttribute(
element,
@@ -34,8 +36,8 @@ let useLayout = (): t => {
setTheme(_ => GuideLayout.loadTheme())
setPaneSizes(_ =>
GuideLayout.loadPaneSizes()->GuideLayout.clampPaneSizes(
- ~viewportWidth=window.innerWidth->Int.toFloat,
- ~viewportHeight=window.innerHeight->Int.toFloat,
+ ~viewportWidth=WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat,
+ ~viewportHeight=WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat,
)
)
setThemeLoaded(_ => true)
@@ -83,24 +85,24 @@ let useLayout = (): t => {
switch dragTarget.current {
| ResizingColumns =>
let pointerX = event->ReactEvent.Mouse.clientX->Int.toFloat
- let viewportWidth = window.innerWidth->Int.toFloat
+ let viewportWidth = WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat
let instructionsWidth = GuideLayout.clampInstructionsWidth(~viewportWidth, ~pointerX)
setPaneSizes(previous => {...previous, instructionsWidth: Some(instructionsWidth)})
| ResizingRows =>
let pointerY = event->ReactEvent.Mouse.clientY->Int.toFloat
- let viewportHeight = window.innerHeight->Int.toFloat
+ let viewportHeight = WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat
let outputHeight = GuideLayout.clampOutputHeight(~viewportHeight, ~pointerY)
setPaneSizes(previous => {...previous, outputHeight})
| NotDragging => ()
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
},
)
}, [])
diff --git a/apps/guide/package.json b/apps/guide/package.json
index fd319ca9b..2303154af 100644
--- a/apps/guide/package.json
+++ b/apps/guide/package.json
@@ -21,8 +21,8 @@
"@react-router/node": "^8.3.1",
"@rescript-lang/playground": "workspace:*",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"isbot": "^5",
"react": "^19.3.0",
"react-dom": "^19.3.0",
@@ -32,7 +32,7 @@
"remark-gfm": "^4.0.1",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
- "rescript": "^12.2.0",
+ "rescript": "^13.0.0-alpha.6",
"unified": "^11.0.5",
"vfile-matter": "^5.0.1"
},
diff --git a/apps/guide/rescript.json b/apps/guide/rescript.json
index 3c89889a8..5eb916b23 100644
--- a/apps/guide/rescript.json
+++ b/apps/guide/rescript.json
@@ -7,7 +7,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "__tests__",
diff --git a/apps/guide/vite.config.mjs b/apps/guide/vite.config.mjs
index a4e2a4a1d..63f3ccf2c 100644
--- a/apps/guide/vite.config.mjs
+++ b/apps/guide/vite.config.mjs
@@ -19,17 +19,16 @@ const sharedEditorDeps = [
"@codemirror/view",
"@lezer/highlight",
"@replit/codemirror-vim",
- "@rescript/runtime/lib/es6/Belt_Array.js",
- "@rescript/runtime/lib/es6/Primitive_int.js",
- "@rescript/runtime/lib/es6/Primitive_object.js",
- "@rescript/runtime/lib/es6/Primitive_option.js",
- "@rescript/runtime/lib/es6/Primitive_string.js",
- "@rescript/runtime/lib/es6/Stdlib_Array.js",
- "@rescript/runtime/lib/es6/Stdlib_Dict.js",
- "@rescript/runtime/lib/es6/Stdlib_Int.js",
- "@rescript/runtime/lib/es6/Stdlib_JsExn.js",
- "@rescript/runtime/lib/es6/Stdlib_List.js",
- "@rescript/runtime/lib/es6/Stdlib_Option.js",
+ "@rescript/runtime/lib/es6/Primitive_int.mjs",
+ "@rescript/runtime/lib/es6/Primitive_object.mjs",
+ "@rescript/runtime/lib/es6/Primitive_option.mjs",
+ "@rescript/runtime/lib/es6/Primitive_string.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Array.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Dict.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Int.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_JsExn.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_List.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Option.mjs",
"@tsnobip/rescript-lezer",
"lz-string",
"react-markdown",
diff --git a/package.json b/package.json
index 182786394..2b8c62d84 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"devDependencies": {
"lefthook": "^2.1.4",
"oxfmt": "^0.46.0",
- "rescript": "^12.2.0"
+ "rescript": "^13.0.0-alpha.6"
},
"resolutions": {
"marked": "4.0.10",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index e6cae5796..77b9bef8c 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -6,8 +6,8 @@
"dependencies": {
"@babel/parser": "^7.29.2",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"lz-string": "^1.5.0",
"react": "^19.3.0",
"react-dom": "^19.3.0",
diff --git a/packages/playground/rescript.json b/packages/playground/rescript.json
index 997cde23e..d8fa7b14e 100644
--- a/packages/playground/rescript.json
+++ b/packages/playground/rescript.json
@@ -6,7 +6,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/playground/src/CompilerManagerHook.res b/packages/playground/src/CompilerManagerHook.res
index 1b3f35c53..82438f874 100644
--- a/packages/playground/src/CompilerManagerHook.res
+++ b/packages/playground/src/CompilerManagerHook.res
@@ -633,8 +633,13 @@ let useCompilerManager = (
setState(_ => Ready({...state, logs: [], validReactCode: entryPointExists}))
| SetupFailed(_) => ()
| Ready(ready) if syncUrl =>
- let url = createUrl((pathname :> string), ready)
- WebAPI.History.replaceState(history, ~data=JSON.Null, ~unused="", ~url)
+ let url = createUrl(pathname :> string, ready)
+ WebAPI.History.replaceState(
+ WebAPI.DOM.window->WebAPI.Window.history,
+ ~data=JSON.Null,
+ ~unused="",
+ ~url,
+ )
| Ready(_) => ()
}
}
diff --git a/packages/playground/src/ConsolePanel.res b/packages/playground/src/ConsolePanel.res
index 0c9bff4ed..174549768 100644
--- a/packages/playground/src/ConsolePanel.res
+++ b/packages/playground/src/ConsolePanel.res
@@ -3,6 +3,7 @@ type logLevel = [
| #warn
| #error
]
+
type log = {level: logLevel, content: array}
@react.component
@@ -17,8 +18,8 @@ let make = (~logs, ~appendLog) => {
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [appendLog])
@@ -48,7 +49,7 @@ let make = (~logs, ~appendLog) => {
})
->React.array
- content
+ {content}
}}
}
diff --git a/packages/playground/src/EvalIFrame.res b/packages/playground/src/EvalIFrame.res
index aaee8db3d..5de9a5e97 100644
--- a/packages/playground/src/EvalIFrame.res
+++ b/packages/playground/src/EvalIFrame.res
@@ -69,23 +69,24 @@ let srcDoc = `
`
-external asIFrame: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmliFrameElement = "%identity"
+external asIFrame: WebAPI.Element.t => WebAPI.HTMLIFrameElement.t = "%identity"
let sendOutput = (code, imports) => {
- let frame = document->WebAPI.Document.querySelector("#iframe-eval")
+ let frame =
+ WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.querySelector("#iframe-eval")
switch frame {
| Value(element) if element.tagName == "IFRAME" =>
let element = element->asIFrame
switch element.contentWindow {
- | Value({window}) =>
+ | Value(frameWindow) =>
let message = JSON.Object(
dict{
"code": JSON.String(code),
"imports": JSON.Object(imports->Dict.mapValues(v => JSON.String(v))),
},
)
- window->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
+ frameWindow->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
| Null => Console.error("contentWindow not found")
}
| Value(_) | Null => Console.error("iframe not found")
diff --git a/packages/playground/src/Playground.res b/packages/playground/src/Playground.res
index 8897b0047..ee1fec30d 100644
--- a/packages/playground/src/Playground.res
+++ b/packages/playground/src/Playground.res
@@ -47,7 +47,7 @@ let dropdownLabelReleased = "--- Released ---"
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -55,7 +55,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -63,7 +63,7 @@ let setLocalStorageItem = (~key, ~value) => {
let getSessionStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.sessionStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -71,7 +71,7 @@ let getSessionStorageItem = key => {
let setSessionStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.sessionStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -107,7 +107,7 @@ module DropdownSelect = {
disabled
onChange
>
- children
+ {children}
}
}
@@ -174,9 +174,11 @@ module ResultPane = {
module PreWrap = {
@react.component
let make = (~className="", ~children) =>
- children
+ {children}
}
+
type prefix = [#W | #E]
+
let compactErrorLine = (~highlight=false, ~prefix: prefix, locMsg: Api.LocMsg.t) => {
let {Api.LocMsg.row: row, column, shortMsg} = locMsg
let prefixColor = switch prefix {
@@ -201,7 +203,7 @@ module ResultPane = {
{React.string(` Line ${row->Int.toString}, column ${column->Int.toString}:`)}
- shortMsg
+ {shortMsg}
}
@@ -348,7 +350,7 @@ module ResultPane = {
}
{React.string(msg)}
- errs
+ {errs}
| Comp(UnexpectedError(msg))
| Conv(UnexpectedError(msg)) =>
@@ -446,20 +448,19 @@ module ResultPane = {
}
module WarningFlagsWidget = {
+ @set external setScrollTop: (WebAPI.HTMLElement.t, float) => unit = "scrollTop"
+
// Inspired by MUI (who got inspired by WAI best practise examples)
// https://github.com/mui-org/material-ui/blob/next/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.js#L327
- let scrollToElement = (
- ~parent: WebAPI.DOMAPI.htmlElement,
- element: WebAPI.DOMAPI.htmlElement,
- ): unit =>
+ let scrollToElement = (~parent: WebAPI.HTMLElement.t, element: WebAPI.HTMLElement.t): unit =>
if parent.scrollHeight > parent.clientHeight {
let scrollBottom = parent.clientHeight + Float.toInt(parent.scrollTop)
let elementBottom = element.offsetTop + element.offsetHeight
if elementBottom > scrollBottom {
- parent.scrollTop = Float.fromInt(elementBottom - parent.clientHeight)
+ parent->setScrollTop(Float.fromInt(elementBottom - parent.clientHeight))
} else if element.offsetTop - element.offsetHeight < Float.toInt(parent.scrollTop) {
- parent.scrollTop = Float.fromInt(element.offsetTop - element.offsetHeight)
+ parent->setScrollTop(Float.fromInt(element.offsetTop - element.offsetHeight))
}
}
@@ -830,7 +831,7 @@ module WarningFlagsWidget = {
- elements
+ {elements}
)->Option.getOr(React.null)
@@ -897,7 +898,7 @@ module WarningFlagsWidget = {
- chips
+ {chips}
- deleteButton
+ {deleteButton}
- suggestionBox
+ {suggestionBox}
}
}
@@ -1187,12 +1188,12 @@ module ControlPanel = {
?onClick
className="inline-block text-sky hover:cursor-pointer hover:bg-sky hover:text-white-80-tr rounded border active:bg-sky-70 border-sky-70 px-2 py-1 "
>
- children
+ {children}
}
let commandWithKeyboardShortcut = (commandName, ~key) => {
- let userAgent = window.navigator.userAgent
+ let userAgent = WebAPI.DOM.window->WebAPI.Window.navigator->WebAPI.Navigator.userAgent
if userAgent->String.includes("iPhone") || userAgent->String.includes("Android") {
commandName
} else if userAgent->String.includes("Mac") {
@@ -1235,8 +1236,8 @@ module ControlPanel = {
}
}
- WebAPI.Window.addEventListener(window, Keydown, onKeyDown)
- Some(() => WebAPI.Window.removeEventListener(window, Keydown, onKeyDown))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Keydown, onKeyDown)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Keydown, onKeyDown))
| _ => None
}
}, (state, dispatch, setCurrentTab))
@@ -1289,7 +1290,7 @@ module ControlPanel = {
}
- children
+ {children}
}
}
@@ -1434,7 +1435,7 @@ module OutputPanel = {
let body = Array.mapWithIndex(tabs, ((tab, content), i) => {
let className = currentTab == tab ? "block h-inherit" : "hidden"
- content
+ {content}
})
<> {body->React.array}
@@ -1612,48 +1613,43 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let initialVersion = switch versions {
| [v] => Some(v) // only single version available. maybe local dev.
- | versions => {
- let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
- switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Version :> string)),
- ) {
- | Nullable.Value(version) => version->Semver.parse
- | _ =>
- switch getLocalStorageItem(playgroundVersionStorageKey) {
- | Some(v) => v->Semver.parse
- | None => lastStableVersion
- }
+ | versions =>
+ let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
+ switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Version :> string)
+ ->Null.toOption {
+ | Some(version) => version->Semver.parse
+ | _ =>
+ switch getLocalStorageItem(playgroundVersionStorageKey) {
+ | Some(v) => v->Semver.parse
+ | None => lastStableVersion
}
}
}
- let initialLang = switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Ext :> string)),
- ) {
- | Nullable.Value("re") => Api.Lang.Reason
+ let initialLang = switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Ext :> string)
+ ->Null.toOption {
+ | Some("re") => Api.Lang.Reason
| _ => Api.Lang.Res
}
let initialModuleSystem =
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Module :> string)))->Nullable.toOption
+ searchParams->WebAPI.URLSearchParams.get(Module :> string)->Null.toOption
- let initialJsxPreserveMode = !(
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((JsxPreserve :> string)),
- )->Nullable.isNullable
- )
+ let initialJsxPreserveMode =
+ searchParams->WebAPI.URLSearchParams.get(JsxPreserve :> string)->Null.toOption->Option.isSome
let initialExperimentalFeatures =
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((Experiments :> string)),
- )->Nullable.mapOr([], str => str->String.split(",")->Array.map(String.trim))
+ searchParams
+ ->WebAPI.URLSearchParams.get(Experiments :> string)
+ ->Null.mapOr([], str => str->String.split(",")->Array.map(String.trim))
let initialContent = switch (
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Code :> string))),
+ searchParams->WebAPI.URLSearchParams.get(Code :> string)->Null.toOption,
initialLang,
) {
- | (Nullable.Value(compressedCode), _) =>
- LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
+ | (Some(compressedCode), _) => LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
| (_, Reason) => initialReContent
| (_, Res) =>
switch initialVersion {
@@ -1713,8 +1709,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
setSessionStorageItem(~key=newLightModeToastSeenStorageKey, ~value="true")
}
- let timer = setTimeout(~handler=hideToast, ~timeout=10000)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(WebAPI.DOM.window, ~handler=hideToast, ~timeout=10000)
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
}
}, [])
@@ -1741,12 +1737,16 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
value => {
switch typingTimer.current {
| None => ()
- | Some(timer) => clearTimeout(timer)
+ | Some(timer) => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
}
- let timer = setTimeout(~handler=() => {
- timeoutCompile.current(value)
- typingTimer.current = None
- }, ~timeout=100)
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ timeoutCompile.current(value)
+ typingTimer.current = None
+ },
+ ~timeout=100,
+ )
typingTimer.current = Some(timer)
}
},
@@ -1869,7 +1869,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let (layout, setLayout) = React.useState(() => Row)
React.useEffect(() => {
- setLayout(_ => window.innerWidth < breakingPoint ? Column : Row)
+ setLayout(_ => WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row)
None
}, [])
@@ -1883,7 +1883,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let subPanelRef = React.useRef(Nullable.null)
let onResize = () => {
- let newLayout = window.innerWidth < breakingPoint ? Column : Row
+ let newLayout = WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row
setLayout(_ => newLayout)
switch panelRef.current->Nullable.toOption {
| Some(element) =>
@@ -1909,8 +1909,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
}
React.useEffect(() => {
- WebAPI.Window.addEventListener(window, Resize, onResize)
- Some(() => WebAPI.Window.removeEventListener(window, Resize, onResize))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Resize, onResize)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Resize, onResize))
}, [])
// To force CodeMirror render scrollbar on first render
@@ -1995,15 +1995,15 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
onMove(position)
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.addEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.removeEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
},
)
}, [layout])
@@ -2013,7 +2013,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let hideNewLightModeToast = () => {
setShowNewLightModeToast(_ => false)
WebAPI.Storage.setItem(
- window.sessionStorage,
+ WebAPI.DOM.window->WebAPI.Window.sessionStorage,
~key=newLightModeToastSeenStorageKey,
~value="true",
)
@@ -2040,59 +2040,58 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
| JavaScript => "JavaScript"->React.string
- | Problems => {
- let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
- | Compiling({state: ready})
- | Ready(ready)
- | Executing({state: ready})
- | SwitchingCompiler(ready, _) => {
- "warnings": switch ready.result {
- | Comp(Success({warnings})) => warnings->Array.length
- | _ => 0
- },
- "errors": switch ready.result {
- | FinalResult.Comp(Fail(result)) =>
- switch result {
- | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
- | WarningErr(errors) => errors->Array.length
- | WarningFlagErr(_) => 1
- }
- | Conv(Fail({details})) => details->Array.length
- | Comp(Success(_)) => 0
- | Conv(Success(_)) => 0
- | Comp(UnexpectedError(_))
- | Conv(UnexpectedError(_))
- | Comp(Unknown(_))
- | Conv(Unknown(_)) => 1
- | Nothing => 0
- },
- }
-
- | SetupFailed(_) | Init => {
- "warnings": 0,
- "errors": 0,
- }
+ | Problems =>
+ let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
+ | Compiling({state: ready})
+ | Ready(ready)
+ | Executing({state: ready})
+ | SwitchingCompiler(ready, _) => {
+ "warnings": switch ready.result {
+ | Comp(Success({warnings})) => warnings->Array.length
+ | _ => 0
+ },
+ "errors": switch ready.result {
+ | FinalResult.Comp(Fail(result)) =>
+ switch result {
+ | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
+ | WarningErr(errors) => errors->Array.length
+ | WarningFlagErr(_) => 1
+ }
+ | Conv(Fail({details})) => details->Array.length
+ | Comp(Success(_)) => 0
+ | Conv(Success(_)) => 0
+ | Comp(UnexpectedError(_))
+ | Conv(UnexpectedError(_))
+ | Comp(Unknown(_))
+ | Conv(Unknown(_)) => 1
+ | Nothing => 0
+ },
}
-
- {"Problems"->React.string}
- {if problemCounts["errors"] > 0 {
-
- {problemCounts["errors"]->React.int}
-
- } else {
- React.null
- }}
- {if problemCounts["warnings"] > 0 {
-
- {problemCounts["warnings"]->React.int}
-
- } else {
- React.null
- }}
-
+ | SetupFailed(_) | Init => {
+ "warnings": 0,
+ "errors": 0,
+ }
}
+
+ {"Problems"->React.string}
+ {if problemCounts["errors"] > 0 {
+
+ {problemCounts["errors"]->React.int}
+
+ } else {
+ React.null
+ }}
+ {if problemCounts["warnings"] > 0 {
+
+ {problemCounts["warnings"]->React.int}
+
+ } else {
+ React.null
+ }}
+
+
| Settings => "Settings"->React.string
}
@@ -2121,7 +2120,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
className={`flex ${layout == Column ? "flex-col" : "flex-row"}`}
ref={HtmlRef.elementRef(panelRef)}
>
- // Left Panel
+ /* Left Panel */
) => {
>
- // Separator
+
+ /* Separator */
) => {
{React.string("⣿")}
- // Right Panel
+
+ /* Right Panel */
{
let copy = async () => {
setState(_ => Pending)
- let result = await writeClipboard(window.location.href)
+ let result = await writeClipboard((WebAPI.DOM.window->WebAPI.Window.location).href)
setState(_ =>
switch result {
| Ok() => CopySuccess
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 02291215e..cb536e563 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -17,8 +17,8 @@
"@codemirror/view": "^6.41.0",
"@lezer/highlight": "^1.2.3",
"@replit/codemirror-vim": "^6.3.0",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"@tsnobip/rescript-lezer": "^0.9.0",
"highlight.js": "^11.11.1",
"react": "^19.3.0",
diff --git a/packages/shared/rescript.json b/packages/shared/rescript.json
index 40328e643..a6e880174 100644
--- a/packages/shared/rescript.json
+++ b/packages/shared/rescript.json
@@ -2,7 +2,6 @@
"name": "@rescript-lang/shared",
"namespace": false,
"dependencies": ["@rescript/react", "@rescript/webapi"],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/shared/src/Clipboard.res b/packages/shared/src/Clipboard.res
index af4355463..adf1ecfba 100644
--- a/packages/shared/src/Clipboard.res
+++ b/packages/shared/src/Clipboard.res
@@ -1,21 +1,20 @@
type error = WriteFailed
@send
-external createTextArea: (
- WebAPI.DOMAPI.document,
- @as("textarea") _,
-) => WebAPI.DOMAPI.htmlTextAreaElement = "createElement"
+external createTextArea: (WebAPI.DOM.document, @as("textarea") _) => WebAPI.HTMLTextAreaElement.t =
+ "createElement"
+
+@send external copySelection: (WebAPI.DOM.document, @as("copy") _) => bool = "execCommand"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-@send external copySelection: (WebAPI.DOMAPI.document, @as("copy") _) => bool = "execCommand"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
@send
-external getSelection: WebAPI.DOMAPI.document => Null.t = "getSelection"
+external getSelection: WebAPI.DOM.document => Null.t = "getSelection"
let writeWithSelection = text => {
try {
- let textarea = createTextArea(document)
- let activeElement = document.activeElement
- let selection = getSelection(document)->Null.toOption
+ let textarea = createTextArea(WebAPI.DOM.window->WebAPI.Window.document)
+ let activeElement = WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement
+ let selection = getSelection(WebAPI.DOM.window->WebAPI.Window.document)->Null.toOption
let ranges =
selection->Option.mapOr([], selection =>
Array.fromInitializer(~length=selection.rangeCount, index =>
@@ -30,11 +29,13 @@ let writeWithSelection = text => {
~qualifiedName="style",
~value="position: fixed; left: -9999px; top: 0",
)
- document.body
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebDocument.body
->WebAPI.HTMLElement.appendChild(textarea->WebAPI.HTMLTextAreaElement.asNode)
->ignore
textarea->WebAPI.HTMLTextAreaElement.select
- copySelection(document)
+ copySelection(WebAPI.DOM.window->WebAPI.Window.document)
} catch {
| _ => false
}
@@ -54,7 +55,10 @@ let writeWithSelection = text => {
let writeText = async text => {
try {
- await navigator.clipboard->WebAPI.Clipboard.writeText(text)
+ await WebAPI.DOM.window
+ ->WebAPI.Window.navigator
+ ->WebAPI.Navigator.clipboard
+ ->WebAPI.Clipboard.writeText(text)
Ok()
} catch {
| _ => writeWithSelection(text)
diff --git a/packages/shared/src/CodeMirror.res b/packages/shared/src/CodeMirror.res
index 77357b388..2fca1e362 100644
--- a/packages/shared/src/CodeMirror.res
+++ b/packages/shared/src/CodeMirror.res
@@ -12,6 +12,7 @@
module KeyMap = {
type t = Default | Vim
+
let toString = (keyMap: t) =>
switch keyMap {
| Default => "default"
@@ -43,6 +44,7 @@ module Theme = {
module Side = {
@@warning("-37")
+
type t =
| @as(-1) BeforePointer
| @as(1) AfterPointer
@@ -67,6 +69,7 @@ module HoverHint = {
line: int,
col: int,
}
+
let compareLineCol = (pos1, pos2) => {
if pos1.line < pos2.line {
Ordering.less
@@ -81,6 +84,7 @@ module HoverHint = {
Ordering.equal
}
}
+
// let \"<" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.less
let \"<=" = (pos1, pos2) => compareLineCol(pos1, pos2) !== Ordering.greater
// let \">" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.greater
@@ -130,8 +134,10 @@ module CM6 = {
module EditorSelection = {
type t
type range
+
@module("@codemirror/state") @scope("EditorSelection") @val
external single: (int, int) => t = "single"
+
@get external main: t => range = "main"
@get external anchor: range => int = "anchor"
@get external head: range => int = "head"
@@ -142,18 +148,21 @@ module CM6 = {
@module("@codemirror/state") @scope("EditorState")
external create: createConfig => editorState = "create"
+
@get external selection: editorState => EditorSelection.t = "selection"
module ReadOnly = {
@module("@codemirror/state") @scope(("EditorState", "readOnly")) @val
external of_: bool => extension = "of"
}
+
@get external doc: editorState => Text.t = "doc"
}
module Compartment = {
@module("@codemirror/state") @new
external create: unit => compartment = "Compartment"
+
@send external make: (compartment, extension) => extension = "of"
@send external reconfigure: (compartment, extension) => effect = "reconfigure"
}
@@ -161,8 +170,9 @@ module CM6 = {
module EditorView = {
module Tooltip = {
module View = {
- type t = {dom: WebAPI.DOMAPI.element, offset?: {x: int, y: int}}
+ type t = {dom: WebAPI.Element.t, offset?: {x: int, y: int}}
}
+
type t = {
pos: int,
end?: int,
@@ -174,26 +184,30 @@ module CM6 = {
}
}
- type createConfig = {state: editorState, parent: WebAPI.DOMAPI.element}
+ type createConfig = {state: editorState, parent: WebAPI.Element.t}
+
@module("@codemirror/view") @new
external create: createConfig => editorView = "EditorView"
@send external destroy: editorView => unit = "destroy"
@get external state: editorView => editorState = "state"
- @get external dom: editorView => WebAPI.DOMAPI.htmlElement = "dom"
+ @get external dom: editorView => WebAPI.HTMLElement.t = "dom"
type change = {from: int, to: int, insert: string}
type dispatchArg = {changes: change, selection?: EditorSelection.t}
+
@send
external dispatch: (editorView, dispatchArg) => unit = "dispatch"
type dispatchEffectsArg = {effects: effect}
+
@send
external dispatchEffects: (editorView, dispatchEffectsArg) => unit = "dispatch"
module ThemeOptions = {
type t = {dark?: bool}
}
+
@module("@codemirror/view") @scope("EditorView") @val
external theme: (dict>, ~options: ThemeOptions.t=?) => extension = "theme"
@@ -218,6 +232,7 @@ module CM6 = {
module HoverTooltipOptions = {
type t = {hoverTime?: int, hideOnChange?: bool}
}
+
@module("@codemirror/view")
external hoverTooltip: (
(editorView, int, Side.t) => null,
@@ -256,177 +271,263 @@ module CM6 = {
module Language = {
module HighlightStyle = {
type tag
+
module Tags = {
@@warning("-32") // Suppress "unused external" warnings
+
@module("@lezer/highlight") @scope("tags")
external comment: tag = "comment"
+
@module("@lezer/highlight") @scope("tags")
external lineComment: tag = "lineComment"
+
@module("@lezer/highlight") @scope("tags")
external blockComment: tag = "blockComment"
+
@module("@lezer/highlight") @scope("tags")
external docComment: tag = "docComment"
+
@module("@lezer/highlight") @scope("tags")
external name: tag = "name"
+
@module("@lezer/highlight") @scope("tags")
external variableName: tag = "variableName"
+
@module("@lezer/highlight") @scope("tags")
external typeName: tag = "typeName"
+
@module("@lezer/highlight") @scope("tags")
external tagName: tag = "tagName"
+
@module("@lezer/highlight") @scope("tags")
external propertyName: tag = "propertyName"
+
@module("@lezer/highlight") @scope("tags")
external attributeName: tag = "attributeName"
+
@module("@lezer/highlight") @scope("tags")
external className: tag = "className"
+
@module("@lezer/highlight") @scope("tags")
external labelName: tag = "labelName"
+
@module("@lezer/highlight") @scope("tags")
external namespace: tag = "namespace"
+
@module("@lezer/highlight") @scope("tags")
external macroName: tag = "macroName"
+
@module("@lezer/highlight") @scope("tags")
external literal: tag = "literal"
+
@module("@lezer/highlight") @scope("tags")
external string: tag = "string"
+
@module("@lezer/highlight") @scope("tags")
external docString: tag = "docString"
+
@module("@lezer/highlight") @scope("tags")
external character: tag = "character"
+
@module("@lezer/highlight") @scope("tags")
external attributeValue: tag = "attributeValue"
+
@module("@lezer/highlight") @scope("tags")
external number: tag = "number"
+
@module("@lezer/highlight") @scope("tags")
external integer: tag = "integer"
+
@module("@lezer/highlight") @scope("tags")
external float: tag = "float"
+
@module("@lezer/highlight") @scope("tags")
external bool: tag = "bool"
+
@module("@lezer/highlight") @scope("tags")
external regexp: tag = "regexp"
+
@module("@lezer/highlight") @scope("tags")
external escape: tag = "escape"
+
@module("@lezer/highlight") @scope("tags")
external color: tag = "color"
+
@module("@lezer/highlight") @scope("tags")
external url: tag = "url"
+
@module("@lezer/highlight") @scope("tags")
external keyword: tag = "keyword"
+
@module("@lezer/highlight") @scope("tags")
external self: tag = "self"
+
@module("@lezer/highlight") @scope("tags")
external null: tag = "null"
+
@module("@lezer/highlight") @scope("tags")
external atom: tag = "atom"
+
@module("@lezer/highlight") @scope("tags")
external unit: tag = "unit"
+
@module("@lezer/highlight") @scope("tags")
external modifier: tag = "modifier"
+
@module("@lezer/highlight") @scope("tags")
external operatorKeyword: tag = "operatorKeyword"
+
@module("@lezer/highlight") @scope("tags")
external controlKeyword: tag = "controlKeyword"
+
@module("@lezer/highlight") @scope("tags")
external definitionKeyword: tag = "definitionKeyword"
+
@module("@lezer/highlight") @scope("tags")
external moduleKeyword: tag = "moduleKeyword"
+
@module("@lezer/highlight") @scope("tags")
external operator: tag = "operator"
+
@module("@lezer/highlight") @scope("tags")
external derefOperator: tag = "derefOperator"
+
@module("@lezer/highlight") @scope("tags")
external arithmeticOperator: tag = "arithmeticOperator"
+
@module("@lezer/highlight") @scope("tags")
external logicOperator: tag = "logicOperator"
+
@module("@lezer/highlight") @scope("tags")
external bitwiseOperator: tag = "bitwiseOperator"
+
@module("@lezer/highlight") @scope("tags")
external compareOperator: tag = "compareOperator"
+
@module("@lezer/highlight") @scope("tags")
external updateOperator: tag = "updateOperator"
+
@module("@lezer/highlight") @scope("tags")
external definitionOperator: tag = "definitionOperator"
+
@module("@lezer/highlight") @scope("tags")
external typeOperator: tag = "typeOperator"
+
@module("@lezer/highlight") @scope("tags")
external controlOperator: tag = "controlOperator"
+
@module("@lezer/highlight") @scope("tags")
external punctuation: tag = "punctuation"
+
@module("@lezer/highlight") @scope("tags")
external separator: tag = "separator"
+
@module("@lezer/highlight") @scope("tags")
external bracket: tag = "bracket"
+
@module("@lezer/highlight") @scope("tags")
external angleBracket: tag = "angleBracket"
+
@module("@lezer/highlight") @scope("tags")
external squareBracket: tag = "squareBracket"
+
@module("@lezer/highlight") @scope("tags")
external paren: tag = "paren"
+
@module("@lezer/highlight") @scope("tags")
external brace: tag = "brace"
+
@module("@lezer/highlight") @scope("tags")
external content: tag = "content"
+
@module("@lezer/highlight") @scope("tags")
external heading: tag = "heading"
+
@module("@lezer/highlight") @scope("tags")
external heading1: tag = "heading1"
+
@module("@lezer/highlight") @scope("tags")
external heading2: tag = "heading2"
+
@module("@lezer/highlight") @scope("tags")
external heading3: tag = "heading3"
+
@module("@lezer/highlight") @scope("tags")
external heading4: tag = "heading4"
+
@module("@lezer/highlight") @scope("tags")
external heading5: tag = "heading5"
+
@module("@lezer/highlight") @scope("tags")
external heading6: tag = "heading6"
+
@module("@lezer/highlight") @scope("tags")
external contentSeparator: tag = "contentSeparator"
+
@module("@lezer/highlight") @scope("tags")
external list: tag = "list"
+
@module("@lezer/highlight") @scope("tags")
external quote: tag = "quote"
+
@module("@lezer/highlight") @scope("tags")
external emphasis: tag = "emphasis"
+
@module("@lezer/highlight") @scope("tags")
external strong: tag = "strong"
+
@module("@lezer/highlight") @scope("tags")
external link: tag = "link"
+
@module("@lezer/highlight") @scope("tags")
external monospace: tag = "monospace"
+
@module("@lezer/highlight") @scope("tags")
external strikethrough: tag = "strikethrough"
+
@module("@lezer/highlight") @scope("tags")
external inserted: tag = "inserted"
+
@module("@lezer/highlight") @scope("tags")
external deleted: tag = "deleted"
+
@module("@lezer/highlight") @scope("tags")
external changed: tag = "changed"
+
@module("@lezer/highlight") @scope("tags")
external invalid: tag = "invalid"
+
@module("@lezer/highlight") @scope("tags")
external meta: tag = "meta"
+
@module("@lezer/highlight") @scope("tags")
external documentMeta: tag = "documentMeta"
+
@module("@lezer/highlight") @scope("tags")
external annotation: tag = "annotation"
+
@module("@lezer/highlight") @scope("tags")
external processingInstruction: tag = "processingInstruction"
+
@module("@lezer/highlight") @scope("tags")
external definition: tag => tag = "definition"
+
@module("@lezer/highlight") @scope("tags")
external constant: tag => tag = "constant"
+
@module("@lezer/highlight") @scope("tags")
external function: tag => tag = "function"
+
@module("@lezer/highlight") @scope("tags")
external standard: tag => tag = "standard"
+
@module("@lezer/highlight") @scope("tags")
external local: tag => tag = "local"
+
@module("@lezer/highlight") @scope("tags")
external special: tag => tag = "special"
}
+
module TagStyle = {
type t = {
tag: array,
@@ -437,7 +538,9 @@ module CM6 = {
textDecoration?: string,
}
}
+
type t
+
@scope("HighlightStyle") @module("@codemirror/language")
external define: array => t = "define"
@@ -493,6 +596,7 @@ module CM6 = {
}
type t
+
@module("@codemirror/language")
external bracketMatching: unit => extension = "bracketMatching"
@@ -517,6 +621,7 @@ module CM6 = {
parser: LRParser.t,
languageData?: 'a. {..} as 'a,
}
+
@scope("LRLanguage") @module("@codemirror/language")
external define: spec => t = "define"
}
@@ -577,7 +682,7 @@ type editorInstance = {
}
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
@@ -661,7 +766,7 @@ let createHoverHintExtension = (hoverHints: array) => {
| Some({hint, start, end}) =>
let pos = CM6.Text.line(doc, start.line).from + start.col
let end = CM6.Text.line(doc, end.line).from + end.col
- let dom = WebAPI.Global.document->WebAPI.Document.createElement("div")
+ let dom = WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.createElement("div")
dom.textContent = Value(hint)
dom.className = "p-1 border"
Value({
diff --git a/packages/shared/src/CodeMirror.resi b/packages/shared/src/CodeMirror.resi
index 6c55487f0..ee089a2b5 100644
--- a/packages/shared/src/CodeMirror.resi
+++ b/packages/shared/src/CodeMirror.resi
@@ -41,7 +41,7 @@ module HoverHint: {
type editorInstance
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
diff --git a/packages/shared/src/HtmlRef.res b/packages/shared/src/HtmlRef.res
index d2d2bfbcc..17c4c5b7f 100644
--- a/packages/shared/src/HtmlRef.res
+++ b/packages/shared/src/HtmlRef.res
@@ -1,5 +1,5 @@
/** For refs attached to HTML tags; bridge React's DOM type to WebAPI's HTML type. */
-external fromDom: Dom.element => WebAPI.DOMAPI.htmlElement = "%identity"
+external fromDom: Dom.element => WebAPI.HTMLElement.t = "%identity"
let domRef = ref =>
ReactDOM.Ref.callbackDomRef(element => {
diff --git a/packages/shared/src/ReactRouter.res b/packages/shared/src/ReactRouter.res
index 2edf81b73..409726608 100644
--- a/packages/shared/src/ReactRouter.res
+++ b/packages/shared/src/ReactRouter.res
@@ -6,7 +6,7 @@ type navigate = (string, ~options: navigateOptions=?) => unit
external useNavigate: unit => navigate = "useNavigate"
@module("react-router")
-external useSearchParams: unit => (WebAPI.URLAPI.urlSearchParams, {..} => unit) = "useSearchParams"
+external useSearchParams: unit => (WebAPI.URLSearchParams.t, {..} => unit) = "useSearchParams"
@module("react-router")
external useLoaderData: unit => 'a = "useLoaderData"
@@ -15,7 +15,7 @@ external useLoaderData: unit => 'a = "useLoaderData"
type path = {pathname: Path.t, search?: string, hash?: string}
module Loader = {
- type loaderArgs = {request: WebAPI.FetchAPI.request}
+ type loaderArgs = {request: WebAPI.Request.t}
type t<'a> = loaderArgs => promise<'a>
}
diff --git a/packages/shared/src/WebDocument.res b/packages/shared/src/WebDocument.res
new file mode 100644
index 000000000..41b5227c7
--- /dev/null
+++ b/packages/shared/src/WebDocument.res
@@ -0,0 +1,2 @@
+@get external activeElement: WebAPI.DOM.document => Null.t = "activeElement"
+@get external body: WebAPI.DOM.document => WebAPI.HTMLElement.t = "body"
diff --git a/yarn.lock b/yarn.lock
index a0558cc2c..374b14b69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1815,8 +1815,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@responsive-image/core": "npm:2.1.0"
"@responsive-image/vite-plugin": "npm:3.0.1"
"@rolldown/plugin-babel": "npm:^0.2.4"
@@ -1851,7 +1851,7 @@ __metadata:
remark-frontmatter: "npm:^5.0.0"
remark-gfm: "npm:^4.0.1"
remark-validate-links: "npm:^13.1.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
rolldown: "npm:1.2.8"
search-insights: "npm:^2.17.3"
tailwindcss: "npm:^4"
@@ -1881,8 +1881,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@types/react": "npm:^19.2.14"
"@vitejs/plugin-react": "npm:^6.0.1"
"@vitest/browser-playwright": "npm:^5.0.0"
@@ -1897,7 +1897,7 @@ __metadata:
remark-gfm: "npm:^4.0.1"
remark-parse: "npm:^11.0.0"
remark-stringify: "npm:^11.0.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
unified: "npm:^11.0.5"
vfile-matter: "npm:^5.0.1"
vite: "npm:^8.3.0"
@@ -1914,8 +1914,8 @@ __metadata:
dependencies:
"@babel/parser": "npm:^7.29.2"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
lz-string: "npm:^1.5.0"
react: "npm:^19.3.0"
react-dom: "npm:^19.3.0"
@@ -1940,8 +1940,8 @@ __metadata:
"@codemirror/view": "npm:^6.41.0"
"@lezer/highlight": "npm:^1.2.3"
"@replit/codemirror-vim": "npm:^6.3.0"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@tsnobip/rescript-lezer": "npm:^0.9.0"
highlight.js: "npm:^11.11.1"
react: "npm:^19.3.0"
@@ -1957,63 +1957,64 @@ __metadata:
languageName: unknown
linkType: soft
-"@rescript/darwin-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-arm64@npm:12.2.0"
+"@rescript/darwin-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-arm64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
-"@rescript/darwin-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-x64@npm:12.2.0"
+"@rescript/darwin-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-x64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
-"@rescript/linux-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-arm64@npm:12.2.0"
+"@rescript/linux-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-arm64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard
-"@rescript/linux-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-x64@npm:12.2.0"
+"@rescript/linux-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-x64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard
-"@rescript/react@npm:^0.14.2":
- version: 0.14.2
- resolution: "@rescript/react@npm:0.14.2"
+"@rescript/react@npm:^0.16.0-beta.1":
+ version: 0.16.0-beta.1
+ resolution: "@rescript/react@npm:0.16.0-beta.1"
peerDependencies:
- react: ">=19.1.0"
- react-dom: ">=19.1.0"
- checksum: 10c0/6fbc0614ac4e4e5ad37abe474dcc137dc8cb7c3351dbc9afa4de92f080614e78809278a034c52da1676e89c299ab07154760d8b80f68f0a5cfd284e22035f713
+ "@rescript/runtime": ">=13.0.0-alpha.5"
+ react: ">=19.2.0"
+ react-dom: ">=19.2.0"
+ checksum: 10c0/bcf008bfb91d07a15dbec273de633104c56147c56e84c8deebb14a2f6cc95eea8a0ff90c19be6ce272f0e768e0f1f6122386e8ac348beb04bffff84ee49d4ec4
languageName: node
linkType: hard
-"@rescript/runtime@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/runtime@npm:12.2.0"
- checksum: 10c0/59c0194ae52fbbaadc736bbf1cfac1ed6ffde92b2346e36b9f1a29bb136e38b7ef203c780647203912fa657d293eab5c4e208f04dd65ed4bf47d53843980f7e1
+"@rescript/runtime@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/runtime@npm:13.0.0-alpha.6"
+ checksum: 10c0/8d351bc3ff8e47c7ff9af871da90982aab056955d9990e38618285aa2eb0ecf6ec5094e07e63f1457957d6f273f1167ecfe67439547d5bcfeb547c2b0489129f
languageName: node
linkType: hard
-"@rescript/webapi@npm:0.1.0-experimental-29db5f4":
- version: 0.1.0-experimental-29db5f4
- resolution: "@rescript/webapi@npm:0.1.0-experimental-29db5f4"
- dependencies:
- rescript: "npm:^12.0.0-beta.3"
- checksum: 10c0/0ef8538fe59b2c058217dd17a5e653ac4902a87caad3b78bde2efc8099538c33e8c1fc7cef41595fd385a78de2ca172c60bdd36a100839f8983da7a40ebd9560
+"@rescript/webapi@npm:alpha":
+ version: 0.1.0-alpha-b1d58f9
+ resolution: "@rescript/webapi@npm:0.1.0-alpha-b1d58f9"
+ peerDependencies:
+ rescript: ">=13"
+ checksum: 10c0/4d242fd3deabf511552f936fe2a5dfa141da7932a644e96528e65c7d32f3bfa29ae4e0e548c5912995d0467312aa1c89b00267fc05b1c80ad373d13d3cd7945c
languageName: node
linkType: hard
-"@rescript/win32-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/win32-x64@npm:12.2.0"
+"@rescript/win32-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/win32-x64@npm:13.0.0-alpha.6"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -9121,20 +9122,20 @@ __metadata:
dependencies:
lefthook: "npm:^2.1.4"
oxfmt: "npm:^0.46.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
languageName: unknown
linkType: soft
-"rescript@npm:^12.0.0-beta.3, rescript@npm:^12.2.0":
- version: 12.2.0
- resolution: "rescript@npm:12.2.0"
+"rescript@npm:^13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "rescript@npm:13.0.0-alpha.6"
dependencies:
- "@rescript/darwin-arm64": "npm:12.2.0"
- "@rescript/darwin-x64": "npm:12.2.0"
- "@rescript/linux-arm64": "npm:12.2.0"
- "@rescript/linux-x64": "npm:12.2.0"
- "@rescript/runtime": "npm:12.2.0"
- "@rescript/win32-x64": "npm:12.2.0"
+ "@rescript/darwin-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/darwin-x64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-x64": "npm:13.0.0-alpha.6"
+ "@rescript/runtime": "npm:13.0.0-alpha.6"
+ "@rescript/win32-x64": "npm:13.0.0-alpha.6"
dependenciesMeta:
"@rescript/darwin-arm64":
optional: true
@@ -9148,11 +9149,9 @@ __metadata:
optional: true
bin:
bsc: cli/bsc.js
- bstracing: cli/bstracing.js
rescript: cli/rescript.js
- rescript-legacy: cli/rescript-legacy.js
rescript-tools: cli/rescript-tools.js
- checksum: 10c0/7650a77a66e2f2ba2523eac54fd930f0b70bad922e9b498678e701e842a56c7b6facd0daf1ef9c7b71d344d9483a0293d17db72a67515a22d07856bdfc34fb46
+ checksum: 10c0/8b4a7430444a4db28e2e480b6750f700ceca0d899d3262248c682314e372cb33fb9030962e0628c93bd6dfc6ea07f03143423aa48f2d478c22152496ee211adf
languageName: node
linkType: hard
children
+{children}
} // Used for hero like introduction text in // e.g Doc sections module Intro = { @react.component - let make = (~children) => children
+ let make = (~children) => {children}
}
module Cite = {
@@ -20,7 +20,7 @@ module Cite = {
// For semantics, check out
// https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
- {React.string(author)}
)}
@@ -30,13 +30,13 @@ module Cite = {
module Info = {
@react.component
let make = (~children) =>
-
- children
+ {children}
, React.element>, React.element>,
+ cite?: React.component, React.element>>,
@as("Info")
- info?: React.componentLike, React.element>,
+ info?: React.component>,
@as("Warn")
- warn?: React.componentLike, React.element>,
+ warn?: React.component>,
@as("Intro")
- intro?: React.componentLike, React.element>,
+ intro?: React.component>,
@as("Image")
- image?: React.componentLike<
- Image.props,
- React.element,
- >,
+ image?: React.component>,
@as("Video")
- video?: React.componentLike, React.element>,
+ video?: React.component>,
@as("UrlBox")
- urlBox?: React.componentLike, React.element>,
+ urlBox?: React.component>,
@as("CodeTab")
- codeTab?: CodeTab.props> => React.element,
+ codeTab?: React.component>>,
/* Common markdown elements */
- p?: P.props => React.element,
- li?: Li.props => React.element,
- h1?: H1.props => React.element,
- h2?: H2.props => React.element,
- h3?: H3.props => React.element,
- h4?: H4.props => React.element,
- h5?: H5.props => React.element,
- ul?: Ul.props => React.element,
- ol?: Ol.props => React.element,
- table?: Table.props => React.element,
- thead?: Thead.props => React.element,
- th?: Th.props => React.element,
- td?: Td.props => React.element,
- blockquote?: Blockquote.props => React.element,
- strong?: Strong.props => React.element,
- hr?: Hr.props => React.element,
- code?: React.componentLike, React.element>, React.element>,
- pre?: Pre.props => React.element,
- a?: A.props => React.element,
+ p?: React.component>,
+ li?: React.component>,
+ h1?: React.component>,
+ h2?: React.component>,
+ h3?: React.component>,
+ h4?: React.component>,
+ h5?: React.component>,
+ ul?: React.component>,
+ ol?: React.component>,
+ table?: React.component>,
+ thead?: React.component>,
+ th?: React.component>,
+ td?: React.component>,
+ blockquote?: React.component>,
+ strong?: React.component>,
+ hr?: React.component,
+ code?: React.component, React.element>>,
+ pre?: React.component>,
+ a?: React.component>,
}
let default = {
diff --git a/apps/docs/src/components/NavbarPrimary.res b/apps/docs/src/components/NavbarPrimary.res
index a8e5d1c6a..d9b5c5dd1 100644
--- a/apps/docs/src/components/NavbarPrimary.res
+++ b/apps/docs/src/components/NavbarPrimary.res
@@ -10,8 +10,7 @@ let isActive = (~url, ~pathname: Path.t) => {
module LeftContent = {
@react.component
let make =
- @directive("'use memo'")
- () => {
+ @directive("'use memo'") () => {
let {pathname} = useLocation()
children+
{children}{Option.mapOr(author, React.null, author =>
children
+ {children}
}
module Warn = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module UrlBox = {
@@ -47,7 +47,7 @@ module UrlBox = {
let elements = React.Children.toArray(children)
let content = if typeof(children) == #string || React.isValidElement(children) {
- imgEl + {imgEl} {MdxLegacy.getChildren(children)}
} else { @@ -57,7 +57,7 @@ module UrlBox = { let rest = elements->Array.slice(~start=1) <>- imgEl + {imgEl} {MdxLegacy.getChildren(head)}
{React.array(rest)} @@ -82,8 +82,8 @@ module UrlBox = { }
- content
-
}
}
@@ -103,12 +103,13 @@ module Anchor = {
}
}
+
//*--- HEADLINES ---*//
module H1 = {
@react.component
let make = (~id=?, ~title=?, ~children) =>
- link
+ {content}
+ {link}
children
+{children}
} module H2 = { @@ -118,7 +119,7 @@ module H2 = { <>
- children
+ {children}
- children
+ {children}
- children
+ {children}
children
+ let make = (~children) => {children}
}
module InlineCode = {
@@ -177,7 +178,7 @@ module InlineCode = {
- children
+ {children}
}
@@ -185,13 +186,13 @@ module Table = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Thead = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Th = {
@@ -200,13 +201,13 @@ module Th = {
- children
+ {children}
}
module Td = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Code = {
@@ -233,16 +234,16 @@ module Code = {
let highlightedLines = parseNumericRangeMeta(metastring)
- if List.has(metaSplits, "example", String.equal) {
+ if metaSplits->List.some(value => value == "example") {
- children
+ {children}
}
@@ -353,13 +354,13 @@ module A = {
?target
dataTestId="absolute-url"
>
- children
+ {children}
} else {
- children
+ {children}
}
}
@@ -367,12 +368,12 @@ module A = {
module Ul = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Ol = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Li = {
@@ -397,7 +398,7 @@ module Li = {
| [child] =>
switch getType(child) {
| "pre" | "p" => child
- | _ =>
- children
+ {children}
children
+ let make = (~children) => {children}
}
module InlineCode = {
@@ -177,7 +178,7 @@ module InlineCode = {
- children
+ {children}
}
@@ -185,13 +186,13 @@ module Table = {
@react.component
let make = (~children) =>
- children
+ {children}
}
module Thead = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Th = {
@@ -200,13 +201,13 @@ module Th = {
- children
+ {children}
}
module Td = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Code = {
@@ -233,16 +234,16 @@ module Code = {
let highlightedLines = parseNumericRangeMeta(metastring)
- if List.has(metaSplits, "example", String.equal) {
+ if metaSplits->List.some(value => value == "example") {
- children
+ {children}
}
@@ -353,13 +354,13 @@ module A = {
?target
dataTestId="absolute-url"
>
- children
+ {children}
} else {
- children
+ {children}
}
}
@@ -367,12 +368,12 @@ module A = {
module Ul = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Ol = {
@react.component
- let make = (~children) => children
+ let make = (~children) => {children}
}
module Li = {
@@ -397,7 +398,7 @@ module Li = {
| [child] =>
switch getType(child) {
| "pre" | "p" => child
- | _ =>
child
+ | _ =>{child}
} | _ => let first = elements[0]->Option.getOrThrow @@ -407,18 +408,18 @@ module Li = { | "ul" | "ol" | "li" | "pre" => <> {getType(first) == "p" ? React.array(head) :{React.array(head)}
} - last + {last} - | _ =>children
+ | _ =>{children}
} } - {
+ @directive("'use memo'") () => {
let iconClasses = "w-6 h-6 opacity-50 hover:opacity-100"
let linkClasses = "hidden md:block"
{
+ @directive("'use memo'") () => {
let scrollDirection = Hooks.useScrollDirection(~topMargin=64, ~threshold=32)
let navbarClasses = switch scrollDirection {
diff --git a/apps/docs/src/components/NavbarUtils.res b/apps/docs/src/components/NavbarUtils.res
index 0f639ffdb..2677b3a3e 100644
--- a/apps/docs/src/components/NavbarUtils.res
+++ b/apps/docs/src/components/NavbarUtils.res
@@ -16,35 +16,36 @@ let isActiveLink = (~includes: string, ~excludes: option=?, ~route: Path
let linkOrActiveLink = (~target: Path.t, ~route: Path.t) => target === route ? activeLink : link
let linkOrActiveLinkSubroute = (~target: Path.t, ~route: Path.t) =>
- String.startsWith((route :> string), (target :> string)) ? activeLink : link
+ String.startsWith(route :> string, target :> string) ? activeLink : link
-external elementToDialog: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmlDialogElement = "%identity"
+external elementToDialog: WebAPI.Element.t => WebAPI.HTMLDialogElement.t = "%identity"
let getMobileOverlayDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-overlay")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-overlay")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
-@get external _open: WebAPI.DOMAPI.htmlDialogElement => bool = "open"
+@get external _open: WebAPI.HTMLDialogElement.t => bool = "open"
let openMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileOverlay = _ =>
switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileOverlay = _ => {
let isOpen = switch getMobileOverlayDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
@@ -55,28 +56,29 @@ let toggleMobileOverlay = _ => {
}
let getMobileTertiaryDialog = () => {
- Nullable.make(document->WebAPI.Document.getElementById("mobile-tertiary-drawer")->elementToDialog)
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.getElementById("mobile-tertiary-drawer")
+ ->Null.toOption
+ ->Option.map(elementToDialog)
}
let openMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.showModal
+ | None => ()
}
let closeMobileTertiaryDrawer = _ =>
switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->WebAPI.HTMLDialogElement.close
- | Null => ()
- | Undefined => ()
+ | Some(dialog) => dialog->WebAPI.HTMLDialogElement.close
+ | None => ()
}
let toggleMobileTertiaryDrawer = _ => {
let isOpen = switch getMobileTertiaryDialog() {
- | Nullable.Value(dialog) => dialog->_open
- | Null => false
- | Undefined => false
+ | Some(dialog) => dialog->_open
+ | None => false
}
if isOpen {
diff --git a/apps/docs/src/components/Search.res b/apps/docs/src/components/Search.res
index 4669666eb..5dac83c13 100644
--- a/apps/docs/src/components/Search.res
+++ b/apps/docs/src/components/Search.res
@@ -12,12 +12,12 @@ let reduce = (state, action) =>
let unavailableText = "Search unavailable"
let unavailableLabel = "Search unavailable for this build"
-@get external isContentEditable: WebAPI.DOMAPI.element => option = "isContentEditable"
-@get external focusMethod: WebAPI.DOMAPI.element => option unit> = "focus"
-@get external inputValue: WebAPI.DOMAPI.element => option = "value"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
+@get external isContentEditable: WebAPI.Element.t => option = "isContentEditable"
+@get external focusMethod: WebAPI.Element.t => option unit> = "focus"
+@get external inputValue: WebAPI.Element.t => option = "value"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-let isEditable = (element: WebAPI.DOMAPI.element) =>
+let isEditable = (element: WebAPI.Element.t) =>
switch element.tagName {
| "TEXTAREA" | "SELECT" | "INPUT" => true
| _ => element->isContentEditable->Option.getOr(false)
@@ -30,16 +30,17 @@ let restoreFocus = element =>
}
let hasSearchQuery = () =>
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) =>
WebAPI.DOMTokenList.contains(element.classList, "DocSearch-Input") &&
element->inputValue->Option.map(value => value !== "")->Option.getOr(false)
| Null => false
}
-let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
+let activateSearch = (~dispatch, ~returnFocus: React.ref>) => {
if returnFocus.current->Option.isNone {
- returnFocus.current = document.activeElement->Null.toOption
+ returnFocus.current =
+ WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement->Null.toOption
}
dispatch(Open(React.lazy_(() => import(SearchModal.make))))
}
@@ -51,7 +52,7 @@ let make = () => {
let algoliaConfig = Env.algoliaPublicConfig
let onClose = React.useCallback(() => {
- switch WebAPI.Document.querySelector(document, "body") {
+ switch WebAPI.Document.querySelector(WebAPI.DOM.window->WebAPI.Window.document, "body") {
| Value(body) => WebAPI.DOMTokenList.remove(body.classList, "DocSearch--active")
| Null => ()
}
@@ -65,24 +66,30 @@ let make = () => {
switch algoliaConfig {
| None => None
| Some(_) =>
- let handleGlobalKeyDown = (event: WebAPI.UIEventsAPI.keyboardEvent) => {
+ let handleGlobalKeyDown = event => {
+ let preventDefault = () => event->WebAPI.KeyboardEvent.preventDefault
if event.key === "Escape" && !hasSearchQuery() {
onClose()
} else if event.key === "/" || (event.key === "k" && (event.ctrlKey || event.metaKey)) {
- switch document.activeElement {
+ switch WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement {
| Value(element) if isEditable(element) => ()
| _ =>
activateSearch(~dispatch, ~returnFocus)
- WebAPI.KeyboardEvent.preventDefault(event)
+ preventDefault()
}
}
}
// Read Escape's query before autocomplete clears it at the input.
- WebAPI.Window.addEventListener(window, Keydown, handleGlobalKeyDown, ~options={capture: true})
+ WebAPI.Window.addEventListener(
+ WebAPI.DOM.window,
+ Keydown,
+ handleGlobalKeyDown,
+ ~options={capture: true},
+ )
Some(
() =>
WebAPI.Window.removeEventListener(
- window,
+ WebAPI.DOM.window,
Keydown,
handleGlobalKeyDown,
~options={capture: true},
diff --git a/apps/docs/src/components/SearchModal.res b/apps/docs/src/components/SearchModal.res
index 9101eac9e..ee9603ecf 100644
--- a/apps/docs/src/components/SearchModal.res
+++ b/apps/docs/src/components/SearchModal.res
@@ -17,7 +17,7 @@ let make = (~apiKey, ~appId, ~indexName, ~onClose: unit => unit) => {
hitComponent
onClose
insights=true
- initialScrollY={window.scrollY->Float.toInt}
+ initialScrollY={WebAPI.DOM.window->WebAPI.Window.scrollY->Float.toInt}
searchParameters={
distinct: 3,
hitsPerPage: 20,
diff --git a/apps/docs/src/components/SidebarNav.res b/apps/docs/src/components/SidebarNav.res
index cc2c4ba34..9d75b1022 100644
--- a/apps/docs/src/components/SidebarNav.res
+++ b/apps/docs/src/components/SidebarNav.res
@@ -11,9 +11,9 @@ module Toc = {
onClick={evt => {
evt->ReactEvent.Mouse.preventDefault
WebAPI.Document.getElementById(
- document,
+ WebAPI.DOM.window->WebAPI.Window.document,
href->String.replace("#", ""),
- )->WebAPI.Element.scrollIntoView_alignToTop
+ )->Null.forEach(WebAPI.Element.scrollIntoViewAlignToTop)
onClick()
}}
to={"#" ++ href->Url.normalizeAnchor}
@@ -36,7 +36,7 @@ module Title = {
let make = (~children) => {
let className = "hl-overline text-gray-80 mt-5" //overline
- string)} route={(pathname :> string)} categories activeToc
+ key={pathname :> string} route={pathname :> string} categories activeToc
/>
=?,
~categories: array,
- ~components=MarkdownComponents.default,
~docSearchLvl0=?,
~children,
) => {
@@ -20,5 +19,5 @@ let make = (
let sidebar = children
+ {children}
}
diff --git a/apps/docs/src/layouts/MainLayout.res b/apps/docs/src/layouts/MainLayout.res
index 059e9f8d4..9de35dc42 100644
--- a/apps/docs/src/layouts/MainLayout.res
+++ b/apps/docs/src/layouts/MainLayout.res
@@ -1,11 +1,11 @@
@react.component
-let make = (~components=MarkdownComponents.default, ~children) => {
+let make = (~children) => {
<>
- children
+ {children}
diff --git a/apps/docs/src/layouts/MainLayout.resi b/apps/docs/src/layouts/MainLayout.resi
index e76a5ba10..940ed3d87 100644
--- a/apps/docs/src/layouts/MainLayout.resi
+++ b/apps/docs/src/layouts/MainLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
+let make: (~children: React.element) => React.element
diff --git a/apps/docs/src/layouts/SidebarPageLayout.res b/apps/docs/src/layouts/SidebarPageLayout.res
index 8445b4572..a2c95e940 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.res
+++ b/apps/docs/src/layouts/SidebarPageLayout.res
@@ -2,8 +2,6 @@ module Link = ReactRouter.Link
@react.component
let make = (
- ~sidebarState: (bool, (bool => bool) => unit)=(false, _ => ()),
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
~sidebar: React.element,
~rightSidebar: option=?,
~categories: option>=?,
@@ -45,8 +43,8 @@ let make = (
| None => React.null
}
lesson.content
+ {lesson.content}
}
@@ -348,7 +350,7 @@ module ResultPane = {
}
{React.string(msg)}
- errs
+ {errs}
| Comp(UnexpectedError(msg))
| Conv(UnexpectedError(msg)) =>
@@ -446,20 +448,19 @@ module ResultPane = {
}
module WarningFlagsWidget = {
+ @set external setScrollTop: (WebAPI.HTMLElement.t, float) => unit = "scrollTop"
+
// Inspired by MUI (who got inspired by WAI best practise examples)
// https://github.com/mui-org/material-ui/blob/next/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.js#L327
- let scrollToElement = (
- ~parent: WebAPI.DOMAPI.htmlElement,
- element: WebAPI.DOMAPI.htmlElement,
- ): unit =>
+ let scrollToElement = (~parent: WebAPI.HTMLElement.t, element: WebAPI.HTMLElement.t): unit =>
if parent.scrollHeight > parent.clientHeight {
let scrollBottom = parent.clientHeight + Float.toInt(parent.scrollTop)
let elementBottom = element.offsetTop + element.offsetHeight
if elementBottom > scrollBottom {
- parent.scrollTop = Float.fromInt(elementBottom - parent.clientHeight)
+ parent->setScrollTop(Float.fromInt(elementBottom - parent.clientHeight))
} else if element.offsetTop - element.offsetHeight < Float.toInt(parent.scrollTop) {
- parent.scrollTop = Float.fromInt(element.offsetTop - element.offsetHeight)
+ parent->setScrollTop(Float.fromInt(element.offsetTop - element.offsetHeight))
}
}
@@ -830,7 +831,7 @@ module WarningFlagsWidget = {
- suggestionBox
+ {suggestionBox}
}
}
@@ -1187,12 +1188,12 @@ module ControlPanel = {
?onClick
className="inline-block text-sky hover:cursor-pointer hover:bg-sky hover:text-white-80-tr rounded border active:bg-sky-70 border-sky-70 px-2 py-1 "
>
- children
+ {children}
}
let commandWithKeyboardShortcut = (commandName, ~key) => {
- let userAgent = window.navigator.userAgent
+ let userAgent = WebAPI.DOM.window->WebAPI.Window.navigator->WebAPI.Navigator.userAgent
if userAgent->String.includes("iPhone") || userAgent->String.includes("Android") {
commandName
} else if userAgent->String.includes("Mac") {
@@ -1235,8 +1236,8 @@ module ControlPanel = {
}
}
- WebAPI.Window.addEventListener(window, Keydown, onKeyDown)
- Some(() => WebAPI.Window.removeEventListener(window, Keydown, onKeyDown))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Keydown, onKeyDown)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Keydown, onKeyDown))
| _ => None
}
}, (state, dispatch, setCurrentTab))
@@ -1289,7 +1290,7 @@ module ControlPanel = {
}
) => {
let initialVersion = switch versions {
| [v] => Some(v) // only single version available. maybe local dev.
- | versions => {
- let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
- switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Version :> string)),
- ) {
- | Nullable.Value(version) => version->Semver.parse
- | _ =>
- switch getLocalStorageItem(playgroundVersionStorageKey) {
- | Some(v) => v->Semver.parse
- | None => lastStableVersion
- }
+ | versions =>
+ let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
+ switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Version :> string)
+ ->Null.toOption {
+ | Some(version) => version->Semver.parse
+ | _ =>
+ switch getLocalStorageItem(playgroundVersionStorageKey) {
+ | Some(v) => v->Semver.parse
+ | None => lastStableVersion
}
}
}
- let initialLang = switch Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Ext :> string)),
- ) {
- | Nullable.Value("re") => Api.Lang.Reason
+ let initialLang = switch searchParams
+ ->WebAPI.URLSearchParams.get(CompilerManagerHook.Ext :> string)
+ ->Null.toOption {
+ | Some("re") => Api.Lang.Reason
| _ => Api.Lang.Res
}
let initialModuleSystem =
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Module :> string)))->Nullable.toOption
+ searchParams->WebAPI.URLSearchParams.get(Module :> string)->Null.toOption
- let initialJsxPreserveMode = !(
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((JsxPreserve :> string)),
- )->Nullable.isNullable
- )
+ let initialJsxPreserveMode =
+ searchParams->WebAPI.URLSearchParams.get(JsxPreserve :> string)->Null.toOption->Option.isSome
let initialExperimentalFeatures =
- Nullable.make(
- searchParams->WebAPI.URLSearchParams.get((Experiments :> string)),
- )->Nullable.mapOr([], str => str->String.split(",")->Array.map(String.trim))
+ searchParams
+ ->WebAPI.URLSearchParams.get(Experiments :> string)
+ ->Null.mapOr([], str => str->String.split(",")->Array.map(String.trim))
let initialContent = switch (
- Nullable.make(searchParams->WebAPI.URLSearchParams.get((Code :> string))),
+ searchParams->WebAPI.URLSearchParams.get(Code :> string)->Null.toOption,
initialLang,
) {
- | (Nullable.Value(compressedCode), _) =>
- LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
+ | (Some(compressedCode), _) => LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
| (_, Reason) => initialReContent
| (_, Res) =>
switch initialVersion {
@@ -1713,8 +1709,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
setSessionStorageItem(~key=newLightModeToastSeenStorageKey, ~value="true")
}
- let timer = setTimeout(~handler=hideToast, ~timeout=10000)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(WebAPI.DOM.window, ~handler=hideToast, ~timeout=10000)
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
}
}, [])
@@ -1741,12 +1737,16 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
value => {
switch typingTimer.current {
| None => ()
- | Some(timer) => clearTimeout(timer)
+ | Some(timer) => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
}
- let timer = setTimeout(~handler=() => {
- timeoutCompile.current(value)
- typingTimer.current = None
- }, ~timeout=100)
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ timeoutCompile.current(value)
+ typingTimer.current = None
+ },
+ ~timeout=100,
+ )
typingTimer.current = Some(timer)
}
},
@@ -1869,7 +1869,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let (layout, setLayout) = React.useState(() => Row)
React.useEffect(() => {
- setLayout(_ => window.innerWidth < breakingPoint ? Column : Row)
+ setLayout(_ => WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row)
None
}, [])
@@ -1883,7 +1883,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let subPanelRef = React.useRef(Nullable.null)
let onResize = () => {
- let newLayout = window.innerWidth < breakingPoint ? Column : Row
+ let newLayout = WebAPI.DOM.window->WebAPI.Window.innerWidth < breakingPoint ? Column : Row
setLayout(_ => newLayout)
switch panelRef.current->Nullable.toOption {
| Some(element) =>
@@ -1909,8 +1909,8 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
}
React.useEffect(() => {
- WebAPI.Window.addEventListener(window, Resize, onResize)
- Some(() => WebAPI.Window.removeEventListener(window, Resize, onResize))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Resize, onResize)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Resize, onResize))
}, [])
// To force CodeMirror render scrollbar on first render
@@ -1995,15 +1995,15 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
onMove(position)
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.addEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Touchmove, onTouchMove)
- WebAPI.Window.removeEventListener(window, Mouseup, onMouseUp)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Touchmove, onTouchMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, onMouseUp)
},
)
}, [layout])
@@ -2013,7 +2013,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
let hideNewLightModeToast = () => {
setShowNewLightModeToast(_ => false)
WebAPI.Storage.setItem(
- window.sessionStorage,
+ WebAPI.DOM.window->WebAPI.Window.sessionStorage,
~key=newLightModeToastSeenStorageKey,
~value="true",
)
@@ -2040,59 +2040,58 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
| JavaScript => "JavaScript"->React.string
- | Problems => {
- let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
- | Compiling({state: ready})
- | Ready(ready)
- | Executing({state: ready})
- | SwitchingCompiler(ready, _) => {
- "warnings": switch ready.result {
- | Comp(Success({warnings})) => warnings->Array.length
- | _ => 0
- },
- "errors": switch ready.result {
- | FinalResult.Comp(Fail(result)) =>
- switch result {
- | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
- | WarningErr(errors) => errors->Array.length
- | WarningFlagErr(_) => 1
- }
- | Conv(Fail({details})) => details->Array.length
- | Comp(Success(_)) => 0
- | Conv(Success(_)) => 0
- | Comp(UnexpectedError(_))
- | Conv(UnexpectedError(_))
- | Comp(Unknown(_))
- | Conv(Unknown(_)) => 1
- | Nothing => 0
- },
- }
-
- | SetupFailed(_) | Init => {
- "warnings": 0,
- "errors": 0,
- }
+ | Problems =>
+ let problemCounts: {"warnings": int, "errors": int} = switch compilerState {
+ | Compiling({state: ready})
+ | Ready(ready)
+ | Executing({state: ready})
+ | SwitchingCompiler(ready, _) => {
+ "warnings": switch ready.result {
+ | Comp(Success({warnings})) => warnings->Array.length
+ | _ => 0
+ },
+ "errors": switch ready.result {
+ | FinalResult.Comp(Fail(result)) =>
+ switch result {
+ | SyntaxErr(errors) | TypecheckErr(errors) | OtherErr(errors) => errors->Array.length
+ | WarningErr(errors) => errors->Array.length
+ | WarningFlagErr(_) => 1
+ }
+ | Conv(Fail({details})) => details->Array.length
+ | Comp(Success(_)) => 0
+ | Conv(Success(_)) => 0
+ | Comp(UnexpectedError(_))
+ | Conv(UnexpectedError(_))
+ | Comp(Unknown(_))
+ | Conv(Unknown(_)) => 1
+ | Nothing => 0
+ },
}
- ) => {
className={`flex ${layout == Column ? "flex-col" : "flex-row"}`}
ref={HtmlRef.elementRef(panelRef)}
>
- // Left Panel
+ /* Left Panel */
children
+ {children}
}
}
@@ -142,10 +142,10 @@ let make = (
className="h-full relative top-0 px-4 w-full block md:top-40 md:sticky border-r border-gray-20 overflow-y-auto pb-24 max-h-[calc(100vh-10rem)] pt-8"
>
-
- preludeSection
+ {preludeSection}
/* Firefox ignores padding in scroll containers, so we need margin
to make a bottom gap for the sidebar.
diff --git a/apps/docs/src/layouts/CommunityLayout.res b/apps/docs/src/layouts/CommunityLayout.res
index f704be1c9..a1dc6310e 100644
--- a/apps/docs/src/layouts/CommunityLayout.res
+++ b/apps/docs/src/layouts/CommunityLayout.res
@@ -15,7 +15,7 @@ let make = (~children, ~categories, ~entries) => {
<>
toplevelNav
+ {toplevelNav}
- previous
- next
+ {previous}
+ {next}
}
| None => React.null
@@ -56,7 +54,7 @@ let make = (
- sidebar
+ {sidebar}
| None => React.null
}}
- children
- pagination
+ {children}
+ {pagination}
{switch rightSidebar {
| Some(ele) => ele
diff --git a/apps/docs/src/layouts/SidebarPageLayout.resi b/apps/docs/src/layouts/SidebarPageLayout.resi
index d9730f135..acf6130f8 100644
--- a/apps/docs/src/layouts/SidebarPageLayout.resi
+++ b/apps/docs/src/layouts/SidebarPageLayout.resi
@@ -1,7 +1,5 @@
@react.component
let make: (
- // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
- ~sidebarState: (bool, (bool => bool) => unit)=?,
~sidebar: React.element,
~rightSidebar: React.element=?,
~categories: array=?,
diff --git a/apps/docs/src/markdown/Mdx.res b/apps/docs/src/markdown/Mdx.res
index e17226a6a..1e1e1eb40 100644
--- a/apps/docs/src/markdown/Mdx.res
+++ b/apps/docs/src/markdown/Mdx.res
@@ -68,7 +68,7 @@ let sortSection = mdxPages =>
)
let groupBySection = mdxPages =>
- Array.reduce(mdxPages, (Dict.make() :> Dict.t>), (acc, item) => {
+ Array.reduce(mdxPages, Dict.make() :> Dict.t>, (acc, item) => {
let section = item.section->Option.flatMap(Dict.get(acc, _))
switch section {
// If the section already exists, add this item to it
diff --git a/apps/docs/src/markdown/MdxLegacy.res b/apps/docs/src/markdown/MdxLegacy.res
index 5ee546bd3..46239dc3e 100644
--- a/apps/docs/src/markdown/MdxLegacy.res
+++ b/apps/docs/src/markdown/MdxLegacy.res
@@ -21,15 +21,14 @@ let getType = element => {
if React.isValidElement(element) {
switch props(element).mdxType {
| Some(tag) => tag
- | None => {
- let tag = elementType(element)
- typeof(tag) == #string ? String.make(tag) : "unknown"
- }
+ | None =>
+ let tag = elementType(element)
+ typeof(tag) == #string ? String.make(tag) : "unknown"
}
} else {
"unknown"
}
}
-@get external component: React.element => React.componentLike<'props, React.element> = "type"
+@get external component: React.element => React.component<'props> = "type"
let isComponent = (element, make) => React.isValidElement(element) && component(element) === make
diff --git a/apps/docs/test-utils/TestUtils.res b/apps/docs/test-utils/TestUtils.res
index 1edc1da72..3c0f6c7c3 100644
--- a/apps/docs/test-utils/TestUtils.res
+++ b/apps/docs/test-utils/TestUtils.res
@@ -1,16 +1,18 @@
-external imageFromNode: WebAPI.DOMAPI.node => WebAPI.DOMAPI.htmlImageElement = "%identity"
+external imageFromElement: WebAPI.Element.t => WebAPI.HTMLImageElement.t = "%identity"
let waitForImages = async (selector: string) => {
- let root = switch document->WebAPI.Document.querySelector(selector) {
+ let root = switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(selector) {
| Value(root) => root
- | Null => failwith(`expected to find screenshot target ${selector}`)
+ | Null => panic(`expected to find screenshot target ${selector}`)
}
let images = root->WebAPI.Element.querySelectorAll("img")
if images.length > 0 {
for i in 0 to images.length - 1 {
- let image = images->WebAPI.NodeList.item(i)->imageFromNode
+ let image = images->WebAPI.NodeList.item(i)->Null.getOrThrow->imageFromElement
await image->WebAPI.HTMLImageElement.decode
}
}
diff --git a/apps/guide/app/GuideCompilerBridgeHook.res b/apps/guide/app/GuideCompilerBridgeHook.res
index 2b19d1a1b..b64874e6d 100644
--- a/apps/guide/app/GuideCompilerBridgeHook.res
+++ b/apps/guide/app/GuideCompilerBridgeHook.res
@@ -30,11 +30,15 @@ let useCompilerBridge = (
React.useEffect(() => {
switch compilerState {
| Ready({targetLang}) if code !== lastCompiledCode.current =>
- let timer = setTimeout(~handler=() => {
- lastCompiledCode.current = code
- compilerDispatch(CompileCode(targetLang, code))
- }, ~timeout=150)
- Some(() => clearTimeout(timer))
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
+ ~handler=() => {
+ lastCompiledCode.current = code
+ compilerDispatch(CompileCode(targetLang, code))
+ },
+ ~timeout=150,
+ )
+ Some(() => WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer))
| _ => None
}
}, (code, compilerState, compilerDispatch))
@@ -59,8 +63,8 @@ let useCompilerBridge = (
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [setOutput])
React.useEffect(() => {
@@ -102,14 +106,15 @@ let useCompilerBridge = (
imports->Dict.mapValues(path =>
path->GuideRuntimeImport.url(~bundleBaseUrl, ~compilerVersion=selected.id)
)
- let timer = setTimeout(
+ let timer = WebAPI.Window.setTimeout(
+ WebAPI.DOM.window,
~handler=() => EvalIFrame.sendOutput(runtimeCode, imports),
~timeout=50,
)
Some(
() => {
isWaitingForRuntimeOutput.current = false
- clearTimeout(timer)
+ WebAPI.Window.clearTimeout(WebAPI.DOM.window, timer)
},
)
| None => None
diff --git a/apps/guide/app/GuideCompilerData.res b/apps/guide/app/GuideCompilerData.res
index d4a32be91..ce7f3cdc5 100644
--- a/apps/guide/app/GuideCompilerData.res
+++ b/apps/guide/app/GuideCompilerData.res
@@ -5,12 +5,13 @@ type t = {
module Env = {
@scope(("process", "env")) external nodeEnv: string = "NODE_ENV"
+
@scope(("process", "env"))
external playgroundBundleEndpoint: option = "PLAYGROUND_BUNDLE_ENDPOINT"
}
let fetchVersions = async versionsBaseUrl => {
- let response = await fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
+ let response = await WebAPI.Fetch.fetch(versionsBaseUrl ++ "/playground-bundles/versions.json")
let json = await WebAPI.Response.json(response)
json
->JSON.Decode.array
diff --git a/apps/guide/app/GuideDom.res b/apps/guide/app/GuideDom.res
index 406bf1246..90f33b2f7 100644
--- a/apps/guide/app/GuideDom.res
+++ b/apps/guide/app/GuideDom.res
@@ -1,3 +1,3 @@
-external domElementToWebElement: Dom.element => WebAPI.DOMAPI.element = "%identity"
+external domElementToWebElement: Dom.element => WebAPI.Element.t = "%identity"
let toWebElement = domElementToWebElement
diff --git a/apps/guide/app/GuideHome.res b/apps/guide/app/GuideHome.res
index 1462ecde6..0906944aa 100644
--- a/apps/guide/app/GuideHome.res
+++ b/apps/guide/app/GuideHome.res
@@ -1,4 +1,5 @@
-let navigateToDocsIntro = url => window.location->WebAPI.Location.assign(url)
+let navigateToDocsIntro = url =>
+ WebAPI.DOM.window->WebAPI.Window.location->WebAPI.Location.assign(url)
@react.component
let make = (
@@ -39,7 +40,7 @@ let make = (
{React.string(lesson.title)}
-
// for the guide, so storage failures fall back to the current UI state.
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -115,7 +115,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -123,7 +123,7 @@ let setLocalStorageItem = (~key, ~value) => {
let removeLocalStorageItem = key => {
try {
- WebAPI.Storage.removeItem(window.localStorage, key)
+ WebAPI.Storage.removeItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)
} catch {
| JsExn(_) => ()
}
diff --git a/apps/guide/app/GuideLayoutHook.res b/apps/guide/app/GuideLayoutHook.res
index 211dad3cc..dfc5d137c 100644
--- a/apps/guide/app/GuideLayoutHook.res
+++ b/apps/guide/app/GuideLayoutHook.res
@@ -12,7 +12,9 @@ type t = {
}
let syncThemeColor = theme =>
- switch document->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
+ switch WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebAPI.Document.querySelector(`meta[name="theme-color"]`) {
| Value(element) =>
WebAPI.Element.setAttribute(
element,
@@ -34,8 +36,8 @@ let useLayout = (): t => {
setTheme(_ => GuideLayout.loadTheme())
setPaneSizes(_ =>
GuideLayout.loadPaneSizes()->GuideLayout.clampPaneSizes(
- ~viewportWidth=window.innerWidth->Int.toFloat,
- ~viewportHeight=window.innerHeight->Int.toFloat,
+ ~viewportWidth=WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat,
+ ~viewportHeight=WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat,
)
)
setThemeLoaded(_ => true)
@@ -83,24 +85,24 @@ let useLayout = (): t => {
switch dragTarget.current {
| ResizingColumns =>
let pointerX = event->ReactEvent.Mouse.clientX->Int.toFloat
- let viewportWidth = window.innerWidth->Int.toFloat
+ let viewportWidth = WebAPI.DOM.window->WebAPI.Window.innerWidth->Int.toFloat
let instructionsWidth = GuideLayout.clampInstructionsWidth(~viewportWidth, ~pointerX)
setPaneSizes(previous => {...previous, instructionsWidth: Some(instructionsWidth)})
| ResizingRows =>
let pointerY = event->ReactEvent.Mouse.clientY->Int.toFloat
- let viewportHeight = window.innerHeight->Int.toFloat
+ let viewportHeight = WebAPI.DOM.window->WebAPI.Window.innerHeight->Int.toFloat
let outputHeight = GuideLayout.clampOutputHeight(~viewportHeight, ~pointerY)
setPaneSizes(previous => {...previous, outputHeight})
| NotDragging => ()
}
- WebAPI.Window.addEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.addEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
Some(
() => {
- WebAPI.Window.removeEventListener(window, Mousemove, onMouseMove)
- WebAPI.Window.removeEventListener(window, Mouseup, stopDragging)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mousemove, onMouseMove)
+ WebAPI.Window.removeEventListener(WebAPI.DOM.window, Mouseup, stopDragging)
},
)
}, [])
diff --git a/apps/guide/package.json b/apps/guide/package.json
index fd319ca9b..2303154af 100644
--- a/apps/guide/package.json
+++ b/apps/guide/package.json
@@ -21,8 +21,8 @@
"@react-router/node": "^8.3.1",
"@rescript-lang/playground": "workspace:*",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"isbot": "^5",
"react": "^19.3.0",
"react-dom": "^19.3.0",
@@ -32,7 +32,7 @@
"remark-gfm": "^4.0.1",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
- "rescript": "^12.2.0",
+ "rescript": "^13.0.0-alpha.6",
"unified": "^11.0.5",
"vfile-matter": "^5.0.1"
},
diff --git a/apps/guide/rescript.json b/apps/guide/rescript.json
index 3c89889a8..5eb916b23 100644
--- a/apps/guide/rescript.json
+++ b/apps/guide/rescript.json
@@ -7,7 +7,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "__tests__",
diff --git a/apps/guide/vite.config.mjs b/apps/guide/vite.config.mjs
index a4e2a4a1d..63f3ccf2c 100644
--- a/apps/guide/vite.config.mjs
+++ b/apps/guide/vite.config.mjs
@@ -19,17 +19,16 @@ const sharedEditorDeps = [
"@codemirror/view",
"@lezer/highlight",
"@replit/codemirror-vim",
- "@rescript/runtime/lib/es6/Belt_Array.js",
- "@rescript/runtime/lib/es6/Primitive_int.js",
- "@rescript/runtime/lib/es6/Primitive_object.js",
- "@rescript/runtime/lib/es6/Primitive_option.js",
- "@rescript/runtime/lib/es6/Primitive_string.js",
- "@rescript/runtime/lib/es6/Stdlib_Array.js",
- "@rescript/runtime/lib/es6/Stdlib_Dict.js",
- "@rescript/runtime/lib/es6/Stdlib_Int.js",
- "@rescript/runtime/lib/es6/Stdlib_JsExn.js",
- "@rescript/runtime/lib/es6/Stdlib_List.js",
- "@rescript/runtime/lib/es6/Stdlib_Option.js",
+ "@rescript/runtime/lib/es6/Primitive_int.mjs",
+ "@rescript/runtime/lib/es6/Primitive_object.mjs",
+ "@rescript/runtime/lib/es6/Primitive_option.mjs",
+ "@rescript/runtime/lib/es6/Primitive_string.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Array.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Dict.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Int.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_JsExn.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_List.mjs",
+ "@rescript/runtime/lib/es6/Stdlib_Option.mjs",
"@tsnobip/rescript-lezer",
"lz-string",
"react-markdown",
diff --git a/package.json b/package.json
index 182786394..2b8c62d84 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"devDependencies": {
"lefthook": "^2.1.4",
"oxfmt": "^0.46.0",
- "rescript": "^12.2.0"
+ "rescript": "^13.0.0-alpha.6"
},
"resolutions": {
"marked": "4.0.10",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index e6cae5796..77b9bef8c 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -6,8 +6,8 @@
"dependencies": {
"@babel/parser": "^7.29.2",
"@rescript-lang/shared": "workspace:*",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"lz-string": "^1.5.0",
"react": "^19.3.0",
"react-dom": "^19.3.0",
diff --git a/packages/playground/rescript.json b/packages/playground/rescript.json
index 997cde23e..d8fa7b14e 100644
--- a/packages/playground/rescript.json
+++ b/packages/playground/rescript.json
@@ -6,7 +6,6 @@
"@rescript/react",
"@rescript/webapi"
],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/playground/src/CompilerManagerHook.res b/packages/playground/src/CompilerManagerHook.res
index 1b3f35c53..82438f874 100644
--- a/packages/playground/src/CompilerManagerHook.res
+++ b/packages/playground/src/CompilerManagerHook.res
@@ -633,8 +633,13 @@ let useCompilerManager = (
setState(_ => Ready({...state, logs: [], validReactCode: entryPointExists}))
| SetupFailed(_) => ()
| Ready(ready) if syncUrl =>
- let url = createUrl((pathname :> string), ready)
- WebAPI.History.replaceState(history, ~data=JSON.Null, ~unused="", ~url)
+ let url = createUrl(pathname :> string, ready)
+ WebAPI.History.replaceState(
+ WebAPI.DOM.window->WebAPI.Window.history,
+ ~data=JSON.Null,
+ ~unused="",
+ ~url,
+ )
| Ready(_) => ()
}
}
diff --git a/packages/playground/src/ConsolePanel.res b/packages/playground/src/ConsolePanel.res
index 0c9bff4ed..174549768 100644
--- a/packages/playground/src/ConsolePanel.res
+++ b/packages/playground/src/ConsolePanel.res
@@ -3,6 +3,7 @@ type logLevel = [
| #warn
| #error
]
+
type log = {level: logLevel, content: array}
@react.component
@@ -17,8 +18,8 @@ let make = (~logs, ~appendLog) => {
| _ => ()
}
}
- WebAPI.Window.addEventListener(window, Custom("message"), cb)
- Some(() => WebAPI.Window.removeEventListener(window, Custom("message"), cb))
+ WebAPI.Window.addEventListener(WebAPI.DOM.window, Custom("message"), cb)
+ Some(() => WebAPI.Window.removeEventListener(WebAPI.DOM.window, Custom("message"), cb))
}, [appendLog])
shortMsg
+ {shortMsg}
@@ -48,7 +49,7 @@ let make = (~logs, ~appendLog) => {
})
->React.array
-
}
diff --git a/packages/playground/src/EvalIFrame.res b/packages/playground/src/EvalIFrame.res
index aaee8db3d..5de9a5e97 100644
--- a/packages/playground/src/EvalIFrame.res
+++ b/packages/playground/src/EvalIFrame.res
@@ -69,23 +69,24 @@ let srcDoc = `
`
-external asIFrame: WebAPI.DOMAPI.element => WebAPI.DOMAPI.htmliFrameElement = "%identity"
+external asIFrame: WebAPI.Element.t => WebAPI.HTMLIFrameElement.t = "%identity"
let sendOutput = (code, imports) => {
- let frame = document->WebAPI.Document.querySelector("#iframe-eval")
+ let frame =
+ WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.querySelector("#iframe-eval")
switch frame {
| Value(element) if element.tagName == "IFRAME" =>
let element = element->asIFrame
switch element.contentWindow {
- | Value({window}) =>
+ | Value(frameWindow) =>
let message = JSON.Object(
dict{
"code": JSON.String(code),
"imports": JSON.Object(imports->Dict.mapValues(v => JSON.String(v))),
},
)
- window->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
+ frameWindow->WebAPI.Window.postMessage(~message, ~targetOrigin="*")
| Null => Console.error("contentWindow not found")
}
| Value(_) | Null => Console.error("iframe not found")
diff --git a/packages/playground/src/Playground.res b/packages/playground/src/Playground.res
index 8897b0047..ee1fec30d 100644
--- a/packages/playground/src/Playground.res
+++ b/packages/playground/src/Playground.res
@@ -47,7 +47,7 @@ let dropdownLabelReleased = "--- Released ---"
let getLocalStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.localStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.localStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -55,7 +55,7 @@ let getLocalStorageItem = key => {
let setLocalStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.localStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.localStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -63,7 +63,7 @@ let setLocalStorageItem = (~key, ~value) => {
let getSessionStorageItem = key => {
try {
- WebAPI.Storage.getItem(window.sessionStorage, key)->Null.toOption
+ WebAPI.Storage.getItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, key)->Null.toOption
} catch {
| JsExn(_) => None
}
@@ -71,7 +71,7 @@ let getSessionStorageItem = key => {
let setSessionStorageItem = (~key, ~value) => {
try {
- WebAPI.Storage.setItem(window.sessionStorage, ~key, ~value)
+ WebAPI.Storage.setItem(WebAPI.DOM.window->WebAPI.Window.sessionStorage, ~key, ~value)
} catch {
| JsExn(_) => ()
}
@@ -107,7 +107,7 @@ module DropdownSelect = {
disabled
onChange
>
- children
+ {children}
}
}
@@ -174,9 +174,11 @@ module ResultPane = {
module PreWrap = {
@react.component
let make = (~className="", ~children) =>
- content
+ {content}
}}
children+
{children}
}
+
type prefix = [#W | #E]
+
let compactErrorLine = (~highlight=false, ~prefix: prefix, locMsg: Api.LocMsg.t) => {
let {Api.LocMsg.row: row, column, shortMsg} = locMsg
let prefixColor = switch prefix {
@@ -201,7 +203,7 @@ module ResultPane = {
{React.string(` Line ${row->Int.toString}, column ${column->Int.toString}:`)}
-
- elements
+ {elements}
)->Option.getOr(React.null)
@@ -897,7 +898,7 @@ module WarningFlagsWidget = {
- chips
+ {chips}
- deleteButton
+ {deleteButton}
- children
+ {children}
}
}
@@ -1434,7 +1435,7 @@ module OutputPanel = {
let body = Array.mapWithIndex(tabs, ((tab, content), i) => {
let className = currentTab == tab ? "block h-inherit" : "hidden"
- content
+ {content}
})
<> {body->React.array}
@@ -1612,48 +1613,43 @@ let make = (~bundleBaseUrl: string, ~versions: array
- {"Problems"->React.string}
- {if problemCounts["errors"] > 0 {
-
- {problemCounts["errors"]->React.int}
-
- } else {
- React.null
- }}
- {if problemCounts["warnings"] > 0 {
-
- {problemCounts["warnings"]->React.int}
-
- } else {
- React.null
- }}
-
+ | SetupFailed(_) | Init => {
+ "warnings": 0,
+ "errors": 0,
+ }
}
+
+ {"Problems"->React.string}
+ {if problemCounts["errors"] > 0 {
+
+ {problemCounts["errors"]->React.int}
+
+ } else {
+ React.null
+ }}
+ {if problemCounts["warnings"] > 0 {
+
+ {problemCounts["warnings"]->React.int}
+
+ } else {
+ React.null
+ }}
+
+
| Settings => "Settings"->React.string
}
@@ -2121,7 +2120,7 @@ let make = (~bundleBaseUrl: string, ~versions: array) => {
>
- // Separator
+
+ /* Separator */
) => {
{React.string("⣿")}
- // Right Panel
+
+ /* Right Panel */
{
let copy = async () => {
setState(_ => Pending)
- let result = await writeClipboard(window.location.href)
+ let result = await writeClipboard((WebAPI.DOM.window->WebAPI.Window.location).href)
setState(_ =>
switch result {
| Ok() => CopySuccess
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 02291215e..cb536e563 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -17,8 +17,8 @@
"@codemirror/view": "^6.41.0",
"@lezer/highlight": "^1.2.3",
"@replit/codemirror-vim": "^6.3.0",
- "@rescript/react": "^0.14.2",
- "@rescript/webapi": "0.1.0-experimental-29db5f4",
+ "@rescript/react": "^0.16.0-beta.1",
+ "@rescript/webapi": "alpha",
"@tsnobip/rescript-lezer": "^0.9.0",
"highlight.js": "^11.11.1",
"react": "^19.3.0",
diff --git a/packages/shared/rescript.json b/packages/shared/rescript.json
index 40328e643..a6e880174 100644
--- a/packages/shared/rescript.json
+++ b/packages/shared/rescript.json
@@ -2,7 +2,6 @@
"name": "@rescript-lang/shared",
"namespace": false,
"dependencies": ["@rescript/react", "@rescript/webapi"],
- "compiler-flags": ["-open WebAPI.Global"],
"sources": [
{
"dir": "src",
diff --git a/packages/shared/src/Clipboard.res b/packages/shared/src/Clipboard.res
index af4355463..adf1ecfba 100644
--- a/packages/shared/src/Clipboard.res
+++ b/packages/shared/src/Clipboard.res
@@ -1,21 +1,20 @@
type error = WriteFailed
@send
-external createTextArea: (
- WebAPI.DOMAPI.document,
- @as("textarea") _,
-) => WebAPI.DOMAPI.htmlTextAreaElement = "createElement"
+external createTextArea: (WebAPI.DOM.document, @as("textarea") _) => WebAPI.HTMLTextAreaElement.t =
+ "createElement"
+
+@send external copySelection: (WebAPI.DOM.document, @as("copy") _) => bool = "execCommand"
+@send external focusElement: WebAPI.Element.t => unit = "focus"
-@send external copySelection: (WebAPI.DOMAPI.document, @as("copy") _) => bool = "execCommand"
-@send external focusElement: WebAPI.DOMAPI.element => unit = "focus"
@send
-external getSelection: WebAPI.DOMAPI.document => Null.t = "getSelection"
+external getSelection: WebAPI.DOM.document => Null.t = "getSelection"
let writeWithSelection = text => {
try {
- let textarea = createTextArea(document)
- let activeElement = document.activeElement
- let selection = getSelection(document)->Null.toOption
+ let textarea = createTextArea(WebAPI.DOM.window->WebAPI.Window.document)
+ let activeElement = WebAPI.DOM.window->WebAPI.Window.document->WebDocument.activeElement
+ let selection = getSelection(WebAPI.DOM.window->WebAPI.Window.document)->Null.toOption
let ranges =
selection->Option.mapOr([], selection =>
Array.fromInitializer(~length=selection.rangeCount, index =>
@@ -30,11 +29,13 @@ let writeWithSelection = text => {
~qualifiedName="style",
~value="position: fixed; left: -9999px; top: 0",
)
- document.body
+ WebAPI.DOM.window
+ ->WebAPI.Window.document
+ ->WebDocument.body
->WebAPI.HTMLElement.appendChild(textarea->WebAPI.HTMLTextAreaElement.asNode)
->ignore
textarea->WebAPI.HTMLTextAreaElement.select
- copySelection(document)
+ copySelection(WebAPI.DOM.window->WebAPI.Window.document)
} catch {
| _ => false
}
@@ -54,7 +55,10 @@ let writeWithSelection = text => {
let writeText = async text => {
try {
- await navigator.clipboard->WebAPI.Clipboard.writeText(text)
+ await WebAPI.DOM.window
+ ->WebAPI.Window.navigator
+ ->WebAPI.Navigator.clipboard
+ ->WebAPI.Clipboard.writeText(text)
Ok()
} catch {
| _ => writeWithSelection(text)
diff --git a/packages/shared/src/CodeMirror.res b/packages/shared/src/CodeMirror.res
index 77357b388..2fca1e362 100644
--- a/packages/shared/src/CodeMirror.res
+++ b/packages/shared/src/CodeMirror.res
@@ -12,6 +12,7 @@
module KeyMap = {
type t = Default | Vim
+
let toString = (keyMap: t) =>
switch keyMap {
| Default => "default"
@@ -43,6 +44,7 @@ module Theme = {
module Side = {
@@warning("-37")
+
type t =
| @as(-1) BeforePointer
| @as(1) AfterPointer
@@ -67,6 +69,7 @@ module HoverHint = {
line: int,
col: int,
}
+
let compareLineCol = (pos1, pos2) => {
if pos1.line < pos2.line {
Ordering.less
@@ -81,6 +84,7 @@ module HoverHint = {
Ordering.equal
}
}
+
// let \"<" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.less
let \"<=" = (pos1, pos2) => compareLineCol(pos1, pos2) !== Ordering.greater
// let \">" = (pos1, pos2) => compareLineCol(pos1, pos2) === Ordering.greater
@@ -130,8 +134,10 @@ module CM6 = {
module EditorSelection = {
type t
type range
+
@module("@codemirror/state") @scope("EditorSelection") @val
external single: (int, int) => t = "single"
+
@get external main: t => range = "main"
@get external anchor: range => int = "anchor"
@get external head: range => int = "head"
@@ -142,18 +148,21 @@ module CM6 = {
@module("@codemirror/state") @scope("EditorState")
external create: createConfig => editorState = "create"
+
@get external selection: editorState => EditorSelection.t = "selection"
module ReadOnly = {
@module("@codemirror/state") @scope(("EditorState", "readOnly")) @val
external of_: bool => extension = "of"
}
+
@get external doc: editorState => Text.t = "doc"
}
module Compartment = {
@module("@codemirror/state") @new
external create: unit => compartment = "Compartment"
+
@send external make: (compartment, extension) => extension = "of"
@send external reconfigure: (compartment, extension) => effect = "reconfigure"
}
@@ -161,8 +170,9 @@ module CM6 = {
module EditorView = {
module Tooltip = {
module View = {
- type t = {dom: WebAPI.DOMAPI.element, offset?: {x: int, y: int}}
+ type t = {dom: WebAPI.Element.t, offset?: {x: int, y: int}}
}
+
type t = {
pos: int,
end?: int,
@@ -174,26 +184,30 @@ module CM6 = {
}
}
- type createConfig = {state: editorState, parent: WebAPI.DOMAPI.element}
+ type createConfig = {state: editorState, parent: WebAPI.Element.t}
+
@module("@codemirror/view") @new
external create: createConfig => editorView = "EditorView"
@send external destroy: editorView => unit = "destroy"
@get external state: editorView => editorState = "state"
- @get external dom: editorView => WebAPI.DOMAPI.htmlElement = "dom"
+ @get external dom: editorView => WebAPI.HTMLElement.t = "dom"
type change = {from: int, to: int, insert: string}
type dispatchArg = {changes: change, selection?: EditorSelection.t}
+
@send
external dispatch: (editorView, dispatchArg) => unit = "dispatch"
type dispatchEffectsArg = {effects: effect}
+
@send
external dispatchEffects: (editorView, dispatchEffectsArg) => unit = "dispatch"
module ThemeOptions = {
type t = {dark?: bool}
}
+
@module("@codemirror/view") @scope("EditorView") @val
external theme: (dict>, ~options: ThemeOptions.t=?) => extension = "theme"
@@ -218,6 +232,7 @@ module CM6 = {
module HoverTooltipOptions = {
type t = {hoverTime?: int, hideOnChange?: bool}
}
+
@module("@codemirror/view")
external hoverTooltip: (
(editorView, int, Side.t) => null,
@@ -256,177 +271,263 @@ module CM6 = {
module Language = {
module HighlightStyle = {
type tag
+
module Tags = {
@@warning("-32") // Suppress "unused external" warnings
+
@module("@lezer/highlight") @scope("tags")
external comment: tag = "comment"
+
@module("@lezer/highlight") @scope("tags")
external lineComment: tag = "lineComment"
+
@module("@lezer/highlight") @scope("tags")
external blockComment: tag = "blockComment"
+
@module("@lezer/highlight") @scope("tags")
external docComment: tag = "docComment"
+
@module("@lezer/highlight") @scope("tags")
external name: tag = "name"
+
@module("@lezer/highlight") @scope("tags")
external variableName: tag = "variableName"
+
@module("@lezer/highlight") @scope("tags")
external typeName: tag = "typeName"
+
@module("@lezer/highlight") @scope("tags")
external tagName: tag = "tagName"
+
@module("@lezer/highlight") @scope("tags")
external propertyName: tag = "propertyName"
+
@module("@lezer/highlight") @scope("tags")
external attributeName: tag = "attributeName"
+
@module("@lezer/highlight") @scope("tags")
external className: tag = "className"
+
@module("@lezer/highlight") @scope("tags")
external labelName: tag = "labelName"
+
@module("@lezer/highlight") @scope("tags")
external namespace: tag = "namespace"
+
@module("@lezer/highlight") @scope("tags")
external macroName: tag = "macroName"
+
@module("@lezer/highlight") @scope("tags")
external literal: tag = "literal"
+
@module("@lezer/highlight") @scope("tags")
external string: tag = "string"
+
@module("@lezer/highlight") @scope("tags")
external docString: tag = "docString"
+
@module("@lezer/highlight") @scope("tags")
external character: tag = "character"
+
@module("@lezer/highlight") @scope("tags")
external attributeValue: tag = "attributeValue"
+
@module("@lezer/highlight") @scope("tags")
external number: tag = "number"
+
@module("@lezer/highlight") @scope("tags")
external integer: tag = "integer"
+
@module("@lezer/highlight") @scope("tags")
external float: tag = "float"
+
@module("@lezer/highlight") @scope("tags")
external bool: tag = "bool"
+
@module("@lezer/highlight") @scope("tags")
external regexp: tag = "regexp"
+
@module("@lezer/highlight") @scope("tags")
external escape: tag = "escape"
+
@module("@lezer/highlight") @scope("tags")
external color: tag = "color"
+
@module("@lezer/highlight") @scope("tags")
external url: tag = "url"
+
@module("@lezer/highlight") @scope("tags")
external keyword: tag = "keyword"
+
@module("@lezer/highlight") @scope("tags")
external self: tag = "self"
+
@module("@lezer/highlight") @scope("tags")
external null: tag = "null"
+
@module("@lezer/highlight") @scope("tags")
external atom: tag = "atom"
+
@module("@lezer/highlight") @scope("tags")
external unit: tag = "unit"
+
@module("@lezer/highlight") @scope("tags")
external modifier: tag = "modifier"
+
@module("@lezer/highlight") @scope("tags")
external operatorKeyword: tag = "operatorKeyword"
+
@module("@lezer/highlight") @scope("tags")
external controlKeyword: tag = "controlKeyword"
+
@module("@lezer/highlight") @scope("tags")
external definitionKeyword: tag = "definitionKeyword"
+
@module("@lezer/highlight") @scope("tags")
external moduleKeyword: tag = "moduleKeyword"
+
@module("@lezer/highlight") @scope("tags")
external operator: tag = "operator"
+
@module("@lezer/highlight") @scope("tags")
external derefOperator: tag = "derefOperator"
+
@module("@lezer/highlight") @scope("tags")
external arithmeticOperator: tag = "arithmeticOperator"
+
@module("@lezer/highlight") @scope("tags")
external logicOperator: tag = "logicOperator"
+
@module("@lezer/highlight") @scope("tags")
external bitwiseOperator: tag = "bitwiseOperator"
+
@module("@lezer/highlight") @scope("tags")
external compareOperator: tag = "compareOperator"
+
@module("@lezer/highlight") @scope("tags")
external updateOperator: tag = "updateOperator"
+
@module("@lezer/highlight") @scope("tags")
external definitionOperator: tag = "definitionOperator"
+
@module("@lezer/highlight") @scope("tags")
external typeOperator: tag = "typeOperator"
+
@module("@lezer/highlight") @scope("tags")
external controlOperator: tag = "controlOperator"
+
@module("@lezer/highlight") @scope("tags")
external punctuation: tag = "punctuation"
+
@module("@lezer/highlight") @scope("tags")
external separator: tag = "separator"
+
@module("@lezer/highlight") @scope("tags")
external bracket: tag = "bracket"
+
@module("@lezer/highlight") @scope("tags")
external angleBracket: tag = "angleBracket"
+
@module("@lezer/highlight") @scope("tags")
external squareBracket: tag = "squareBracket"
+
@module("@lezer/highlight") @scope("tags")
external paren: tag = "paren"
+
@module("@lezer/highlight") @scope("tags")
external brace: tag = "brace"
+
@module("@lezer/highlight") @scope("tags")
external content: tag = "content"
+
@module("@lezer/highlight") @scope("tags")
external heading: tag = "heading"
+
@module("@lezer/highlight") @scope("tags")
external heading1: tag = "heading1"
+
@module("@lezer/highlight") @scope("tags")
external heading2: tag = "heading2"
+
@module("@lezer/highlight") @scope("tags")
external heading3: tag = "heading3"
+
@module("@lezer/highlight") @scope("tags")
external heading4: tag = "heading4"
+
@module("@lezer/highlight") @scope("tags")
external heading5: tag = "heading5"
+
@module("@lezer/highlight") @scope("tags")
external heading6: tag = "heading6"
+
@module("@lezer/highlight") @scope("tags")
external contentSeparator: tag = "contentSeparator"
+
@module("@lezer/highlight") @scope("tags")
external list: tag = "list"
+
@module("@lezer/highlight") @scope("tags")
external quote: tag = "quote"
+
@module("@lezer/highlight") @scope("tags")
external emphasis: tag = "emphasis"
+
@module("@lezer/highlight") @scope("tags")
external strong: tag = "strong"
+
@module("@lezer/highlight") @scope("tags")
external link: tag = "link"
+
@module("@lezer/highlight") @scope("tags")
external monospace: tag = "monospace"
+
@module("@lezer/highlight") @scope("tags")
external strikethrough: tag = "strikethrough"
+
@module("@lezer/highlight") @scope("tags")
external inserted: tag = "inserted"
+
@module("@lezer/highlight") @scope("tags")
external deleted: tag = "deleted"
+
@module("@lezer/highlight") @scope("tags")
external changed: tag = "changed"
+
@module("@lezer/highlight") @scope("tags")
external invalid: tag = "invalid"
+
@module("@lezer/highlight") @scope("tags")
external meta: tag = "meta"
+
@module("@lezer/highlight") @scope("tags")
external documentMeta: tag = "documentMeta"
+
@module("@lezer/highlight") @scope("tags")
external annotation: tag = "annotation"
+
@module("@lezer/highlight") @scope("tags")
external processingInstruction: tag = "processingInstruction"
+
@module("@lezer/highlight") @scope("tags")
external definition: tag => tag = "definition"
+
@module("@lezer/highlight") @scope("tags")
external constant: tag => tag = "constant"
+
@module("@lezer/highlight") @scope("tags")
external function: tag => tag = "function"
+
@module("@lezer/highlight") @scope("tags")
external standard: tag => tag = "standard"
+
@module("@lezer/highlight") @scope("tags")
external local: tag => tag = "local"
+
@module("@lezer/highlight") @scope("tags")
external special: tag => tag = "special"
}
+
module TagStyle = {
type t = {
tag: array,
@@ -437,7 +538,9 @@ module CM6 = {
textDecoration?: string,
}
}
+
type t
+
@scope("HighlightStyle") @module("@codemirror/language")
external define: array => t = "define"
@@ -493,6 +596,7 @@ module CM6 = {
}
type t
+
@module("@codemirror/language")
external bracketMatching: unit => extension = "bracketMatching"
@@ -517,6 +621,7 @@ module CM6 = {
parser: LRParser.t,
languageData?: 'a. {..} as 'a,
}
+
@scope("LRLanguage") @module("@codemirror/language")
external define: spec => t = "define"
}
@@ -577,7 +682,7 @@ type editorInstance = {
}
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
@@ -661,7 +766,7 @@ let createHoverHintExtension = (hoverHints: array) => {
| Some({hint, start, end}) =>
let pos = CM6.Text.line(doc, start.line).from + start.col
let end = CM6.Text.line(doc, end.line).from + end.col
- let dom = WebAPI.Global.document->WebAPI.Document.createElement("div")
+ let dom = WebAPI.DOM.window->WebAPI.Window.document->WebAPI.Document.createElement("div")
dom.textContent = Value(hint)
dom.className = "p-1 border"
Value({
diff --git a/packages/shared/src/CodeMirror.resi b/packages/shared/src/CodeMirror.resi
index 6c55487f0..ee089a2b5 100644
--- a/packages/shared/src/CodeMirror.resi
+++ b/packages/shared/src/CodeMirror.resi
@@ -41,7 +41,7 @@ module HoverHint: {
type editorInstance
type editorConfig = {
- parent: WebAPI.DOMAPI.element,
+ parent: WebAPI.Element.t,
initialValue: string,
mode: string,
readOnly: bool,
diff --git a/packages/shared/src/HtmlRef.res b/packages/shared/src/HtmlRef.res
index d2d2bfbcc..17c4c5b7f 100644
--- a/packages/shared/src/HtmlRef.res
+++ b/packages/shared/src/HtmlRef.res
@@ -1,5 +1,5 @@
/** For refs attached to HTML tags; bridge React's DOM type to WebAPI's HTML type. */
-external fromDom: Dom.element => WebAPI.DOMAPI.htmlElement = "%identity"
+external fromDom: Dom.element => WebAPI.HTMLElement.t = "%identity"
let domRef = ref =>
ReactDOM.Ref.callbackDomRef(element => {
diff --git a/packages/shared/src/ReactRouter.res b/packages/shared/src/ReactRouter.res
index 2edf81b73..409726608 100644
--- a/packages/shared/src/ReactRouter.res
+++ b/packages/shared/src/ReactRouter.res
@@ -6,7 +6,7 @@ type navigate = (string, ~options: navigateOptions=?) => unit
external useNavigate: unit => navigate = "useNavigate"
@module("react-router")
-external useSearchParams: unit => (WebAPI.URLAPI.urlSearchParams, {..} => unit) = "useSearchParams"
+external useSearchParams: unit => (WebAPI.URLSearchParams.t, {..} => unit) = "useSearchParams"
@module("react-router")
external useLoaderData: unit => 'a = "useLoaderData"
@@ -15,7 +15,7 @@ external useLoaderData: unit => 'a = "useLoaderData"
type path = {pathname: Path.t, search?: string, hash?: string}
module Loader = {
- type loaderArgs = {request: WebAPI.FetchAPI.request}
+ type loaderArgs = {request: WebAPI.Request.t}
type t<'a> = loaderArgs => promise<'a>
}
diff --git a/packages/shared/src/WebDocument.res b/packages/shared/src/WebDocument.res
new file mode 100644
index 000000000..41b5227c7
--- /dev/null
+++ b/packages/shared/src/WebDocument.res
@@ -0,0 +1,2 @@
+@get external activeElement: WebAPI.DOM.document => Null.t = "activeElement"
+@get external body: WebAPI.DOM.document => WebAPI.HTMLElement.t = "body"
diff --git a/yarn.lock b/yarn.lock
index a0558cc2c..374b14b69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1815,8 +1815,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@responsive-image/core": "npm:2.1.0"
"@responsive-image/vite-plugin": "npm:3.0.1"
"@rolldown/plugin-babel": "npm:^0.2.4"
@@ -1851,7 +1851,7 @@ __metadata:
remark-frontmatter: "npm:^5.0.0"
remark-gfm: "npm:^4.0.1"
remark-validate-links: "npm:^13.1.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
rolldown: "npm:1.2.8"
search-insights: "npm:^2.17.3"
tailwindcss: "npm:^4"
@@ -1881,8 +1881,8 @@ __metadata:
"@react-router/node": "npm:^8.3.1"
"@rescript-lang/playground": "workspace:*"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@types/react": "npm:^19.2.14"
"@vitejs/plugin-react": "npm:^6.0.1"
"@vitest/browser-playwright": "npm:^5.0.0"
@@ -1897,7 +1897,7 @@ __metadata:
remark-gfm: "npm:^4.0.1"
remark-parse: "npm:^11.0.0"
remark-stringify: "npm:^11.0.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
unified: "npm:^11.0.5"
vfile-matter: "npm:^5.0.1"
vite: "npm:^8.3.0"
@@ -1914,8 +1914,8 @@ __metadata:
dependencies:
"@babel/parser": "npm:^7.29.2"
"@rescript-lang/shared": "workspace:*"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
lz-string: "npm:^1.5.0"
react: "npm:^19.3.0"
react-dom: "npm:^19.3.0"
@@ -1940,8 +1940,8 @@ __metadata:
"@codemirror/view": "npm:^6.41.0"
"@lezer/highlight": "npm:^1.2.3"
"@replit/codemirror-vim": "npm:^6.3.0"
- "@rescript/react": "npm:^0.14.2"
- "@rescript/webapi": "npm:0.1.0-experimental-29db5f4"
+ "@rescript/react": "npm:^0.16.0-beta.1"
+ "@rescript/webapi": "npm:alpha"
"@tsnobip/rescript-lezer": "npm:^0.9.0"
highlight.js: "npm:^11.11.1"
react: "npm:^19.3.0"
@@ -1957,63 +1957,64 @@ __metadata:
languageName: unknown
linkType: soft
-"@rescript/darwin-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-arm64@npm:12.2.0"
+"@rescript/darwin-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-arm64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
-"@rescript/darwin-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/darwin-x64@npm:12.2.0"
+"@rescript/darwin-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/darwin-x64@npm:13.0.0-alpha.6"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
-"@rescript/linux-arm64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-arm64@npm:12.2.0"
+"@rescript/linux-arm64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-arm64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard
-"@rescript/linux-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/linux-x64@npm:12.2.0"
+"@rescript/linux-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/linux-x64@npm:13.0.0-alpha.6"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard
-"@rescript/react@npm:^0.14.2":
- version: 0.14.2
- resolution: "@rescript/react@npm:0.14.2"
+"@rescript/react@npm:^0.16.0-beta.1":
+ version: 0.16.0-beta.1
+ resolution: "@rescript/react@npm:0.16.0-beta.1"
peerDependencies:
- react: ">=19.1.0"
- react-dom: ">=19.1.0"
- checksum: 10c0/6fbc0614ac4e4e5ad37abe474dcc137dc8cb7c3351dbc9afa4de92f080614e78809278a034c52da1676e89c299ab07154760d8b80f68f0a5cfd284e22035f713
+ "@rescript/runtime": ">=13.0.0-alpha.5"
+ react: ">=19.2.0"
+ react-dom: ">=19.2.0"
+ checksum: 10c0/bcf008bfb91d07a15dbec273de633104c56147c56e84c8deebb14a2f6cc95eea8a0ff90c19be6ce272f0e768e0f1f6122386e8ac348beb04bffff84ee49d4ec4
languageName: node
linkType: hard
-"@rescript/runtime@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/runtime@npm:12.2.0"
- checksum: 10c0/59c0194ae52fbbaadc736bbf1cfac1ed6ffde92b2346e36b9f1a29bb136e38b7ef203c780647203912fa657d293eab5c4e208f04dd65ed4bf47d53843980f7e1
+"@rescript/runtime@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/runtime@npm:13.0.0-alpha.6"
+ checksum: 10c0/8d351bc3ff8e47c7ff9af871da90982aab056955d9990e38618285aa2eb0ecf6ec5094e07e63f1457957d6f273f1167ecfe67439547d5bcfeb547c2b0489129f
languageName: node
linkType: hard
-"@rescript/webapi@npm:0.1.0-experimental-29db5f4":
- version: 0.1.0-experimental-29db5f4
- resolution: "@rescript/webapi@npm:0.1.0-experimental-29db5f4"
- dependencies:
- rescript: "npm:^12.0.0-beta.3"
- checksum: 10c0/0ef8538fe59b2c058217dd17a5e653ac4902a87caad3b78bde2efc8099538c33e8c1fc7cef41595fd385a78de2ca172c60bdd36a100839f8983da7a40ebd9560
+"@rescript/webapi@npm:alpha":
+ version: 0.1.0-alpha-b1d58f9
+ resolution: "@rescript/webapi@npm:0.1.0-alpha-b1d58f9"
+ peerDependencies:
+ rescript: ">=13"
+ checksum: 10c0/4d242fd3deabf511552f936fe2a5dfa141da7932a644e96528e65c7d32f3bfa29ae4e0e548c5912995d0467312aa1c89b00267fc05b1c80ad373d13d3cd7945c
languageName: node
linkType: hard
-"@rescript/win32-x64@npm:12.2.0":
- version: 12.2.0
- resolution: "@rescript/win32-x64@npm:12.2.0"
+"@rescript/win32-x64@npm:13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "@rescript/win32-x64@npm:13.0.0-alpha.6"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -9121,20 +9122,20 @@ __metadata:
dependencies:
lefthook: "npm:^2.1.4"
oxfmt: "npm:^0.46.0"
- rescript: "npm:^12.2.0"
+ rescript: "npm:^13.0.0-alpha.6"
languageName: unknown
linkType: soft
-"rescript@npm:^12.0.0-beta.3, rescript@npm:^12.2.0":
- version: 12.2.0
- resolution: "rescript@npm:12.2.0"
+"rescript@npm:^13.0.0-alpha.6":
+ version: 13.0.0-alpha.6
+ resolution: "rescript@npm:13.0.0-alpha.6"
dependencies:
- "@rescript/darwin-arm64": "npm:12.2.0"
- "@rescript/darwin-x64": "npm:12.2.0"
- "@rescript/linux-arm64": "npm:12.2.0"
- "@rescript/linux-x64": "npm:12.2.0"
- "@rescript/runtime": "npm:12.2.0"
- "@rescript/win32-x64": "npm:12.2.0"
+ "@rescript/darwin-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/darwin-x64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-arm64": "npm:13.0.0-alpha.6"
+ "@rescript/linux-x64": "npm:13.0.0-alpha.6"
+ "@rescript/runtime": "npm:13.0.0-alpha.6"
+ "@rescript/win32-x64": "npm:13.0.0-alpha.6"
dependenciesMeta:
"@rescript/darwin-arm64":
optional: true
@@ -9148,11 +9149,9 @@ __metadata:
optional: true
bin:
bsc: cli/bsc.js
- bstracing: cli/bstracing.js
rescript: cli/rescript.js
- rescript-legacy: cli/rescript-legacy.js
rescript-tools: cli/rescript-tools.js
- checksum: 10c0/7650a77a66e2f2ba2523eac54fd930f0b70bad922e9b498678e701e842a56c7b6facd0daf1ef9c7b71d344d9483a0293d17db72a67515a22d07856bdfc34fb46
+ checksum: 10c0/8b4a7430444a4db28e2e480b6750f700ceca0d899d3262248c682314e372cb33fb9030962e0628c93bd6dfc6ea07f03143423aa48f2d478c22152496ee211adf
languageName: node
linkType: hard