move logic from PackageSourceMap to PackageSources

Author: wilfreddenton

crates/wit-parser/src/resolve/fs.rs

@@ -1,16 +1,13 @@
 //! Filesystem operations for [`Resolve`].
 
-use alloc::collections::BTreeMap;
 use alloc::format;
-use alloc::string::ToString;
-use alloc::vec;
 use std::path::Path;
 use std::vec::Vec;
 
 use anyhow::{Context, Result, bail};
 
 use super::{PackageSources, Resolve};
-use crate::{IndexSet, UnresolvedPackageGroup};
+use crate::UnresolvedPackageGroup;
 
 /// All the sources used during resolving a directory or path.
 #[derive(Clone, Debug)]
@@ -24,10 +21,7 @@ impl PackageSourceMap {
             .to_str()
             .ok_or_else(|| anyhow::anyhow!("path is not valid utf-8: {:?}", source))?;
         Ok(Self {
-            inner: PackageSources {
-                sources: vec![vec![path_str.to_string()]],
-                package_id_to_source_map_idx: BTreeMap::from([(package_id, 0)]),
-            },
+            inner: PackageSources::from_single_source(package_id, path_str),
         })
     }
 
@@ -37,24 +31,14 @@ impl PackageSourceMap {
 
     /// All unique source paths.
     pub fn paths(&self) -> impl Iterator<Item = &Path> {
-        // Usually any two source map should not have duplicated source paths,
-        // but it can happen, e.g. with using [`Resolve::push_str`] directly.
-        // To be sure we use a set for deduplication here.
-        self.inner
-            .sources
-            .iter()
-            .flatten()
-            .map(|s| Path::new(s))
-            .collect::<IndexSet<&Path>>()
-            .into_iter()
+        self.inner.source_names().map(Path::new)
     }
 
     /// Source paths for package
     pub fn package_paths(&self, id: super::PackageId) -> Option<impl Iterator<Item = &Path>> {
         self.inner
-            .package_id_to_source_map_idx
-            .get(&id)
-            .map(|&idx| self.inner.sources[idx].iter().map(|s| Path::new(s)))
+            .package_source_names(id)
+            .map(|iter| iter.map(Path::new))
     }
 }
 

crates/wit-parser/src/resolve/mod.rs

@@ -131,11 +131,19 @@ pub type PackageId = Id<Package>;
 /// Source name mappings for resolved packages (no_std compatible).
 #[derive(Clone, Debug)]
 pub struct PackageSources {
-    pub(crate) sources: Vec<Vec<String>>,
-    pub(crate) package_id_to_source_map_idx: BTreeMap<PackageId, usize>,
+    sources: Vec<Vec<String>>,
+    package_id_to_source_map_idx: BTreeMap<PackageId, usize>,
 }
 
 impl PackageSources {
+    #[cfg(feature = "std")]
+    fn from_single_source(package_id: PackageId, source: &str) -> Self {
+        Self {
+            sources: vec![vec![source.to_owned()]],
+            package_id_to_source_map_idx: BTreeMap::from([(package_id, 0)]),
+        }
+    }
+
     fn from_source_maps(
         source_maps: Vec<SourceMap>,
         package_id_to_source_map_idx: BTreeMap<PackageId, usize>,
@@ -159,6 +167,23 @@ impl PackageSources {
             package_id_to_source_map_idx,
         }
     }
+
+    /// All unique source names.
+    pub fn source_names(&self) -> impl Iterator<Item = &str> {
+        self.sources
+            .iter()
+            .flatten()
+            .map(|s| s.as_str())
+            .collect::<IndexSet<&str>>()
+            .into_iter()
+    }
+
+    /// Source names for a specific package.
+    pub fn package_source_names(&self, id: PackageId) -> Option<impl Iterator<Item = &str>> {
+        self.package_id_to_source_map_idx
+            .get(&id)
+            .map(|&idx| self.sources[idx].iter().map(|s| s.as_str()))
+    }
 }
 
 /// Visitor helper for performing topological sort on a group of packages.