@jsenv/core 27.0.0-alpha.82 → 27.0.0-alpha.85
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/js/event_source_client.js +208 -4
- package/dist/js/s.js +2 -2
- package/dist/main.js +1430 -615
- package/dist/s.js +2 -2
- package/dist/s.js.map +2 -1
- package/package.json +6 -2
- package/src/build/build.js +5 -8
- package/src/build/build_urls_generator.js +1 -2
- package/src/build/inject_global_version_mappings.js +4 -4
- package/src/build/inject_service_worker_urls.js +2 -2
- package/src/build/resync_ressource_hints.js +17 -18
- package/src/build/start_build_server.js +33 -26
- package/src/dev/plugins/explorer/jsenv_plugin_explorer.js +1 -2
- package/src/dev/plugins/toolbar/client/util/fetching.js +1 -1
- package/src/dev/plugins/toolbar/jsenv_plugin_toolbar.js +3 -3
- package/src/dev/start_dev_server.js +38 -30
- package/src/execute/runtimes/browsers/from_playwright.js +5 -4
- package/src/execute/runtimes/node/node_process.js +2 -2
- package/src/helpers/command/command.js +73 -0
- package/src/helpers/event_source/event_source.js +197 -0
- package/src/helpers/event_source/sse_service.js +53 -0
- package/src/helpers/worker_reload.js +57 -0
- package/src/omega/compat/runtime_compat.js +2 -1
- package/src/omega/kitchen.js +4 -1
- package/src/omega/server/user_agent.js +2 -1
- package/src/omega/url_graph/sort_by_dependencies.js +27 -0
- package/src/omega/url_graph/url_info_transformations.js +24 -14
- package/src/plugins/autoreload/dev_sse/client/event_source_client.js +1 -1
- package/src/plugins/autoreload/dev_sse/client/reload.js +6 -3
- package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_client.js +3 -3
- package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_server.js +1 -1
- package/src/plugins/bundling/css/bundle_css.js +4 -4
- package/src/plugins/bundling/js_module/bundle_js_module.js +86 -67
- package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js +2 -2
- package/src/plugins/file_urls/jsenv_plugin_file_urls.js +4 -5
- package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js +62 -74
- package/src/plugins/import_meta_hot/html_hot_dependencies.js +9 -15
- package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js +3 -3
- package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js +2 -2
- package/src/plugins/importmap/jsenv_plugin_importmap.js +25 -27
- package/src/plugins/inject_globals/inject_globals.js +4 -4
- package/src/plugins/inline/jsenv_plugin_data_urls.js +1 -1
- package/src/plugins/inline/jsenv_plugin_html_inline_content.js +41 -43
- package/src/plugins/inline/jsenv_plugin_js_inline_content.js +4 -4
- package/src/plugins/minification/css/minify_css.js +1 -1
- package/src/plugins/transpilation/as_js_classic/client/s.js +2 -2
- package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js +2 -4
- package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_html.js +45 -67
- package/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js +2 -3
- package/src/plugins/transpilation/babel/helpers/babel_plugin_babel_helpers_as_jsenv_imports.js +3 -4
- package/src/plugins/transpilation/babel/jsenv_plugin_babel.js +1 -1
- package/src/plugins/transpilation/babel/new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js +2 -3
- package/src/plugins/transpilation/babel/regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js +2 -3
- package/src/plugins/transpilation/css_parcel/jsenv_plugin_css_parcel.js +1 -1
- package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js +1 -1
- package/src/plugins/transpilation/jsenv_plugin_top_level_await.js +2 -1
- package/src/plugins/url_analysis/css/css_urls.js +2 -3
- package/src/plugins/url_analysis/html/html_urls.js +98 -113
- package/src/plugins/url_analysis/js/js_urls.js +3 -2
- package/src/test/coverage/babel_plugin_instrument.js +82 -0
- package/src/test/coverage/coverage_reporter_html_directory.js +36 -0
- package/src/test/coverage/coverage_reporter_json_file.js +22 -0
- package/src/test/coverage/coverage_reporter_text_log.js +19 -0
- package/src/test/coverage/empty_coverage_factory.js +52 -0
- package/src/test/coverage/file_by_file_coverage.js +25 -0
- package/src/test/coverage/istanbul_coverage_composition.js +28 -0
- package/src/test/coverage/istanbul_coverage_map_from_coverage.js +16 -0
- package/src/test/coverage/list_files_not_covered.js +15 -0
- package/src/test/coverage/missing_coverage.js +41 -0
- package/src/test/coverage/report_to_coverage.js +196 -0
- package/src/test/coverage/v8_and_istanbul.js +37 -0
- package/src/test/coverage/v8_coverage_composition.js +24 -0
- package/src/test/coverage/v8_coverage_from_directory.js +87 -0
- package/src/test/coverage/v8_coverage_to_istanbul.js +99 -0
- package/src/test/execute_plan.js +2 -2
- package/src/test/execute_test_plan.js +3 -3
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
import { readFile } from "@jsenv/filesystem"
|
|
2
|
+
import { Abort } from "@jsenv/abort"
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
visitNodeV8Directory,
|
|
6
|
+
filterV8Coverage,
|
|
7
|
+
} from "./v8_coverage_from_directory.js"
|
|
8
|
+
import { composeTwoV8Coverages } from "./v8_coverage_composition.js"
|
|
9
|
+
import { composeTwoFileByFileIstanbulCoverages } from "./istanbul_coverage_composition.js"
|
|
10
|
+
import { v8CoverageToIstanbul } from "./v8_coverage_to_istanbul.js"
|
|
11
|
+
import { composeV8AndIstanbul } from "./v8_and_istanbul.js"
|
|
12
|
+
import { normalizeFileByFileCoveragePaths } from "./file_by_file_coverage.js"
|
|
13
|
+
import { getMissingFileByFileCoverage } from "./missing_coverage.js"
|
|
14
|
+
|
|
15
|
+
export const reportToCoverage = async (
|
|
16
|
+
report,
|
|
17
|
+
{
|
|
18
|
+
signal,
|
|
19
|
+
logger,
|
|
20
|
+
rootDirectoryUrl,
|
|
21
|
+
coverageConfig,
|
|
22
|
+
coverageIncludeMissing,
|
|
23
|
+
urlShouldBeCovered,
|
|
24
|
+
coverageForceIstanbul,
|
|
25
|
+
coverageV8ConflictWarning,
|
|
26
|
+
},
|
|
27
|
+
) => {
|
|
28
|
+
// collect v8 and istanbul coverage from executions
|
|
29
|
+
let { v8Coverage, fileByFileIstanbulCoverage } = await getCoverageFromReport({
|
|
30
|
+
signal,
|
|
31
|
+
report,
|
|
32
|
+
onMissing: ({ file, executionResult, executionName }) => {
|
|
33
|
+
// several reasons not to have coverage here:
|
|
34
|
+
// 1. the file we executed did not import an instrumented file.
|
|
35
|
+
// - a test file without import
|
|
36
|
+
// - a test file importing only file excluded from coverage
|
|
37
|
+
// - a coverDescription badly configured so that we don't realize
|
|
38
|
+
// a file should be covered
|
|
39
|
+
|
|
40
|
+
// 2. the file we wanted to executed timedout
|
|
41
|
+
// - infinite loop
|
|
42
|
+
// - too extensive operation
|
|
43
|
+
// - a badly configured or too low allocatedMs for that execution.
|
|
44
|
+
|
|
45
|
+
// 3. the file we wanted to execute contains syntax-error
|
|
46
|
+
|
|
47
|
+
// in any scenario we are fine because
|
|
48
|
+
// coverDescription will generate empty coverage for files
|
|
49
|
+
// that were suppose to be coverage but were not.
|
|
50
|
+
if (
|
|
51
|
+
executionResult.status === "completed" &&
|
|
52
|
+
executionResult.runtimeName !== "node" &&
|
|
53
|
+
!process.env.NODE_V8_COVERAGE
|
|
54
|
+
) {
|
|
55
|
+
logger.warn(
|
|
56
|
+
`No execution.coverageFileUrl from execution named "${executionName}" of ${file}`,
|
|
57
|
+
)
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
})
|
|
61
|
+
|
|
62
|
+
if (!coverageForceIstanbul && process.env.NODE_V8_COVERAGE) {
|
|
63
|
+
await visitNodeV8Directory({
|
|
64
|
+
logger,
|
|
65
|
+
signal,
|
|
66
|
+
NODE_V8_COVERAGE: process.env.NODE_V8_COVERAGE,
|
|
67
|
+
onV8Coverage: (nodeV8Coverage) => {
|
|
68
|
+
const nodeV8CoverageLight = filterV8Coverage(nodeV8Coverage, {
|
|
69
|
+
urlShouldBeCovered,
|
|
70
|
+
})
|
|
71
|
+
v8Coverage = v8Coverage
|
|
72
|
+
? composeTwoV8Coverages(v8Coverage, nodeV8CoverageLight)
|
|
73
|
+
: nodeV8CoverageLight
|
|
74
|
+
},
|
|
75
|
+
})
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
// try to merge v8 with istanbul, if any
|
|
79
|
+
let fileByFileCoverage
|
|
80
|
+
if (v8Coverage) {
|
|
81
|
+
let v8FileByFileCoverage = await v8CoverageToIstanbul(v8Coverage, {
|
|
82
|
+
signal,
|
|
83
|
+
})
|
|
84
|
+
|
|
85
|
+
v8FileByFileCoverage = normalizeFileByFileCoveragePaths(
|
|
86
|
+
v8FileByFileCoverage,
|
|
87
|
+
rootDirectoryUrl,
|
|
88
|
+
)
|
|
89
|
+
|
|
90
|
+
if (fileByFileIstanbulCoverage) {
|
|
91
|
+
fileByFileIstanbulCoverage = normalizeFileByFileCoveragePaths(
|
|
92
|
+
fileByFileIstanbulCoverage,
|
|
93
|
+
rootDirectoryUrl,
|
|
94
|
+
)
|
|
95
|
+
fileByFileCoverage = composeV8AndIstanbul(
|
|
96
|
+
v8FileByFileCoverage,
|
|
97
|
+
fileByFileIstanbulCoverage,
|
|
98
|
+
{ coverageV8ConflictWarning },
|
|
99
|
+
)
|
|
100
|
+
} else {
|
|
101
|
+
fileByFileCoverage = v8FileByFileCoverage
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
// get istanbul only
|
|
105
|
+
else if (fileByFileIstanbulCoverage) {
|
|
106
|
+
fileByFileCoverage = normalizeFileByFileCoveragePaths(
|
|
107
|
+
fileByFileIstanbulCoverage,
|
|
108
|
+
rootDirectoryUrl,
|
|
109
|
+
)
|
|
110
|
+
}
|
|
111
|
+
// no coverage found in execution (or zero file where executed)
|
|
112
|
+
else {
|
|
113
|
+
fileByFileCoverage = {}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
// now add coverage for file not covered
|
|
117
|
+
if (coverageIncludeMissing) {
|
|
118
|
+
const missingFileByFileCoverage = await getMissingFileByFileCoverage({
|
|
119
|
+
signal,
|
|
120
|
+
rootDirectoryUrl,
|
|
121
|
+
coverageConfig,
|
|
122
|
+
fileByFileCoverage,
|
|
123
|
+
})
|
|
124
|
+
Object.assign(
|
|
125
|
+
fileByFileCoverage,
|
|
126
|
+
normalizeFileByFileCoveragePaths(
|
|
127
|
+
missingFileByFileCoverage,
|
|
128
|
+
rootDirectoryUrl,
|
|
129
|
+
),
|
|
130
|
+
)
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
return fileByFileCoverage
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
const getCoverageFromReport = async ({ signal, report, onMissing }) => {
|
|
137
|
+
const operation = Abort.startOperation()
|
|
138
|
+
operation.addAbortSignal(signal)
|
|
139
|
+
|
|
140
|
+
try {
|
|
141
|
+
let v8Coverage
|
|
142
|
+
let fileByFileIstanbulCoverage
|
|
143
|
+
|
|
144
|
+
// collect v8 and istanbul coverage from executions
|
|
145
|
+
await Object.keys(report).reduce(async (previous, file) => {
|
|
146
|
+
operation.throwIfAborted()
|
|
147
|
+
await previous
|
|
148
|
+
|
|
149
|
+
const executionResultForFile = report[file]
|
|
150
|
+
await Object.keys(executionResultForFile).reduce(
|
|
151
|
+
async (previous, executionName) => {
|
|
152
|
+
operation.throwIfAborted()
|
|
153
|
+
await previous
|
|
154
|
+
|
|
155
|
+
const executionResultForFileOnRuntime =
|
|
156
|
+
executionResultForFile[executionName]
|
|
157
|
+
const { coverageFileUrl } = executionResultForFileOnRuntime
|
|
158
|
+
if (!coverageFileUrl) {
|
|
159
|
+
onMissing({
|
|
160
|
+
executionName,
|
|
161
|
+
file,
|
|
162
|
+
executionResult: executionResultForFileOnRuntime,
|
|
163
|
+
})
|
|
164
|
+
return
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
const executionCoverage = await readFile(coverageFileUrl, {
|
|
168
|
+
as: "json",
|
|
169
|
+
})
|
|
170
|
+
if (isV8Coverage(executionCoverage)) {
|
|
171
|
+
v8Coverage = v8Coverage
|
|
172
|
+
? composeTwoV8Coverages(v8Coverage, executionCoverage)
|
|
173
|
+
: executionCoverage
|
|
174
|
+
} else {
|
|
175
|
+
fileByFileIstanbulCoverage = fileByFileIstanbulCoverage
|
|
176
|
+
? composeTwoFileByFileIstanbulCoverages(
|
|
177
|
+
fileByFileIstanbulCoverage,
|
|
178
|
+
executionCoverage,
|
|
179
|
+
)
|
|
180
|
+
: executionCoverage
|
|
181
|
+
}
|
|
182
|
+
},
|
|
183
|
+
Promise.resolve(),
|
|
184
|
+
)
|
|
185
|
+
}, Promise.resolve())
|
|
186
|
+
|
|
187
|
+
return {
|
|
188
|
+
v8Coverage,
|
|
189
|
+
fileByFileIstanbulCoverage,
|
|
190
|
+
}
|
|
191
|
+
} finally {
|
|
192
|
+
await operation.end()
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
const isV8Coverage = (coverage) => Boolean(coverage.result)
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { createDetailedMessage } from "@jsenv/log"
|
|
2
|
+
|
|
3
|
+
export const composeV8AndIstanbul = (
|
|
4
|
+
v8FileByFileCoverage,
|
|
5
|
+
istanbulFileByFileCoverage,
|
|
6
|
+
{ coverageV8ConflictWarning },
|
|
7
|
+
) => {
|
|
8
|
+
const fileByFileCoverage = {}
|
|
9
|
+
const v8Files = Object.keys(v8FileByFileCoverage)
|
|
10
|
+
const istanbulFiles = Object.keys(istanbulFileByFileCoverage)
|
|
11
|
+
|
|
12
|
+
v8Files.forEach((key) => {
|
|
13
|
+
fileByFileCoverage[key] = v8FileByFileCoverage[key]
|
|
14
|
+
})
|
|
15
|
+
istanbulFiles.forEach((key) => {
|
|
16
|
+
const v8Coverage = v8FileByFileCoverage[key]
|
|
17
|
+
if (v8Coverage) {
|
|
18
|
+
if (coverageV8ConflictWarning) {
|
|
19
|
+
console.warn(
|
|
20
|
+
createDetailedMessage(
|
|
21
|
+
`Coverage conflict on "${key}", found two coverage that cannot be merged together: v8 and istanbul. The istanbul coverage will be ignored.`,
|
|
22
|
+
{
|
|
23
|
+
details: `This happens when a file is executed on a runtime using v8 coverage (node or chromium) and on runtime using istanbul coverage (firefox or webkit)`,
|
|
24
|
+
suggestion:
|
|
25
|
+
"You can disable this warning with coverageV8ConflictWarning: false",
|
|
26
|
+
},
|
|
27
|
+
),
|
|
28
|
+
)
|
|
29
|
+
}
|
|
30
|
+
fileByFileCoverage[key] = v8Coverage
|
|
31
|
+
} else {
|
|
32
|
+
fileByFileCoverage[key] = istanbulFileByFileCoverage[key]
|
|
33
|
+
}
|
|
34
|
+
})
|
|
35
|
+
|
|
36
|
+
return fileByFileCoverage
|
|
37
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
|
|
2
|
+
|
|
3
|
+
export const composeTwoV8Coverages = (firstV8Coverage, secondV8Coverage) => {
|
|
4
|
+
if (secondV8Coverage.result.length === 0) {
|
|
5
|
+
return firstV8Coverage
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
// eslint-disable-next-line import/no-unresolved
|
|
9
|
+
const { mergeProcessCovs } = requireFromJsenv("@c88/v8-coverage")
|
|
10
|
+
// "mergeProcessCovs" do not preserves source-map-cache during the merge
|
|
11
|
+
// so we store sourcemap cache now
|
|
12
|
+
const sourceMapCache = {}
|
|
13
|
+
const visit = (coverageReport) => {
|
|
14
|
+
if (coverageReport["source-map-cache"]) {
|
|
15
|
+
Object.assign(sourceMapCache, coverageReport["source-map-cache"])
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
visit(firstV8Coverage)
|
|
19
|
+
visit(secondV8Coverage)
|
|
20
|
+
const v8Coverage = mergeProcessCovs([firstV8Coverage, secondV8Coverage])
|
|
21
|
+
v8Coverage["source-map-cache"] = sourceMapCache
|
|
22
|
+
|
|
23
|
+
return v8Coverage
|
|
24
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import {
|
|
2
|
+
assertAndNormalizeDirectoryUrl,
|
|
3
|
+
readDirectory,
|
|
4
|
+
readFile,
|
|
5
|
+
} from "@jsenv/filesystem"
|
|
6
|
+
import { resolveUrl } from "@jsenv/urls"
|
|
7
|
+
import { createDetailedMessage } from "@jsenv/log"
|
|
8
|
+
import { Abort } from "@jsenv/abort"
|
|
9
|
+
|
|
10
|
+
export const visitNodeV8Directory = async ({
|
|
11
|
+
logger,
|
|
12
|
+
signal,
|
|
13
|
+
NODE_V8_COVERAGE,
|
|
14
|
+
onV8Coverage,
|
|
15
|
+
maxMsWaitingForNodeToWriteCoverageFile = 2000,
|
|
16
|
+
}) => {
|
|
17
|
+
const operation = Abort.startOperation()
|
|
18
|
+
operation.addAbortSignal(signal)
|
|
19
|
+
|
|
20
|
+
const tryReadDirectory = async () => {
|
|
21
|
+
const dirContent = await readDirectory(NODE_V8_COVERAGE)
|
|
22
|
+
if (dirContent.length > 0) {
|
|
23
|
+
return dirContent
|
|
24
|
+
}
|
|
25
|
+
logger.warn(`v8 coverage directory is empty at ${NODE_V8_COVERAGE}`)
|
|
26
|
+
return dirContent
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
try {
|
|
30
|
+
operation.throwIfAborted()
|
|
31
|
+
const dirContent = await tryReadDirectory()
|
|
32
|
+
|
|
33
|
+
const coverageDirectoryUrl =
|
|
34
|
+
assertAndNormalizeDirectoryUrl(NODE_V8_COVERAGE)
|
|
35
|
+
await dirContent.reduce(async (previous, dirEntry) => {
|
|
36
|
+
operation.throwIfAborted()
|
|
37
|
+
await previous
|
|
38
|
+
|
|
39
|
+
const dirEntryUrl = resolveUrl(dirEntry, coverageDirectoryUrl)
|
|
40
|
+
const tryReadJsonFile = async (timeSpentTrying = 0) => {
|
|
41
|
+
const fileContent = await readFile(dirEntryUrl, { as: "string" })
|
|
42
|
+
if (fileContent === "") {
|
|
43
|
+
if (timeSpentTrying < 400) {
|
|
44
|
+
await new Promise((resolve) => setTimeout(resolve, 200))
|
|
45
|
+
return tryReadJsonFile(timeSpentTrying + 200)
|
|
46
|
+
}
|
|
47
|
+
console.warn(`Coverage JSON file is empty at ${dirEntryUrl}`)
|
|
48
|
+
return null
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
try {
|
|
52
|
+
const fileAsJson = JSON.parse(fileContent)
|
|
53
|
+
return fileAsJson
|
|
54
|
+
} catch (e) {
|
|
55
|
+
if (timeSpentTrying < maxMsWaitingForNodeToWriteCoverageFile) {
|
|
56
|
+
await new Promise((resolve) => setTimeout(resolve, 200))
|
|
57
|
+
return tryReadJsonFile(timeSpentTrying + 200)
|
|
58
|
+
}
|
|
59
|
+
console.warn(
|
|
60
|
+
createDetailedMessage(`Error while reading coverage file`, {
|
|
61
|
+
"error stack": e.stack,
|
|
62
|
+
"file": dirEntryUrl,
|
|
63
|
+
}),
|
|
64
|
+
)
|
|
65
|
+
return null
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
const fileContent = await tryReadJsonFile()
|
|
70
|
+
if (fileContent) {
|
|
71
|
+
onV8Coverage(fileContent)
|
|
72
|
+
}
|
|
73
|
+
}, Promise.resolve())
|
|
74
|
+
} finally {
|
|
75
|
+
await operation.end()
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
export const filterV8Coverage = (v8Coverage, { urlShouldBeCovered }) => {
|
|
80
|
+
const v8CoverageFiltered = {
|
|
81
|
+
...v8Coverage,
|
|
82
|
+
result: v8Coverage.result.filter((fileReport) =>
|
|
83
|
+
urlShouldBeCovered(fileReport.url),
|
|
84
|
+
),
|
|
85
|
+
}
|
|
86
|
+
return v8CoverageFiltered
|
|
87
|
+
}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { urlToFileSystemPath } from "@jsenv/urls"
|
|
2
|
+
import { Abort } from "@jsenv/abort"
|
|
3
|
+
|
|
4
|
+
import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
|
|
5
|
+
import { composeTwoFileByFileIstanbulCoverages } from "./istanbul_coverage_composition.js"
|
|
6
|
+
|
|
7
|
+
export const v8CoverageToIstanbul = async (v8Coverage, { signal }) => {
|
|
8
|
+
const operation = Abort.startOperation()
|
|
9
|
+
operation.addAbortSignal(signal)
|
|
10
|
+
|
|
11
|
+
try {
|
|
12
|
+
const v8ToIstanbul = requireFromJsenv("v8-to-istanbul")
|
|
13
|
+
const sourcemapCache = v8Coverage["source-map-cache"]
|
|
14
|
+
let istanbulCoverageComposed = null
|
|
15
|
+
|
|
16
|
+
await v8Coverage.result.reduce(async (previous, fileV8Coverage) => {
|
|
17
|
+
operation.throwIfAborted()
|
|
18
|
+
await previous
|
|
19
|
+
|
|
20
|
+
const { source } = fileV8Coverage
|
|
21
|
+
let sources
|
|
22
|
+
// when v8 coverage comes from playwright (chromium) v8Coverage.source is set
|
|
23
|
+
if (typeof source === "string") {
|
|
24
|
+
sources = { source }
|
|
25
|
+
}
|
|
26
|
+
// when v8 coverage comes from Node.js, the source can be read from sourcemapCache
|
|
27
|
+
else if (sourcemapCache) {
|
|
28
|
+
sources = sourcesFromSourceMapCache(fileV8Coverage.url, sourcemapCache)
|
|
29
|
+
}
|
|
30
|
+
const path = urlToFileSystemPath(fileV8Coverage.url)
|
|
31
|
+
|
|
32
|
+
const converter = v8ToIstanbul(
|
|
33
|
+
path,
|
|
34
|
+
// wrapperLength is undefined we don't need it
|
|
35
|
+
// https://github.com/istanbuljs/v8-to-istanbul/blob/2b54bc97c5edf8a37b39a171ec29134ba9bfd532/lib/v8-to-istanbul.js#L27
|
|
36
|
+
undefined,
|
|
37
|
+
sources,
|
|
38
|
+
)
|
|
39
|
+
await converter.load()
|
|
40
|
+
|
|
41
|
+
converter.applyCoverage(fileV8Coverage.functions)
|
|
42
|
+
const istanbulCoverage = converter.toIstanbul()
|
|
43
|
+
|
|
44
|
+
istanbulCoverageComposed = istanbulCoverageComposed
|
|
45
|
+
? composeTwoFileByFileIstanbulCoverages(
|
|
46
|
+
istanbulCoverageComposed,
|
|
47
|
+
istanbulCoverage,
|
|
48
|
+
)
|
|
49
|
+
: istanbulCoverage
|
|
50
|
+
}, Promise.resolve())
|
|
51
|
+
|
|
52
|
+
if (!istanbulCoverageComposed) {
|
|
53
|
+
return {}
|
|
54
|
+
}
|
|
55
|
+
istanbulCoverageComposed = markAsConvertedFromV8(istanbulCoverageComposed)
|
|
56
|
+
return istanbulCoverageComposed
|
|
57
|
+
} finally {
|
|
58
|
+
await operation.end()
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
const markAsConvertedFromV8 = (fileByFileCoverage) => {
|
|
63
|
+
const fileByFileMarked = {}
|
|
64
|
+
Object.keys(fileByFileCoverage).forEach((key) => {
|
|
65
|
+
const fileCoverage = fileByFileCoverage[key]
|
|
66
|
+
fileByFileMarked[key] = {
|
|
67
|
+
...fileCoverage,
|
|
68
|
+
fromV8: true,
|
|
69
|
+
}
|
|
70
|
+
})
|
|
71
|
+
return fileByFileMarked
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const sourcesFromSourceMapCache = (url, sourceMapCache) => {
|
|
75
|
+
const sourceMapAndLineLengths = sourceMapCache[url]
|
|
76
|
+
if (!sourceMapAndLineLengths) {
|
|
77
|
+
return {}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
const { data, lineLengths } = sourceMapAndLineLengths
|
|
81
|
+
// See: https://github.com/nodejs/node/pull/34305
|
|
82
|
+
if (!data) {
|
|
83
|
+
return undefined
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const sources = {
|
|
87
|
+
sourcemap: data,
|
|
88
|
+
...(lineLengths ? { source: sourcesFromLineLengths(lineLengths) } : {}),
|
|
89
|
+
}
|
|
90
|
+
return sources
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
const sourcesFromLineLengths = (lineLengths) => {
|
|
94
|
+
let source = ""
|
|
95
|
+
lineLengths.forEach((length) => {
|
|
96
|
+
source += `${"".padEnd(length, ".")}\n`
|
|
97
|
+
})
|
|
98
|
+
return source
|
|
99
|
+
}
|
package/src/test/execute_plan.js
CHANGED
|
@@ -19,8 +19,8 @@ import {
|
|
|
19
19
|
writeFileSync,
|
|
20
20
|
} from "@jsenv/filesystem"
|
|
21
21
|
|
|
22
|
-
import { babelPluginInstrument } from "
|
|
23
|
-
import { reportToCoverage } from "
|
|
22
|
+
import { babelPluginInstrument } from "./coverage/babel_plugin_instrument.js"
|
|
23
|
+
import { reportToCoverage } from "./coverage/report_to_coverage.js"
|
|
24
24
|
import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
|
|
25
25
|
import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
|
|
26
26
|
import { createKitchen } from "@jsenv/core/src/omega/kitchen.js"
|
|
@@ -6,9 +6,9 @@ import {
|
|
|
6
6
|
} from "@jsenv/filesystem"
|
|
7
7
|
import { createLogger, createDetailedMessage } from "@jsenv/log"
|
|
8
8
|
|
|
9
|
-
import { generateCoverageJsonFile } from "
|
|
10
|
-
import { generateCoverageHtmlDirectory } from "
|
|
11
|
-
import { generateCoverageTextLog } from "
|
|
9
|
+
import { generateCoverageJsonFile } from "./coverage/coverage_reporter_json_file.js"
|
|
10
|
+
import { generateCoverageHtmlDirectory } from "./coverage/coverage_reporter_html_directory.js"
|
|
11
|
+
import { generateCoverageTextLog } from "./coverage/coverage_reporter_text_log.js"
|
|
12
12
|
import { executePlan } from "./execute_plan.js"
|
|
13
13
|
|
|
14
14
|
export const defaultCoverageConfig = {
|