version as string

Author: aspeddro

src/common/App.res

@@ -59,13 +59,13 @@ let make = (props: props): React.element => {
     switch pagepath[0] {
     | Some("api") =>
       switch url->Url.getVersionString {
-      | "v11.0.0" | "v12.0.0" =>
+      | ("v11.0.0" | "v12.0.0") as version =>
         switch (Array.length(pagepath), pagepath[1]) {
-        | (1, _) => <ApiOverviewLayout.Docs version=url> content </ApiOverviewLayout.Docs>
+        | (1, _) => <ApiOverviewLayout.Docs version> content </ApiOverviewLayout.Docs>
         | _ => content
         }
-      | "v8.0.0" | "v9.0.0" | "v10.0.0" =>
-        <ApiOverviewLayoutLegacy version=url> content </ApiOverviewLayoutLegacy>
+      | ("v8.0.0" | "v9.0.0" | "v10.0.0") as version =>
+        <ApiOverviewLayoutLegacy version> content </ApiOverviewLayoutLegacy>
       | _ => content
       }
     | _ =>

src/layouts/ApiOverviewLayout.res

@@ -1,31 +1,26 @@
 module Sidebar = SidebarLayout.Sidebar
 
-let makeCategories: Url.t => array<Sidebar.Category.t> = url => {
-  switch url.version {
-  | Version("v12.0.0" | "v11.0.0") | Latest | Next =>
-    let version = Url.getVersionString(url)
-    [
-      {
-        name: "Overview",
-        items: [
-          {name: "Introduction", href: `/docs/manual/${version}/api`},
-          if version >= "v12.0.0" {
-            {name: "Stdlib", href: `/docs/manual/${version}/api/stdlib`}
-          } else {
-            {name: "Core", href: `/docs/manual/${version}/api/core`}
-          },
-        ],
-      },
-      {
-        name: "Additional Libraries",
-        items: [
-          {name: "Belt", href: `/docs/manual/${version}/api/belt`},
-          {name: "Dom", href: `/docs/manual/${version}/api/dom`},
-        ],
-      },
-    ]
-  | _ => throw(Failure(`Invalid version ${url->Url.getVersionString}`))
-  }
+let makeCategories: string => array<Sidebar.Category.t> = version => {
+  [
+    {
+      name: "Overview",
+      items: [
+        {name: "Introduction", href: `/docs/manual/${version}/api`},
+        if version >= "v12.0.0" {
+          {name: "Stdlib", href: `/docs/manual/${version}/api/stdlib`}
+        } else {
+          {name: "Core", href: `/docs/manual/${version}/api/core`}
+        },
+      ],
+    },
+    {
+      name: "Additional Libraries",
+      items: [
+        {name: "Belt", href: `/docs/manual/${version}/api/belt`},
+        {name: "Dom", href: `/docs/manual/${version}/api/dom`},
+      ],
+    },
+  ]
 }
 
 /* Used for API docs (structured data) */
@@ -36,11 +31,10 @@ module Docs = {
     let route = router.route
 
     let categories = makeCategories(version)
-    let versionStr = Url.getVersionString(version)
 
-    <ApiLayout categories version=versionStr components>
-      {switch version.version {
-      | Version("v9.0.0" | "v8.0.0") => <ApiLayout.OldDocsWarning route version=versionStr />
+    <ApiLayout categories version components>
+      {switch version {
+      | "v9.0.0" | "v8.0.0" => <ApiLayout.OldDocsWarning route version />
       | _ => React.null
       }}
       children

src/layouts/ApiOverviewLayout.resi

@@ -1,7 +1,7 @@
 module Docs: {
   @react.component
   let make: (
-    ~version: Url.t,
+    ~version: string,
     ~components: MarkdownComponents.t=?,
     ~children: React.element,
   ) => React.element

src/layouts/ApiOverviewLayoutLegacy.res

@@ -329,14 +329,16 @@ let moduleCategories = (moduleName, version) => {
 }
 
 @react.component
-let make = (~components=ApiMarkdown.default, ~version: Url.t, ~children) => {
+let make = (~components=ApiMarkdown.default, ~version, ~children) => {
   let router = Next.Router.useRouter()
   let route = router.route
-  let versionStr = version->Url.getVersionString
+  let url = router.route->Url.parse
+
+  let versionStr = version
 
   let warnBanner = <ApiLayout.OldDocsWarning route version=versionStr />
 
-  switch version.pagepath->Array.get(1) {
+  switch url.pagepath->Array.get(1) {
   | None =>
     let title = "API"
     let categories: array<Category.t> = [
@@ -348,7 +350,7 @@ let make = (~components=ApiMarkdown.default, ~version: Url.t, ~children) => {
         name: "Modules",
         items: [
           {name: "Js Module", href: `/docs/manual/${versionStr}/api/js`},
-          {name: "Belt Stdlib", href: `/docs/manual/${versionStr}/api/belt`},
+          {name: "Belt Module", href: `/docs/manual/${versionStr}/api/belt`},
           {name: "Dom Module", href: `/docs/manual/${versionStr}/api/dom`},
         ],
       },
@@ -360,7 +362,7 @@ let make = (~components=ApiMarkdown.default, ~version: Url.t, ~children) => {
   | Some(moduleName) =>
     let indexData = switch Dict.get(indexData, moduleName) {
     | Some(moduleData) =>
-      Dict.get(moduleData, version->Url.getVersionString)->Option.getOrThrow(
+      Dict.get(moduleData, version)->Option.getOrThrow(
         ~message=`Not found data for ${moduleName} version ${versionStr}`,
       )
     | None => throw(Failure(`Not found index data for module: ${moduleName}`))

src/layouts/ApiOverviewLayoutLegacy.resi

@@ -1,6 +1,6 @@
 @react.component
 let make: (
   ~components: MarkdownComponents.t=?,
-  ~version: Url.t,
+  ~version: string,
   ~children: React.element,
 ) => React.element