refactor: clean up the config crate (#1528)

* feat: clean up config crates

* refactor: reorder config items

* refactor: a bit

benches/font-load/src/load.rs

@@ -20,7 +20,7 @@ fn load_embedded() {
 fn load_system() {
     let config = Config::default();
 
-    let _fonts = config.compile.determine_fonts();
+    let _fonts = config.fonts();
 }
 
 /*

crates/tinymist/src/cmd.rs

@@ -69,7 +69,7 @@ impl ServerState {
                     .map_err(|e| invalid_params(format!("Cannot parse creation timestamp: {e}")))?,
             )
         } else {
-            self.config.compile.determine_creation_timestamp()
+            self.config.creation_timestamp()
         };
 
         let export = self.config.export_task();

crates/tinymist/src/input.rs

@@ -136,7 +136,7 @@ impl ServerState {
     pub fn focus_main_file(&mut self, new_entry: Option<ImmutPath>) -> Result<bool> {
         if self.pinning_by_user
             || (self.pinning_by_preview && !self.pinning_by_browsing_preview)
-            || self.config.compile.has_default_entry_path
+            || self.config.has_default_entry_path
         {
             self.focusing = new_entry;
             return Ok(false);
@@ -207,7 +207,7 @@ impl ServerState {
 
     pub(crate) fn resolve_task(&mut self, path: ImmutPath) -> TaskInputs {
         let proj_input = matches!(
-            self.config.project_resolution,
+            self.entry_resolver().project_resolution,
             ProjectResolutionKind::LockDatabase
         )
         .then(|| {

crates/tinymist/src/lsp.rs

@@ -139,8 +139,8 @@ impl ServerState {
             self.change_export_config(new_export_config);
         }
 
-        if old_config.compile.primary_opts() != self.config.compile.primary_opts() {
+        if old_config.primary_opts() != self.config.primary_opts() {
-            self.config.compile.fonts = OnceCell::new(); // todo: don't reload fonts if not changed
+            self.config.fonts = OnceCell::new(); // todo: don't reload fonts if not changed
             self.reload_projects()
                 .log_error("could not restart primary");
         }

crates/tinymist/src/main.rs

@@ -22,9 +22,7 @@ use tinymist::tool::project::{
     compile_main, coverage_main, generate_script_main, project_main, task_main,
 };
 use tinymist::world::TaskInputs;
-use tinymist::{
+use tinymist::{Config, DapRegularInit, RegularInit, ServerState, SuperInit, UserActionTask};
-    CompileConfig, Config, DapRegularInit, RegularInit, ServerState, SuperInit, UserActionTask,
-};
 use tinymist_core::LONG_VERSION;
 use tinymist_project::EntryResolver;
 use tinymist_query::package::PackageInfo;
@@ -205,14 +203,11 @@ pub fn trace_lsp_main(args: TraceLspArgs) -> Result<()> {
         let client = client_root.weak();
         let roots = vec![ImmutPath::from(root_path)];
         let config = Config {
-            compile: CompileConfig {
+            entry_resolver: EntryResolver {
-                entry_resolver: EntryResolver {
+                roots,
-                    roots,
+                ..EntryResolver::default()
-                    ..EntryResolver::default()
-                },
-                font_opts: args.compile.font,
-                ..CompileConfig::default()
             },
+            font_opts: args.compile.font,
             ..Config::default()
         };
 

crates/tinymist/src/project.rs

@@ -123,7 +123,7 @@ impl ServerState {
         dedicate: &str,
         entry: Option<ImmutPath>,
     ) -> Result<ProjectInsId> {
-        let entry = self.config.compile.entry_resolver.resolve(entry);
+        let entry = self.config.entry_resolver.resolve(entry);
         let enable_html = matches!(self.config.export_target, ExportTarget::Html);
         self.project.restart_dedicate(dedicate, entry, enable_html)
     }
@@ -145,7 +145,7 @@ impl ServerState {
         );
 
         // Create the compile handler for client consuming results.
-        let periscope_args = config.compile.periscope_args.clone();
+        let periscope_args = config.periscope_args.clone();
         let handle = Arc::new(CompileHandlerImpl {
             #[cfg(feature = "preview")]
             preview,
@@ -159,7 +159,7 @@ impl ServerState {
                 allow_multiline_token: const_config.tokens_multiline_token_support,
                 remove_html: !config.support_html_in_markdown,
                 completion_feat: config.completion.clone(),
-                color_theme: match config.compile.color_theme.as_deref() {
+                color_theme: match config.color_theme.as_deref() {
                     Some("dark") => tinymist_query::ColorTheme::Dark,
                     _ => tinymist_query::ColorTheme::Light,
                 },
@@ -179,15 +179,15 @@ impl ServerState {
         });
 
         let export_target = config.export_target;
-        let default_path = config.compile.entry_resolver.resolve_default();
+        let default_path = config.entry_resolver.resolve_default();
-        let entry = config.compile.entry_resolver.resolve(default_path);
+        let entry = config.entry_resolver.resolve(default_path);
-        let inputs = config.compile.determine_inputs();
+        let inputs = config.inputs();
-        let cert_path = config.compile.determine_certification_path();
+        let cert_path = config.certification_path();
-        let package = config.compile.determine_package_opts();
+        let package = config.package_opts();
 
         log::info!("ServerState: creating ProjectState, entry: {entry:?}, inputs: {inputs:?}");
 
-        let fonts = config.compile.determine_fonts();
+        let fonts = config.fonts();
         let package_registry =
             LspUniverseBuilder::resolve_package(cert_path.clone(), Some(&package));
         let verse =

crates/tinymist/src/server.rs

@@ -141,14 +141,9 @@ impl ServerState {
         &self.config.const_config
     }
 
-    /// Gets the compile configuration.
-    pub fn compile_config(&self) -> &CompileConfig {
-        &self.config.compile
-    }
-
     /// Gets the entry resolver.
     pub fn entry_resolver(&self) -> &EntryResolver {
-        &self.compile_config().entry_resolver
+        &self.config.entry_resolver
     }
 
     /// Whether the main file is pinning.
@@ -162,7 +157,7 @@ impl ServerState {
 
     /// The entry point for the language server.
     pub fn main(client: TypedLspClient<Self>, config: Config, start: bool) -> Self {
-        log::info!("LanguageState: initialized with config {config:?}");
+        log::info!("ServerState: initialized with config {config:?}");
 
         // Bootstrap server
         let (editor_tx, editor_rx) = mpsc::unbounded_channel();
@@ -173,7 +168,7 @@ impl ServerState {
             let editor_actor = EditorActor::new(
                 client.clone().to_untyped(),
                 editor_rx,
-                service.config.compile.notify_status,
+                service.config.notify_status,
             );
 
             service
@@ -393,7 +388,7 @@ impl ServerState {
     pub fn on_export(&mut self, req: OnExportRequest) -> QueryFuture {
         let OnExportRequest { path, task, open } = req;
         let entry = self.entry_resolver().resolve(Some(path.as_path().into()));
-        let lock_dir = self.compile_config().entry_resolver.resolve_lock(&entry);
+        let lock_dir = self.entry_resolver().resolve_lock(&entry);
 
         let update_dep = lock_dir.clone().map(|lock_dir| {
             |snap: LspCompileSnapshot| async move {

crates/tinymist/src/utils.rs

@@ -52,7 +52,3 @@ pub fn try_<T>(f: impl FnOnce() -> Option<T>) -> Option<T> {
 pub fn try_or<T>(f: impl FnOnce() -> Option<T>, default: T) -> T {
     f().unwrap_or(default)
 }
-
-pub fn try_or_default<T: Default>(f: impl FnOnce() -> Option<T>) -> T {
-    f().unwrap_or_default()
-}

docs/tinymist/module/lsp.typ

@@ -30,7 +30,7 @@ There are three servers in the `server` directory:
 - `trace` provides the trace server (profiling typst programs), initialized by `trace_lsp_main` in `main.rs`.
 - `preview` provides a `typst-preview` compatible preview server, initialized by `preview_main` in `tool/preview.rs`.
 
-The long-running servers are contributed by the `LanguageState` in the `server.rs` file.
+The long-running servers are contributed by the `ServerState` in the `server.rs` file.
 
 They will bootstrap actors in the `actor` directory and start tasks in the `task` directory.