fix ordering

Author: crowlKats

src/html/mod.rs

@@ -2,6 +2,7 @@ use deno_ast::ModuleSpecifier;
 use handlebars::handlebars_helper;
 use handlebars::Handlebars;
 use indexmap::IndexMap;
+use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::rc::Rc;
@@ -161,7 +162,7 @@ impl<'ctx> GenerateCtx<'ctx> {
   }
 }
 
-#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub struct ShortPath {
   pub path: String,
   pub specifier: ModuleSpecifier,
@@ -244,6 +245,21 @@ impl ShortPath {
   }
 }
 
+impl Ord for ShortPath {
+  fn cmp(&self, other: &Self) -> Ordering {
+    self
+      .is_main
+      .cmp(&other.is_main)
+      .then_with(|| self.display_name().cmp(&other.display_name()))
+  }
+}
+
+impl PartialOrd for ShortPath {
+  fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+    Some(self.cmp(other))
+  }
+}
+
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
 pub enum DocNodeKindWithDrilldown {
   Property,

src/html/partition.rs

@@ -264,18 +264,13 @@ pub fn partition_nodes_by_entrypoint(
     flatten_namespaces,
   );
 
-  for (_kind, nodes) in partitions.iter_mut() {
-    nodes.sort_by_key(|n| n.get_name().to_string());
+  for (_file, nodes) in partitions.iter_mut() {
+    nodes.sort_by(compare_node);
   }
 
+  partitions.sort_keys();
+
   partitions
-    .sorted_by(|key1, _value1, key2, _value2| {
-      key1
-        .is_main
-        .cmp(&key2.is_main)
-        .then_with(|| key1.display_name().cmp(&key2.display_name()))
-    })
-    .collect()
 }
 
 fn compare_node(
@@ -298,9 +293,11 @@ fn compare_node(
     .then_with(|| {
       node1
         .get_name()
-        .cmp(node2.get_name())
-        .then_with(|| node1.kind.cmp(&node2.kind))
+        .to_ascii_lowercase()
+        .cmp(&node2.get_name().to_ascii_lowercase())
     })
+    .then_with(|| node1.get_name().cmp(node2.get_name()))
+    .then_with(|| node1.kind.cmp(&node2.kind))
 }
 
 pub fn get_partitions_for_file(