fe check WIP

Author: Grant Wuerker

Cargo.lock

@@ -34,6 +34,7 @@ tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 tracing-tree = "0.4.0"
 wasm-bindgen-test = "0.3"
+semver = "1.0.26"
 
 [profile.dev]
 # Set to 0 to make the build faster and debugging more difficult.

Cargo.toml

@@ -2,19 +2,19 @@ use camino::Utf8PathBuf;
 use smol_str::SmolStr;
 use toml::Value;
 
-use crate::input::Version;
+use crate::ingot::Version;
 
 #[derive(Debug, Clone)]
 pub struct Config {
-    pub ingot: Ingot,
+    pub ingot: IngotMetadata,
     pub dependencies: Vec<Dependency>,
     pub diagnostics: Vec<ConfigDiagnostics>,
 }
 
 impl Config {
     pub fn from_string(content: String) -> Self {
         let mut diagnostics = Vec::new();
-        let mut ingot = Ingot::default();
+        let mut ingot = IngotMetadata::default();
         let mut dependencies = Vec::new();
 
         let parsed: Value = match content.parse() {
@@ -96,7 +96,7 @@ impl Config {
 }
 
 #[derive(Debug, Default, Clone)]
-pub struct Ingot {
+pub struct IngotMetadata {
     pub name: Option<SmolStr>,
     pub version: Option<Version>,
 }

crates/common/src/config.rs

@@ -23,12 +23,7 @@ impl Workspace {
     pub fn default(db: &dyn InputDb) -> Self {
         Workspace::new(db, Trie::new(), IndexMap::new())
     }
-    pub(crate) fn set(
-        &self,
-        db: &mut dyn InputDb,
-        url: Url,
-        file: File,
-    ) -> Result<File, InputIndexError> {
+    pub fn set(&self, db: &mut dyn InputDb, url: Url, file: File) -> Result<File, InputIndexError> {
         // Check if the file is already associated with another URL
         let paths = self.paths(db);
         if let Some(existing_url) = paths.get(&file) {

crates/common/src/file/workspace.rs

@@ -1,10 +1,8 @@
 use camino::Utf8PathBuf;
 use radix_immutable::StringPrefixView;
-use serde::Serialize;
 use url::Url;
 
-use crate::config::IngotMetadata;
-// use crate::config::IngotManifest;
+use crate::config::{Config, IngotMetadata};
 use crate::core::BUILTIN_CORE_BASE_URL;
 use crate::file::{File, Workspace};
 use crate::urlext::UrlExt;
@@ -106,12 +104,7 @@ pub trait IngotIndex {
     fn containing_ingot_base(&self, db: &dyn InputDb, location: &Url) -> Option<Url>;
     fn containing_ingot_config(self, db: &dyn InputDb, location: Url) -> Option<File>;
     fn containing_ingot<'db>(self, db: &'db dyn InputDb, location: &Url) -> Option<Ingot<'db>>;
-    fn touch_ingot<'db>(
-        self,
-        db: &'db mut dyn InputDb,
-        base_url: &Url,
-        initial_config: IngotMetadata,
-    ) -> Option<Ingot<'db>>;
+    fn touch_ingot<'db>(self, db: &'db mut dyn InputDb, base_url: &Url) -> Option<Ingot<'db>>;
 }
 
 pub type Version = serde_semver::semver::Version;
@@ -168,33 +161,19 @@ impl IngotIndex for Workspace {
         containing_ingot_impl(db, self, location.clone())
     }
 
-    fn touch_ingot<'db>(
-        self,
-        db: &'db mut dyn InputDb,
-        base_url: &Url,
-        config: IngotMetadata,
-    ) -> Option<Ingot<'db>> {
+    fn touch_ingot<'db>(self, db: &'db mut dyn InputDb, base_url: &Url) -> Option<Ingot<'db>> {
         let base_dir = base_url
             .directory()
             .expect("Base URL should have a directory");
         let config_file = base_dir
             .join("fe.toml")
             .expect("Config file should be indexed");
-        // Wrap the config in a proper IngotConfig wrapper for serialization
-        let ingot_config = IngotConfig { ingot: config };
-        let config_toml = toml::to_string(&ingot_config).unwrap_or_default();
-        let config = self.touch(db, config_file, Some(config_toml));
+        let config = self.touch(db, config_file, None);
 
         config.containing_ingot(db)
     }
 }
 
-/// A wrapper struct to ensure the config is serialized with an [ingot] table
-#[derive(Serialize)]
-struct IngotConfig {
-    ingot: IngotMetadata,
-}
-
 #[salsa::tracked]
 fn containing_ingot_impl<'db>(
     db: &'db dyn InputDb,