Change JS config to use a schema and JSON (#794)

* Change JS config to use a schema and JSON

* Add cfg checks

* Fix warning while building CLI

* Move SharedConfig pieces to from javy to javy-core

.github/workflows/ci.yml

@@ -33,10 +33,7 @@ jobs:
       - name: Test
         env:
           CARGO_TARGET_WASM32_WASIP1_RUNNER: wasmtime --dir=.
-        run: cargo hack test --target=wasm32-wasip1 --workspace --exclude=javy-cli --exclude=javy-config --exclude=javy-runner --each-feature -- --nocapture
-
-      - name: Test Config
-        run: cargo test --package=javy-config
+        run: cargo hack test --target=wasm32-wasip1 --workspace --exclude=javy-cli --exclude=javy-runner --each-feature -- --nocapture
 
       - name: Test Runner
         run: cargo test --package=javy-runner

Cargo.toml

@@ -4,7 +4,6 @@ members = [
   "crates/core",
   "crates/cli",
   "crates/test-macros",
-  "crates/config",
   "crates/runner",
   "fuzz",
 ]
@@ -23,11 +22,11 @@ wasmtime-wasi = "19"
 wasi-common = "19"
 anyhow = "1.0"
 once_cell = "1.20"
-bitflags = "2.6.0"
-javy-config = { path = "crates/config" }
 javy = { path = "crates/javy", version = "3.0.2-alpha.1" }
 tempfile = "3.13.0"
 uuid = { version = "1.10", features = ["v4"] }
+serde = { version = "1.0", default-features = false }
+serde_json = "1.0"
 
 [profile.release]
 lto = true

Makefile

@@ -22,7 +22,7 @@ docs:
 	cargo doc --package=javy-core --open --target=wasm32-wasip1
 
 test-javy:
-	CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime --dir=." cargo test --package=javy --target=wasm32-wasip1 --features json,messagepack -- --nocapture
+	CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime --dir=." cargo hack test --package=javy --target=wasm32-wasip1 --each-feature -- --nocapture
 
 test-core:
 	CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime" cargo test --package=javy-core --target=wasm32-wasip1 -- --nocapture
@@ -44,10 +44,7 @@ test-wpt:
 	npm install --prefix wpt
 	npm test --prefix wpt 
 
-test-config:
-	CARGO_PROFILE_RELEASE_LTO=off cargo test --package=javy-config -- --nocapture
-
-tests: test-javy test-core test-runner test-cli test-wpt test-config
+tests: test-javy test-core test-runner test-cli test-wpt
 
 fmt: fmt-javy fmt-core fmt-cli
 

crates/cli/Cargo.toml

@@ -33,12 +33,11 @@ convert_case = "0.6.0"
 wasm-opt = "0.116.1"
 tempfile = { workspace = true }
 clap = { version = "4.5.19", features = ["derive"] }
-javy-config = { workspace = true }
+serde = { workspace = true, default-features = false }
+serde_json = { workspace = true }
 
 [dev-dependencies]
-serde_json = "1.0"
 lazy_static = "1.5"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
 criterion = "0.5"
 num-format = "0.4.4"
 wasmparser = "0.218.0"

crates/cli/src/codegen/builder.rs

@@ -1,9 +1,9 @@
 use crate::{
     codegen::{CodeGenType, Generator},
+    js_config::JsConfig,
     providers::Provider,
 };
 use anyhow::{bail, Result};
-use javy_config::Config;
 use std::path::PathBuf;
 
 /// Options for using WIT in the code generation process.
@@ -83,9 +83,9 @@ impl CodeGenBuilder {
     }
 
     /// Build a [`CodeGenerator`].
-    pub fn build(self, ty: CodeGenType, js_runtime_config: Config) -> Result<Generator> {
+    pub fn build(self, ty: CodeGenType, js_runtime_config: JsConfig) -> Result<Generator> {
         if let CodeGenType::Dynamic = ty {
-            if js_runtime_config != Config::default() {
+            if js_runtime_config.has_configs() {
                 bail!("Cannot set JS runtime options when building a dynamic module")
             }
         }

crates/cli/src/codegen/mod.rs

@@ -38,8 +38,6 @@ use std::{fs, rc::Rc, sync::OnceLock};
 
 pub(crate) use builder::*;
 
-use javy_config::Config;
-
 mod transform;
 
 mod exports;
@@ -52,7 +50,7 @@ use wasi_common::{pipe::ReadPipe, sync::WasiCtxBuilder, WasiCtx};
 use wasm_opt::{OptimizationOptions, ShrinkLevel};
 use wizer::{Linker, Wizer};
 
-use crate::{providers::Provider, JS};
+use crate::{js_config::JsConfig, providers::Provider, JS};
 use anyhow::Result;
 
 static mut WASI: OnceLock<WasiCtx> = OnceLock::new();
@@ -112,7 +110,7 @@ pub(crate) struct Generator {
     /// Codegen type to use.
     pub ty: CodeGenType,
     /// JS runtime config.
-    pub js_runtime_config: Config,
+    pub js_runtime_config: JsConfig,
     /// Provider to use.
     pub provider: Provider,
     /// JavaScript function exports.
@@ -125,7 +123,7 @@ pub(crate) struct Generator {
 
 impl Generator {
     /// Creates a new [`Generator`].
-    pub fn new(ty: CodeGenType, js_runtime_config: Config, provider: Provider) -> Self {
+    pub fn new(ty: CodeGenType, js_runtime_config: JsConfig, provider: Provider) -> Self {
         Self {
             ty,
             js_runtime_config,
@@ -141,15 +139,14 @@ impl Generator {
         let config = transform::module_config();
         let module = match &self.ty {
             CodeGenType::Static => {
-                // Copy config bits into stdin for `initialize_runtime` function.
+                // Copy config JSON into stdin for `initialize_runtime` function.
+                let runtime_config = self.js_runtime_config.to_json()?;
                 unsafe {
                     WASI.get_or_init(|| {
                         WasiCtxBuilder::new()
                             .inherit_stderr()
                             .inherit_stdout()
-                            .stdin(Box::new(ReadPipe::from(
-                                self.js_runtime_config.bits().to_le_bytes().as_slice(),
-                            )))
+                            .stdin(Box::new(ReadPipe::from(runtime_config)))
                             .build()
                     });
                 };
@@ -463,21 +460,21 @@ fn print_wat(_wasm_binary: &[u8]) -> Result<()> {
 
 #[cfg(test)]
 mod test {
+    use crate::js_config::JsConfig;
     use crate::providers::Provider;
 
     use super::Generator;
     use super::WitOptions;
     use anyhow::Result;
-    use javy_config::Config;
 
     #[test]
     fn default_values() -> Result<()> {
         let gen = Generator::new(
             crate::codegen::CodeGenType::Dynamic,
-            Config::default(),
+            JsConfig::default(),
             Provider::Default,
         );
-        assert_eq!(gen.js_runtime_config, Config::default());
+        assert!(!gen.js_runtime_config.has_configs());
         assert!(gen.source_compression);
         assert!(matches!(gen.provider, Provider::Default));
         assert_eq!(gen.wit_opts, WitOptions::default());