Skip to content

Handle promise when generating source maps #102

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Handle promise when generating source maps #102

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44584f1
Fix sourcemap implementation
dbisso Sep 6, 2022
aef8aa1
Revert some accidental changes
dbisso Sep 6, 2022
e7a11cf
Avoid variable collision
dbisso Sep 7, 2022
0633098
Set sources content only once
dbisso Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,28 +203,30 @@ module.exports = function (params) {

if (result.map.mappings && result.map.mappings.length > 0) {
var resultMap = new SourceMapConsumer(result.map);
resultMap.eachMapping(function (mapping) {
if (!mapping.source) return;

map.addMapping({
generated: {
line: mapping.generatedLine + currentLine - 1,
column: mapping.generatedColumn + (leadingWhitespace ? leadingWhitespace.length : 0)
},
original: {
line: mapping.originalLine,
column: mapping.originalColumn
},
source: mapping.source,
name: mapping.name
resultMap.then(consumer => {
consumer.eachMapping(function (mapping) {
if (!mapping.source) return;

map.addMapping({
generated: {
line: mapping.generatedLine + currentLine - 1,
column: mapping.generatedColumn + (leadingWhitespace ? leadingWhitespace.length : 0)
},
original: {
line: mapping.originalLine,
column: mapping.originalColumn
},
source: mapping.source,
name: mapping.name
});
});
});

if (result.map.sourcesContent) {
result.map.sourcesContent.forEach(function (sourceContent, i) {
map.setSourceContent(result.map.sources[i], sourceContent);
});
}
if (map.sourcesContent) {
map.sourcesContent.forEach(function (sourceContent, i) {
map.setSourceContent(map.sources[i], sourceContent);
});
}
});
}
} else { // result was a simple file, map whole file to new location
for (var q = 0; q < lines; q++) {
Expand Down Expand Up @@ -331,4 +333,4 @@ module.exports = function (params) {
}

return es.map(include)
};
};