Skip to content

Commit 64050e6

Browse files
committed
Updates to satisfy linter
Also makes the linter ignore the submodule
1 parent 8afce96 commit 64050e6

File tree

2 files changed

+92
-33
lines changed

2 files changed

+92
-33
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
},
6666
"license": "BSD-3-Clause",
6767
"scripts": {
68-
"lint": "eslint --fix *.js lib/ test/",
68+
"lint": "eslint --fix *.js lib/ test/ --ignore-pattern 'test/source-map-tests/**'",
6969
"test": "git submodule update --init --recursive; node test/run-tests.js",
7070
"coverage": "c8 --reporter=text --reporter=html npm test",
7171
"prettier": "prettier --write .",

test/test-spec-tests.js

Lines changed: 91 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* http://opensource.org/licenses/BSD-3-Clause
66
*/
77

8-
const fs = require('node:fs/promises');
8+
const fs = require("node:fs/promises");
99
const SourceMapConsumer =
1010
require("../lib/source-map-consumer").SourceMapConsumer;
1111

@@ -50,7 +50,7 @@ const skippedTests = [
5050
"ignoreListWrongType2",
5151
"ignoreListWrongType3",
5252
"ignoreListOutOfBounds",
53-
]
53+
];
5454

5555
// The source-map library converts null sources to the "null" URL in its
5656
// sources list, so for equality checking we accept this as null.
@@ -66,76 +66,135 @@ function mapLine(line) {
6666
}
6767

6868
async function testMappingAction(assert, rawSourceMap, action) {
69-
return SourceMapConsumer.with(rawSourceMap, null, (consumer) => {
70-
mappedPosition = consumer.originalPositionFor({
69+
return SourceMapConsumer.with(rawSourceMap, null, consumer => {
70+
let mappedPosition = consumer.originalPositionFor({
7171
line: mapLine(action.generatedLine),
7272
column: action.generatedColumn,
7373
});
7474

75-
assert.equal(mappedPosition.line, mapLine(action.originalLine), `original line didn't match, expected ${mapLine(action.originalLine)} got ${mappedPosition.line}`);
76-
assert.equal(mappedPosition.column, action.originalColumn, `original column didn't match, expected ${action.originalColumn} got ${mappedPosition.column}`);
77-
assert.equal(nullish(mappedPosition.source), action.originalSource, `original source didn't match, expected ${action.originalSource} got ${mappedPosition.source}`);
78-
if (action.mappedName)
79-
assert.equal(mappedPosition.name, action.mappedName, `mapped name didn't match, expected ${action.mappedName} got ${mappedPosition.name}`);
75+
assert.equal(
76+
mappedPosition.line,
77+
mapLine(action.originalLine),
78+
`original line didn't match, expected ${mapLine(
79+
action.originalLine
80+
)} got ${mappedPosition.line}`
81+
);
82+
assert.equal(
83+
mappedPosition.column,
84+
action.originalColumn,
85+
`original column didn't match, expected ${action.originalColumn} got ${mappedPosition.column}`
86+
);
87+
assert.equal(
88+
nullish(mappedPosition.source),
89+
action.originalSource,
90+
`original source didn't match, expected ${action.originalSource} got ${mappedPosition.source}`
91+
);
92+
if (action.mappedName) {
93+
assert.equal(
94+
mappedPosition.name,
95+
action.mappedName,
96+
`mapped name didn't match, expected ${action.mappedName} got ${mappedPosition.name}`
97+
);
98+
}
8099

81100
// When the source is null, a reverse lookup may not make sense
82101
// because there isn't a unique way to look it up.
83102
if (action.originalSource !== null) {
84-
let mappedPosition = consumer.generatedPositionFor({
103+
mappedPosition = consumer.generatedPositionFor({
85104
source: action.originalSource,
86105
line: mapLine(action.originalLine),
87-
column: action.originalColumn
106+
column: action.originalColumn,
88107
});
89108

90-
assert.equal(mappedPosition.line, mapLine(action.generatedLine), `generated line didn't match, expected ${mapLine(action.generatedLine)} got ${mappedPosition.line}`);
91-
assert.equal(mappedPosition.column, action.generatedColumn, `generated column didn't match, expected ${action.generatedColumn} got ${mappedPosition.column}`);
109+
assert.equal(
110+
mappedPosition.line,
111+
mapLine(action.generatedLine),
112+
`generated line didn't match, expected ${mapLine(
113+
action.generatedLine
114+
)} got ${mappedPosition.line}`
115+
);
116+
assert.equal(
117+
mappedPosition.column,
118+
action.generatedColumn,
119+
`generated column didn't match, expected ${action.generatedColumn} got ${mappedPosition.column}`
120+
);
92121
}
93-
94122
});
95123
}
96124

97125
async function testTransitiveMappingAction(assert, rawSourceMap, action) {
98-
return SourceMapConsumer.with(rawSourceMap, null, async (consumer) => {
99-
assert.ok(Array.isArray(action.intermediateMaps), "transitive mapping case requires intermediate maps");
126+
return SourceMapConsumer.with(rawSourceMap, null, async consumer => {
127+
assert.ok(
128+
Array.isArray(action.intermediateMaps),
129+
"transitive mapping case requires intermediate maps"
130+
);
100131

101132
let mappedPosition = consumer.originalPositionFor({
102133
line: mapLine(action.generatedLine),
103134
column: action.generatedColumn,
104135
});
105136

106137
for (const intermediateMapPath of action.intermediateMaps) {
107-
const intermediateMap = await readJSON(`./source-map-tests/resources/${intermediateMapPath}`);
108-
await SourceMapConsumer.with(intermediateMap, null, (consumer) => {
109-
mappedPosition = consumer.originalPositionFor({
110-
line: mappedPosition.line,
111-
column: mappedPosition.column,
112-
});
113-
});
138+
const intermediateMap = await readJSON(
139+
`./source-map-tests/resources/${intermediateMapPath}`
140+
);
141+
await SourceMapConsumer.with(
142+
intermediateMap,
143+
null,
144+
consumerIntermediate => {
145+
mappedPosition = consumerIntermediate.originalPositionFor({
146+
line: mappedPosition.line,
147+
column: mappedPosition.column,
148+
});
149+
}
150+
);
114151
}
115152

116-
assert.equal(mappedPosition.line, mapLine(action.originalLine), `original line didn't match, expected ${mapLine(action.originalLine)} got ${mappedPosition.line}`);
117-
assert.equal(mappedPosition.column, action.originalColumn, `original column didn't match, expected ${action.originalColumn} got ${mappedPosition.column}`);
118-
assert.equal(mappedPosition.source, action.originalSource, `original source didn't match, expected ${action.originalSource} got ${mappedPosition.source}`);
153+
assert.equal(
154+
mappedPosition.line,
155+
mapLine(action.originalLine),
156+
`original line didn't match, expected ${mapLine(
157+
action.originalLine
158+
)} got ${mappedPosition.line}`
159+
);
160+
assert.equal(
161+
mappedPosition.column,
162+
action.originalColumn,
163+
`original column didn't match, expected ${action.originalColumn} got ${mappedPosition.column}`
164+
);
165+
assert.equal(
166+
mappedPosition.source,
167+
action.originalSource,
168+
`original source didn't match, expected ${action.originalSource} got ${mappedPosition.source}`
169+
);
119170
});
120171
}
121172

122173
for (const testCase of sourceMapSpecTests.tests) {
123-
if (skippedTests.includes(testCase.name))
174+
if (skippedTests.includes(testCase.name)) {
124175
continue;
176+
}
125177
exports[`test from source map spec tests, name: ${testCase.name}`] =
126178
async function (assert) {
127-
const json = await readJSON(`./source-map-tests/resources/${testCase.sourceMapFile}`);
179+
const json = await readJSON(
180+
`./source-map-tests/resources/${testCase.sourceMapFile}`
181+
);
128182
try {
129183
const map = await new SourceMapConsumer(json);
130184
map.eachMapping(() => {});
131185
map.destroy();
132186
} catch (exn) {
133-
if (testCase.sourceMapIsValid)
134-
assert.fail("Expected valid source map but failed to load successfully: " + exn.message);
187+
if (testCase.sourceMapIsValid) {
188+
assert.fail(
189+
"Expected valid source map but failed to load successfully: " +
190+
exn.message
191+
);
192+
}
135193
return;
136194
}
137-
if (!testCase.sourceMapIsValid)
195+
if (!testCase.sourceMapIsValid) {
138196
assert.fail("Expected invalid source map but loaded successfully");
197+
}
139198
if (testCase.testActions) {
140199
for (const testAction of testCase.testActions) {
141200
if (testAction.actionType == "checkMapping") {
@@ -146,4 +205,4 @@ for (const testCase of sourceMapSpecTests.tests) {
146205
}
147206
}
148207
};
149-
};
208+
}

0 commit comments

Comments
 (0)