swc-plugin-component-annotate 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swc-plugin-component-annotate",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Use SWC to automatically annotate React components with data attributes for component tracking",
   "author": "scttcper <scttcper@gmail.com>",
   "license": "MIT",

package/src/lib.rs

@@ -14,6 +14,22 @@ use swc_core::{
     plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
 };
 
+// Macro to efficiently determine path separator and extract components
+macro_rules! path_info {
+    ($path:expr) => {{
+        let has_forward_slash = $path.contains('/');
+        let has_backslash = $path.contains('\\');
+
+        if has_forward_slash {
+            (true, false, '/', $path.split('/'))
+        } else if has_backslash {
+            (false, true, '\\', $path.split('\\'))
+        } else {
+            (false, false, '/', $path.split('/')) // Default to forward slash for single component
+        }
+    }};
+}
+
 pub struct ReactComponentAnnotateVisitor {
     config: PluginConfig,
     source_file_name: Option<String>,
@@ -294,23 +310,64 @@ impl VisitMut for ReactComponentAnnotateVisitor {
 
 fn extract_filename(filename: &FileName) -> Option<String> {
     match filename {
-        FileName::Real(path) => path
-            .file_name()
-            .and_then(|name| name.to_str())
-            .map(|s| s.to_string()),
+        FileName::Real(path) => {
+            if let Some(file_name) = path.file_name().and_then(|name| name.to_str()) {
+                // Check if it's an index file
+                if file_name.starts_with("index.") {
+                    // Get parent directory name and combine with filename
+                    if let Some(parent) = path
+                        .parent()
+                        .and_then(|p| p.file_name())
+                        .and_then(|n| n.to_str())
+                    {
+                        Some(format!("{}/{}", parent, file_name))
+                    } else {
+                        Some(file_name.to_string())
+                    }
+                } else {
+                    Some(file_name.to_string())
+                }
+            } else {
+                None
+            }
+        }
         FileName::Custom(custom) => {
-            if custom.contains('/') {
-                custom.split('/').last().map(|s| s.to_string())
-            } else if custom.contains('\\') {
-                custom.split('\\').last().map(|s| s.to_string())
+            let (has_forward_slash, has_backslash, _separator, parts) = path_info!(custom);
+            let parts_vec: Vec<&str> = parts.collect();
+
+            let file_part = if has_forward_slash || has_backslash {
+                parts_vec.last().copied().unwrap_or(custom)
             } else {
-                Some(custom.clone())
+                custom
+            };
+
+            // Check if it's an index file
+            if file_part.starts_with("index.") {
+                // Extract parent directory from the full path
+                let parent = if (has_forward_slash || has_backslash) && parts_vec.len() >= 2 {
+                    Some(parts_vec[parts_vec.len() - 2])
+                } else {
+                    None
+                };
+
+                if let Some(parent_name) = parent {
+                    Some(format!("{}/{}", parent_name, file_part))
+                } else {
+                    Some(file_part.to_string())
+                }
+            } else {
+                Some(file_part.to_string())
             }
         }
         _ => None,
     }
 }
 
+// Export for testing
+pub fn extract_filename_for_test(filename: &FileName) -> Option<String> {
+    extract_filename(filename)
+}
+
 #[plugin_transform]
 pub fn process_transform(
     mut program: Program,