Merge pull request #276 from kwonoj/test-e2e-path

Author: kwonoj

.github/workflows/ci_main.yml

@@ -9,7 +9,10 @@ on:
 
 jobs:
  build:
- runs-on: ubuntu-latest
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, windows-latest]
  name: Run test
 
  steps:
@@ -44,6 +47,7 @@ jobs:
  run: |
  cargo check
  - name: Generate code coverage
+ if: matrix.os == 'ubuntu-latest'
  run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
  - uses: codecov/codecov-action@v2
  with:

.gitignore

@@ -1,5 +1,4 @@
 /target
-Cargo.lock
 node_modules/
 .swc/
 *.log
@@ -10,4 +9,4 @@ spec/swc-coverage-custom-transform/target/
 a.js
 swc-plugin-coverage-*.tgz
 /tmp
-trace-*.json
+trace-*.json

Cargo.lock

@@ -12,7 +12,7 @@ resolver = "2"
 #lto = true
 
  [workspace.dependencies]
- istanbul-oxide = { path = "./packages/istanbul-oxide", version = "0.0.29" }
+ istanbul-oxide = { path = "./packages/istanbul-oxide", version = "0.0.30" }
  swc-coverage-instrument = { path = "./packages/swc-coverage-instrument" }
 
  getrandom = { version = "0.2.15" }

Cargo.toml

@@ -1,6 +1,6 @@
 {
  "name": "swc-plugin-coverage-instrument",
- "version": "0.0.29",
+ "version": "0.0.30",
  "description": "SWC coverage instrumentation plugin",
  "main": "./target/wasm32-wasip1/release/swc_plugin_coverage.wasm",
  "napi": {

package-lock.json

@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "istanbul-oxide"
 repository = "https://github.com/kwonoj/swc-coverage-instrument"
-version = "0.0.29"
+version = "0.0.30"
 
 [dependencies]
 indexmap = { workspace = true, features = ["serde"] }

package.json

@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "swc-coverage-instrument"
 repository = "https://github.com/kwonoj/swc-coverage-instrument"
-version = "0.0.29"
+version = "0.0.30"
 
 [dependencies]
 istanbul-oxide = { workspace = true }

packages/istanbul-oxide/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "swc-plugin-coverage"
 repository = "https://github.com/kwonoj/swc-coverage-instrument"
-version = "0.0.29"
+version = "0.0.30"
 
 [lib]
 crate-type = ["cdylib"]

packages/swc-coverage-instrument/Cargo.toml

@@ -14,7 +14,7 @@ use typed_path::Utf8TypedPath;
 use wax::Pattern;
 
 /// Normalize a file path to use forward slashes for consistent glob matching
-fn normalize_path_for_glob_matching(path: &str) -> String {
+fn normalize_path(path: &str) -> String {
  let typed_path = Utf8TypedPath::derive(path);
  if typed_path.is_windows() {
  typed_path.with_unix_encoding().to_string()
@@ -77,9 +77,14 @@ pub fn process(program: Program, metadata: TransformPluginProgramMetadata) -> Pr
  // compatible glob and the filename matches the pattern, the file will not be instrumented.
  // Note that the filename is provided by swc's core, may not be the full absolute path to the file name.
  if let Some(exclude) = &instrument_options.unstable_exclude {
- match wax::any(exclude.iter().map(|s| s.as_ref()).collect::<Vec<&str>>()) {
+ let normalized_patterns = exclude
+ .iter()
+ .map(|s| normalize_path(s))
+ .collect::<Vec<_>>();
+
+ match wax::any(normalized_patterns.iter().map(|s| s.as_str())) {
  Ok(p) => {
- let normalized_filename = normalize_path_for_glob_matching(filename);
+ let normalized_filename = normalize_path(filename);
  if p.is_match(normalized_filename.as_str()) {
  return program;
  }
@@ -110,32 +115,32 @@ mod tests {
  #[test]
  fn test_normalize_path_for_glob_matching() {
  // Test Windows paths are normalized to Unix-style
- let result = normalize_path_for_glob_matching(r"C:\Users\project\test\index.test.ts");
+ let result = normalize_path(r"C:\Users\project\test\index.test.ts");
  println!("Windows path result: {}", result);
  // The typed-path crate converts Windows paths to Unix format, but may strip the drive letter
  // The important thing is that backslashes are converted to forward slashes
  assert!(result.contains("/Users/project/test/index.test.ts"));
 
  // Test mixed separators are normalized
- let result = normalize_path_for_glob_matching(r"C:\Users/project\test/file.js");
+ let result = normalize_path(r"C:\Users/project\test/file.js");
  println!("Mixed separators result: {}", result);
  assert!(result.contains("/Users/project/test/file.js"));
 
  // Test Unix paths remain unchanged
  assert_eq!(
- normalize_path_for_glob_matching("/home/user/project/src/utils/helper.js"),
+ normalize_path("/home/user/project/src/utils/helper.js"),
  "/home/user/project/src/utils/helper.js"
  );
 
  // Test relative Unix paths remain unchanged
  assert_eq!(
- normalize_path_for_glob_matching("src/components/Button.tsx"),
+ normalize_path("src/components/Button.tsx"),
  "src/components/Button.tsx"
  );
 
  // Test that backslashes are converted to forward slashes
  let windows_path = r"project\src\test\file.ts";
- let result = normalize_path_for_glob_matching(windows_path);
+ let result = normalize_path(windows_path);
  println!("Relative Windows path result: {}", result);
  assert!(result.contains("project/src/test/file.ts"));
  }