diff --git a/src/layouts/ApiLayout.resi b/src/layouts/ApiLayout.resi
index e25243943..e491130b4 100644
--- a/src/layouts/ApiLayout.resi
+++ b/src/layouts/ApiLayout.resi
@@ -12,6 +12,6 @@ let make: (
~title: string=?,
~version: string=?,
~activeToc: SidebarLayout.Toc.t=?,
- ~components: Mdx.Components.t=?,
+ ~components: MarkdownComponents.t=?,
~children: React.element,
) => React.element
diff --git a/src/layouts/ApiOverviewLayout.resi b/src/layouts/ApiOverviewLayout.resi
index 3cdd24d14..44164d31e 100644
--- a/src/layouts/ApiOverviewLayout.resi
+++ b/src/layouts/ApiOverviewLayout.resi
@@ -1,4 +1,4 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
diff --git a/src/layouts/ApiOverviewLayout8_0_0.resi b/src/layouts/ApiOverviewLayout8_0_0.resi
index 3cdd24d14..44164d31e 100644
--- a/src/layouts/ApiOverviewLayout8_0_0.resi
+++ b/src/layouts/ApiOverviewLayout8_0_0.resi
@@ -1,4 +1,4 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
diff --git a/src/layouts/ApiOverviewLayout9_0_0.resi b/src/layouts/ApiOverviewLayout9_0_0.resi
index 3cdd24d14..44164d31e 100644
--- a/src/layouts/ApiOverviewLayout9_0_0.resi
+++ b/src/layouts/ApiOverviewLayout9_0_0.resi
@@ -1,4 +1,4 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
diff --git a/src/layouts/BeltDocsLayout.resi b/src/layouts/BeltDocsLayout.resi
index 727ce6720..8e4b9eb04 100644
--- a/src/layouts/BeltDocsLayout.resi
+++ b/src/layouts/BeltDocsLayout.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
diff --git a/src/layouts/BeltDocsLayout8_0_0.resi b/src/layouts/BeltDocsLayout8_0_0.resi
index 727ce6720..8e4b9eb04 100644
--- a/src/layouts/BeltDocsLayout8_0_0.resi
+++ b/src/layouts/BeltDocsLayout8_0_0.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
diff --git a/src/layouts/CommunityLayout.res b/src/layouts/CommunityLayout.res
index 9bd71881a..c81e76a21 100644
--- a/src/layouts/CommunityLayout.res
+++ b/src/layouts/CommunityLayout.res
@@ -4,7 +4,7 @@ module CommunityLayout = DocsLayout.Make({
})
@react.component
-let make = (~frontmatter=?, ~components=Markdown.default, ~children) => {
+let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
let breadcrumbs = list{{Url.name: "Community", href: "/community"}}
let title = "Community"
diff --git a/src/layouts/CommunityLayout.resi b/src/layouts/CommunityLayout.resi
index 4e3e224be..fd33938ba 100644
--- a/src/layouts/CommunityLayout.resi
+++ b/src/layouts/CommunityLayout.resi
@@ -1,6 +1,6 @@
@react.component
let make: (
~frontmatter: Js.Json.t=?,
- ~components: Mdx.Components.t=?,
+ ~components: MarkdownComponents.t=?,
~children: React.element,
) => React.element
diff --git a/src/layouts/DocsLayout.res b/src/layouts/DocsLayout.res
index 946e7a647..f8c26a80e 100644
--- a/src/layouts/DocsLayout.res
+++ b/src/layouts/DocsLayout.res
@@ -56,7 +56,7 @@ let make = (
~availableVersions: option
>=?,
~activeToc: option=?,
~categories: array,
- ~components=Markdown.default,
+ ~components=MarkdownComponents.default,
~theme=#Reason,
~children,
) => {
@@ -66,7 +66,7 @@ let make = (
let (isSidebarOpen, setSidebarOpen) = React.useState(_ => false)
let toggleSidebar = () => setSidebarOpen(prev => !prev)
- React.useEffect0(() => {
+ React.useEffect(() => {
open Next.Router.Events
let {Next.Router.events: events} = router
@@ -81,7 +81,7 @@ let make = (
events->off(#hashChangeComplete(onChangeComplete))
},
)
- })
+ }, [])
let preludeSection =
@@ -178,7 +178,7 @@ module Make = (Content: StaticContent) => {
~version: option
=?,
~availableVersions: option>=?,
/* ~activeToc: option=?, */
- ~components: option=?,
+ ~components: option=?,
~theme: option=?,
~children: React.element,
) => {
@@ -200,13 +200,12 @@ module Make = (Content: StaticContent) => {
let activeToc: option = {
open Belt.Option
Js.Dict.get(Content.tocData, route)->map(data => {
- open SidebarLayout.Toc
let title = data["title"]
let entries = Belt.Array.map(data["headers"], header => {
- header: header["name"],
+ SidebarLayout.Toc.header: header["name"],
href: "#" ++ header["href"],
})
- {title, entries}
+ {SidebarLayout.Toc.title, entries}
})
}
@@ -243,17 +242,17 @@ module Make = (Content: StaticContent) => {
}
make({
- "breadcrumbs": breadcrumbs,
- "title": title,
- "metaTitleCategory": metaTitleCategory,
- "frontmatter": frontmatter,
- "version": version,
- "availableVersions": availableVersions,
- "activeToc": activeToc,
- "categories": categories,
- "components": components,
- "theme": theme,
- "children": children,
+ ?breadcrumbs,
+ title,
+ ?metaTitleCategory,
+ ?frontmatter,
+ ?version,
+ ?availableVersions,
+ ?activeToc,
+ categories,
+ ?components,
+ ?theme,
+ children,
})
}
}
diff --git a/src/layouts/DocsLayout.resi b/src/layouts/DocsLayout.resi
index 7f8a85045..14207cd7e 100644
--- a/src/layouts/DocsLayout.resi
+++ b/src/layouts/DocsLayout.resi
@@ -11,7 +11,7 @@ let make: (
~availableVersions: array<(string, string)>=?,
~activeToc: SidebarLayout.Toc.t=?,
~categories: array,
- ~components: Mdx.Components.t=?,
+ ~components: MarkdownComponents.t=?,
~theme: ColorTheme.t=?,
~children: React.element,
) => React.element
@@ -32,7 +32,7 @@ module Make: (Content: StaticContent) =>
~version: string=?,
~availableVersions: array<(string, string)>=?,
/* ~activeToc: option=?, */
- ~components: Mdx.Components.t=?,
+ ~components: MarkdownComponents.t=?,
~theme: ColorTheme.t=?,
~children: React.element,
) => React.element
diff --git a/src/layouts/DomDocsLayout.resi b/src/layouts/DomDocsLayout.resi
index 727ce6720..8e4b9eb04 100644
--- a/src/layouts/DomDocsLayout.resi
+++ b/src/layouts/DomDocsLayout.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
diff --git a/src/layouts/DomDocsLayout8_0_0.resi b/src/layouts/DomDocsLayout8_0_0.resi
index 727ce6720..8e4b9eb04 100644
--- a/src/layouts/DomDocsLayout8_0_0.resi
+++ b/src/layouts/DomDocsLayout8_0_0.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
diff --git a/src/layouts/DomDocsLayout9_0_0.resi b/src/layouts/DomDocsLayout9_0_0.resi
index 595dfe9fd..3f9b2e92a 100644
--- a/src/layouts/DomDocsLayout9_0_0.resi
+++ b/src/layouts/DomDocsLayout9_0_0.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
@react.component
diff --git a/src/layouts/GenTypeDocsLayout.res b/src/layouts/GenTypeDocsLayout.res
index 7bf715c9f..586377c8e 100644
--- a/src/layouts/GenTypeDocsLayout.res
+++ b/src/layouts/GenTypeDocsLayout.res
@@ -4,7 +4,7 @@ module LatestLayout = DocsLayout.Make({
})
@react.component
-let make = (~frontmatter=?, ~components=Markdown.default, ~children) => {
+let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
let router = Next.Router.useRouter()
let route = router.route
diff --git a/src/layouts/GenTypeDocsLayout.resi b/src/layouts/GenTypeDocsLayout.resi
index 4e3e224be..fd33938ba 100644
--- a/src/layouts/GenTypeDocsLayout.resi
+++ b/src/layouts/GenTypeDocsLayout.resi
@@ -1,6 +1,6 @@
@react.component
let make: (
~frontmatter: Js.Json.t=?,
- ~components: Mdx.Components.t=?,
+ ~components: MarkdownComponents.t=?,
~children: React.element,
) => React.element
diff --git a/src/layouts/JsDocsLayout.resi b/src/layouts/JsDocsLayout.resi
index 727ce6720..8e4b9eb04 100644
--- a/src/layouts/JsDocsLayout.resi
+++ b/src/layouts/JsDocsLayout.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
diff --git a/src/layouts/JsDocsLayout8_0_0.resi b/src/layouts/JsDocsLayout8_0_0.resi
index 727ce6720..8e4b9eb04 100644
--- a/src/layouts/JsDocsLayout8_0_0.resi
+++ b/src/layouts/JsDocsLayout8_0_0.resi
@@ -1,6 +1,6 @@
module Docs: {
@react.component
- let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+ let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
}
module Prose: {
diff --git a/src/layouts/LandingPageLayout.res b/src/layouts/LandingPageLayout.res
index 4cd7acce7..3197e4ea5 100644
--- a/src/layouts/LandingPageLayout.res
+++ b/src/layouts/LandingPageLayout.res
@@ -176,7 +176,7 @@ module QuickInstall = {
}
}
- React.useEffect1(() => {
+ React.useEffect(() => {
switch state {
| Copied =>
open Webapi
@@ -691,7 +691,7 @@ module Sponsors = {
*/
@react.component
-let make = (~components=Markdown.default, ~children) => {
+let make = (~components=MarkdownComponents.default, ~children) => {
let overlayState = React.useState(() => false)
<>
@@ -707,7 +707,7 @@ let make = (~components=Markdown.default, ~children) => {
-
+
@@ -722,7 +722,7 @@ let make = (~components=Markdown.default, ~children) => {
children
-
+
diff --git a/src/layouts/LandingPageLayout.resi b/src/layouts/LandingPageLayout.resi
index f9cf82e1a..e76a5ba10 100644
--- a/src/layouts/LandingPageLayout.resi
+++ b/src/layouts/LandingPageLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
diff --git a/src/layouts/MainLayout.res b/src/layouts/MainLayout.res
index 34bc0d30c..dd3994a9a 100644
--- a/src/layouts/MainLayout.res
+++ b/src/layouts/MainLayout.res
@@ -1,5 +1,5 @@
@react.component
-let make = (~components=Markdown.default, ~children) => {
+let make = (~components=MarkdownComponents.default, ~children) => {
let overlayState = React.useState(() => false)
<>
@@ -8,7 +8,7 @@ let make = (~components=Markdown.default, ~children) => {
- children
+ children
diff --git a/src/layouts/MainLayout.resi b/src/layouts/MainLayout.resi
index f9cf82e1a..e76a5ba10 100644
--- a/src/layouts/MainLayout.resi
+++ b/src/layouts/MainLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
diff --git a/src/layouts/ManualDocsLayout.res b/src/layouts/ManualDocsLayout.res
index 55c510630..1536bc25b 100644
--- a/src/layouts/ManualDocsLayout.res
+++ b/src/layouts/ManualDocsLayout.res
@@ -15,7 +15,7 @@ module V900Layout = DocsLayout.Make({
module Latest = {
@react.component
- let make = (~frontmatter=?, ~components=Markdown.default, ~children) => {
+ let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
let router = Next.Router.useRouter()
let route = router.route
@@ -60,7 +60,11 @@ module Latest = {
module V900 = {
@react.component
- let make = (~frontmatter: option=?, ~components=Markdown.default, ~children) => {
+ let make = (
+ ~frontmatter: option=?,
+ ~components=MarkdownComponents.default,
+ ~children,
+ ) => {
let router = Next.Router.useRouter()
let route = router.route
@@ -104,7 +108,7 @@ module V900 = {
module V800 = {
@react.component
- let make = (~frontmatter=?, ~components=Markdown.default, ~children) => {
+ let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
let router = Next.Router.useRouter()
let route = router.route
diff --git a/src/layouts/ReactDocsLayout.res b/src/layouts/ReactDocsLayout.res
index 2a94b1d68..96f9911a9 100644
--- a/src/layouts/ReactDocsLayout.res
+++ b/src/layouts/ReactDocsLayout.res
@@ -16,7 +16,7 @@ module V0100Layout = DocsLayout.Make({
module Latest = {
@react.component
- let make = (~frontmatter=?, ~components=Markdown.default, ~children) => {
+ let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
let router = Next.Router.useRouter()
let route = router.route
@@ -61,7 +61,7 @@ module Latest = {
module V0100 = {
@react.component
- let make = (~frontmatter=?, ~components=Markdown.default, ~children) => {
+ let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
let router = Next.Router.useRouter()
let route = router.route
diff --git a/src/layouts/ReasonCompilerDocsLayout.res b/src/layouts/ReasonCompilerDocsLayout.res
index c26c84fb5..40e07bde0 100644
--- a/src/layouts/ReasonCompilerDocsLayout.res
+++ b/src/layouts/ReasonCompilerDocsLayout.res
@@ -59,7 +59,7 @@ let categories = [
]
@react.component
-let make = (~components=Markdown.default, ~children) => {
+let make = (~components=MarkdownComponents.default, ~children) => {
let router = Next.Router.useRouter()
let route = router.route
diff --git a/src/layouts/ReasonCompilerDocsLayout.resi b/src/layouts/ReasonCompilerDocsLayout.resi
index f9cf82e1a..e76a5ba10 100644
--- a/src/layouts/ReasonCompilerDocsLayout.resi
+++ b/src/layouts/ReasonCompilerDocsLayout.resi
@@ -1,2 +1,2 @@
@react.component
-let make: (~components: Mdx.Components.t=?, ~children: React.element) => React.element
+let make: (~components: MarkdownComponents.t=?, ~children: React.element) => React.element
diff --git a/src/layouts/SidebarLayout.res b/src/layouts/SidebarLayout.res
index 23e24a465..fa3e1b833 100644
--- a/src/layouts/SidebarLayout.res
+++ b/src/layouts/SidebarLayout.res
@@ -210,7 +210,7 @@ module MobileDrawerButton = {
let make = (
~metaTitle: string,
~theme: ColorTheme.t,
- ~components: Mdx.Components.t,
+ ~components: MarkdownComponents.t,
~editHref: option=?,
~sidebarState: (bool, (bool => bool) => unit),
// (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
@@ -235,7 +235,7 @@ let make = (
let (_isSidebarOpen, setSidebarOpen) = sidebarState
let toggleSidebar = () => setSidebarOpen(prev => !prev)
- React.useEffect0(() => {
+ React.useEffect(() => {
open Next.Router.Events
let {Next.Router.events: events} = router
@@ -250,7 +250,7 @@ let make = (
events->off(#hashChangeComplete(onChangeComplete))
},
)
- })
+ }, [])
let editLinkEl = switch editHref {
| Some(href) =>
@@ -321,7 +321,7 @@ let make = (
- children
+ children
pagination
diff --git a/src/layouts/SidebarLayout.resi b/src/layouts/SidebarLayout.resi
index 77e2f26df..4d2a87f34 100644
--- a/src/layouts/SidebarLayout.resi
+++ b/src/layouts/SidebarLayout.resi
@@ -65,7 +65,7 @@ module Sidebar: {
let make: (
~metaTitle: string,
~theme: ColorTheme.t,
- ~components: Mdx.Components.t,
+ ~components: MarkdownComponents.t,
~editHref: string=?,
// (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
~sidebarState: (bool, (bool => bool) => unit),
diff --git a/src/others/Revalidate.res b/src/others/Revalidate.res
index f4d6dff4f..f065486a6 100644
--- a/src/others/Revalidate.res
+++ b/src/others/Revalidate.res
@@ -16,20 +16,25 @@ module Res = {
}
}
-@val external process: 'a = "process"
-
let handler = async (req: Req.req, res: Res.res) => {
switch req.query->Js.Dict.get("secret") {
| Some(secret) =>
- if secret !== process["env"]["NEXT_REVALIDATE_SECRET_TOKEN"] {
- res->Res.Status.make(401)->Res.Status.json({"message": "Invalid secret"})
- } else {
- try {
- let () = await res->Res.revalidate("/try")
- res->Res.json({"revalidated": true})
- } catch {
- | Js.Exn.Error(_) => res->Res.Status.make(500)->Res.Status.send("Error revalidating")
+ switch Node.Process.env->Js.Dict.get("NEXT_REVALIDATE_SECRET_TOKEN") {
+ | Some(token) =>
+ if secret !== token {
+ res->Res.Status.make(401)->Res.Status.json({"message": "Invalid secret"})
+ } else {
+ try {
+ let () = await res->Res.revalidate("/try")
+ res->Res.json({"revalidated": true})
+ } catch {
+ | Js.Exn.Error(_) => res->Res.Status.make(500)->Res.Status.send("Error revalidating")
+ }
}
+ | None =>
+ res
+ ->Res.Status.make(500)
+ ->Res.Status.send("Error revalidating, `NEXT_REVALIDATE_SECRET_TOKEN` not found")
}
| None =>
res->Res.Status.make(500)->Res.Status.send("Error revalidating, param `secret` not found")
diff --git a/src/vendor/Json.ml b/src/vendor/Json.ml
deleted file mode 100644
index f2f8ccd30..000000000
--- a/src/vendor/Json.ml
+++ /dev/null
@@ -1,19 +0,0 @@
-module Decode = Json_decode
-module Encode = Json_encode
-
-exception ParseError of string
-
-let parse s =
- try Some (Js.Json.parseExn s) with
- | _ -> None
-
-let parseOrRaise s =
- try Js.Json.parseExn s with
- | Js.Exn.Error e ->
- let message =
- match Js.Exn.message e with
- | Some m -> m
- | None -> "Unknown error"
- in raise @@ ParseError message
-
-external stringify : Js.Json.t -> string = "JSON.stringify" [@@bs.val]
\ No newline at end of file
diff --git a/src/vendor/Json.res b/src/vendor/Json.res
new file mode 100644
index 000000000..7ea25ccb2
--- /dev/null
+++ b/src/vendor/Json.res
@@ -0,0 +1,21 @@
+module Decode = Json_decode
+module Encode = Json_encode
+
+exception ParseError(string)
+
+let parse = s =>
+ try Some(Js.Json.parseExn(s)) catch {
+ | _ => None
+ }
+
+let parseOrRaise = s =>
+ try Js.Json.parseExn(s) catch {
+ | Js.Exn.Error(e) =>
+ let message = switch Js.Exn.message(e) {
+ | Some(m) => m
+ | None => "Unknown error"
+ }
+ \"@@"(raise, ParseError(message))
+ }
+
+@val external stringify: Js.Json.t => string = "JSON.stringify"
diff --git a/src/vendor/Json.mli b/src/vendor/Json.resi
similarity index 79%
rename from src/vendor/Json.mli
rename to src/vendor/Json.resi
index 81918a7e9..f2cf4441d 100644
--- a/src/vendor/Json.mli
+++ b/src/vendor/Json.resi
@@ -1,4 +1,4 @@
-(** Efficient JSON handling
+@@ocaml.text(" Efficient JSON handling
This module has four aspects to it:
- Parsing, which turns a JSON string into an encoded JSON data structure
- Stringificaiton, which produces a JSON string from an encoded JSON data structure
@@ -37,10 +37,10 @@ let arrayOfInts str
match Json.Decode.(array int value)
| Ok arr -> arr
| Error _ -> []
- | None -> failWith "Unable to parse JSON"
+ | None -> failWith \"Unable to parse JSON\"
(* prints `[3, 2, 1]` *)
-let _ = Js.log (arrayOfInts "[1, 2, 3]" |> Js.Array.reverse)
+let _ = Js.log (arrayOfInts \"[1, 2, 3]\" |> Js.Array.reverse)
]}
@example {[
@@ -55,16 +55,16 @@ let _ =
@example {[
(* Encoding a JSON data structure using Json.Encode *)
-(* prints ["foo", "bar"] *)
+(* prints [\"foo\", \"bar\"] *)
let _ =
- [| "foo", "bar" |]
+ [| \"foo\", \"bar\" |]
|> Json.Encode.stringArray
|> Json.stringify
|> Js.log
-(* prints ["foo", "bar"] *)
+(* prints [\"foo\", \"bar\"] *)
let _ =
- [| "foo", "bar" |]
+ [| \"foo\", \"bar\" |]
|> Js.Array.map Encode.int
|> Json.Encode.jsonArray
|> Json.stringify
@@ -88,29 +88,31 @@ let mapJsonObjectString f decoder encoder str =
let sum ns =
Array.fold_left (+) 0
-(* prints `{ "foo": 6, "bar": 24 }` *)
+(* prints `{ \"foo\": 6, \"bar\": 24 }` *)
let _ =
Js.log (
mapJsonObjectString sun Json.Decode.(array int) Json.Encode.int {|
{
- "foo": [1, 2, 3],
- "bar": [9, 8, 7]
+ \"foo\": [1, 2, 3],
+ \"bar\": [9, 8, 7]
}
|}
)
]}
-*)
+")
module Decode = Json_decode
module Encode = Json_encode
-exception ParseError of string
+exception ParseError(string)
-val parse: string -> Js.Json.t option
-(** [parse s] returns [Some json] if s is a valid json string, [None] otherwise *)
+@ocaml.doc(" [parse s] returns [Some json] if s is a valid json string, [None] otherwise ")
+let parse: string => option
-val parseOrRaise: string -> Js.Json.t
-(** [parse s] returns a [Js.Json.t] if s is a valid json string, raises [ParseError] otherwise *)
+@ocaml.doc(
+ " [parse s] returns a [Js.Json.t] if s is a valid json string, raises [ParseError] otherwise "
+)
+let parseOrRaise: string => Js.Json.t
-val stringify: Js.Json.t -> string
-(** [stringify json] returns the [string] representation of the given [Js.Json.t] value *)
+@ocaml.doc(" [stringify json] returns the [string] representation of the given [Js.Json.t] value ")
+let stringify: Js.Json.t => string
diff --git a/src/vendor/Json_decode.ml b/src/vendor/Json_decode.ml
deleted file mode 100644
index 070918948..000000000
--- a/src/vendor/Json_decode.ml
+++ /dev/null
@@ -1,217 +0,0 @@
-external _unsafeCreateUninitializedArray : int -> 'a array = "Array" [@@bs.new]
-
-external _stringify : Js.Json.t -> string = "JSON.stringify" [@@bs.val]
-
-let _isInteger value =
- Js.Float.isFinite value && Js.Math.floor_float value == value
-
-type 'a decoder = Js.Json.t -> 'a
-
-exception DecodeError of string
-
-let id json = json
-
-let bool json =
- if Js.typeof json = "boolean" then
- (Obj.magic (json : Js.Json.t) : bool)
- else
- raise @@ DecodeError ("Expected boolean, got " ^ _stringify json)
-
-let float json =
- if Js.typeof json = "number" then
- (Obj.magic (json : Js.Json.t) : float)
- else
- raise @@ DecodeError ("Expected number, got " ^ _stringify json)
-
-let int json =
- let f = float json in
- if _isInteger f then
- (Obj.magic (f : float) : int)
- else
- raise @@ DecodeError ("Expected integer, got " ^ _stringify json)
-
-let string json =
- if Js.typeof json = "string" then
- (Obj.magic (json : Js.Json.t) : string)
- else
- raise @@ DecodeError ("Expected string, got " ^ _stringify json)
-
-let char json =
- let s = string json in
- if String.length s = 1 then
- String.get s 0
- else
- raise @@ DecodeError ("Expected single-character string, got " ^ _stringify json)
-
-let date json =
- json |> string
- |> Js.Date.fromString
-
-let nullable decode json =
- if (Obj.magic json : 'a Js.null) == Js.null then
- Js.null
- else
- Js.Null.return (decode json)
-
-(* TODO: remove this? *)
-let nullAs value json =
- if (Obj.magic json : 'a Js.null) == Js.null then
- value
- else
- raise @@ DecodeError ("Expected null, got " ^ _stringify json)
-
-let array decode json =
- if Js.Array.isArray json then begin
- let source = (Obj.magic (json : Js.Json.t) : Js.Json.t array) in
- let length = Js.Array.length source in
- let target = _unsafeCreateUninitializedArray length in
- for i = 0 to length - 1 do
- let value =
- try
- decode (Array.unsafe_get source i)
- with
- DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin array at index " ^ string_of_int i)
- in
- Array.unsafe_set target i value;
- done;
- target
- end
- else
- raise @@ DecodeError ("Expected array, got " ^ _stringify json)
-
-let list decode json =
- json |> array decode |> Array.to_list
-
-let pair decodeA decodeB json =
- if Js.Array.isArray json then begin
- let source = (Obj.magic (json : Js.Json.t) : Js.Json.t array) in
- let length = Js.Array.length source in
- if length = 2 then
- try
- decodeA (Array.unsafe_get source 0),
- decodeB (Array.unsafe_get source 1)
- with
- DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin pair/tuple2")
- else
- raise @@ DecodeError ({j|Expected array of length 2, got array of length $length|j})
- end
- else
- raise @@ DecodeError ("Expected array, got " ^ _stringify json)
-
-let tuple2 = pair
-
-let tuple3 decodeA decodeB decodeC json =
- if Js.Array.isArray json then begin
- let source = (Obj.magic (json : Js.Json.t) : Js.Json.t array) in
- let length = Js.Array.length source in
- if length = 3 then
- try
- decodeA (Array.unsafe_get source 0),
- decodeB (Array.unsafe_get source 1),
- decodeC (Array.unsafe_get source 2)
- with
- DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin tuple3")
- else
- raise @@ DecodeError ({j|Expected array of length 3, got array of length $length|j})
- end
- else
- raise @@ DecodeError ("Expected array, got " ^ _stringify json)
-
-let tuple4 decodeA decodeB decodeC decodeD json =
- if Js.Array.isArray json then begin
- let source = (Obj.magic (json : Js.Json.t) : Js.Json.t array) in
- let length = Js.Array.length source in
- if length = 4 then
- try
- decodeA (Array.unsafe_get source 0),
- decodeB (Array.unsafe_get source 1),
- decodeC (Array.unsafe_get source 2),
- decodeD (Array.unsafe_get source 3)
- with
- DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin tuple4")
- else
- raise @@ DecodeError ({j|Expected array of length 4, got array of length $length|j})
- end
- else
- raise @@ DecodeError ("Expected array, got " ^ _stringify json)
-
-let dict decode json =
- if Js.typeof json = "object" &&
- not (Js.Array.isArray json) &&
- not ((Obj.magic json : 'a Js.null) == Js.null)
- then begin
- let source = (Obj.magic (json : Js.Json.t) : Js.Json.t Js.Dict.t) in
- let keys = Js.Dict.keys source in
- let l = Js.Array.length keys in
- let target = Js.Dict.empty () in
- for i = 0 to l - 1 do
- let key = (Array.unsafe_get keys i) in
- let value =
- try
- decode (Js.Dict.unsafeGet source key)
- with
- DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tin dict")
- in
- Js.Dict.set target key value;
- done;
- target
- end
- else
- raise @@ DecodeError ("Expected object, got " ^ _stringify json)
-
-let field key decode json =
- if
- Js.typeof json = "object" &&
- not (Js.Array.isArray json) &&
- not ((Obj.magic json : 'a Js.null) == Js.null)
- then begin
- let dict =
- (Obj.magic (json : Js.Json.t) : Js.Json.t Js.Dict.t) in
- match Js.Dict.get dict key with
- | Some value -> begin
- try
- decode value
- with
- DecodeError msg -> raise @@ DecodeError (msg ^ "\n\tat field '" ^ key ^ "'")
- end
- | None ->
- raise @@ DecodeError ({j|Expected field '$(key)'|j})
- end
- else
- raise @@ DecodeError ("Expected object, got " ^ _stringify json)
-
-let rec at key_path decoder =
- match key_path with
- | [key] -> field key decoder
- | first::rest -> field first (at rest decoder)
- | [] -> raise @@ Invalid_argument ("Expected key_path to contain at least one element")
-
-let optional decode json =
- try Some (decode json) with
- | DecodeError _ -> None
-
-let oneOf decoders json =
- let rec inner decoders errors =
- match decoders with
- | [] ->
- let revErrors = List.rev errors in
- raise @@ DecodeError
- ({j|All decoders given to oneOf failed. Here are all the errors: $revErrors. And the JSON being decoded: |j} ^ _stringify json)
- | decode::rest ->
- try decode json with
- | DecodeError e ->
- inner rest (e :: errors) in
- inner decoders []
-
-let either a b =
- oneOf [a;b]
-
-let withDefault default decode json =
- try decode json with
- | DecodeError _ -> default
-
-let map f decode json =
- f (decode json)
-
-let andThen b a json=
- b (a json) json
diff --git a/src/vendor/Json_decode.mli b/src/vendor/Json_decode.mli
deleted file mode 100644
index 23fac0bcd..000000000
--- a/src/vendor/Json_decode.mli
+++ /dev/null
@@ -1,495 +0,0 @@
-(** Provides a set of low level combinator primitives to decode Js.Json.t data
-structures
-A decoder combinator will return the decoded value if successful, or raise a
-[DecodeError of string] if unsuccessful, where the string argument contains the
-error message.
-Decoders are designed to be combined to produce more complex decoders that can
-decode arbitrary data structures, though the emphasis for this library is for
-it to be {i possible} to decode any given data structure, not necessarily for
-it to be {i convenient}. For convenience you should look towards opinionated
-third-party libraries.
-*)
-
-type 'a decoder = Js.Json.t -> 'a
-(** The type of a decoder combinator *)
-
-exception DecodeError of string
-
-val id : Js.Json.t decoder
-(** Identity decoder.
-
- {b Returns} the input JSON value.
-
- Always succeeds. You would use this if you wanted to partially decode
- some JSON in stages; in the first stage you could decode some portion
- of the input, while using [id] to keep the rest as JSON and decoding
- that in subsequent stages.
-
- @example {[
- open Json
- (* returns [(1 : int, {"a": true} : Js.Json.t)] *)
- let json = parseOrRaise {|{"id": 1, {"a": true}}|}
- let _ = Decode.(int json, id json)
- ]} *)
-
-val bool : bool decoder
-(** Decodes a JSON value into a [bool]
-
-{b Returns} a [bool] if the JSON value is a [true] or [false].
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns true *)
- let _ = Json.parseOrRaise "true" |> Decode.bool
- (* returns false *)
- let _ = Json.parseOrRaise "false" |> Decode.bool
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "123" |> Decode.bool
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.bool
-]}
-*)
-
-val float : float decoder
-(** Decodes a JSON value into a [float]
-
-{b Returns} a [float] if the JSON value is a number.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns 1.23 *)
- let _ = Json.parseOrRaise "1.23" |> Decode.float
- (* returns 23. *)
- let _ = Json.parseOrRaise "23" |> Decode.float
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "true" |> Decode.float
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.float
-]}
-*)
-
-val int : int decoder
-(** Decodes a JSON value into an [int]
-
-{b Returns} an [int] if the JSON value is a number.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns 23 *)
- let _ = Json.parseOrRaise "23" |> Decode.int
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "1.23" |> Decode.int
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "true" |> Decode.int
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.int
-]}
-*)
-
-val string : string decoder
-(** Decodes a JSON value into a [string]
-
-{b Returns} a [string] if the JSON value is a string.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns "foo" *)
- let _ = Json.parseOrRaise "\"foo\"" |> Decode.string
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "1.23" |> Decode.string
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.string
-]}
-*)
-
-val char : char decoder
-(** Decodes a JSON value into a [char]
-
-{b Returns} a [char] if the JSON value is a single-character string.
-
-@raise [DecodeError] if unsuccessful.
-
-@example {[
- open Json
- (* returns 'a' *)
- let _ = Json.parseOrRaise "\"a\"" |> Decode.char
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "\"abc\"" |> Decode.char
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.char
-]}
-*)
-
-val date : Js.Date.t decoder
-(** Decodes an ISO8601-formatted JSON string into a [Js.Date.t]
-
-{b Returns} a [Js.Date.t] if the JSON value is an IS8601-formatted string.
-
-@raise [DecodeError] if unsuccessful
-*)
-
-val nullable : 'a decoder -> 'a Js.null decoder
-(** Decodes a JSON value into an ['a Js.null]
-
-{b Returns} [Js.null] if the JSON value is [null], or an ['a Js.null] if the
-given decoder succeeds,
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns (Js.Null.return 23) *)
- let _ = Json.parseOrRaise "23" |> Decode.(nullable int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "1.23" |> Decode.(nullable int)
- (* returns Js.null *)
- let _ = Json.parseOrRaise "null" |> Decode.(nullable int)
-]}
-*)
-
-val nullAs : 'a -> 'a decoder
-(** Returns the given value if the JSON value is [null]
-
-{b Returns} an ['a] if the JSON value is [null].
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "\"x\"" |> Decode.nullAs "x"
- (* returns "x" *)
- let _ = Json.parseOrRaise "null" |> Decode.nullAs "x"
- (* returns None *)
- let _ = Json.parseOrRaise "null" |> Decode.nullAs None
-]}
-*)
-
-val array : 'a decoder -> 'a array decoder
-(** Decodes a JSON array into an ['a array] using the given decoder on each element
-
-{b Returns} an ['a array] if the JSON value is a JSON array and all its
-elements are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns [| 1; 2; 3 |] *)
- let _ = Json.parseOrRaise "[1, 2, 3]" |> Decode.(array int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "[1, 2, "c"]" |> Decode.(array int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "123" |> Decode.(array int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.(array int)
-]}
-*)
-
-val list : 'a decoder -> 'a list decoder
-(** Decodes a JSON array into an ['a list] using the given decoder on each element
-
-{b Returns} an ['a list] if the JSON value is a JSON array and all its
-elements are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns [1; 2; 3] *)
- let _ = Json.parseOrRaise "[1, 2, 3]" |> Decode.(list int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "[1, 2, "c"]" |> Decode.(list int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "123" |> Decode.(list int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.(list int)
-]}
-*)
-
-val pair : 'a decoder -> 'b decoder -> ('a * 'b) decoder
-(** Decodes a JSON array with two elements into an ['a * 'b] tuple using
- each of the given decoders in order.
-
-{b Returns} an ['a * 'b] if the JSON value is a JSON array of length 2 and both
- its elements are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns (1, "bar") *)
- let _ = Json.parseOrRaise "[1, \"bar\"]" |> Decode.(pair int string)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "[1, 2]" |> Decode.(pair int string)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "[1, 2, 3]" |> Decode.(pair int int)
-]}
-*)
-
-val tuple2 : 'a decoder -> 'b decoder -> ('a * 'b) decoder
-(** Decodes a JSON array with two elements into an ['a * 'b] tuple using
- each of the given decoders in order.
-
-{b Alias of [pair]}
-
-{b Returns} an ['a * 'b] if the JSON value is a JSON array of length 2 and both
- its elements are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns (1, "bar") *)
- let _ = Json.parseOrRaise "[1, \"bar\"]" |> Decode.(tuple2 int string)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "[1, 2]" |> Decode.(tuple2 int string)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "[1, 2, 3]" |> Decode.(tuple2 int int)
-]}
-*)
-
-val tuple3 : 'a decoder -> 'b decoder -> 'c decoder -> ('a * 'b * 'c) decoder
-(** Decodes a JSON array with three elements into an ['a * 'b * 'c] tuple using
- each of the given decoders in order.
-
-{b Returns} an ['a * 'b * 'c] if the JSON value is a JSON array of length 3 and
- all its elements are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-*)
-
-val tuple4 : 'a decoder -> 'b decoder -> 'c decoder -> 'd decoder -> ('a * 'b * 'c * 'd) decoder
-(** Decodes a JSON array with four elements into an ['a * 'b * 'c * 'd] tuple
- using each of the given decoders in order.
-
-{b Returns} an ['a * 'b * 'c * 'd] if the JSON value is a JSON array of length 4
- and all its elements are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-*)
-
-val dict : 'a decoder -> 'a Js.Dict.t decoder
-(** Decodes a JSON object into a dict using the given decoder on each of its values
-
-{b Returns} an ['a Js.Dict.t] if the JSON value is a JSON object and all its
-values are successfully decoded.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns (Js.Dict.fromList [("x", 23); ("y", 42)]) *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": 42 } |} |> Decode.(dict int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(dict int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "123" |> Decode.(dict int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.(dict int)
-]}
-*)
-
-val field : string -> 'a decoder -> 'a decoder
-(** Decodes a JSON object with a specific field into the value of that field
-
-{b Returns} an ['a] if the JSON value is a JSON object with the given field
-and a value that is successfully decoded with the given decoder.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns 23 *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": 42 } |} |> Decode.(field "x" int)
- (* returns 23 *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(field "x" int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(field "y" int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "123" |> Decode.(field "x" int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.(field "x" int)
-]}
-*)
-
-val at : string list -> 'a decoder -> 'a decoder
-(** Same as [field] but takes a top level field and a list of nested fields for decoding nested values.
-
-{b Returns} an ['a] if the JSON value is a JSON object with the given field
-and a value that is successfully decoded with the given decoder.
-
-@raise [DecodeError] if unsuccessful
-@raise [Invalid_argument] if list of fields is empty
-
-@example {[
- open Json
- (* returns 23 *)
- let _ = Json.parseOrRaise {| { "x": {"foo": 23}, "y": 42 } |} |> Decode.(at ["x"; "foo"] int)
- (* raises DecodeError *)
- let _ = Json.parseOrRaise {| { "x": null, "y": "b" } |} |> Decode.(at ["x"; "foo"] int)
-]}
-*)
-
-val optional : 'a decoder -> 'a option decoder
-(** Maps a decoder [result] to an option
-
-{b Returns} [Some of 'a] if the given decoder is successful, [None] if
-it is not.
-
-This decoder will never raise a [DecodeError]. Its purpose is to catch and
-transform [DecodeError]'s of a given decoder into [None]s by mapping its
-[result] into an [option]. This prevents a decoder error from terminating
-a composite decoder, and is useful to decode optional JSON object fields.
-
-@example {[
- open Json
- (* returns (Some 23) *)
- let _ = Json.parseOrRaise "23" |> Decode.(optional int)
- (* returns None *)
- let _ = Json.parseOrRaise 1.23 |> Decode.(optional int)
- (* returns None *)
- let _ = Json.parseOrRaise "null" |> Decode.(optional int)
- (* returns (Some 23) *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(optional (field "x" int))
- (* returns None *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(optional (field "y" int))
- (* returns None *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(optional (field "z" int))
- (* returns (Some 23) *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(field "x" (optional int))
- (* returns None *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(field "y" (optional int))
- (* raises DecodeError *)
- let _ = Json.parseOrRaise {| { "x": 23, "y": "b" } |} |> Decode.(field "z" (optional int))
-]}
-*)
-
-val oneOf : 'a decoder list -> 'a decoder
-(** Tries each [decoder] in order, retunring the result of the first that succeeds
-
-{b Returns} an ['a] if one of the decoders succeed.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns 23 *)
- let _ = Json.parseOrRaise "23" |> Decode.(oneOf [int; field "x" int])
- (* returns 42 *)
- let _ = Json.parseOrRaise {| { "x": 42 } |} |> Decode.(oneOf [int; field "x" int])
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.(oneOf [int; field "x" int]
-]}
-*)
-
-val either : 'a decoder -> 'a decoder -> 'a decoder
-(** Tries each [decoder] in order, retunring the result of the first that succeeds
-
-{b Returns} an ['a] if one of the decoders succeed.
-
-@raise [DecodeError] if unsuccessful
-
-@example {[
- open Json
- (* returns 23 *)
- let _ = Json.parseOrRaise "23" |> Decode.(either int (field "x" int))
- (* returns 42 *)
- let _ = Json.parseOrRaise {| { "x": 42 } |} |> Decode.(either int (field "x" int))
- (* raises DecodeError *)
- let _ = Json.parseOrRaise "null" |> Decode.(either int (field "x" int))
-]}
-*)
-
-val withDefault : 'a -> 'a decoder -> 'a decoder
-(** Tries the given [decoder] and returns its result if it succeeds, or the
-given default value if it fails.
-
-{b Returns} an ['a].
-
-@example {[
- open Json
- (* returns 23 *)
- let _ = Json.parseOrRaise "23" |> Decode.withDefault 0 int
- (* returns 0 *)
- let _ = Json.parseOrRaise "\"x\"" |> Decode.withDefault 0 int
- (* returns 0 *)
- let _ = Json.parseOrRaise "null" |> Decode.withDefault 0 int
-]}
-*)
-
-val map : ('a -> 'b) -> 'a decoder -> 'b decoder
-(** Returns a decoder that maps the result of the given decoder if successful
-
-{b Returns} a ['b] if the given decoder succeeds.
-
-@example {[
- open Json
- (* returns 46 *)
- let _ = Json.parseOrRaise "23" |> Decode.map (fun x -> x + x) int
-]}
-*)
-
-val andThen : ('a -> 'b decoder) -> 'a decoder -> 'b decoder
-(** Returns a decoder that maps the result of the given decoder if successful
-
-{b Returns} an ['a] if both decoders succeed.
-
-@example {[
- (* Decode a JSON tree structure *)
- type 'a tree =
- | Node of 'a * 'a tree list
- | Leaf of 'a
-
- module Decode = struct
- open Json.Decode
-
- let rec tree decoder =
- field "type" string |> andThen (
- function | "node" -> node decoder
- | "leaf" -> leaf decoder
- | _ -> failwith "unknown node type"
- )
-
- and node decoder json =
- Node (
- (json |> field "value" decoder),
- (json |> field "children" (array (tree decoder) |> map Array.to_list))
- )
-
- and leaf decoder json =
- Leaf (json |> field "value" decoder)
- end
-
- let json = {| {
- "type": "node",
- "value": 9,
- "children": [{
- "type": "node",
- "value": 5,
- "children": [{
- "type": "leaf",
- "value": 3
- }, {
- "type": "leaf",
- "value": 2
- }]
- }, {
- "type": "leaf",
- "value": 4
- }]
- } |}
-
- let myTree =
- json |> Json.parseOrRaise
- |> Decode.tree Json.Decode.int
-]}
-*)
diff --git a/src/vendor/Json_decode.res b/src/vendor/Json_decode.res
new file mode 100644
index 000000000..6440ce47a
--- /dev/null
+++ b/src/vendor/Json_decode.res
@@ -0,0 +1,236 @@
+@new external _unsafeCreateUninitializedArray: int => array<'a> = "Array"
+
+@val external _stringify: Js.Json.t => string = "JSON.stringify"
+
+let _isInteger = value => Js.Float.isFinite(value) && Js.Math.floor_float(value) === value
+
+type decoder<'a> = Js.Json.t => 'a
+
+exception DecodeError(string)
+
+let id = json => json
+
+let bool = json =>
+ if Js.typeof(json) == "boolean" {
+ (Obj.magic((json: Js.Json.t)): bool)
+ } else {
+ \"@@"(raise, DecodeError("Expected boolean, got " ++ _stringify(json)))
+ }
+
+let float = json =>
+ if Js.typeof(json) == "number" {
+ (Obj.magic((json: Js.Json.t)): float)
+ } else {
+ \"@@"(raise, DecodeError("Expected number, got " ++ _stringify(json)))
+ }
+
+let int = json => {
+ let f = float(json)
+ if _isInteger(f) {
+ (Obj.magic((f: float)): int)
+ } else {
+ \"@@"(raise, DecodeError("Expected integer, got " ++ _stringify(json)))
+ }
+}
+
+let string = json =>
+ if Js.typeof(json) == "string" {
+ (Obj.magic((json: Js.Json.t)): string)
+ } else {
+ \"@@"(raise, DecodeError("Expected string, got " ++ _stringify(json)))
+ }
+
+let char = json => {
+ let s = string(json)
+ if String.length(s) == 1 {
+ String.get(s, 0)
+ } else {
+ \"@@"(raise, DecodeError("Expected single-character string, got " ++ _stringify(json)))
+ }
+}
+
+let date = json => Js.Date.fromString(string(json))
+
+let nullable = (decode, json) =>
+ if (Obj.magic(json): Js.null<'a>) === Js.null {
+ Js.null
+ } else {
+ Js.Null.return(decode(json))
+ }
+
+/* TODO: remove this? */
+let nullAs = (value, json) =>
+ if (Obj.magic(json): Js.null<'a>) === Js.null {
+ value
+ } else {
+ \"@@"(raise, DecodeError("Expected null, got " ++ _stringify(json)))
+ }
+
+let array = (decode, json) =>
+ if Js.Array.isArray(json) {
+ let source: array = Obj.magic((json: Js.Json.t))
+ let length = Js.Array.length(source)
+ let target = _unsafeCreateUninitializedArray(length)
+ for i in 0 to length - 1 {
+ let value = try decode(Array.unsafe_get(source, i)) catch {
+ | DecodeError(msg) =>
+ \"@@"(raise, DecodeError(msg ++ ("\n\tin array at index " ++ string_of_int(i))))
+ }
+
+ Array.unsafe_set(target, i, value)
+ }
+ target
+ } else {
+ \"@@"(raise, DecodeError("Expected array, got " ++ _stringify(json)))
+ }
+
+let list = (decode, json) => array(decode, json)->Array.to_list
+
+let pair = (decodeA, decodeB, json) =>
+ if Js.Array.isArray(json) {
+ let source: array = Obj.magic((json: Js.Json.t))
+ let length = Js.Array.length(source)
+ if length == 2 {
+ try (decodeA(Array.unsafe_get(source, 0)), decodeB(Array.unsafe_get(source, 1))) catch {
+ | DecodeError(msg) => \"@@"(raise, DecodeError(msg ++ "\n\tin pair/tuple2"))
+ }
+ } else {
+ \"@@"(
+ raise,
+ DecodeError(`Expected array of length 2, got array of length ${length->string_of_int}`),
+ )
+ }
+ } else {
+ \"@@"(raise, DecodeError("Expected array, got " ++ _stringify(json)))
+ }
+
+let tuple2 = pair
+
+let tuple3 = (decodeA, decodeB, decodeC, json) =>
+ if Js.Array.isArray(json) {
+ let source: array = Obj.magic((json: Js.Json.t))
+ let length = Js.Array.length(source)
+ if length == 3 {
+ try (
+ decodeA(Array.unsafe_get(source, 0)),
+ decodeB(Array.unsafe_get(source, 1)),
+ decodeC(Array.unsafe_get(source, 2)),
+ ) catch {
+ | DecodeError(msg) => \"@@"(raise, DecodeError(msg ++ "\n\tin tuple3"))
+ }
+ } else {
+ \"@@"(
+ raise,
+ DecodeError(`Expected array of length 3, got array of length ${length->string_of_int}`),
+ )
+ }
+ } else {
+ \"@@"(raise, DecodeError("Expected array, got " ++ _stringify(json)))
+ }
+
+let tuple4 = (decodeA, decodeB, decodeC, decodeD, json) =>
+ if Js.Array.isArray(json) {
+ let source: array = Obj.magic((json: Js.Json.t))
+ let length = Js.Array.length(source)
+ if length == 4 {
+ try (
+ decodeA(Array.unsafe_get(source, 0)),
+ decodeB(Array.unsafe_get(source, 1)),
+ decodeC(Array.unsafe_get(source, 2)),
+ decodeD(Array.unsafe_get(source, 3)),
+ ) catch {
+ | DecodeError(msg) => \"@@"(raise, DecodeError(msg ++ "\n\tin tuple4"))
+ }
+ } else {
+ \"@@"(
+ raise,
+ DecodeError(`Expected array of length 4, got array of length ${length->string_of_int}`),
+ )
+ }
+ } else {
+ \"@@"(raise, DecodeError("Expected array, got " ++ _stringify(json)))
+ }
+
+let dict = (decode, json) =>
+ if (
+ Js.typeof(json) == "object" &&
+ (!Js.Array.isArray(json) &&
+ !((Obj.magic(json): Js.null<'a>) === Js.null))
+ ) {
+ let source: Js.Dict.t = Obj.magic((json: Js.Json.t))
+ let keys = Js.Dict.keys(source)
+ let l = Js.Array.length(keys)
+ let target = Js.Dict.empty()
+ for i in 0 to l - 1 {
+ let key = Array.unsafe_get(keys, i)
+ let value = try decode(Js.Dict.unsafeGet(source, key)) catch {
+ | DecodeError(msg) => \"@@"(raise, DecodeError(msg ++ "\n\tin dict"))
+ }
+
+ Js.Dict.set(target, key, value)
+ }
+ target
+ } else {
+ \"@@"(raise, DecodeError("Expected object, got " ++ _stringify(json)))
+ }
+
+let field = (key, decode, json) =>
+ if (
+ Js.typeof(json) == "object" &&
+ (!Js.Array.isArray(json) &&
+ !((Obj.magic(json): Js.null<'a>) === Js.null))
+ ) {
+ let dict: Js.Dict.t = Obj.magic((json: Js.Json.t))
+ switch Js.Dict.get(dict, key) {
+ | Some(value) =>
+ try decode(value) catch {
+ | DecodeError(msg) => \"@@"(raise, DecodeError(msg ++ ("\n\tat field '" ++ (key ++ "'"))))
+ }
+ | None => \"@@"(raise, DecodeError(`Expected field '${key}'`))
+ }
+ } else {
+ \"@@"(raise, DecodeError("Expected object, got " ++ _stringify(json)))
+ }
+
+let rec at = (key_path, decoder, json) =>
+ switch key_path {
+ | list{key} => field(key, decoder, json)
+ | list{first, ...rest} => field(first, at(rest, decoder, ...), json)
+ | list{} => \"@@"(raise, Invalid_argument("Expected key_path to contain at least one element"))
+ }
+
+let optional = (decode, json) =>
+ try Some(decode(json)) catch {
+ | DecodeError(_) => None
+ }
+
+let oneOf = (decoders, json) => {
+ let rec inner = (decoders, errors) =>
+ switch decoders {
+ | list{} =>
+ let formattedErrors = "\n- " ++ Js.Array.joinWith("\n- ", Array.of_list(List.rev(errors)))
+ \"@@"(
+ raise,
+ DecodeError(
+ `All decoders given to oneOf failed. Here are all the errors: ${formattedErrors}\\nAnd the JSON being decoded: ` ++
+ _stringify(json),
+ ),
+ )
+ | list{decode, ...rest} =>
+ try decode(json) catch {
+ | DecodeError(e) => inner(rest, list{e, ...errors})
+ }
+ }
+ inner(decoders, list{})
+}
+
+let either = (a, b) => oneOf(list{a, b}, ...)
+
+let withDefault = (default, decode, json) =>
+ try decode(json) catch {
+ | DecodeError(_) => default
+ }
+
+let map = (f, decode, json) => f(decode(json))
+
+let andThen = (b, a, json) => b(a(json))(json)
diff --git a/src/vendor/Json_decode.resi b/src/vendor/Json_decode.resi
new file mode 100644
index 000000000..f558c5a81
--- /dev/null
+++ b/src/vendor/Json_decode.resi
@@ -0,0 +1,28 @@
+type decoder<'a> = Js.Json.t => 'a
+
+exception DecodeError(string)
+
+let id: decoder
+let bool: Js.Json.t => bool
+let float: Js.Json.t => float
+let int: Js.Json.t => int
+let string: Js.Json.t => string
+let char: Js.Json.t => char
+let date: Js.Json.t => Js.Date.t
+let nullable: ('a => 'b, 'a) => Js.Null.t<'b>
+let nullAs: ('a, Js.Json.t) => 'a
+let array: (decoder<'a>, Js.Json.t) => array<'a>
+let list: (decoder<'a>, Js.Json.t) => list<'a>
+let pair: (decoder<'a>, decoder<'b>, Js.Json.t) => ('a, 'b)
+let tuple2: (decoder<'a>, decoder<'b>, Js.Json.t) => ('a, 'b)
+let tuple3: (decoder<'a>, decoder<'b>, decoder<'c>, Js.Json.t) => ('a, 'b, 'c)
+let tuple4: (decoder<'a>, decoder<'b>, decoder<'c>, decoder<'d>, Js.Json.t) => ('a, 'b, 'c, 'd)
+let dict: (decoder<'a>, Js.Json.t) => Js.Dict.t<'a>
+let field: (Js.Dict.key, decoder<'a>, Js.Json.t) => 'a
+let at: (list, decoder<'a>, Js.Json.t) => 'a
+let optional: ('a => 'b, 'a) => option<'b>
+let oneOf: (list>, Js.Json.t) => 'a
+let either: (decoder<'a>, decoder<'a>) => Js.Json.t => 'a
+let withDefault: ('a, 'b => 'a, 'b) => 'a
+let map: ('a => 'b, 'c => 'a, 'c) => 'b
+let andThen: ('a => 'b => 'c, 'b => 'a, 'b) => 'c
diff --git a/src/vendor/Json_encode.ml b/src/vendor/Json_encode.ml
deleted file mode 100644
index 4c592e92d..000000000
--- a/src/vendor/Json_encode.ml
+++ /dev/null
@@ -1,54 +0,0 @@
-type 'a encoder = 'a -> Js.Json.t
-
-external null : Js.Json.t = "null" [@@bs.val]
-external string : string -> Js.Json.t = "%identity"
-external float : float -> Js.Json.t = "%identity"
-external int : int -> Js.Json.t = "%identity"
-external bool : bool -> Js.Json.t = "%identity"
-
-let char c =
- c |> String.make 1
- |> string
-
-let date d =
- d |> Js.Date.toJSONUnsafe
- |> string
-
-let nullable encode = function
- | None -> null
- | Some v -> encode v
-
-let withDefault d encode = function
- | None -> d
- | Some v -> encode v
-
-external jsonDict : Js.Json.t Js_dict.t -> Js.Json.t = "%identity"
-let dict encode d =
- let pairs = Js.Dict.entries d in
- let encodedPairs = Array.map (fun (k, v) -> (k, encode(v))) pairs in
- jsonDict (Js.Dict.fromArray encodedPairs)
-
-let object_ props: Js.Json.t =
- props |> Js.Dict.fromList
- |> jsonDict
-
-external jsonArray : Js.Json.t array -> Js.Json.t = "%identity"
-let array encode l =
- l |> Array.map encode
- |> jsonArray
-let list encode l =
- l |> List.map encode
- |> Array.of_list
- |> jsonArray
-
-let pair encodeA encodeB (a, b) =
- jsonArray [|encodeA a; encodeB b|]
-let tuple2 = pair
-let tuple3 encodeA encodeB encodeC (a, b, c) =
- jsonArray [|encodeA a; encodeB b; encodeC c|]
-let tuple4 encodeA encodeB encodeC encodeD (a, b, c, d) =
- jsonArray [|encodeA a; encodeB b; encodeC c; encodeD d|]
-
-external stringArray : string array -> Js.Json.t = "%identity"
-external numberArray : float array -> Js.Json.t = "%identity"
-external boolArray : bool array -> Js.Json.t = "%identity"
diff --git a/src/vendor/Json_encode.mli b/src/vendor/Json_encode.mli
deleted file mode 100644
index 4fd01c71a..000000000
--- a/src/vendor/Json_encode.mli
+++ /dev/null
@@ -1,77 +0,0 @@
-(** Provides functions for encoding a JSON data structure *)
-
-type 'a encoder = 'a -> Js.Json.t
-(** The type of a encoder combinator *)
-
-external null : Js.Json.t = "null" [@@bs.val]
-(** [null] is the singleton null JSON value *)
-
-external string : string -> Js.Json.t = "%identity"
-(** [string s] makes a JSON string of the [string] [s] *)
-
-external float : float -> Js.Json.t = "%identity"
-(** [float n] makes a JSON number of the [float] [n] *)
-
-external int : int -> Js.Json.t = "%identity"
-(** [int n] makes a JSON number of the [int] [n] *)
-
-external bool : bool -> Js.Json.t = "%identity"
-(** [bool b] makes a JSON boolean of the [bool] [b] *)
-
-val char : char -> Js.Json.t
-(** [char c] makes a JSON string of the [char] [c] *)
-
-val date : Js.Date.t -> Js.Json.t
-(** [date d] makes an ISO 8601 JSON string of the [Js.Date.t] [d] *)
-
-val nullable : 'a encoder -> 'a option -> Js.Json.t
-(** [nullable encoder option] returns either the encoded value or [null] *)
-
-val withDefault : Js.Json.t -> 'a encoder -> 'a option -> Js.Json.t
-(** [withDefault default encoder option] returns the encoded value if present, oterwise [default] *)
-
-val pair : 'a encoder -> 'b encoder -> ('a * 'b) -> Js.Json.t
-(** [pair encoder encoder tuple] creates a JSON array from a tuple of size 2 *)
-
-val tuple2 : 'a encoder -> 'b encoder -> ('a * 'b) -> Js.Json.t
-(** [tuple2 encoder encoder tuple] creates a JSON array from a tuple of size 2. Alias of [pair] *)
-
-val tuple3 : 'a encoder -> 'b encoder -> 'c encoder -> ('a * 'b * 'c) -> Js.Json.t
-(** [tuple3 enc enc enc tuple] creates a JSON array from a tuple of size 3 *)
-
-val tuple4 : 'a encoder -> 'b encoder -> 'c encoder -> 'd encoder -> ('a * 'b * 'c * 'd) -> Js.Json.t
-(** [tuple4 enc enc enc enc tuple] creates a JSON array from a tuple of size 4 *)
-
-external jsonDict : Js.Json.t Js_dict.t -> Js.Json.t = "%identity"
-(** [jsonDict d] makes a JSON object of the [Js.Dict.t] [d] *)
-
-val dict : 'a encoder -> 'a Js_dict.t encoder
-(** [dict encoder d] makes a JSON object of the [Js.Dict.t] [d] with the given [encoder] *)
-
-val object_ : (string * Js.Json.t) list -> Js.Json.t
-(** [object_ props] makes a JSON object of the [props] list of properties *)
-
-val array : 'a encoder -> 'a array encoder
-(** [array encoder l] makes a JSON array of the [list] [l] using the given [encoder]
- * NOTE: This will be renamed `array` once the existing and deprecated `array` function
- * has been removed.
- *)
-
-val list : 'a encoder -> 'a list encoder
-(** [list encoder a] makes a JSON array of the [array] [a] using the given [encoder] *)
-
-(** The functions below are specialized for specific array type which
- happened to be already JSON object in the BuckleScript runtime. Therefore
- they are more efficient (constant time rather than linear conversion). *)
-
-external jsonArray : Js.Json.t array -> Js.Json.t = "%identity"
-(** [jsonArray a] makes a JSON array of the [Js.Json.t array] [a] *)
-
-external stringArray : string array -> Js.Json.t = "%identity"
-(** [stringArray a] makes a JSON array of the [string array] [a] *)
-
-external numberArray : float array -> Js.Json.t = "%identity"
-(** [numberArray a] makes a JSON array of the [float array] [a] *)
-
-external boolArray : bool array -> Js.Json.t = "%identity"
-(** [boolArray] makes a JSON array of the [bool array] [a] *)
diff --git a/src/vendor/Json_encode.res b/src/vendor/Json_encode.res
new file mode 100644
index 000000000..8f85bd662
--- /dev/null
+++ b/src/vendor/Json_encode.res
@@ -0,0 +1,61 @@
+type encoder<'a> = 'a => Js.Json.t
+
+@val external null: Js.Json.t = "null"
+external string: string => Js.Json.t = "%identity"
+external float: float => Js.Json.t = "%identity"
+external int: int => Js.Json.t = "%identity"
+external bool: bool => Js.Json.t = "%identity"
+
+let char = c => string(String.make(1, c))
+
+let date = d => string(Js.Date.toJSONUnsafe(d))
+
+let nullable = (encode, x) =>
+ switch x {
+ | None => null
+ | Some(v) => encode(v)
+ }
+
+let withDefault = (d, encode, x) =>
+ switch x {
+ | None => d
+ | Some(v) => encode(v)
+ }
+
+external jsonDict: Js_dict.t => Js.Json.t = "%identity"
+let dict = (encode, d) => {
+ let pairs = Js.Dict.entries(d)
+ let encodedPairs = Array.map(((k, v)) => (k, encode(v)), pairs)
+ jsonDict(Js.Dict.fromArray(encodedPairs))
+}
+
+let object_ = (props): Js.Json.t => jsonDict(Js.Dict.fromList(props))
+
+external jsonArray: array => Js.Json.t = "%identity"
+let array = (encode, l) => jsonArray(Array.map(x => encode(x), l))
+let list = (encode, x) =>
+ switch x {
+ | list{} => jsonArray([])
+ | list{hd, ...tl} as l =>
+ let a = Array.make(List.length(l), encode(hd))
+ let rec fill = (i, x) =>
+ switch x {
+ | list{} => a
+ | list{hd, ...tl} =>
+ Array.unsafe_set(a, i, encode(hd))
+ fill(i + 1, tl)
+ }
+
+ jsonArray(fill(1, tl))
+ }
+
+let pair = (encodeA, encodeB, (a, b)) => jsonArray([encodeA(a), encodeB(b)])
+let tuple2 = pair
+let tuple3 = (encodeA, encodeB, encodeC, (a, b, c)) =>
+ jsonArray([encodeA(a), encodeB(b), encodeC(c)])
+let tuple4 = (encodeA, encodeB, encodeC, encodeD, (a, b, c, d)) =>
+ jsonArray([encodeA(a), encodeB(b), encodeC(c), encodeD(d)])
+
+external stringArray: array => Js.Json.t = "%identity"
+external numberArray: array => Js.Json.t = "%identity"
+external boolArray: array => Js.Json.t = "%identity"
diff --git a/src/vendor/Json_encode.resi b/src/vendor/Json_encode.resi
new file mode 100644
index 000000000..957fd1453
--- /dev/null
+++ b/src/vendor/Json_encode.resi
@@ -0,0 +1,24 @@
+type encoder<'a> = 'a => Js.Json.t
+
+@val external null: Js.Json.t = "null"
+external string: string => Js.Json.t = "%identity"
+external float: float => Js.Json.t = "%identity"
+external int: int => Js.Json.t = "%identity"
+external bool: bool => Js.Json.t = "%identity"
+let char: char => Js.Json.t
+let date: Js.Date.t => Js.Json.t
+let nullable: (encoder<'a>, option<'a>) => Js.Json.t
+let withDefault: ('a, 'b => 'a, option<'b>) => 'a
+external jsonDict: Js_dict.t => Js.Json.t = "%identity"
+let dict: (encoder<'a>, Js.Dict.t<'a>) => Js.Json.t
+let object_: list<(Js.Dict.key, Js.Json.t)> => Js.Json.t
+external jsonArray: array => Js.Json.t = "%identity"
+let array: (encoder<'a>, array<'a>) => Js.Json.t
+let list: (encoder<'a>, list<'a>) => Js.Json.t
+let pair: (encoder<'a>, encoder<'b>, ('a, 'b)) => Js.Json.t
+let tuple2: (encoder<'a>, encoder<'b>, ('a, 'b)) => Js.Json.t
+let tuple3: (encoder<'a>, encoder<'b>, encoder<'c>, ('a, 'b, 'c)) => Js.Json.t
+let tuple4: (encoder<'a>, encoder<'b>, encoder<'c>, encoder<'d>, ('a, 'b, 'c, 'd)) => Js.Json.t
+external stringArray: array => Js.Json.t = "%identity"
+external numberArray: array => Js.Json.t = "%identity"
+external boolArray: array => Js.Json.t = "%identity"