update to typst v0.10.0

Author: nvarner

Cargo.lock

@@ -27,9 +27,9 @@ native-tls = ["reqwest?/native-tls"]
 fontconfig = ["fontdb/fontconfig"]
 
 [dependencies]
-typst = { git = "https://github.com/typst/typst.git", tag = "v0.9.0" }
-typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.9.0" }
-typst-ide = { git = "https://github.com/typst/typst.git", tag = "v0.9.0" }
+typst = { git = "https://github.com/typst/typst.git", tag = "v0.10.0" }
+typst-ide = { git = "https://github.com/typst/typst.git", tag = "v0.10.0" }
+typst-pdf = { git = "https://github.com/typst/typst.git", tag = "v0.10.0" }
 
 anyhow = "1.0.71"
 async-compression = { version = "0.4.1", features = ["tokio", "gzip"] }
@@ -42,7 +42,11 @@ chrono = { version = "0.4.24", default-features = false, features = [
 comemo = "0.3"
 dirs = "5.0"
 elsa = "1.9.0"
-fontdb = { version = "0.16.0", default-features = false, features = ["std", "fs", "memmap"] }
+fontdb = { version = "0.16.0", default-features = false, features = [
+    "std",
+    "fs",
+    "memmap",
+] }
 futures = "0.3"
 if_chain = "1.0"
 indexmap = "2.1.0"

Cargo.toml

@@ -21,7 +21,7 @@ pub type TypstRange = std::ops::Range<usize>;
 pub type TypstTooltip = typst_ide::Tooltip;
 pub type LspHoverContents = lsp_types::HoverContents;
 
-pub type TypstDatetime = typst::eval::Datetime;
+pub type TypstDatetime = typst::foundations::Datetime;
 
 pub type LspDiagnostic = lsp_types::Diagnostic;
 pub type TypstDiagnostic = typst::diag::SourceDiagnostic;
@@ -30,7 +30,7 @@ pub type LspSeverity = lsp_types::DiagnosticSeverity;
 pub type TypstSeverity = typst::diag::Severity;
 
 pub type LspParamInfo = lsp_types::ParameterInformation;
-pub type TypstParamInfo = typst::eval::ParamInfo;
+pub type TypstParamInfo = typst::foundations::ParamInfo;
 
 /// An LSP range with its associated encoding.
 pub struct LspRange {
@@ -130,10 +130,9 @@ pub mod typst_to_lsp {
         LanguageString, Location, MarkedString, MarkupContent, MarkupKind, TextEdit,
     };
     use tracing::error;
-    use typst::diag::Tracepoint;
-    use typst::eval::{CastInfo, Repr};
+    use typst::diag::{EcoString, Tracepoint};
+    use typst::foundations::{CastInfo, Repr};
     use typst::syntax::{FileId, Source, Spanned};
-    use typst_library::prelude::EcoString;
 
     use crate::config::ConstConfig;
     use crate::server::diagnostics::DiagnosticsMap;

src/lsp_typst_boundary.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::Context;
 use tower_lsp::lsp_types::Url;
 use tracing::info;
-use typst::doc::Document;
+use typst::model::Document;
 
 use crate::ext::UrlExt;
 
@@ -22,7 +22,7 @@ impl TypstServer {
         self.thread_with_world(source_uri)
             .await?
             .run(move |world| {
-                let data = typst::export::pdf(&document, Some(pdf_uri.as_str()), world.now());
+                let data = typst_pdf::pdf(&document, Some(pdf_uri.as_str()), world.now());
 
                 world
                     .write_raw(&pdf_uri, &data)

src/server/export.rs

@@ -15,6 +15,8 @@ impl TypstServer {
     ) -> anyhow::Result<Option<Hover>> {
         let position_encoding = self.const_config().position_encoding;
 
+        let doc = self.document.lock().await.clone();
+
         let result = self
             .thread_with_world(uri)
             .await?
@@ -24,7 +26,7 @@ impl TypstServer {
                 let typst_offset =
                     lsp_to_typst::position_to_offset(position, position_encoding, &source);
 
-                let typst_tooltip = typst_ide::tooltip(&world, &[], &source, typst_offset)?;
+                let typst_tooltip = typst_ide::tooltip(&world, Some(&doc), &source, typst_offset)?;
 
                 Some((typst_offset, typst_tooltip))
             })

src/server/hover.rs

@@ -400,7 +400,7 @@ impl LanguageServer for TypstServer {
                 let typst_offset =
                     lsp_to_typst::position_to_offset(position, position_encoding, &source);
                 let (typst_start_offset, completions) =
-                    typst_ide::autocomplete(&world, &doc.pages, &source, typst_offset, explicit)?;
+                    typst_ide::autocomplete(&world, Some(&doc), &source, typst_offset, explicit)?;
                 let lsp_start_position =
                     offset_to_position(typst_start_offset, position_encoding, &source);
 

src/server/lsp.rs

@@ -6,7 +6,7 @@ use tokio::sync::{Mutex, OwnedRwLockReadGuard, RwLock, RwLockReadGuard};
 use tower_lsp::lsp_types::Url;
 use tower_lsp::Client;
 use tracing_subscriber::{reload, Registry};
-use typst::doc::Document;
+use typst::model::Document;
 use typst::syntax::Source;
 
 use crate::config::{Config, ConstConfig};
@@ -78,8 +78,8 @@ impl TypstServer {
             .expect("workspace should be initialized")
     }
 
-    pub fn typst_global_scopes(&self) -> typst::eval::Scopes {
-        typst::eval::Scopes::new(Some(&TYPST_STDLIB))
+    pub fn typst_global_scopes(&self) -> typst::foundations::Scopes {
+        typst::foundations::Scopes::new(Some(&TYPST_STDLIB))
     }
 
     #[tracing::instrument(skip(self))]

src/server/mod.rs

@@ -4,8 +4,8 @@ use tower_lsp::lsp_types::{
     Registration, SemanticToken, SemanticTokensEdit, SemanticTokensFullOptions,
     SemanticTokensLegend, SemanticTokensOptions, Unregistration,
 };
+use typst::diag::EcoString;
 use typst::syntax::{ast, LinkedNode, Source, SyntaxKind};
-use typst_library::prelude::EcoString;
 
 use self::delta::token_delta;
 use self::modifier_set::ModifierSet;

src/server/semantic_tokens/mod.rs

@@ -1,6 +1,6 @@
 use tower_lsp::lsp_types::{Position, SemanticToken};
+use typst::diag::EcoString;
 use typst::syntax::Source;
-use typst_library::prelude::EcoString;
 
 use crate::config::PositionEncoding;
 use crate::ext::{PositionExt, StrExt};

src/server/semantic_tokens/token_encode.rs

@@ -4,7 +4,7 @@ use tower_lsp::lsp_types::{
     SignatureInformation, Url,
 };
 use tracing::trace;
-use typst::eval::{Func, ParamInfo, Scopes, Value};
+use typst::foundations::{Func, ParamInfo, Scopes, Value};
 use typst::syntax::{ast, LinkedNode, Source, SyntaxKind};
 
 use crate::lsp_typst_boundary::{lsp_to_typst, typst_to_lsp, LspPosition, TypstOffset};

src/server/signature.rs

@@ -2,8 +2,10 @@ use std::sync::Arc;
 
 use comemo::Track;
 use tower_lsp::lsp_types::Url;
-use typst::doc::Document;
-use typst::eval::{Module, Route, Tracer};
+use typst::engine::Route;
+use typst::eval::Tracer;
+use typst::foundations::Module;
+use typst::model::Document;
 use typst::World;
 
 use crate::lsp_typst_boundary::typst_to_lsp;

src/server/typst_compiler.rs

@@ -7,8 +7,8 @@ use comemo::Prehashed;
 use fontdb::{Database, Source};
 use once_cell::sync::OnceCell;
 use tracing::error;
-use typst::eval::Bytes;
-use typst::font::{Font, FontBook, FontInfo};
+use typst::foundations::Bytes;
+use typst::text::{Font, FontBook, FontInfo};
 
 use super::fs::local::LocalFs;
 use super::fs::FsError;

src/workspace/font_manager.rs

@@ -5,7 +5,7 @@ use elsa::sync::FrozenMap;
 use once_cell::sync::OnceCell;
 use tower_lsp::lsp_types::Url;
 use tracing::trace;
-use typst::eval::Bytes;
+use typst::foundations::Bytes;
 use typst::syntax::Source;
 
 use crate::ext::PathExt;

src/workspace/fs/cache.rs

@@ -2,7 +2,7 @@ use std::fs;
 use std::path::{Path, PathBuf};
 
 use tower_lsp::lsp_types::Url;
-use typst::eval::Bytes;
+use typst::foundations::Bytes;
 use typst::syntax::Source;
 use walkdir::WalkDir;
 

src/workspace/fs/local.rs

@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use anyhow::anyhow;
 use tower_lsp::lsp_types::{TextDocumentContentChangeEvent, Url};
-use typst::eval::Bytes;
+use typst::foundations::Bytes;
 use typst::syntax::Source;
 
 use crate::config::PositionEncoding;

src/workspace/fs/lsp.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use tower_lsp::lsp_types::{TextDocumentContentChangeEvent, Url};
-use typst::eval::Bytes;
+use typst::foundations::Bytes;
 use typst::syntax::Source;
 
 use crate::config::PositionEncoding;

src/workspace/fs/manager.rs

@@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
 use tower_lsp::lsp_types::Url;
 use tracing::error;
 use typst::diag::FileError;
-use typst::eval::Bytes;
+use typst::foundations::Bytes;
 use typst::syntax::{FileId, Source};
 
 use crate::ext::UriError;

src/workspace/fs/mod.rs

@@ -40,8 +40,9 @@ use tower_lsp::lsp_types::{
     InitializeParams, TextDocumentContentChangeEvent, Url, WorkspaceFoldersChangeEvent,
 };
 use tracing::trace;
-use typst::eval::{Bytes, Library};
+use typst::foundations::Bytes;
 use typst::syntax::Source;
+use typst::Library;
 
 use crate::config::PositionEncoding;
 use crate::ext::InitializeParamsExt;
@@ -60,7 +61,7 @@ pub mod project;
 pub mod world;
 
 lazy_static! {
-    pub static ref TYPST_STDLIB: Prehashed<Library> = Prehashed::new(typst_library::build());
+    pub static ref TYPST_STDLIB: Prehashed<Library> = Prehashed::new(Library::default());
 }
 
 #[derive(Debug)]

src/workspace/mod.rs

@@ -4,9 +4,10 @@ use std::sync::Arc;
 use comemo::Prehashed;
 use tokio::sync::OwnedRwLockReadGuard;
 use tower_lsp::lsp_types::Url;
-use typst::eval::{Bytes, Library};
-use typst::font::{Font, FontBook};
+use typst::foundations::Bytes;
 use typst::syntax::{FileId, Source};
+use typst::text::{Font, FontBook};
+use typst::Library;
 
 use crate::ext::FileIdExt;
 

src/workspace/project.rs

@@ -3,10 +3,10 @@ use futures::Future;
 use tokio::runtime;
 use tower_lsp::lsp_types::Url;
 use typst::diag::{EcoString, FileResult};
-use typst::eval::{Bytes, Datetime, Library};
-use typst::font::{Font, FontBook};
+use typst::foundations::{Bytes, Datetime};
 use typst::syntax::{FileId, PackageSpec, Source};
-use typst::World;
+use typst::text::{Font, FontBook};
+use typst::{Library, World};
 
 use crate::workspace::fs::{FsError, FsResult};
 use crate::workspace::project::Project;