escover 6.0.1 → 6.1.1
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/ChangeLog +10 -0
- package/README.md +2 -2
- package/lib/cli/cli.js +12 -3
- package/lib/config.js +4 -3
- package/lib/coverage-file/{find-cache-dir.js → coverage-directory.js} +7 -2
- package/lib/coverage-file/coverage-file.js +22 -8
- package/lib/escover.js +9 -45
- package/lib/instrument/index.js +0 -4
- package/lib/register.js +7 -37
- package/package.json +1 -3
- package/lib/exit.js +0 -6
package/ChangeLog
CHANGED
package/README.md
CHANGED
|
@@ -115,10 +115,10 @@ NODE_OPTIONS="'--loader zenlend'" ZENLOAD='escover,mock-import' escover npm test
|
|
|
115
115
|
If you want to disable coverage on status code without erroring, use `ESCOVER_SUCCESS_EXIT_CODE`:
|
|
116
116
|
|
|
117
117
|
```js
|
|
118
|
-
import {
|
|
118
|
+
import {SKIPPED} from 'supertape/exit-codes';
|
|
119
119
|
|
|
120
120
|
const env = {
|
|
121
|
-
ESCOVER_SUCCESS_EXIT_CODE:
|
|
121
|
+
ESCOVER_SUCCESS_EXIT_CODE: SKIPPED,
|
|
122
122
|
};
|
|
123
123
|
|
|
124
124
|
export default {
|
package/lib/cli/cli.js
CHANGED
|
@@ -6,11 +6,18 @@ import {version} from './version.js';
|
|
|
6
6
|
import reportLines from '../formatters/lines.js';
|
|
7
7
|
import reportFiles from '../formatters/files.js';
|
|
8
8
|
|
|
9
|
+
const {env} = process;
|
|
10
|
+
|
|
9
11
|
const noop = () => {};
|
|
10
12
|
|
|
11
|
-
const {ESCOVER_FORMAT} =
|
|
13
|
+
const {NODE_OPTIONS, ESCOVER_FORMAT} = env;
|
|
12
14
|
|
|
13
|
-
export const
|
|
15
|
+
export const createNodeOptions = (options = NODE_OPTIONS) => {
|
|
16
|
+
if (!options.includes('escover/register'))
|
|
17
|
+
return `--import escover/register ${options}`;
|
|
18
|
+
|
|
19
|
+
return options;
|
|
20
|
+
};
|
|
14
21
|
|
|
15
22
|
export const cli = ({argv, exit, readCoverage}) => {
|
|
16
23
|
const args = yargsParser(argv.slice(2), {
|
|
@@ -50,11 +57,12 @@ export const cli = ({argv, exit, readCoverage}) => {
|
|
|
50
57
|
export const isSuccess = (error) => !error || error?.status === Number(process.env.ESCOVER_SUCCESS_EXIT_CODE);
|
|
51
58
|
|
|
52
59
|
function execute(cmd, exit) {
|
|
60
|
+
console.log(createNodeOptions());
|
|
53
61
|
const [error] = tryCatch(execSync, cmd, {
|
|
54
62
|
stdio: [0, 1, 2],
|
|
55
63
|
env: {
|
|
56
64
|
...process.env,
|
|
57
|
-
NODE_OPTIONS:
|
|
65
|
+
NODE_OPTIONS: createNodeOptions(),
|
|
58
66
|
},
|
|
59
67
|
});
|
|
60
68
|
|
|
@@ -66,3 +74,4 @@ function execute(cmd, exit) {
|
|
|
66
74
|
return exit(1);
|
|
67
75
|
}
|
|
68
76
|
}
|
|
77
|
+
|
package/lib/config.js
CHANGED
|
@@ -29,13 +29,14 @@ const defaults = {
|
|
|
29
29
|
exclude: [],
|
|
30
30
|
};
|
|
31
31
|
|
|
32
|
-
export const readConfig = () => {
|
|
33
|
-
const
|
|
32
|
+
export const readConfig = (overrides = {}) => {
|
|
33
|
+
const {find = findUpSync, read = readFileSync} = overrides;
|
|
34
|
+
const name = find('.nycrc.json');
|
|
34
35
|
|
|
35
36
|
if (!name)
|
|
36
37
|
return defaults;
|
|
37
38
|
|
|
38
|
-
const data =
|
|
39
|
+
const data = read(name, 'utf8');
|
|
39
40
|
|
|
40
41
|
return {
|
|
41
42
|
...defaults,
|
|
@@ -2,8 +2,12 @@ import {join} from 'node:path';
|
|
|
2
2
|
import {cwd} from 'node:process';
|
|
3
3
|
import {mkdirSync} from 'node:fs';
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
const NAME = 'coverage';
|
|
6
|
+
|
|
7
|
+
export const getCoverageDirectory = () => join(cwd(), NAME);
|
|
8
|
+
|
|
9
|
+
export function createCoverageDirectory() {
|
|
10
|
+
const name = join(cwd(), NAME);
|
|
7
11
|
|
|
8
12
|
mkdirSync(name, {
|
|
9
13
|
recursive: true,
|
|
@@ -11,3 +15,4 @@ export function findCacheDir() {
|
|
|
11
15
|
|
|
12
16
|
return name;
|
|
13
17
|
}
|
|
18
|
+
|
|
@@ -1,16 +1,28 @@
|
|
|
1
1
|
import {writeFileSync, readFileSync} from 'node:fs';
|
|
2
2
|
import {join} from 'node:path';
|
|
3
3
|
import {tryCatch} from 'try-catch';
|
|
4
|
+
import {operator} from 'putout';
|
|
4
5
|
import {getFileEntries} from '../c4.js';
|
|
5
6
|
import {transform} from '../transform.js';
|
|
6
7
|
import {merge} from '../merge.js';
|
|
7
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
createCoverageDirectory,
|
|
10
|
+
getCoverageDirectory,
|
|
11
|
+
} from './coverage-directory.js';
|
|
8
12
|
import {generateLcov, parseLcov} from './lcov.js';
|
|
9
13
|
|
|
14
|
+
const {getFile} = operator;
|
|
15
|
+
|
|
10
16
|
const LCOV = 'lcov.info';
|
|
11
17
|
|
|
12
|
-
export const writeCoverage = () => {
|
|
13
|
-
const
|
|
18
|
+
export const writeCoverage = (overrides = {}) => {
|
|
19
|
+
const {
|
|
20
|
+
write = writeFileSync,
|
|
21
|
+
getFiles = getFileEntries,
|
|
22
|
+
createCovDir = createCoverageDirectory,
|
|
23
|
+
} = overrides;
|
|
24
|
+
|
|
25
|
+
const files = getFiles();
|
|
14
26
|
|
|
15
27
|
if (!files.size)
|
|
16
28
|
return;
|
|
@@ -18,17 +30,19 @@ export const writeCoverage = () => {
|
|
|
18
30
|
const parsed = transform(files);
|
|
19
31
|
const merged = merge(parsed);
|
|
20
32
|
const lcov = generateLcov(merged);
|
|
21
|
-
const dir =
|
|
33
|
+
const dir = createCovDir();
|
|
22
34
|
|
|
23
|
-
|
|
35
|
+
write(join(dir, LCOV), lcov);
|
|
24
36
|
};
|
|
25
37
|
|
|
26
|
-
export const readCoverage = () => {
|
|
27
|
-
const
|
|
28
|
-
const
|
|
38
|
+
export const readCoverage = (overrides = {}) => {
|
|
39
|
+
const {read = readFileSync} = overrides;
|
|
40
|
+
const dir = getCoverageDirectory();
|
|
41
|
+
const [error, data] = tryCatch(read, join(dir, LCOV), 'utf8');
|
|
29
42
|
|
|
30
43
|
if (error)
|
|
31
44
|
return [];
|
|
32
45
|
|
|
33
46
|
return parseLcov(data);
|
|
34
47
|
};
|
|
48
|
+
|
package/lib/escover.js
CHANGED
|
@@ -3,7 +3,6 @@ import {montag} from 'montag';
|
|
|
3
3
|
import {instrument} from './instrument/index.js';
|
|
4
4
|
import {createFileEntry} from './c4.js';
|
|
5
5
|
import {readConfig, isExclude} from './config.js';
|
|
6
|
-
import {writeCoverage} from './coverage-file/coverage-file.js';
|
|
7
6
|
|
|
8
7
|
globalThis.__createC4 = createFileEntry;
|
|
9
8
|
|
|
@@ -19,56 +18,21 @@ const EXCLUDE = [
|
|
|
19
18
|
...exclude,
|
|
20
19
|
];
|
|
21
20
|
|
|
22
|
-
export function
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
type,
|
|
26
|
-
url,
|
|
27
|
-
line,
|
|
28
|
-
column,
|
|
29
|
-
loader,
|
|
30
|
-
} = data;
|
|
31
|
-
|
|
32
|
-
if (loader !== 'escover')
|
|
33
|
-
return;
|
|
34
|
-
|
|
35
|
-
const c4 = createFileEntry(url);
|
|
36
|
-
|
|
37
|
-
if (type === 'set')
|
|
38
|
-
c4['🧨'](line, column);
|
|
39
|
-
|
|
40
|
-
if (type === 'init')
|
|
41
|
-
c4.init(line, column);
|
|
42
|
-
|
|
43
|
-
writeCoverage();
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
export async function load(url, context, defaultLoad) {
|
|
48
|
-
const {format, source: rawSource} = await defaultLoad(url, context, defaultLoad);
|
|
49
|
-
|
|
50
|
-
if (/commonjs|builtin/.test(format))
|
|
51
|
-
return {
|
|
52
|
-
format,
|
|
53
|
-
};
|
|
21
|
+
export function load(url, context, defaultLoad) {
|
|
22
|
+
const result = defaultLoad(url, context, defaultLoad);
|
|
23
|
+
const {format, source: rawSource} = result;
|
|
54
24
|
|
|
55
25
|
if (!url.includes(CWD))
|
|
56
|
-
return
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
26
|
+
return result;
|
|
27
|
+
|
|
28
|
+
if (/commonjs|builtin/.test(format))
|
|
29
|
+
return result;
|
|
60
30
|
|
|
61
31
|
if (isExclude(url, EXCLUDE))
|
|
62
|
-
return
|
|
63
|
-
format,
|
|
64
|
-
source: rawSource,
|
|
65
|
-
};
|
|
32
|
+
return result;
|
|
66
33
|
|
|
67
34
|
if (rawSource.includes('const __c4'))
|
|
68
|
-
return
|
|
69
|
-
format,
|
|
70
|
-
source: rawSource,
|
|
71
|
-
};
|
|
35
|
+
return result;
|
|
72
36
|
|
|
73
37
|
const source = montag`
|
|
74
38
|
const __c4 = global.__createC4('${url}');
|
package/lib/instrument/index.js
CHANGED
|
@@ -2,13 +2,9 @@ import putout from 'putout';
|
|
|
2
2
|
import * as convertOptionalToLogical from '@putout/plugin-convert-optional-to-logical';
|
|
3
3
|
import * as mark from './plugin-mark/index.js';
|
|
4
4
|
|
|
5
|
-
const cut = (a) => a.replace('#!/usr/bin/env node', '');
|
|
6
|
-
|
|
7
5
|
export const instrument = (url, source) => {
|
|
8
6
|
const c4 = globalThis.__createC4(url);
|
|
9
7
|
|
|
10
|
-
source = cut(source);
|
|
11
|
-
|
|
12
8
|
const {code} = putout(source, {
|
|
13
9
|
printer: 'putout',
|
|
14
10
|
fixCount: 1,
|
package/lib/register.js
CHANGED
|
@@ -1,41 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
1
|
+
import {registerHooks} from 'node:module';
|
|
2
|
+
import process from 'node:process';
|
|
3
|
+
import * as escoverLoader from './escover.js';
|
|
4
|
+
import {writeCoverage} from './coverage-file/coverage-file.js';
|
|
3
5
|
|
|
4
|
-
|
|
6
|
+
registerHooks(escoverLoader);
|
|
5
7
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
process.on('exit', () => {
|
|
9
|
+
writeCoverage();
|
|
8
10
|
});
|
|
9
11
|
|
|
10
|
-
register('./escover.js', import.meta.url, {
|
|
11
|
-
parentURL: import.meta.url,
|
|
12
|
-
data: {
|
|
13
|
-
port: port2,
|
|
14
|
-
},
|
|
15
|
-
transferList: [port2],
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
function initialize({port}) {
|
|
19
|
-
const loader = 'escover';
|
|
20
|
-
|
|
21
|
-
globalThis.__createC4 = (url) => ({
|
|
22
|
-
'🧨': (line, column) => {
|
|
23
|
-
port.postMessage({
|
|
24
|
-
type: 'set',
|
|
25
|
-
url,
|
|
26
|
-
line,
|
|
27
|
-
column,
|
|
28
|
-
loader,
|
|
29
|
-
});
|
|
30
|
-
},
|
|
31
|
-
'init': (line, column) => {
|
|
32
|
-
port.postMessage({
|
|
33
|
-
type: 'init',
|
|
34
|
-
url,
|
|
35
|
-
line,
|
|
36
|
-
column,
|
|
37
|
-
loader,
|
|
38
|
-
});
|
|
39
|
-
},
|
|
40
|
-
});
|
|
41
|
-
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "escover",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.1.1",
|
|
4
4
|
"author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
|
|
5
5
|
"description": "Coverage for EcmaScript Modules",
|
|
6
6
|
"main": "lib/escover.js",
|
|
@@ -45,7 +45,6 @@
|
|
|
45
45
|
"chalk": "^5.0.0",
|
|
46
46
|
"find-cache-dir": "^5.0.0",
|
|
47
47
|
"find-up": "^8.0.0",
|
|
48
|
-
"mock-import": "^5.0.0",
|
|
49
48
|
"montag": "^2.0.1",
|
|
50
49
|
"once": "^1.4.0",
|
|
51
50
|
"picomatch": "^4.0.2",
|
|
@@ -60,7 +59,6 @@
|
|
|
60
59
|
},
|
|
61
60
|
"license": "MIT",
|
|
62
61
|
"devDependencies": {
|
|
63
|
-
"@putout/eslint-flat": "^4.0.0",
|
|
64
62
|
"@putout/test": "^15.1.1",
|
|
65
63
|
"c8": "^11.0.0",
|
|
66
64
|
"escover": "file:.",
|