Skip to content

Commit

Permalink
Update sourcemap tracing logic
Browse files Browse the repository at this point in the history 
Fixes a few things:
- Propagates the input's sourcesContent item
- Propagates the input's original name, if found (else, uses our name)
- Uses much faster lookup_token (instead of a full traversal, that would be sooo slow)
  • Loading branch information
@jridgewell
jridgewell committed Dec 2, 2022
1 parent 8ecee8d commit 9939ca0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 18 deletions.
18 changes: 10 additions & 8 deletions crates/swc/tests/fixture/sourcemap/004/output/index.map
View file
@@ -1,22 +1,24 @@
{
"mappings": "AAACA,CAAAA,KAAKC,mBAAmBD,2BAA2B,MAAM;IACtD;QACI;KACH;IACD;cACU,YAAYI;YACd;YACA,IAAIE,aAAaH;gBACb,IAAIC;gBACJ,yBAAyB;oBACrBM,UAAUN,KAAK;gBACnB;YACJ;YACAC;;;;gBAIIU;;;;YAIJ;;0BAEcX;;;;oBAIN;gBACJ;;;;aAIHD",
"mappings": "AAACA,CAAAA,KAAKC,gBAAmB,GAAGD,KAAKC,gBAAmB,IAAI,EAAC,AAAD,EAAIC,IAAI,CAAC;IAC7D;QACI;KACH;IACD;QACU,MAAY,SAAUC,CAAuB,EAAEC,CAAmB,EAAEC,CAAmB,EAAE;YAC3F;YACA,IAAIC,IAAa,SAAoBC,CAAI,EAAE;gBACvC,IAAIC,IAAOD,EAAKC,IAAI;gBACpB,OAAsB,CAAA,GAAGC,EAA+CC,GAAE,AAAFA,EAAK,OAAO;oBAChFC,UAAUH,EAAKI,GAAG;gBACtB;YACJ;YACAP,EAAoBQ,CAAC,CAACT,IACDC,EAAoBS,CAAC,CAACV,GAAqB;gBACvCW,SAAS,WAAoB;oBAC9C,OAAqBA;gBACzB;gBACqBC,SAAS,WAAoB;oBAC9C,OAAqBV;gBACzB;YACJ,EAAA;YACqB,IAAIG,IAAiDJ,EAAoB,OAC1FU,IAAU,CAAA;QAE1B;QACc,MAAY,SAAUZ,CAAuB,EAAEc,CAAwB,EAAEZ,CAAmB,EAAE;YAC/Fa,CAAAA,OAAOC,QAAQ,GAAGD,OAAOC,QAAQ,IAAI,EAAC,AAAD,EAAIjB,IAAI,CAAC;gBAC3C;gBACA,WAAY;oBACR,OAAOG,EAAoB;gBAC/B;aACH;QAGb;IACI;IACS,SAAUA,CAAmB,EAAE;QAK3BA,EAAoBe,CAAC,CAAC,GAAG;YAC9B;YACA;YACA;SACH,EAAE,WAAY;YACX,OAPOf,EAAoBA,EAAoBgB,CAAC,GAOxB;QAC5B,IAESC,OAD0BjB,EAAoBe,CAAC,EAAA;IAGhE;CACC",
"names": [
"self",
"webpackChunk_N_E",
"push",
"n",
"t",
"u",
"r",
"__unused_webpack_module",
"__webpack_exports__",
"__webpack_require__",
"StaticPage",
"_ref",
"data",
"_",
"react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__",
"jsx",
"children",
"foo",
"r",
"d",
"__N_SSG",
"i",
"default",
"__unused_webpack_exports",
"window",
"__NEXT_P",
"O",
Expand All @@ -27,7 +29,7 @@
"../../input/index.js"
],
"sourcesContent": [
"(self.webpackChunk_N_E = self.webpackChunk_N_E || []).push([\n [\n 158\n ],\n {\n 2943: function(n, t, u) {\n \"use strict\";\n var r = function(n) {\n var t = n.data;\n return (0, _.jsx)(\"div\", {\n children: t.foo\n });\n };\n u.r(t), u.d(t, {\n __N_SSG: function() {\n return i;\n },\n default: function() {\n return r;\n }\n });\n var _ = u(4512), i = !0;\n },\n 7139: function(n, t, u) {\n (window.__NEXT_P = window.__NEXT_P || []).push([\n \"/static\",\n function() {\n return u(2943);\n }\n ]);\n }\n },\n function(n) {\n n.O(0, [\n 774,\n 888,\n 179\n ], function() {\n return n(n.s = 7139);\n }), _N_E = n.O();\n }\n]);\n"
"(self[\"webpackChunk_N_E\"] = self[\"webpackChunk_N_E\"] || []).push([\n [\n 158\n ],\n {\n /***/ 2943: /***/ function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {\n \"use strict\";\n var StaticPage = function StaticPage(_ref) {\n var data = _ref.data;\n return /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(\"div\", {\n children: data.foo\n });\n };\n __webpack_require__.r(__webpack_exports__);\n /* harmony export */ __webpack_require__.d(__webpack_exports__, {\n /* harmony export */ __N_SSG: function __N_SSG1() {\n return /* binding */ __N_SSG;\n },\n /* harmony export */ default: function _default() {\n return /* binding */ StaticPage;\n }\n });\n /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4512);\n var __N_SSG = true;\n /***/\n},\n /***/ 7139: /***/ function (__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {\n (window.__NEXT_P = window.__NEXT_P || []).push([\n \"/static\",\n function () {\n return __webpack_require__(2943);\n }\n ]);\n if (false) { }\n /***/\n}\n },\n /******/ function (__webpack_require__) {\n // webpackRuntimeModules\n /******/ var __webpack_exec__ = function __webpack_exec__(moduleId) {\n return __webpack_require__(__webpack_require__.s = moduleId);\n };\n /******/ __webpack_require__.O(0, [\n 774,\n 888,\n 179\n ], function () {\n return __webpack_exec__(7139);\n });\n /******/ var __webpack_exports__ = __webpack_require__.O();\n /******/ _N_E = __webpack_exports__;\n /******/\n}\n]);\n"
],
"version": 3
}
31 changes: 21 additions & 10 deletions crates/swc_common/src/source_map.rs
View file
Expand Up @@ -1195,6 +1195,7 @@ impl SourceMap {
let mut ch_start = 0;
let mut line_prev_extra_bytes = 0;
let mut line_ch_start = 0;
let mut inline_sources_content = false;

for (pos, lc) in mappings.iter() {
let pos = *pos;
Expand Down Expand Up @@ -1223,7 +1224,8 @@ impl SourceMap {
f = self.lookup_source_file(pos);
src_id = builder.add_source(&config.file_name_to_source(&f.name));

if config.inline_sources_content(&f.name) {
inline_sources_content = config.inline_sources_content(&f.name);
if inline_sources_content && !orig.is_some() {
builder.set_source_contents(src_id, Some(&f.src));
}

Expand Down Expand Up @@ -1252,13 +1254,10 @@ impl SourceMap {
None => continue,
};

let mut name = config.name_for_bytepos(pos);
let mut name_idx = None;

if let Some(name) = config.name_for_bytepos(pos) {
name_idx = Some(builder.add_name(name))
}

let mut line = a + 1; // Line numbers start at 1
let mut line = a;

let linebpos = f.lines[a as usize];
debug_assert!(
Expand All @@ -1282,20 +1281,32 @@ impl SourceMap {

if let Some(orig) = &orig {
if let Some(token) = orig
.tokens()
.find(|token| token.get_src_line() == line - 1 && token.get_src_col() == col)
.lookup_token(line, col)
.filter(|t| t.get_dst_line() == line)
{
line = token.get_src_line() + 1;
line = token.get_src_line();
col = token.get_src_col();
if token.has_name() {
name = token.get_name();
}
if let Some(src) = token.get_source() {
src_id = builder.add_source(src);
if inline_sources_content && !builder.has_source_contents(src_id) {
if let Some(contents) = token.get_source_view() {
builder.set_source_contents(src_id, Some(contents.source()));
}
}
}
} else {
continue;
}
}

builder.add_raw(lc.line, lc.col, line - 1, col, Some(src_id), name_idx);
if let Some(name) = name {
name_idx = Some(builder.add_name(name))
}

builder.add_raw(lc.line, lc.col, line, col, Some(src_id), name_idx);
prev_dst_line = lc.line;
}

Expand Down

0 comments on commit 9939ca0

Please sign in to comment.