handle subdirectories correcty

Author: szokeasaurusrex

Cargo.toml

@@ -96,6 +96,7 @@ with_crash_reporting = []
 
 [workspace.lints.clippy]
 allow-attributes = "warn"
+dbg-macro = "warn"
 str-to-string = "warn"
 string-to-string = "warn"
 tests-outside-test-module = "warn"

src/utils/sourcemaps.rs

@@ -25,6 +25,7 @@ use crate::utils::file_search::ReleaseFileMatch;
 use crate::utils::file_upload::{
     initialize_legacy_release_upload, FileUpload, SourceFile, SourceFiles, UploadContext,
 };
+use crate::utils::fs;
 use crate::utils::logging::is_quiet_mode;
 use crate::utils::progress::ProgressBar;
 use crate::utils::sourcemaps::inject::{InjectReportBuilder, ReportItem};
@@ -172,7 +173,7 @@ fn guess_sourcemap_reference(
 /// and original url with which the file was added to the processor.
 /// This enable us to look up the source map file based on the original url.
 /// Which can be used for example for debug id referencing.
-#[derive(Eq, Hash, PartialEq)]
+#[derive(Eq, Hash, PartialEq, Debug)]
 pub struct SourceMapReference {
     url: String,
     original_url: Option<String>,
@@ -288,7 +289,6 @@ impl SourceMapProcessor {
     /// Collect references to sourcemaps in minified source files
     /// and saves them in `self.sourcemap_references`.
     fn collect_sourcemap_references(&mut self) {
-        dbg!(&self.sources.iter().map(|x| x.0.clone()).collect::<Vec<_>>());
         // Collect available sourcemaps
         let sourcemaps: HashSet<_> = self
             .sources
@@ -325,7 +325,16 @@ impl SourceMapProcessor {
             .filter_map(|(source, location)| location.as_ref().map(|location| (source, location)))
             .for_each(|(source, location)| {
                 // Add location to already associated sourcemaps, so we cannot guess it again.
-                explicitly_associated_sourcemaps.insert(location.to_owned(), source.url.clone());
+                explicitly_associated_sourcemaps.insert(
+                    fs::path_as_url(
+                        &source
+                            .path
+                            .parent()
+                            .expect("source path has a parent")
+                            .join(location),
+                    ),
+                    source.url.clone(),
+                );
 
                 self.sourcemap_references.insert(
                     source.url.clone(),
@@ -347,12 +356,16 @@ impl SourceMapProcessor {
                             source.warn(format!(
                                 "could not determine a source map reference ({err})"
                             ));
-                            self.sourcemap_references.insert(source.url.clone(), None);
                         })
                         .ok()
                         .filter(|sourcemap_reference| {
                             explicitly_associated_sourcemaps
-                                .get(&sourcemap_reference.url)
+                                .get(
+                                    sourcemap_reference
+                                        .original_url
+                                        .as_ref()
+                                        .expect("original url set in guess_sourcemap_reference"),
+                                )
                                 .inspect(|url| {
                                     source.warn(format!(
                                         "based on the file name, we guessed a source map \
@@ -370,7 +383,10 @@ impl SourceMapProcessor {
                             .entry(sourcemap_reference)
                             .or_insert_with(Vec::new)
                             .push(source);
+                    } else {
+                        self.sourcemap_references.insert(source.url.clone(), None);
                     }
+
                     sources_associated_with_sm
                 },
             )

tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd

@@ -2,16 +2,27 @@
 $ sentry-cli sourcemaps inject ./
 ? success
 > Searching ./
-> Found 3 files
-> Analyzing 3 sources
+> Found 11 files
+> Analyzing 11 sources
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
   Modified: The following source files have been modified to have debug ids
-    d577e31d-376c-5043-b751-add9ec84b7bc - ./app.min.js
-    f3aa1477-a45c-540a-9905-f6d9f6d1d7e1 - ./references_app.min.js
+    0fb38a98-fdda-5fd2-8e58-d8370f1596fb - ./app.min.js
+        - warning: based on the file name, we guessed a source map reference (app.min.js.map), which is already associated with source ./references_app.min.js. Please explicitly set the sourcemap URL with a `//# sourceMappingURL=...` comment in the source file.
+    2de47eef-a93e-5d79-8c45-afb649b15f9e - ./mapInSubdirectory.min.js
+    f369af08-3e09-58d4-92a9-7f432f7d51cb - ./otherApp.js
+        - warning: Could not associate this source with a source map. We guessed the sourcemap reference otherApp.map for multiple sources, including this one. Please explicitly set the sourcemap URL with a `//# sourceMappingURL=...` comment in the source file, to make the association clear.
+    4ee42454-c84d-5d2a-b0b9-8cda74c57838 - ./otherApp.min.js
+        - warning: Could not associate this source with a source map. We guessed the sourcemap reference otherApp.map for multiple sources, including this one. Please explicitly set the sourcemap URL with a `//# sourceMappingURL=...` comment in the source file, to make the association clear.
+    44931b59-c632-5017-a624-3bb0ac2a0317 - ./references_app.min.js
+    edefb3dc-9f7a-5540-9db0-270bbd81b8fd - ./subdirectory/app.min.js
+    228cdb31-bb0a-533c-ac4c-c2ab111ab148 - ./subdirectory/mapForFileInParentDirectory.min.js
+        - warning: based on the file name, we guessed a source map reference (mapForFileInParentDirectory.min.js.map), which is already associated with source ./mapInSubdirectory.min.js. Please explicitly set the sourcemap URL with a `//# sourceMappingURL=...` comment in the source file.
   Modified: The following sourcemap files have been modified to have debug ids
-    f3aa1477-a45c-540a-9905-f6d9f6d1d7e1 - ./app.min.js.map
+    44931b59-c632-5017-a624-3bb0ac2a0317 - ./app.min.js.map
+    edefb3dc-9f7a-5540-9db0-270bbd81b8fd - ./subdirectory/app.min.js.map
+    2de47eef-a93e-5d79-8c45-afb649b15f9e - ./subdirectory/mapForFileInParentDirectory.min.js.map
 
 
 ```

tests/integration/_expected_outputs/sourcemaps/sourcemaps-inject-double-association/app.min.js

@@ -0,0 +1,6 @@
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="2de47eef-a93e-5d79-8c45-afb649b15f9e")}catch(e){}}();
+!function(e,t){"use strict";function n(e){return document.getElementById(e)}function r(e,t){e.addEventListener("click",t)}var o=n("btn");r(o,function(){console.log("mapInSubdirectory.min.js!")})}(window,document);
+
+//# sourceMappingURL=subdirectory/mapForFileInParentDirectory.min.js.map
+//# debugId=2de47eef-a93e-5d79-8c45-afb649b15f9e

tests/integration/_expected_outputs/sourcemaps/sourcemaps-inject-double-association/app.min.js.map

@@ -1,6 +1,6 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f3aa1477-a45c-540a-9905-f6d9f6d1d7e1")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="44931b59-c632-5017-a624-3bb0ac2a0317")}catch(e){}}();
 !function(e,t){"use strict";function n(e){return document.querySelector(e)}function r(e,t){e.textContent=t}var o=n("#message");r(o,"Hello World!")}(window,document);
 //# sourceMappingURL=app.min.js.map
 
-//# debugId=f3aa1477-a45c-540a-9905-f6d9f6d1d7e1
+//# debugId=44931b59-c632-5017-a624-3bb0ac2a0317