From e8f504f0dceeeda35a5969d746e8e69aec5bd35a Mon Sep 17 00:00:00 2001 From: Toshit Chawda Date: Sun, 16 Mar 2025 21:46:47 -0700 Subject: [PATCH] rewriter -> js --- rewriter/Cargo.lock | 22 +++++++++++----------- rewriter/Cargo.toml | 2 +- rewriter/{rewriter => js}/Cargo.toml | 2 +- rewriter/{rewriter => js}/src/cfg.rs | 0 rewriter/{rewriter => js}/src/changes.rs | 0 rewriter/{rewriter => js}/src/lib.rs | 0 rewriter/{rewriter => js}/src/visitor.rs | 0 rewriter/native/Cargo.toml | 2 +- rewriter/native/benches/samples.rs | 2 +- rewriter/native/src/main.rs | 2 +- rewriter/wasm/Cargo.toml | 4 ++-- rewriter/wasm/src/error.rs | 6 +++--- rewriter/wasm/src/lib.rs | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) rename rewriter/{rewriter => js}/Cargo.toml (91%) rename rewriter/{rewriter => js}/src/cfg.rs (100%) rename rewriter/{rewriter => js}/src/changes.rs (100%) rename rewriter/{rewriter => js}/src/lib.rs (100%) rename rewriter/{rewriter => js}/src/visitor.rs (100%) diff --git a/rewriter/Cargo.lock b/rewriter/Cargo.lock index 628b8dd..7be401f 100644 --- a/rewriter/Cargo.lock +++ b/rewriter/Cargo.lock @@ -715,6 +715,15 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "js" +version = "0.1.0" +dependencies = [ + "oxc", + "smallvec", + "thiserror 2.0.12", +] + [[package]] name = "js-sys" version = "0.3.77" @@ -776,8 +785,8 @@ dependencies = [ "boa_engine", "bytes", "criterion", + "js", "oxc", - "rewriter", "url", "urlencoding", ] @@ -1332,15 +1341,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "rewriter" -version = "0.1.0" -dependencies = [ - "oxc", - "smallvec", - "thiserror 2.0.12", -] - [[package]] name = "ropey" version = "1.6.1" @@ -1706,9 +1706,9 @@ name = "wasm" version = "0.1.0" dependencies = [ "instant", + "js", "js-sys", "oxc", - "rewriter", "thiserror 2.0.12", "wasm-bindgen", "web-sys", diff --git a/rewriter/Cargo.toml b/rewriter/Cargo.toml index 0f74500..a5a40a8 100644 --- a/rewriter/Cargo.toml +++ b/rewriter/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["native", "rewriter", "wasm"] +members = ["native", "js", "wasm"] resolver = "2" [profile.release] diff --git a/rewriter/rewriter/Cargo.toml b/rewriter/js/Cargo.toml similarity index 91% rename from rewriter/rewriter/Cargo.toml rename to rewriter/js/Cargo.toml index 7f79941..e421dfa 100644 --- a/rewriter/rewriter/Cargo.toml +++ b/rewriter/js/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rewriter" +name = "js" version = "0.1.0" edition = "2021" diff --git a/rewriter/rewriter/src/cfg.rs b/rewriter/js/src/cfg.rs similarity index 100% rename from rewriter/rewriter/src/cfg.rs rename to rewriter/js/src/cfg.rs diff --git a/rewriter/rewriter/src/changes.rs b/rewriter/js/src/changes.rs similarity index 100% rename from rewriter/rewriter/src/changes.rs rename to rewriter/js/src/changes.rs diff --git a/rewriter/rewriter/src/lib.rs b/rewriter/js/src/lib.rs similarity index 100% rename from rewriter/rewriter/src/lib.rs rename to rewriter/js/src/lib.rs diff --git a/rewriter/rewriter/src/visitor.rs b/rewriter/js/src/visitor.rs similarity index 100% rename from rewriter/rewriter/src/visitor.rs rename to rewriter/js/src/visitor.rs diff --git a/rewriter/native/Cargo.toml b/rewriter/native/Cargo.toml index 3636550..5871fcb 100644 --- a/rewriter/native/Cargo.toml +++ b/rewriter/native/Cargo.toml @@ -10,7 +10,7 @@ workspace = true anyhow = "1.0.97" bytes = "1.10.1" oxc = { workspace = true } -rewriter = { version = "0.1.0", path = "../rewriter" } +js = { version = "0.1.0", path = "../js" } url = "2.5.4" urlencoding = "2.1.3" diff --git a/rewriter/native/benches/samples.rs b/rewriter/native/benches/samples.rs index ea47dc5..35c5e46 100644 --- a/rewriter/native/benches/samples.rs +++ b/rewriter/native/benches/samples.rs @@ -1,7 +1,7 @@ use std::str::FromStr; use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion}; -use rewriter::{cfg::Config, rewrite}; +use js::{cfg::Config, rewrite}; use url::Url; use urlencoding::encode; diff --git a/rewriter/native/src/main.rs b/rewriter/native/src/main.rs index abf463c..32e1add 100644 --- a/rewriter/native/src/main.rs +++ b/rewriter/native/src/main.rs @@ -6,7 +6,7 @@ use oxc::{ allocator::{Allocator, String}, diagnostics::NamedSource, }; -use rewriter::{cfg::Config, rewrite, RewriteResult}; +use js::{cfg::Config, rewrite, RewriteResult}; use url::Url; use urlencoding::encode; diff --git a/rewriter/wasm/Cargo.toml b/rewriter/wasm/Cargo.toml index c085131..c918874 100644 --- a/rewriter/wasm/Cargo.toml +++ b/rewriter/wasm/Cargo.toml @@ -13,11 +13,11 @@ crate-type = ["cdylib"] instant = { version = "0.1.13", features = ["wasm-bindgen"] } js-sys = "0.3.77" oxc = { workspace = true } -rewriter = { version = "0.1.0", path = "../rewriter", default-features = false } +js = { version = "0.1.0", path = "../js", default-features = false } thiserror = "2.0.12" wasm-bindgen = "0.2.100" web-sys = { version = "0.3.77", features = ["Url"] } [features] default = ["debug"] -debug = ["rewriter/debug"] +debug = ["js/debug"] diff --git a/rewriter/wasm/src/error.rs b/rewriter/wasm/src/error.rs index 177ec7d..074b749 100644 --- a/rewriter/wasm/src/error.rs +++ b/rewriter/wasm/src/error.rs @@ -1,7 +1,7 @@ use std::cell::BorrowMutError; use js_sys::Error; -use rewriter::RewriterError as InnerRewriterError; +use js::RewriterError as JsRewriterError; use thiserror::Error; use wasm_bindgen::{JsError, JsValue}; @@ -11,8 +11,8 @@ pub enum RewriterError { Js(String), #[error("str fromutf8 error: {0}")] Str(#[from] std::str::Utf8Error), - #[error("Rewriter: {0}")] - Rewriter(#[from] InnerRewriterError), + #[error("JS Rewriter: {0}")] + JsRewriter(#[from] JsRewriterError), #[error("reflect set failed: {0}")] ReflectSetFail(String), #[error("Rewriter was already rewriting")] diff --git a/rewriter/wasm/src/lib.rs b/rewriter/wasm/src/lib.rs index 3e7b50a..44b1a17 100644 --- a/rewriter/wasm/src/lib.rs +++ b/rewriter/wasm/src/lib.rs @@ -9,7 +9,7 @@ use oxc::{ allocator::{Allocator, String}, diagnostics::NamedSource, }; -use rewriter::{cfg::Config, rewrite, RewriteResult}; +use js::{cfg::Config, rewrite, RewriteResult}; use wasm_bindgen::prelude::*; use web_sys::Url;