From 4c10b945d304344dcc1e82dd2db55332ef550544 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Thu, 9 May 2024 11:26:58 -0700 Subject: [PATCH] Add transitive mapping support in spec test harness --- test/source-map-tests | 2 +- test/test-spec-tests.js | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/test/source-map-tests b/test/source-map-tests index b2852261..ec5a471d 160000 --- a/test/source-map-tests +++ b/test/source-map-tests @@ -1 +1 @@ -Subproject commit b2852261baf54df31ac33e2ccc5c8fe246c9a4bb +Subproject commit ec5a471db6e3a736242e1e3d9a4aebea1472edf5 diff --git a/test/test-spec-tests.js b/test/test-spec-tests.js index bc169bbf..656da32c 100644 --- a/test/test-spec-tests.js +++ b/test/test-spec-tests.js @@ -73,6 +73,31 @@ async function testMappingAction(assert, rawSourceMap, action) { }); } +async function testTransitiveMappingAction(assert, rawSourceMap, action) { + return SourceMapConsumer.with(rawSourceMap, null, async (consumer) => { + assert.ok(Array.isArray(action.intermediateMaps), "transitive mapping case requires intermediate maps"); + + let mappedPosition = consumer.originalPositionFor({ + line: action.generatedLine + 1, + column: action.generatedColumn, + }); + + for (let intermediateMapPath of action.intermediateMaps) { + const intermediateMap = await readJSON(`./source-map-tests/resources/${intermediateMapPath}`); + await SourceMapConsumer.with(intermediateMap, null, (consumer) => { + mappedPosition = consumer.originalPositionFor({ + line: mappedPosition.line, + column: mappedPosition.column, + }); + }); + } + + assert.equal(mappedPosition.line, action.originalLine + 1, `original line didn't match, expected ${action.originalLine + 1} got ${mappedPosition.line}`); + assert.equal(mappedPosition.column, action.originalColumn, `original column didn't match, expected ${action.originalColumn} got ${mappedPosition.column}`); + assert.equal(mappedPosition.source, action.originalSource, `original source didn't match, expected ${action.originalSource} got ${mappedPosition.source}`); + }); +} + for (let testCase of sourceMapSpecTests.tests) { if (skippedTests.includes(testCase.name)) continue; @@ -95,6 +120,8 @@ for (let testCase of sourceMapSpecTests.tests) { for (let testAction of testCase.testActions) { if (testAction.actionType == "checkMapping") { await testMappingAction(assert, json, testAction); + } else if (testAction.actionType == "checkMappingTransitive") { + await testTransitiveMappingAction(assert, json, testAction); } } }