Module aliases passed into LoadedModule, and used in docs to generate docs for aliases exposed by the module

compiler/load/src/file.rs

@@ -621,6 +621,7 @@ pub struct LoadedModule {
     pub type_problems: MutMap<ModuleId, Vec<solve::TypeError>>,
     pub declarations_by_id: MutMap<ModuleId, Vec<Declaration>>,
     pub exposed_to_host: MutMap<Symbol, Variable>,
+    pub exposed_aliases: MutMap<Symbol, Alias>,
     pub header_sources: MutMap<ModuleId, (PathBuf, Box<str>)>,
     pub sources: MutMap<ModuleId, (PathBuf, Box<str>)>,
     pub timings: MutMap<ModuleId, ModuleTiming>,
@@ -763,6 +764,7 @@ enum Msg<'a> {
     FinishedAllTypeChecking {
         solved_subs: Solved<Subs>,
         exposed_vars_by_symbol: MutMap<Symbol, Variable>,
+        exposed_aliases_by_symbol: MutMap<Symbol, Alias>,
         documentation: MutMap<ModuleId, ModuleDocumentation>,
     },
     FoundSpecializations {
@@ -1510,6 +1512,7 @@ where
                     Msg::FinishedAllTypeChecking {
                         solved_subs,
                         exposed_vars_by_symbol,
+                        exposed_aliases_by_symbol,
                         documentation,
                     } => {
                         // We're done! There should be no more messages pending.
@@ -1525,6 +1528,7 @@ where
                         return Ok(LoadResult::TypeChecked(finish(
                             state,
                             solved_subs,
+                            exposed_aliases_by_symbol,
                             exposed_vars_by_symbol,
                             documentation,
                         )));
@@ -1939,6 +1943,7 @@ fn update<'a>(
                     .send(Msg::FinishedAllTypeChecking {
                         solved_subs,
                         exposed_vars_by_symbol: solved_module.exposed_vars_by_symbol,
+                        exposed_aliases_by_symbol: solved_module.aliases,
                         documentation,
                     })
                     .map_err(|_| LoadingProblem::MsgChannelDied)?;
@@ -2263,6 +2268,7 @@ fn finish_specialization(
 fn finish(
     state: State,
     solved: Solved<Subs>,
+    exposed_aliases_by_symbol: MutMap<Symbol, Alias>,
     exposed_vars_by_symbol: MutMap<Symbol, Variable>,
     documentation: MutMap<ModuleId, ModuleDocumentation>,
 ) -> LoadedModule {
@@ -2290,6 +2296,10 @@ fn finish(
         .map(|(id, (path, src))| (id, (path, src.into())))
         .collect();
 
+    dbg!(&exposed_vars_by_symbol);
+    let exposed_aliases = exposed_aliases_by_symbol;
+    // todo!("Get exposed aliases");
+
     LoadedModule {
         module_id: state.root_id,
         interns,
@@ -2298,6 +2308,7 @@ fn finish(
         type_problems: state.module_cache.type_problems,
         declarations_by_id: state.declarations_by_id,
         exposed_to_host: exposed_vars_by_symbol.into_iter().collect(),
+        exposed_aliases,
         header_sources,
         sources,
         timings: state.timings,

docs/src/lib.rs

@@ -63,12 +63,23 @@ pub fn generate(filenames: Vec<PathBuf>, std_lib: StdLib, build_dir: &Path) {
 
     // Write each package's module docs html file
     for loaded_module in package.modules.iter_mut() {
-        let exposed_values = loaded_module
+        let mut exposed_values = loaded_module
             .exposed_to_host
             .iter()
             .map(|(symbol, _)| symbol.ident_string(&loaded_module.interns).to_string())
             .collect::<Vec<String>>();
 
+        let mut exposed_aliases = loaded_module
+            .exposed_aliases
+            .iter()
+            .map(|(symbol, _)| symbol.ident_string(&loaded_module.interns).to_string())
+            .collect::<Vec<String>>();
+
+        let mut exports = Vec::new();
+
+        exports.append(&mut exposed_values);
+        exports.append(&mut exposed_aliases);
+
         for module in loaded_module.documentation.values_mut() {
             let module_dir = build_dir.join(module.name.replace(".", "/").as_str());
 
@@ -83,7 +94,7 @@ pub fn generate(filenames: Vec<PathBuf>, std_lib: StdLib, build_dir: &Path) {
                 )
                 .replace(
                     "<!-- Module Docs -->",
-                    render_main_content(&loaded_module.interns, &exposed_values, module).as_str(),
+                    render_main_content(&loaded_module.interns, &exports, module).as_str(),
                 );
 
             fs::write(module_dir.join("index.html"), rendered_module)