Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(es/codegen): Add sourcemap entry for injected semicolons #3750

Merged
merged 11 commits into from Feb 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,5 +1,5 @@
{
"mappings": "AAAA,MAAM,CAAC,CAAa;SAEXA,CAAC,GAAG,CAAC;IACVC,CAAC;AACL,CAAC;SAEQA,CAAC,GAAY,CAAC;QAAZC,CAAC,oEAAG,KAAK;IAChB,EAAE,EAAEA,CAAC,EAAE,CAAC;QACJ,KAAK,CAAC,GAAG,CAACC,KAAK,CAAC,CAAO;IAC3B,CAAC;IACDF,CAAC,EAAE,CAAC;AACR,CAAC;AAEDD,CAAC",
"mappings": "AAAA,MAAM,CAAC,CAAa;SAEXA,CAAC,GAAG,CAAC;IACVC,CAAC,EAAE,CAAC;AACR,CAAC;SAEQA,CAAC,GAAY,CAAC;QAAZC,CAAC,oEAAG,KAAK;IAChB,EAAE,EAAEA,CAAC,EAAE,CAAC;QACJ,KAAK,CAAC,GAAG,CAACC,KAAK,CAAC,CAAO;IAC3B,CAAC;IACDF,CAAC,EAAE,CAAC,CAAC,CAAC;AACV,CAAC;AAEDD,CAAC,EAAE,CAAC",
"names": [
"a",
"t",
Expand Down
@@ -1,5 +1,5 @@
{
"mappings": ";;;;;AAEO,KAAK,CAACA,GAAG,GAAG,CAAC;QAAPA,GAAG,GAAHA,GAAG",
"mappings": "Y;;;E;oB;AAEO,KAAK,CAACA,GAAG,GAAG,CAAC;QAAPA,GAAG,GAAHA,GAAG,A",
"names": [
"foo"
],
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/issue-3715/1/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": "AAAAA,CAAC,GAAG,EAA6B,AAA7B,yBAA6B,AAA7B,EAA6B",
"mappings": "AAAAA,CAAC,GAAG,EAA6B,AAA7B,yBAA6B,AAA7B,EAA6B,CAA9B,CAA+B",
"names": [
"a"
],
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/issue-3715/2/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": "AAAAA,CAAC,GAAG,EAA6B,AAA7B,yBAA6B,AAA7B,EAA6B",
"mappings": "AAAAA,CAAC,GAAG,EAA6B,AAA7B,yBAA6B,AAA7B,EAA6B,CAA9B,CAA+B",
"names": [
"a"
],
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/issue-3716/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": "AAAAA,CAAC;AAAE,EAAK,AAAL,CAAK,AAAL,EAAK,CAERA,CAAC,GAAE,EAAG,AAAH,CAAG;;AAENA,CAAC,IAAG,EAAK,AAAL,CAAK,AAAL,EAAK;AAETA,CAAC,IAAG,EAAG,AAAH,CAAG",
"mappings": "AAAAA,CAAC,E;AAAE,EAAK,AAAL,CAAK,AAAL,EAAK,CAERA,CAAC,GAAE,EAAG,AAAH,CAAG;A;AAENA,CAAC,EAAE,CAAC,CAAA,EAAK,AAAL,CAAK,AAAL,EAAK;AAETA,CAAC,EAAE,CAAC,CAAA,EAAG,AAAH,CAAG",
"names": [
"a"
],
Expand Down
12 changes: 12 additions & 0 deletions crates/swc/tests/fixture/jest/sourcemap-1/output/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -9,4 +9,4 @@ const Button = _linaria.css`
`;
exports.Button = Button;

//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL2lucHV0L2luZGV4LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNzcyB9IGZyb20gXCJsaW5hcmlhXCJcblxuZXhwb3J0IGNvbnN0IEJ1dHRvbiA9IGNzc2BcbiAgICBjb2xvcjogcmVkO1xuYCJdLCJuYW1lcyI6WyJCdXR0b24iLCJjc3MiXSwibWFwcGluZ3MiOiI7Ozs7O0FBQW9CLEdBQVMsQ0FBVCxRQUFTO0FBRXRCLEtBQUssQ0FBQ0EsTUFBTSxHQUFHQyxRQUFHLEtBQUM7O0FBRTFCO1FBRmFELE1BQU0sR0FBTkEsTUFBTSJ9
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL2lucHV0L2luZGV4LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNzcyB9IGZyb20gXCJsaW5hcmlhXCJcblxuZXhwb3J0IGNvbnN0IEJ1dHRvbiA9IGNzc2BcbiAgICBjb2xvcjogcmVkO1xuYCJdLCJuYW1lcyI6WyJCdXR0b24iLCJjc3MiXSwibWFwcGluZ3MiOiJZOzs7RTt1QjtBQUFvQixHQUFTLENBQVQsUUFBUztBQUV0QixLQUFLLENBQUNBLE1BQU0sR0FBR0MsUUFBRyxLQUFDOztBQUUxQjtRQUZhRCxNQUFNLEdBQU5BLE1BQU0sQSJ9
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/001/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": ";;;;;AAEO,KAAK,CAACA,GAAG,GAAG,CAAC;IAChBC,GAAG,EAAE,CAAC,CAAC;AACX,CAAC;QAFYD,GAAG,GAAHA,GAAG",
"mappings": "Y;;;E;oB;AAEO,KAAK,CAACA,GAAG,GAAG,CAAC;IAChBC,GAAG,EAAE,CAAC,CAAC;AACX,CAAC;QAFYD,GAAG,GAAHA,GAAG,A",
"names": [
"foo",
"arr"
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/002/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": ";;AAAA,MAAM,SAAS,QAAQ,CAACA,UAAU,CAAC,KAAQ,EAAE,CAAC;QAATC,IAAI,GAAN,KAAQ,CAANA,IAAI;IACrC,MAAM,mCAAEC,CAAG,YAAED,IAAI,CAACE,GAAG;AACzB,CAAC;AAED,MAAM,UAAgBC,cAAc;WAAdA,eAAc;;SAAdA,eAAc;IAAdA,eAAc,uDAA7B,QAAQ,WAAwB,CAAC;;;;iDAC7B,CAAC;wBACJC,KAAK,EAAE,CAAC;4BACJJ,IAAI,EAAE,CAAC;gCACHE,GAAG,EAAE,CAAK;4BACd,CAAC;wBACL,CAAC;oBACL,CAAC;;;;;;IACL,CAAC;WARqBC,eAAc",
"mappings": ";;AAAA,MAAM,SAAS,QAAQ,CAACA,UAAU,CAAC,KAAQ,EAAE,CAAC;QAATC,IAAI,GAAN,KAAQ,CAANA,IAAI;IACrC,MAAM,mCAAEC,CAAG,YAAED,IAAI,CAACE,GAAG;AACzB,CAAC;AAED,MAAM,UAAgBC,cAAc;WAAdA,eAAc;;SAAdA,eAAc;IAAdA,eAAc,uDAA7B,QAAQ,WAAwB,CAAC;;;;iDAC7B,CAAC;wBACJC,KAAK,EAAE,CAAC;4BACJJ,IAAI,EAAE,CAAC;gCACHE,GAAG,EAAE,CAAK;4BACd,CAAC;wBACL,CAAC;oBACL,CAAC;;;;;;IACL,CAAC,E;WARqBC,eAAc",
"names": [
"StaticPage",
"data",
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/004/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": "CEACA,IAAI,CAAC,gBAAkB,GAAIA,IAAI,CAAC,gBAAkB,IAAK,CAAC,CAAC,EAAEC,IAAI,CAAC,CAAC;IAAA,CAAC;AAAA,WAAG;IAAA,CAAC;IAAE,CAAC;AAEhE,YAAI,EACH,QAAQ,CAAEC,CAAuB,EAAEC,CAAmB,EAAEC,CAAmB,EAAE,CAAC;YAE7E,CAAY;gBFJtBC,CAAO,GAAP,QAAA,CAAOC,CAAA,EAAA,CAAA;gBAAM,GAAK,CAAAC,CAAA,GAAAD,CAAA,CAAAC,IAAA;gBAAlB,MAAA,KAAAC,CAAA,CAAAC,GAAA,EAAA,CAAA,MAAA,CAAA;oBACDC,QAAA,EAAAH,CAAA,CAAAI,GAAA;gBAAA,CAAA;YAAA,CAAA;YAIWP,CAAmB,CAACQ,CAAC,CAACT,CAAmB,GAC5BC,CAAmB,CAACS,CAAC,CAACV,CAAmB,EAAE,CAAC;gBAC1C,CAAS,UAAE,QAAQ,GAAI,CAAC;oBAAC,MAAM,CAAeW,CAAO;gBAAE,CAAC;gBACxD,CAAS,UAAE,QAAQ,GAAI,CAAC;oBAAC,MAAM,CAAeT,CAAU;gBAAE,CAAC;YAE1E,CAAC;YACY,GAAG,CAACG,CAA8C,GAAGJ,CAAmB,CAAC,IAAI,GAZzDU,CAAA,IAAA,CAAA;QAE5C,CAAA;AAAA,YAAA,ECDD,QAAA,CAAAZ,CAAA,EAAAa,CAAA,EAAAX,CAAA,EAAA,CAAA;aAGAY,MAAe,CAAAC,QAAA,GAAAD,MAAQ,CAAAC,QAA8B,IAAA,CAAA,CAAA,EAAAhB,IAAA,CAAA,CAAA;gBACrD,CAAA;gBACA,QAAA,GAAA,CAAA;oBAKK,MAAA,CAAAG,CAAA,CAAA,IAAA;gBACL,CAAA;YAAA,CAAA;QAAA,CAAA;IAAA,CAAA;IAAA,QAAA,CAAAA,CAAA,EAAA,CAAA;QAAAA,CAAA,CAAAc,CAAA,CAAA,CAAA,EAAA,CAAA;AAAA,eAAA;AAAA,eAAA;AAAA,eAAA;QAAA,CAAA,EAAA,QAAA,GAAA,CAAA;YAAA,MAAA,CAAAd,CAAA,CAAAA,CAAA,CAAAe,CAAA,GAAA,IAAA;QAAA,CAAA,GAAAC,IAAA,GAAAhB,CAAA,CAAAc,CAAA;IAAA,CAAA;AAAA,CAAA",
"mappings": "CEACA,IAAI,CAAC,gBAAkB,GAAIA,IAAI,CAAC,gBAAkB,IAAK,CAAC,CAAC,EAAEC,IAAI,CAAC,CAAC;IAAA,CAAC;AAAA,WAAG;IAAA,CAAC;IAAE,CAAC;AAEhE,YAAI,EACH,QAAQ,CAAEC,CAAuB,EAAEC,CAAmB,EAAEC,CAAmB,EAAE,CAAC;YAE7E,CAAY,WAAA,CAAC;gBFJvBC,CAAO,GAAP,QAAA,CAAOC,CAAA,EAAA,CAAA;gBAAM,GAAK,CAAAC,CAAA,GAAAD,CAAA,CAAAC,IAAA;gBAAlB,MAAA,KAAAC,CAAA,CAAAC,GAAA,EAAA,CAAA,MAAA,CAAA;oBACDC,QAAA,EAAAH,CAAA,CAAAI,GAAA;gBAAA,CAAA;YAAA,CAAA;YAIWP,CAAmB,CAACQ,CAAC,CAACT,CAAmB,GAC5BC,CAAmB,CAACS,CAAC,CAACV,CAAmB,EAAE,CAAC;gBAC1C,CAAS,UAAE,QAAQ,GAAI,CAAC;oBAAC,MAAM,CAAeW,CAAO;gBAAE,CAAC;gBACxD,CAAS,UAAE,QAAQ,GAAI,CAAC;oBAAC,MAAM,CAAeT,CAAU;gBAAE,CAAC;YAE1E,CAAC,C;YACY,GAAG,CAACG,CAA8C,GAAGJ,CAAmB,CAAC,IAAI,GAZzDU,CAAA,IAAA,CAAA;QAE5C,CAAA;AAAA,YAAA,ECDD,QAAA,CAAAZ,CAAA,EAAAa,CAAA,EAAAX,CAAA,EAAA,CAAA;aAGAY,MAAe,CAAAC,QAAA,GAAAD,MAAQ,CAAAC,QAA8B,IAAA,CAAA,CAAA,EAAAhB,IAAA,CAAA,CAAA;gBACrD,CAAA;gBACA,QAAA,GAAA,CAAA;oBAKK,MAAA,CAAAG,CAAA,CAAA,IAAA;gBACL,CAAA;YAAA,CAAA,CAAA,CAAA;QAAA,CAAA;IAAA,CAAA;IAAA,QAAA,CAAAA,CAAA,EAAA,CAAA;QAAAA,CAAA,CAAAc,CAAA,CAAA,CAAA,EAAA,CAAA;AAAA,eAAA;AAAA,eAAA;AAAA,eAAA;QAAA,CAAA,EAAA,QAAA,GAAA,CAAA;YAAA,MAAA,CAAAd,CAAA,CAAAA,CAAA,CAAAe,CAAA,GAAA,IAAA;QAAA,CAAA,GAAAC,IAAA,GAAAhB,CAAA,CAAAc,CAAA,E;IAAA,CAAA;AAAA,CAAA,CAAA,CAAA",
"names": [
"self",
"push",
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/005/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAAA,EAAE,CAAC,CAA6D,wGAAE,QAAQ,WAAI,CAAC;QACrEC,KAAK,EACLC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EACJC,IAAI,EACJC,IAAI;;;;gBA3BJN,KAAK,GAAG,CAAC;oBAACO,GAAG,EAAE,CAAW;oBAAEC,CAAC,EAADA,CAAC;oBAAEC,CAAC,EAAE,EAAE;gBAAC,CAAC;;uBACzBC,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKZ,IAAI;gBAKVa,MAAM,CAACb,IAAI,CAACc,MAAM,EAAEC,IAAI,CAAC,GAAG;gBAC5BF,MAAM,CAACb,IAAI,CAACW,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY;;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKX,IAAI;gBAKVY,MAAM,CAACZ,IAAI,CAACa,MAAM,EAAEC,IAAI,CAAC,GAAG;gBAC5BF,MAAM,CAACZ,IAAI,CAACU,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY;;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKV,IAAI;gBAKVW,MAAM,CAACX,IAAI,CAACY,MAAM,EAAEC,IAAI,CAAC,GAAG;gBAC5BF,MAAM,CAACX,IAAI,CAACS,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY;;uBAEtCf,IAAI,CAACiB,MAAM;;gBAAzBd,IAAI,aAAyBe,UAAU;;uBACzBjB,IAAI,CAACgB,MAAM;;gBAAzBb,IAAI,aAAyBc,UAAU;;uBACzBhB,IAAI,CAACe,MAAM;;gBAAzBZ,IAAI,aAAyBa,UAAU;gBAE7CC,OAAO,CAACC,GAAG,CAAC,CAAC;oBAACC,OAAO,EAAPA,OAAO;oBAAEd,CAAC,EAADA,CAAC;oBAAEJ,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;gBAAC,CAAC;gBAE5CQ,MAAM,CAACT,IAAI,EAAEkB,YAAY,CAACjB,IAAI;gBAC9BQ,MAAM,CAACV,IAAI,EAAEmB,YAAY,CAAClB,IAAI;;;;;;AAClC,CAAC",
"mappings": ";;;;;qB;;;;sB;;kD;;;;;;;;;sF;;;qF;;4B;;;;;AAAAA,EAAE,CAAC,CAA6D,wGAAE,QAAQ,WAAI,CAAC;QACrEC,KAAK,EACLC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EACJC,IAAI,EACJC,IAAI;;;;gBA3BJN,KAAK,GAAG,CAAC;oBAACO,GAAG,EAAE,CAAW;oBAAEC,CAAC,EAADA,CAAC;oBAAEC,CAAC,EAAE,EAAE;gBAAC,CAAC,A;6B;uBACzBC,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKZ,IAAI,YAFdF,CAMM;gBACFe,MAAM,CAACb,IAAI,CAACc,MAAM,EAAEC,IAAI,CAAC,GAAG,C;gBAC5BF,MAAM,CAACb,IAAI,CAACW,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY,Y;6B;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKX,IAAI,YAVdH,CAcM;gBACFe,MAAM,CAACZ,IAAI,CAACa,MAAM,EAAEC,IAAI,CAAC,GAAG,C;gBAC5BF,MAAM,CAACZ,IAAI,CAACU,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY,Y;8B;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKV,IAAI,YAlBdJ,CAsBM;gBACFe,MAAM,CAACX,IAAI,CAACY,MAAM,EAAEC,IAAI,CAAC,GAAG,C;gBAC5BF,MAAM,CAACX,IAAI,CAACS,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY,Y;8B;uBAEtCf,IAAI,CAACiB,MAAM;;gBAAzBd,IAAI,aAAyBe,UAAU,AA1BjDpB,CA0BiD;8B;uBACzBG,IAAI,CAACgB,MAAM;;gBAAzBb,IAAI,aAAyBc,UAAU,AA3BjDpB,CA2BiD;8B;uBACzBI,IAAI,CAACe,MAAM;;gBAAzBZ,IAAI,aAAyBa,UAAU,AA5BjDpB,CA4BiD;gBAE7CqB,OAAO,CAACC,GAAG,CAAC,CAAC;oBAACC,OAAO,EAAPA,OAAO;oBAAEd,CAAC,EAADA,CAAC;oBAAEJ,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;gBAAC,CAAC,C;gBAE5CQ,MAAM,CAACT,IAAI,EAAEkB,YAAY,CAACjB,IAAI,C;gBAC9BQ,MAAM,CAACV,IAAI,EAAEmB,YAAY,CAAClB,IAAI,C;;;;;;AAClC,CAAC,G",
"names": [
"it",
"query",
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/006/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAAA,EAAE,CAAC,CAA6D,wGAAE,QAAQ,WAAI,CAAC;QAQrEC,KAAK,EACLC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EACJC,IAAI,EACJC,IAAI;;;;gBA3BJN,KAAK,GAAG,CAAC;oBAACO,GAAG,EAAE,CAAW;oBAAEC,CAAC,EAADA,CAAC;oBAAEC,CAAC,EAAE,EAAE;gBAAC,CAAC;;uBACzBC,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKZ,IAAI;gBAKVa,MAAM,CAACb,IAAI,CAACc,MAAM,EAAEC,IAAI,CAAC,GAAG;gBAC5BF,MAAM,CAACb,IAAI,CAACW,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY;;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKX,IAAI;gBAKVY,MAAM,CAACZ,IAAI,CAACa,MAAM,EAAEC,IAAI,CAAC,GAAG;gBAC5BF,MAAM,CAACZ,IAAI,CAACU,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY;;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKV,IAAI;gBAKVW,MAAM,CAACX,IAAI,CAACY,MAAM,EAAEC,IAAI,CAAC,GAAG;gBAC5BF,MAAM,CAACX,IAAI,CAACS,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY;;uBAEtCf,IAAI,CAACiB,MAAM;;gBAAzBd,IAAI,aAAyBe,UAAU;;uBACzBjB,IAAI,CAACgB,MAAM;;gBAAzBb,IAAI,aAAyBc,UAAU;;uBACzBhB,IAAI,CAACe,MAAM;;gBAAzBZ,IAAI,aAAyBa,UAAU;gBAE7CC,OAAO,CAACC,GAAG,CAAC,CAAC;oBAACC,OAAO,EAAPA,OAAO;oBAAEd,CAAC,EAADA,CAAC;oBAAEJ,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;gBAAC,CAAC;gBAE5CQ,MAAM,CAACT,IAAI,EAAEkB,YAAY,CAACjB,IAAI;gBAC9BQ,MAAM,CAACV,IAAI,EAAEmB,YAAY,CAAClB,IAAI;;;;;;AAClC,CAAC",
"mappings": ";;;;;qB;;;;sB;;kD;;;;;;;;;sF;;;qF;;4B;;;;;AAAAA,EAAE,CAAC,CAA6D,wGAAE,QAAQ,WAAI,CAAC;QAQrEC,KAAK,EACLC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EAQJC,IAAI,EACJC,IAAI,EACJC,IAAI;;;;gBA3BJN,KAAK,GAAG,CAAC;oBAACO,GAAG,EAAE,CAAW;oBAAEC,CAAC,EAADA,CAAC;oBAAEC,CAAC,EAAE,EAAE;gBAAC,CAAC,A;6B;uBACzBC,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKZ,IAAI,YATdF,CAaM;gBACFe,MAAM,CAACb,IAAI,CAACc,MAAM,EAAEC,IAAI,CAAC,GAAG,C;gBAC5BF,MAAM,CAACb,IAAI,CAACW,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY,Y;6B;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKX,IAAI,YAjBdH,CAqBM;gBACFe,MAAM,CAACZ,IAAI,CAACa,MAAM,EAAEC,IAAI,CAAC,GAAG,C;gBAC5BF,MAAM,CAACZ,IAAI,CAACU,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY,Y;8B;uBAEvCN,YAAY,CAACC,OAAO,EAAE,CAAc,eAAEX,KAAK,EAAE,CAAC;oBAC7DY,OAAO,EAAE,CAAC;wBACNC,MAAM,EAAE,CAAY;oBACxB,CAAC;gBACL,CAAC;;gBAJKV,IAAI,YAzBdJ,CA6BM;gBACFe,MAAM,CAACX,IAAI,CAACY,MAAM,EAAEC,IAAI,CAAC,GAAG,C;gBAC5BF,MAAM,CAACX,IAAI,CAACS,OAAO,CAACK,GAAG,CAAC,CAAc,gBAAGD,IAAI,CAAC,CAAY,Y;8B;uBAEtCf,IAAI,CAACiB,MAAM;;gBAAzBd,IAAI,aAAyBe,UAAU,AAjCjDpB,CAiCiD;8B;uBACzBG,IAAI,CAACgB,MAAM;;gBAAzBb,IAAI,aAAyBc,UAAU,AAlCjDpB,CAkCiD;8B;uBACzBI,IAAI,CAACe,MAAM;;gBAAzBZ,IAAI,aAAyBa,UAAU,AAnCjDpB,CAmCiD;gBAE7CqB,OAAO,CAACC,GAAG,CAAC,CAAC;oBAACC,OAAO,EAAPA,OAAO;oBAAEd,CAAC,EAADA,CAAC;oBAAEJ,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;oBAAEC,IAAI,EAAJA,IAAI;gBAAC,CAAC,C;gBAE5CQ,MAAM,CAACT,IAAI,EAAEkB,YAAY,CAACjB,IAAI,C;gBAC9BQ,MAAM,CAACV,IAAI,EAAEmB,YAAY,CAAClB,IAAI,C;;;;;;AAClC,CAAC,G",
"names": [
"it",
"query",
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/007/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": "AAAA,EAEG,AAFH;;CAEG,AAFH,EAEG,CACH,MAAM,CAAC,GAAK,CAACA,WAAW,GAAG,QAAQ,CAAPC,IAAI,EAAK,CAAC;IAClCC,OAAO,CAACC,GAAG,CAACF,IAAI;IAChBC,OAAO,CAACC,GAAG,CAACF,IAAI;IAChBC,OAAO,CAACC,GAAG,CAACF,IAAI;IAChBC,OAAO,CAACC,GAAG,CAACF,IAAI;AACpB,CAAC",
"mappings": "AAAA,EAEG,AAFH;;CAEG,AAFH,EAEG,CACH,MAAM,CAAC,GAAK,CAACA,WAAW,GAAG,QAAQ,CAAPC,IAAI,EAAK,CAAC;IAClCC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC,CAAC;IAClBC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC,CAAC;IAClBC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC,CAAC;IAClBC,OAAO,CAACC,GAAG,CAACF,IAAI,CAAC,CAAC;AACtB,CAAC",
"names": [
"LogSomeText",
"text",
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/008/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": ";AAAAA,QAAQ,CAAC,CAAoB,yBAAQ,CAAC;IAClCC,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;IAEDF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACf,EAAI,AAAJ,EAAI,CACJC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;IAEDF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACf,EAEG,AAFH;;SAEG,AAFH,EAEG,CACHC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;IAEDF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;AACL,CAAC",
"mappings": "Y;AAAAA,QAAQ,CAAC,CAAoB,yBAAQ,CAAC;IAClCC,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEHF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACf,EAAI,AAAJ,EAAI,CACJC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEHF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACf,EAEG,AAFH;;SAEG,AAFH,EAEG,CACHC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEHF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC",
"names": [
"describe",
"it",
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/sourcemap/009/output/index.map
@@ -1,5 +1,5 @@
{
"mappings": ";AAAA,EAKG,AALH;;;;;CAKG,AALH,EAKG,CACHA,OAAO,CAACC,GAAG,CAAC,GAAG,CAACC,KAAK,GAAGC,KAAK",
"mappings": "Y;AAAA,EAKG,AALH;;;;;CAKG,AALH,EAKG,CACHA,OAAO,CAACC,GAAG,CAAC,GAAG,CAACC,KAAK,GAAGC,KAAK,C",
"names": [
"console",
"log",
Expand Down
@@ -1,5 +1,5 @@
{
"mappings": "AAAAA,QAAQ,CAAC,CAAK,UAAQ,CAAC;IACnBC,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;IAEDF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACf,KAAK,CAACG,GAAG,IAAI;;MAEf;QAEEF,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;IAEDF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI;IAC3B,CAAC;AACL,CAAC",
"mappings": "AAAAA,QAAQ,CAAC,CAAK,UAAQ,CAAC;IACnBC,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEHF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACf,KAAK,CAACG,GAAG,IAAI;;MAEf;QAEEF,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEHF,EAAE,CAAC,CAAO,YAAQ,CAAC;QACfC,MAAM,CAAC,KAAK,EAAEC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC",
"names": [
"describe",
"it",
Expand Down
11 changes: 11 additions & 0 deletions crates/swc/tests/fixture/sourcemap/issue-3733/1/input/.swcrc
@@ -0,0 +1,11 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": false,
"dynamicImport": false
}
},
"sourceMaps": true
}
@@ -0,0 +1 @@
a()//?
@@ -0,0 +1,2 @@
a() //?
;
@@ -0,0 +1,13 @@
{
"mappings": "AAAAA,CAAC,GAAE,EAAG,AAAH,CAAG;A",
"names": [
"a"
],
"sources": [
"../../input/index.js"
],
"sourcesContent": [
"a()//?"
],
"version": 3
}
11 changes: 11 additions & 0 deletions crates/swc/tests/fixture/sourcemap/issue-3733/2/input/.swcrc
@@ -0,0 +1,11 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": false,
"dynamicImport": false
}
},
"sourceMaps": true
}
@@ -0,0 +1 @@
a()/*?*/
@@ -0,0 +1 @@
a() /*?*/ ;
@@ -0,0 +1,13 @@
{
"mappings": "AAAAA,CAAC,GAAE,EAAK,AAAL,CAAK,AAAL,EAAK,C",
"names": [
"a"
],
"sources": [
"../../input/index.js"
],
"sourcesContent": [
"a()/*?*/"
],
"version": 3
}
4 changes: 2 additions & 2 deletions crates/swc_common/src/source_map.rs
Expand Up @@ -1132,8 +1132,8 @@ impl SourceMap {
let pos = *pos;
let lc = *lc;

// TODO: Use correct algorithm
if pos >= BytePos(4294967295) {
if pos == BytePos(u32::MAX) {
builder.add_raw(lc.line, lc.col, 0, 0, None, None);
continue;
}

Expand Down
11 changes: 10 additions & 1 deletion crates/swc_ecma_codegen/src/lib.rs
Expand Up @@ -2310,8 +2310,17 @@ where

#[emitter]
fn emit_expr_stmt(&mut self, e: &ExprStmt) -> Result {
let expr_span = e.expr.span();

emit!(e.expr);
semi!();

let span = if expr_span.hi == e.span.hi {
DUMMY_SP
} else {
Span::new(expr_span.hi, e.span.hi, Default::default())
};

semi!(span);
}

#[emitter]
Expand Down
14 changes: 13 additions & 1 deletion crates/swc_ecma_codegen/src/text_writer/basic_impl.rs
@@ -1,6 +1,6 @@
use std::io::{self, Write};

use swc_common::{sync::Lrc, BytePos, LineCol, SourceMap, Span};
use swc_common::{sync::Lrc, BytePos, LineCol, SourceMap, Span, DUMMY_SP};
use swc_ecma_ast::EsVersion;

use super::{Result, WriteJs};
Expand Down Expand Up @@ -124,6 +124,18 @@ impl<'a, W: Write> WriteJs for JsWriter<'a, W> {
}

fn write_semi(&mut self, span: Option<Span>) -> Result {
if span == Some(DUMMY_SP) {
if let Some(ref mut srcmap) = self.srcmap {
srcmap.push((
BytePos(u32::MAX),
LineCol {
line: self.line_count as _,
col: self.line_pos as _,
},
))
}
}

self.write(span, ";")?;
Ok(())
}
Expand Down