feat: remove compiler crate

.github/workflows/ci.yaml

@@ -61,7 +61,7 @@ jobs:
       - name: Test
         run: |
           cargo test --profile release-ci --no-fail-fast \
-            -p typst-ts-core -p typst-ts-compiler \
+            -p typst-ts-core \
             -p typst-ts-cli  -p typst-ts-integration-test
       - name: Archive Test Results (WebAssembly Renderer in Chrome)
         if: always()

Cargo.toml

@@ -16,6 +16,7 @@ members = [
     "crates/reflexo",
     "crates/reflexo-vfs",
     "crates/reflexo-world",
+    "crates/reflexo-typst",
     "crates/conversion/typst2vec",
     "crates/conversion/vec2canvas",
     "crates/conversion/vec2bbox",
@@ -24,8 +25,6 @@ members = [
     "crates/conversion/vec2svg",
 
     "cli",
-    "core",
-    "compiler",
 
     "fuzzers/incremental",
 
@@ -211,7 +210,6 @@ reflexo-vec2sema = { version = "0.5.0-rc6", path = "crates/conversion/vec2sema"
 reflexo-vec2bbox = { version = "0.5.0-rc6", path = "crates/conversion/vec2bbox" }
 
 typst-ts-core = { version = "0.5.0-rc6", default-features = false }
-typst-ts-compiler = { version = "0.5.0-rc6", default-features = false }
 typst-ts-test-common = { version = "0.5.0-rc6", path = "tests/common" }
 
 # project exporters
@@ -223,8 +221,7 @@ typst-ts-dev-server = { version = "0.5.0-rc6", path = "server/dev" }
 typst-ts-cli = { version = "0.5.0-rc6", path = "cli" }
 
 [patch.crates-io]
-typst-ts-core = { path = "core" }
-typst-ts-compiler = { path = "compiler" }
+typst-ts-core = { path = "crates/reflexo-typst" }
 typst-ts-svg-exporter = { path = "crates/conversion/vec2svg" }
 
 # typst = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "typst.ts-v0.10.0" }

README.md

@@ -105,9 +105,7 @@ The JavaScript packages are published on [npm](https://www.npmjs.com/).
 The rust crates are not published on [crates.io](https://crates.io/) yet, since
 it has the git dependency on [typst](https://github.com/typst/typst).
 
-- Core Library: [typst-ts-core](./core/)
-
-- Compiler Library: [typst-ts-compiler](./compiler/)
+- Compiler Library: [reflexo-typst](./crates/reflexo-typst/)
 
 - CLI as a Library: [typst-ts-cli](./cli/)
 

benches/lowering/Cargo.toml

@@ -13,13 +13,13 @@ divan = "0.1.3"
 typst.workspace = true
 once_cell.workspace = true
 reflexo-typst2vec.workspace = true
-typst-ts-core = { workspace = true, features = ["flat-vector"] }
-typst-ts-cli.workspace = true
-typst-ts-compiler = { workspace = true, default-features = false, features = [
+typst-ts-core = { workspace = true, features = [
+    "flat-vector",
     "system",
     # "lazy-fontdb",
     "dynamic-layout",
 ] }
+typst-ts-cli.workspace = true
 comemo.workspace = true
 rayon.workspace = true
 dissimilar.workspace = true

benches/lowering/src/lowering.rs

@@ -4,10 +4,10 @@ use divan::Bencher;
 use once_cell::sync::Lazy;
 use reflexo_typst2vec::pass::{IncrTypst2VecPass, Typst2VecPass};
 use typst_ts_cli::CompileOnceArgs;
-use typst_ts_compiler::{
+use typst_ts_core::TypstDocument;
+use typst_ts_core::{
     CompileDriver as CompileDriverT, Compiler, PureCompiler, ShadowApiExt, TypstSystemWorld,
 };
-use typst_ts_core::TypstDocument;
 
 type CompileDriver = Lazy<Mutex<CompileDriverT<PureCompiler<TypstSystemWorld>>>>;
 

cli/Cargo.toml

@@ -39,8 +39,7 @@ tracing-subscriber.workspace = true
 codespan-reporting.workspace = true
 human-panic.workspace = true
 
-typst-ts-core = { workspace = true }
-typst-ts-compiler = { workspace = true, default-features = false, features = [
+typst-ts-core = { workspace = true, default-features = false, features = [
     "system",
     # "lazy-fontdb",
     "dynamic-layout",

cli/src/compile.rs

@@ -6,18 +6,18 @@ use tokio::sync::mpsc;
 use typst::diag::{FileError, FileResult};
 use typst::foundations::{Bytes, Dict, IntoValue};
 use typst::model::Document;
-use typst_ts_compiler::{
+use typst_ts_core::config::entry::{EntryOpts, MEMORY_MAIN_ENTRY};
+use typst_ts_core::DynExporter;
+use typst_ts_core::{config::CompileOpts, exporter_builtins::GroupExporter, path::PathClean};
+use typst_ts_core::{
     features::{FeatureSet, DIAG_FMT_FEATURE},
     CompileActor, CompileDriver, CompileExporter, DynamicLayoutCompiler, PureCompiler,
     TypstSystemUniverse,
 };
-use typst_ts_compiler::{
+use typst_ts_core::{
     CompileServerOpts, CompileSnapshot, CompileStarter, EntryManager, EntryReader, ShadowApi,
     SystemCompilerFeat, TypstSystemWorld,
 };
-use typst_ts_core::config::entry::{EntryOpts, MEMORY_MAIN_ENTRY};
-use typst_ts_core::DynExporter;
-use typst_ts_core::{config::CompileOpts, exporter_builtins::GroupExporter, path::PathClean};
 
 use crate::font::fonts;
 use crate::utils::current_dir;

cli/src/lib.rs

@@ -353,7 +353,7 @@ pub enum DiagnosticFormat {
     Short,
 }
 
-impl From<DiagnosticFormat> for typst_ts_compiler::DiagnosticFormat {
+impl From<DiagnosticFormat> for typst_ts_core::DiagnosticFormat {
     fn from(fmt: DiagnosticFormat) -> Self {
         match fmt {
             DiagnosticFormat::Human => Self::Human,

cli/src/main.rs

@@ -20,7 +20,7 @@ use typst_ts_cli::{
     LinkPackagesArgs, ListFontsArgs, ListPackagesArgs, MeasureFontsArgs, Opts, PackageSubCommands,
     QueryArgs, QueryReplArgs, Subcommands,
 };
-use typst_ts_compiler::TypstSystemUniverse;
+use typst_ts_core::TypstSystemUniverse;
 use typst_ts_core::{config::entry::EntryOpts, exporter_builtins::GroupExporter};
 use typst_ts_core::{
     config::CompileOpts,
@@ -127,7 +127,7 @@ fn compile(args: CompileArgs) -> ! {
 /// Execute a query command.
 pub fn query(args: QueryArgs) -> ! {
     use typst_ts_cli::query::format;
-    use typst_ts_compiler::query::retrieve;
+    use typst_ts_core::query::retrieve;
     let compile_args = args.compile.clone();
 
     let mut exporter = GroupExporter::<Document>::new(vec![]);

cli/src/query_repl.rs

@@ -14,9 +14,9 @@ use rustyline::validate::MatchingBracketValidator;
 use rustyline::{Cmd, CompletionType, Config, EditMode, Editor, KeyEvent};
 use rustyline::{Helper, Validator};
 
-use typst_ts_compiler::{CompileDriver, CompileReport, ConsoleDiagReporter, PureCompiler};
-use typst_ts_compiler::{ShadowApiExt, TypstSystemWorld};
 use typst_ts_core::{typst::prelude::*, GenericExporter};
+use typst_ts_core::{CompileDriver, CompileReport, ConsoleDiagReporter, PureCompiler};
+use typst_ts_core::{ShadowApiExt, TypstSystemWorld};
 
 use crate::query::serialize;
 use crate::CompileOnceArgs;