Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,5 @@ export class Transformer {
* # Errors
* Returns an error if the transformation fails to find injection points.
*/
transform(code: string | Buffer, moduleType: ModuleType, sourcemap?: string | null): TransformOutput;
transform(code: string | Buffer, moduleType: ModuleType, sourcemap?: string | object | null): TransformOutput;
}
15 changes: 11 additions & 4 deletions lib/transformer.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,17 @@ class Transformer {
SourceMapGenerator ??= require('source-map').SourceMapGenerator

const file = `${this.#moduleName}/${this.#filePath}`
const sourceMapInput = sourcemap ? new SourceMapConsumer(sourcemap) : { file }
const sourceMap = new SourceMapGenerator(sourceMapInput)
const code = generate(ast, { sourceMap })
const map = sourceMap.toString()
let generator
if (sourcemap) {
const consumer = new SourceMapConsumer(sourcemap)
consumer.file = file
generator = SourceMapGenerator.fromSourceMap(consumer)
} else {
generator = new SourceMapGenerator({ file })
}

const code = generate(ast, { sourceMap: generator })
const map = generator.toString()

return { code, map }
}
Expand Down
17 changes: 17 additions & 0 deletions tests/tests.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,23 @@ describe('source_map', () => {
assert.equal(original.line, originalReturnLine)
assert.equal(original.column, originalReturnColumn)
})

test('produces a valid sourcemap when an inputSourceMap is provided', () => {
const code = 'export class Undici { async fetch (url) { return 42; } }'
const inputSourceMap = { version: 3, sources: ['input.js'], mappings: 'AAAA', names: [] }

const instrumentor = create([
{
channelName: 'Undici:fetch',
module: { name: TEST_MODULE_NAME, versionRange: '>=0.0.1', filePath: TEST_MODULE_PATH },
functionQuery: { className: 'Undici', methodName: 'fetch', kind: 'Async' },
},
])
const transformer = instrumentor.getTransformer(TEST_MODULE_NAME, TEST_MODULE_VERSION, TEST_MODULE_PATH)
const { map } = transformer.transform(code, 'esm', inputSourceMap)

assert.equal(JSON.parse(map).file, `${TEST_MODULE_NAME}/${TEST_MODULE_PATH}`)
})
})

describe('wrap_promise_non_promise', () => {
Expand Down
Loading