Move to global config loading for token transformer

Author: marcins

Cargo.lock

@@ -15,7 +15,7 @@ atlaspack_filesystem = { path = "../atlaspack_filesystem" }
 atlaspack_sourcemap = { path = "../atlaspack_sourcemap" }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-parcel_sourcemap = { workspace = true }
+parcel_sourcemap = { path = "../parcel_sourcemap" }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 

crates/atlaspack_plugin_transformer_tokens/Cargo.toml

@@ -15,18 +15,20 @@ use crate::tokens_transformer_config::{PackageJson, TokensTransformerConfig};
 pub struct AtlaspackTokensTransformerPlugin {
   project_root: PathBuf,
   options: Arc<PluginOptions>,
+  config: Option<TokensTransformerConfig>,
 }
 
 impl AtlaspackTokensTransformerPlugin {
   pub fn new(ctx: &PluginContext) -> Result<Self, Error> {
+    let config = Self::load_config(ctx.config.clone())?;
     Ok(AtlaspackTokensTransformerPlugin {
       project_root: ctx.options.project_root.clone(),
       options: ctx.options.clone(),
+      config,
     })
   }
 
   fn load_config(
-    &self,
     config_loader: atlaspack_core::config_loader::ConfigLoaderRef,
   ) -> Result<Option<TokensTransformerConfig>, Error> {
     let config = config_loader
@@ -52,7 +54,7 @@ impl AtlaspackTokensTransformerPlugin {
 impl TransformerPlugin for AtlaspackTokensTransformerPlugin {
   async fn transform(
     &self,
-    context: TransformContext,
+    _context: TransformContext,
     asset: Asset,
   ) -> Result<TransformResult, Error> {
     // Check feature flag first
@@ -76,10 +78,7 @@ impl TransformerPlugin for AtlaspackTokensTransformerPlugin {
       });
     }
 
-    // Load config from package.json
-    let config = self.load_config(context.config())?;
-
-    let Some(config) = config else {
+    let Some(config) = &self.config else {
       // If no config provided, just return asset unchanged
       return Ok(TransformResult {
         asset,
@@ -108,8 +107,16 @@ impl TransformerPlugin for AtlaspackTokensTransformerPlugin {
         token_data_path,
         should_use_auto_fallback: config.should_use_auto_fallback.unwrap_or(true),
         should_force_auto_fallback: config.should_force_auto_fallback.unwrap_or(true),
-        force_auto_fallback_exemptions: config.force_auto_fallback_exemptions.unwrap_or_default(),
-        default_theme: config.default_theme.unwrap_or_else(|| "light".to_string()),
+        force_auto_fallback_exemptions: config
+          .force_auto_fallback_exemptions
+          .as_ref()
+          .cloned()
+          .unwrap_or_default(),
+        default_theme: config
+          .default_theme
+          .as_deref()
+          .unwrap_or("light")
+          .to_string(),
       },
     };
 

crates/atlaspack_plugin_transformer_tokens/src/tokens_transformer.rs

@@ -17,18 +17,6 @@ pub struct TokensPluginOptions {
   pub default_theme: String,
 }
 
-impl From<TokensPluginOptions> for SharedTokensPluginOptions {
-  fn from(opts: TokensPluginOptions) -> Self {
-    SharedTokensPluginOptions {
-      token_data_path: opts.token_data_path,
-      should_use_auto_fallback: opts.should_use_auto_fallback,
-      should_force_auto_fallback: opts.should_force_auto_fallback,
-      force_auto_fallback_exemptions: opts.force_auto_fallback_exemptions,
-      default_theme: opts.default_theme,
-    }
-  }
-}
-
 #[napi(object)]
 #[derive(Clone)]
 pub struct TokensConfig {
@@ -39,18 +27,6 @@ pub struct TokensConfig {
   pub tokens_options: TokensPluginOptions,
 }
 
-impl From<TokensConfig> for SharedTokensConfig {
-  fn from(config: TokensConfig) -> Self {
-    SharedTokensConfig {
-      filename: config.filename,
-      project_root: config.project_root,
-      is_source: config.is_source,
-      source_maps: config.source_maps,
-      tokens_options: config.tokens_options.into(),
-    }
-  }
-}
-
 #[napi(object)]
 #[derive(Clone, Debug, Serialize)]
 pub struct TokensPluginResult {
@@ -89,7 +65,19 @@ pub fn apply_tokens_plugin(
   let (deferred, promise) = env.create_deferred()?;
 
   // Convert to shared config
-  let shared_config: SharedTokensConfig = config.into();
+  let shared_config = SharedTokensConfig {
+    filename: config.filename,
+    project_root: config.project_root,
+    is_source: config.is_source,
+    source_maps: config.source_maps,
+    tokens_options: SharedTokensPluginOptions {
+      token_data_path: config.tokens_options.token_data_path,
+      should_use_auto_fallback: config.tokens_options.should_use_auto_fallback,
+      should_force_auto_fallback: config.tokens_options.should_force_auto_fallback,
+      force_auto_fallback_exemptions: config.tokens_options.force_auto_fallback_exemptions,
+      default_theme: config.tokens_options.default_theme,
+    },
+  };
 
   // Spawn the work on a Rayon thread
   rayon::spawn(move || {