WIP

Author: josevalim

src/hexdocs.gleam

@@ -50,8 +50,8 @@ fn update(model: Model, msg: Msg) {
     msg.ApiReturnedPackages(response) -> api_returned_packages(model, response)
     msg.ApiReturnedTypesenseSearch(response) ->
       api_returned_typesense_search(model, response)
-    msg.ApiReturnedInitialLatestPackages(versions) ->
-      api_returned_initial_latest_packages(model, versions)
+    msg.ApiReturnedInitialLatestPackages(packages, versions) ->
+      api_returned_initial_latest_packages(model, packages, versions)
 
     msg.DocumentChangedLocation(location:) ->
       model.update_route(model, location)
@@ -166,14 +166,14 @@ fn api_returned_typesense_search(model: Model, response: Loss(decode.Dynamic)) {
 
 fn api_returned_initial_latest_packages(
   model: Model,
+  packages: List(String),
   versions: Loss(List(hexpm.Package)),
-) -> #(Model, Effect(a)) {
+) {
   case versions {
-    Error(_) -> model.replace_search_packages(model)
-    Ok(versions) ->
-      model.add_packages_versions(model, versions)
-      |> model.replace_search_packages
+    Error(_) -> model.add_missing_packages(model, packages)
+    Ok(versions) -> model.add_packages_versions(model, versions)
   }
+  |> model.replace_search_packages
 }
 
 fn document_registered_event_listener(model: Model, unsubscriber: fn() -> Nil) {
@@ -310,10 +310,8 @@ fn user_clicked_go_back(model: Model) -> #(Model, Effect(msg)) {
 fn user_submitted_packages_filter(model: Model) {
   let package = model.search_packages_filter_input
   let version = model.search_packages_filter_version_input
-  model.packages_versions
-  |> dict.get(package)
-  |> result.map(fn(package) { package.releases })
-  |> result.try(list.find(_, fn(r) { r.version == version }))
+
+  model.find_matching_package_version(model, package, version)
   |> result.map(fn(_) {
     let search_packages_filters =
       [version.Package(name: package, version: version, resolved: True)]
@@ -371,7 +369,12 @@ fn user_selected_package_filter_version(model: Model) {
   let releases =
     model.packages_versions
     |> dict.get(package)
-    |> result.map(fn(p) { p.releases })
+    |> result.try(fn(maybe_package) {
+      case maybe_package {
+        None -> Error(Nil)
+        Some(package) -> Ok(package.releases)
+      }
+    })
     |> result.unwrap([])
   let release =
     releases

src/hexdocs/data/model.gleam

@@ -35,8 +35,7 @@ pub type Model {
     /// Stores the content of the `https://hexdocs.pm/package_names.csv`.
     packages: List(String),
     /// Stores the different versions of a package.
-    /// `Dict(Package Name, hexpm.Package)`.
-    packages_versions: Dict(String, hexpm.Package),
+    packages_versions: Dict(String, Option(hexpm.Package)),
     /// Stores the open state of the sidebar.
     sidebar_opened: Bool,
     dom_click_sidebar_unsubscriber: Option(fn() -> Nil),
@@ -119,14 +118,26 @@ pub fn add_packages(model: Model, packages: List(String)) -> Model {
   Model(..model, packages:)
 }
 
-pub fn add_packages_versions(
-  model: Model,
-  packages: List(hexpm.Package),
-) -> Model {
-  use model, package <- list.fold(packages, model)
-  Model(..model, packages_versions: {
-    dict.insert(model.packages_versions, package.name, package)
-  })
+pub fn add_packages_versions(model: Model, packages: List(hexpm.Package)) {
+  let packages_versions = {
+    use packages_versions, package <- list.fold(
+      packages,
+      model.packages_versions,
+    )
+    dict.insert(packages_versions, package.name, Some(package))
+  }
+  Model(..model, packages_versions:)
+}
+
+pub fn add_missing_packages(model: Model, packages: List(String)) {
+  let packages_versions = {
+    use packages_versions, package <- list.fold(
+      packages,
+      model.packages_versions,
+    )
+    dict.insert(packages_versions, package, None)
+  }
+  Model(..model, packages_versions:)
 }
 
 pub fn toggle_sidebar(model: Model) {
@@ -233,18 +244,23 @@ pub fn update_route(model: Model, route: uri.Uri) {
           return: version.Package(package, version, resolved: True),
         )
         case dict.get(model.packages_versions, package) {
+          // We didn't index it yet
           Error(_) -> version.Package(package, version, resolved: False)
-          Ok(versions) -> {
-            case versions.releases {
-              [] -> version.Package(package, version, resolved: False)
+          // We tried but we could not find it
+          Ok(None) -> version.Package(package, version, resolved: True)
+          // We found the packages
+          Ok(Some(hex_package)) -> {
+            case hex_package.releases {
+              [] -> version.Package(package, version, resolved: True)
               [release, ..] ->
                 version.Package(package, release.version, resolved: True)
             }
           }
         }
       }
 
-      let latest = list.filter(packages, fn(p) { p.version == "latest" })
+      let latest =
+        list.filter(packages, fn(p) { p.version == "latest" && !p.resolved })
 
       let model =
         Model(..model, search_input: q, search_packages_filters: packages)
@@ -312,10 +328,7 @@ pub fn select_autocomplete_option(model: Model, package: String) {
         Version -> {
           let version = package
           let package = model.search_packages_filter_input_displayed
-          model.packages_versions
-          |> dict.get(package)
-          |> result.map(fn(package) { package.releases })
-          |> result.try(list.find(_, fn(r) { r.version == version }))
+          find_matching_package_version(model, package, version)
           |> result.map(fn(_) {
             Model(
               ..model,
@@ -330,6 +343,22 @@ pub fn select_autocomplete_option(model: Model, package: String) {
   }
 }
 
+pub fn find_matching_package_version(
+  model: Model,
+  package: String,
+  version: String,
+) {
+  model.packages_versions
+  |> dict.get(package)
+  |> result.try(fn(maybe_package) {
+    case maybe_package {
+      None -> Error(Nil)
+      Some(package) -> Ok(package.releases)
+    }
+  })
+  |> result.try(list.find(_, fn(r) { r.version == version }))
+}
+
 /// When going from the home page, where you have a free text input to the
 /// search page, it's needed to keep the different parts of the search, while
 /// changing how they're handled in the model. That function transforms the
@@ -398,11 +427,12 @@ fn extract_packages_filters_or_fetches(model: Model) {
       None -> {
         case dict.get(model.packages_versions, package) {
           Error(_) -> #(filters, [package, ..packages_to_fetch])
-          Ok(versionned) -> {
-            case list.first(versionned.releases) {
+          Ok(None) -> #(filters, packages_to_fetch)
+          Ok(Some(hex_package)) -> {
+            case hex_package.releases {
               // That case is impossible, returning the neutral element.
-              Error(_) -> #(filters, packages_to_fetch)
-              Ok(release) -> {
+              [] -> #(filters, packages_to_fetch)
+              [release, ..] -> {
                 let ver = release.version
                 #(
                   [
@@ -488,12 +518,12 @@ pub fn autocomplete_versions(model: Model, search: String) {
     Error(_) -> #(model, effect.none())
     Ok(#(package, version)) -> {
       case dict.get(model.packages_versions, package) {
-        Error(_) ->
+        Error(_) | Ok(None) ->
           case list.contains(model.packages, package) {
             True -> #(model, effects.package_versions(package))
             False -> #(model, effect.none())
           }
-        Ok(package) -> {
+        Ok(Some(package)) -> {
           let versions = list.map(package.releases, fn(r) { r.version })
           let autocomplete = autocomplete.init(versions, version)
           let autocomplete = #(Version, autocomplete)

src/hexdocs/data/msg.gleam

@@ -10,7 +10,10 @@ pub type Msg {
   ApiReturnedPackages(Loss(String))
   ApiReturnedTypesenseSearch(Loss(Dynamic))
   ApiReturnedPackagesVersions(packages: Loss(List(hexpm.Package)))
-  ApiReturnedInitialLatestPackages(versions: Loss(List(hexpm.Package)))
+  ApiReturnedInitialLatestPackages(
+    packages: List(String),
+    versions: Loss(List(hexpm.Package)),
+  )
 
   // Application messages.
   DocumentChangedLocation(location: uri.Uri)

src/hexdocs/effects.gleam

@@ -45,7 +45,7 @@ pub fn initial_latest_packages(packages: List(String)) {
       }
     }
   }
-  dispatch(msg.ApiReturnedInitialLatestPackages(versions:))
+  dispatch(msg.ApiReturnedInitialLatestPackages(packages:, versions:))
 }
 
 pub fn subscribe_blurred_search() {