refactor: extract swc_plugin_css_scope

.changeset/fine-places-boil.md

@@ -0,0 +1,3 @@
+---
+
+---

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 
 members = [
   "packages/react/transform",
+  "packages/react/transform/crates/*",
   "packages/react/transform/swc-plugin-reactlynx",
   "packages/react/transform/swc-plugin-reactlynx-compat",
   "packages/web-platform/inline-style-parser",
@@ -16,6 +17,8 @@ hex = "0.4.3"
 indexmap = "2.7.0"
 js-sys = "0.3.77"
 lazy_static = "1.5.0"
+napi = { version = "2.7.0", default-features = false, features = ["napi4"] }
+napi-derive = "2.7.0"
 once_cell = "1.20.2"
 regex = "1.11.1"
 rustc-hash = "2.1.1"

eslint.config.js

@@ -47,6 +47,8 @@ export default tseslint.config(
       'packages/react/transform/tests/__swc_snapshots__/**',
       'packages/react/transform/__test__/**/__snapshots__/**',
 
+      'packages/react/transform/**/tests/__swc_snapshots__/**',
+
       // Configs
       'eslint.config.js',
       'vitest.config.ts',

packages/react/.dprint.jsonc

@@ -13,6 +13,7 @@
 
     // Snapshot
     "transform/tests/__swc_snapshots__/**",
+    "transform/**/tests/__swc_snapshots__/**",
     "transform/__test__/**/__snapshots__/**",
   ],
 }

packages/react/transform/Cargo.toml

@@ -11,15 +11,17 @@ crate-type = ["cdylib"]
 convert_case = { workspace = true }
 hex = { workspace = true }
 indexmap = { workspace = true }
-napi = { version = "2.7.0", default-features = false, features = ["napi4"] }
-napi-derive = "2.7.0"
+napi = { workspace = true }
+napi-derive = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
 sha-1 = { workspace = true }
 swc_core = { workspace = true, features = ["base", "ecma_codegen", "ecma_parser", "ecma_minifier", "ecma_transforms_typescript", "ecma_utils", "ecma_quote", "ecma_transforms_react", "ecma_transforms_optimization", "css_parser", "css_ast", "css_visit", "css_codegen", "__visit", "__testing_transform"] }
+swc_plugin_css_scope = { path = "./crates/swc_plugin_css_scope" }
+swc_plugins_shared = { path = './crates/swc_plugins_shared' }
 version-compare = { workspace = true }
 
 [target."cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))".dependencies.getrandom]

packages/react/transform/crates/swc_plugin_css_scope/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "swc_plugin_css_scope"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+napi = { workspace = true }
+napi-derive = { workspace = true }
+regex = { workspace = true }
+swc_core = { workspace = true, features = ["base", "ecma_codegen", "ecma_parser", "ecma_minifier", "ecma_transforms_typescript", "ecma_utils", "ecma_quote", "ecma_transforms_react", "ecma_transforms_optimization", "css_parser", "css_ast", "css_visit", "css_codegen", "__visit", "__testing_transform"] }
+swc_plugins_shared = { path = "../swc_plugins_shared" }

packages/react/transform/src/swc_plugin_css_scope/mod.rs → packages/react/transform/crates/swc_plugin_css_scope/lib.rs

@@ -1,5 +1,3 @@
-use crate::calc_hash;
-use napi_derive::napi;
 use regex::Regex;
 use swc_core::{
   common::{
@@ -11,6 +9,9 @@ use swc_core::{
     visit::{VisitMut, VisitMutWith},
   },
 };
+use swc_plugins_shared::utils::calc_hash;
+
+pub mod napi;
 
 /// CSSScope refers to the
 ///
@@ -31,50 +32,8 @@ pub enum CSSScope {
   Modules,
 }
 
-impl napi::bindgen_prelude::FromNapiValue for CSSScope {
-  unsafe fn from_napi_value(
-    env: napi::bindgen_prelude::sys::napi_env,
-    napi_val: napi::bindgen_prelude::sys::napi_value,
-  ) -> napi::bindgen_prelude::Result<Self> {
-    let val = <&str>::from_napi_value(env, napi_val).map_err(|e| {
-      napi::bindgen_prelude::error!(
-        e.status,
-        "Failed to convert napi value into enum `{}`. {}",
-        "RemoveCSSScope",
-        e,
-      )
-    })?;
-    match val {
-      "all" => Ok(CSSScope::All),
-      "none" => Ok(CSSScope::None),
-      "modules" => Ok(CSSScope::Modules),
-      _ => Err(napi::bindgen_prelude::error!(
-        napi::bindgen_prelude::Status::InvalidArg,
-        "value `{}` does not match any variant of enum `{}`",
-        val,
-        "RemoveCSSScope"
-      )),
-    }
-  }
-}
-
-impl napi::bindgen_prelude::ToNapiValue for CSSScope {
-  unsafe fn to_napi_value(
-    env: napi::bindgen_prelude::sys::napi_env,
-    val: Self,
-  ) -> napi::bindgen_prelude::Result<napi::bindgen_prelude::sys::napi_value> {
-    match val {
-      CSSScope::All => <&str>::to_napi_value(env, "all"),
-      CSSScope::None => <&str>::to_napi_value(env, "none"),
-      CSSScope::Modules => <&str>::to_napi_value(env, "modules"),
-    }
-  }
-}
-
-#[napi(object)]
 #[derive(Clone, Debug)]
 pub struct CSSScopeVisitorConfig {
-  #[napi(ts_type = "'all' | 'none' | 'modules'")]
   /// @public
   pub mode: CSSScope,
 

packages/react/transform/crates/swc_plugin_css_scope/napi.rs

@@ -0,0 +1,144 @@
+use crate::{
+  CSSScope as CoreCSSScope, CSSScopeVisitor as CoreVisitor, CSSScopeVisitorConfig as CoreConfig,
+};
+use napi_derive::napi;
+use swc_core::{
+  common::comments::Comments,
+  ecma::{ast::*, visit::VisitMut},
+};
+
+#[derive(Clone, Copy, Debug)]
+pub enum CSSScope {
+  All,
+  None,
+  Modules,
+}
+
+impl napi::bindgen_prelude::FromNapiValue for CSSScope {
+  unsafe fn from_napi_value(
+    env: napi::bindgen_prelude::sys::napi_env,
+    napi_val: napi::bindgen_prelude::sys::napi_value,
+  ) -> napi::bindgen_prelude::Result<Self> {
+    let val = <&str>::from_napi_value(env, napi_val).map_err(|e| {
+      napi::bindgen_prelude::error!(
+        e.status,
+        "Failed to convert napi value into enum `{}`. {}",
+        "CSSScope",
+        e,
+      )
+    })?;
+    match val {
+      "all" => Ok(CSSScope::All),
+      "none" => Ok(CSSScope::None),
+      "modules" => Ok(CSSScope::Modules),
+      _ => Err(napi::bindgen_prelude::error!(
+        napi::bindgen_prelude::Status::InvalidArg,
+        "value `{}` does not match any variant of enum `{}`",
+        val,
+        "CSSScope"
+      )),
+    }
+  }
+}
+
+impl napi::bindgen_prelude::ToNapiValue for CSSScope {
+  unsafe fn to_napi_value(
+    env: napi::bindgen_prelude::sys::napi_env,
+    val: Self,
+  ) -> napi::bindgen_prelude::Result<napi::bindgen_prelude::sys::napi_value> {
+    match val {
+      CSSScope::All => <&str>::to_napi_value(env, "all"),
+      CSSScope::None => <&str>::to_napi_value(env, "none"),
+      CSSScope::Modules => <&str>::to_napi_value(env, "modules"),
+    }
+  }
+}
+
+impl From<CSSScope> for CoreCSSScope {
+  fn from(val: CSSScope) -> Self {
+    match val {
+      CSSScope::All => CoreCSSScope::All,
+      CSSScope::None => CoreCSSScope::None,
+      CSSScope::Modules => CoreCSSScope::Modules,
+    }
+  }
+}
+
+impl From<CoreCSSScope> for CSSScope {
+  fn from(val: CoreCSSScope) -> Self {
+    match val {
+      CoreCSSScope::All => CSSScope::All,
+      CoreCSSScope::None => CSSScope::None,
+      CoreCSSScope::Modules => CSSScope::Modules,
+    }
+  }
+}
+
+#[napi(object)]
+#[derive(Clone, Debug)]
+pub struct CSSScopeVisitorConfig {
+  #[napi(ts_type = "'all' | 'none' | 'modules'")]
+  /// @public
+  pub mode: CSSScope,
+
+  /// @public
+  pub filename: String,
+}
+
+impl Default for CSSScopeVisitorConfig {
+  fn default() -> Self {
+    CSSScopeVisitorConfig {
+      mode: CSSScope::None,
+      filename: "index.jsx".into(),
+    }
+  }
+}
+
+impl From<CSSScopeVisitorConfig> for CoreConfig {
+  fn from(val: CSSScopeVisitorConfig) -> Self {
+    CoreConfig {
+      mode: val.mode.into(),
+      filename: val.filename,
+    }
+  }
+}
+
+impl From<CoreConfig> for CSSScopeVisitorConfig {
+  fn from(val: CoreConfig) -> Self {
+    CSSScopeVisitorConfig {
+      mode: val.mode.into(),
+      filename: val.filename,
+    }
+  }
+}
+
+pub struct CSSScopeVisitor<C>
+where
+  C: Comments,
+{
+  inner: CoreVisitor<C>,
+}
+
+impl<C> CSSScopeVisitor<C>
+where
+  C: Comments,
+{
+  pub fn new(cfg: CSSScopeVisitorConfig, comments: Option<C>) -> Self {
+    Self {
+      inner: CoreVisitor::new(cfg.into(), comments),
+    }
+  }
+}
+
+impl<C> VisitMut for CSSScopeVisitor<C>
+where
+  C: Comments,
+{
+  fn visit_mut_expr(&mut self, n: &mut Expr) {
+    self.inner.visit_mut_expr(n);
+  }
+
+  fn visit_mut_module(&mut self, n: &mut Module) {
+    self.inner.visit_mut_module(n);
+  }
+}

packages/react/transform/crates/swc_plugins_shared/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "swc_plugins_shared"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+hex = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true, features = ["preserve_order"] }
+sha-1 = { workspace = true }
+swc_core = { workspace = true, features = ["base", "ecma_codegen", "ecma_parser", "ecma_minifier", "ecma_transforms_typescript", "ecma_utils", "ecma_quote", "ecma_transforms_react", "ecma_transforms_optimization"] }

packages/react/transform/crates/swc_plugins_shared/lib.rs

@@ -0,0 +1 @@
+pub mod utils;

packages/react/transform/src/css.rs

@@ -7,7 +7,7 @@ use swc_core::{
   ecma::{ast::Expr, utils::is_literal},
 };
 
-use crate::utils::jsonify;
+use swc_plugins_shared::utils::jsonify;
 
 static EXTRACT_CSS_DIAGNOSTIC_ID: &str = "react-lynx-extract-css";
 

packages/react/transform/src/lib.rs

@@ -8,7 +8,6 @@ mod css;
 mod esbuild;
 mod swc_plugin_compat;
 mod swc_plugin_compat_post;
-mod swc_plugin_css_scope;
 mod swc_plugin_define_dce;
 mod swc_plugin_directive_dce;
 mod swc_plugin_dynamic_import;
@@ -21,7 +20,6 @@ mod swc_plugin_snapshot;
 mod swc_plugin_worklet;
 mod swc_plugin_worklet_post_process;
 mod target;
-mod utils;
 
 use std::vec;
 
@@ -64,7 +62,7 @@ use swc_core::{
 // So we have to use different name
 use swc_plugin_compat::{CompatVisitor, CompatVisitorConfig};
 use swc_plugin_compat_post::CompatPostVisitor;
-use swc_plugin_css_scope::{CSSScopeVisitor, CSSScopeVisitorConfig};
+use swc_plugin_css_scope::napi::{CSSScopeVisitor, CSSScopeVisitorConfig};
 use swc_plugin_define_dce::DefineDCEVisitorConfig;
 use swc_plugin_directive_dce::{DirectiveDCEVisitor, DirectiveDCEVisitorConfig};
 use swc_plugin_dynamic_import::{DynamicImportVisitor, DynamicImportVisitorConfig};
@@ -73,7 +71,7 @@ use swc_plugin_refresh::{RefreshVisitor, RefreshVisitorConfig};
 use swc_plugin_shake::{ShakeVisitor, ShakeVisitorConfig};
 use swc_plugin_snapshot::{JSXTransformer, JSXTransformerConfig};
 use swc_plugin_worklet::{WorkletVisitor, WorkletVisitorConfig};
-use utils::calc_hash;
+use swc_plugins_shared::utils::calc_hash;
 
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum TransformMode {

packages/react/transform/src/swc_plugin_dynamic_import/mod.rs

@@ -16,7 +16,7 @@ use swc_core::{
   },
 };
 
-use crate::utils::jsonify;
+use swc_plugins_shared::utils::jsonify;
 
 #[napi(object)]
 #[derive(Clone, Debug)]