sxy-test-runner 2.2.2 → 2.2.4
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/AGENTS.md +14 -5
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +9 -4
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/help.unitTest.js +6 -2
- package/dist/cli/help.unitTest.js.map +1 -1
- package/dist/cli/init.d.ts.map +1 -1
- package/dist/cli/init.js +4 -1
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/lib/applyConfigDefaults.unitTest.js +9 -0
- package/dist/cli/lib/applyConfigDefaults.unitTest.js.map +1 -1
- package/dist/cli/lib/defaultConfig.d.ts.map +1 -1
- package/dist/cli/lib/defaultConfig.js +2 -1
- package/dist/cli/lib/defaultConfig.js.map +1 -1
- package/dist/cli/lib/findTestFiles.d.ts +1 -1
- package/dist/cli/lib/findTestFiles.d.ts.map +1 -1
- package/dist/cli/lib/findTestFiles.js +5 -2
- package/dist/cli/lib/findTestFiles.js.map +1 -1
- package/dist/cli/lib/findTestFiles.unitTest.js +5 -0
- package/dist/cli/lib/findTestFiles.unitTest.js.map +1 -1
- package/dist/cli/lib/listenToUser.d.ts +2 -1
- package/dist/cli/lib/listenToUser.d.ts.map +1 -1
- package/dist/cli/lib/listenToUser.js +61 -14
- package/dist/cli/lib/listenToUser.js.map +1 -1
- package/dist/cli/lib/listenToUser.unitTest.d.ts +2 -0
- package/dist/cli/lib/listenToUser.unitTest.d.ts.map +1 -0
- package/dist/cli/lib/listenToUser.unitTest.js +76 -0
- package/dist/cli/lib/listenToUser.unitTest.js.map +1 -0
- package/dist/cli/lib/matchesTestFilesFilter.d.ts +3 -0
- package/dist/cli/lib/matchesTestFilesFilter.d.ts.map +1 -0
- package/dist/cli/lib/matchesTestFilesFilter.js +10 -0
- package/dist/cli/lib/matchesTestFilesFilter.js.map +1 -0
- package/dist/cli/lib/runTests.d.ts.map +1 -1
- package/dist/cli/lib/runTests.js +32 -7
- package/dist/cli/lib/runTests.js.map +1 -1
- package/dist/cli/lib/runTests.unitTest.js +55 -0
- package/dist/cli/lib/runTests.unitTest.js.map +1 -1
- package/dist/cli/lib/showTestResult.js +1 -1
- package/dist/cli/lib/showTestResult.js.map +1 -1
- package/dist/cli/lib/showTtyHelp.d.ts +3 -0
- package/dist/cli/lib/showTtyHelp.d.ts.map +1 -0
- package/dist/cli/lib/showTtyHelp.js +8 -0
- package/dist/cli/lib/showTtyHelp.js.map +1 -0
- package/dist/cli/lib/showTtyHelp.unitTest.d.ts +2 -0
- package/dist/cli/lib/showTtyHelp.unitTest.d.ts.map +1 -0
- package/dist/cli/lib/showTtyHelp.unitTest.js +27 -0
- package/dist/cli/lib/showTtyHelp.unitTest.js.map +1 -0
- package/dist/cli/lib/validateConfig.d.ts.map +1 -1
- package/dist/cli/lib/validateConfig.js +3 -0
- package/dist/cli/lib/validateConfig.js.map +1 -1
- package/dist/cli/lib/validateConfig.unitTest.js +14 -0
- package/dist/cli/lib/validateConfig.unitTest.js.map +1 -1
- package/dist/cli/lib/watchFilesAndRunTestsChokidar.d.ts +1 -1
- package/dist/cli/lib/watchFilesAndRunTestsChokidar.d.ts.map +1 -1
- package/dist/cli/lib/watchFilesAndRunTestsChokidar.js +4 -2
- package/dist/cli/lib/watchFilesAndRunTestsChokidar.js.map +1 -1
- package/dist/cli/lib/watchFilesAndRunTestsNodeWatch.d.ts +1 -1
- package/dist/cli/lib/watchFilesAndRunTestsNodeWatch.d.ts.map +1 -1
- package/dist/cli/lib/watchFilesAndRunTestsNodeWatch.js +4 -2
- package/dist/cli/lib/watchFilesAndRunTestsNodeWatch.js.map +1 -1
- package/dist/cli/once.d.ts.map +1 -1
- package/dist/cli/once.js +23 -2
- package/dist/cli/once.js.map +1 -1
- package/dist/cli/once.unitTest.js +33 -0
- package/dist/cli/once.unitTest.js.map +1 -1
- package/dist/cli/watch.d.ts.map +1 -1
- package/dist/cli/watch.js +26 -14
- package/dist/cli/watch.js.map +1 -1
- package/dist/cli/watch.unitTest.js +56 -65
- package/dist/cli/watch.unitTest.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -2
- package/readme.md +23 -0
package/AGENTS.md
CHANGED
|
@@ -71,15 +71,21 @@ npx sxy-test-runner once
|
|
|
71
71
|
npx sxy-test-runner once --config config/sxyt.config.js
|
|
72
72
|
|
|
73
73
|
# Override the test glob in watch mode
|
|
74
|
-
npx sxy-test-runner watch --files "**/*.focused.test.js"
|
|
74
|
+
npx sxy-test-runner watch --test-files "**/*.focused.test.js"
|
|
75
|
+
|
|
76
|
+
# Override the test glob in one-off mode
|
|
77
|
+
npx sxy-test-runner once --test-files "**/*.focused.test.js"
|
|
78
|
+
|
|
79
|
+
# Further constrain the configured test glob
|
|
80
|
+
npx sxy-test-runner once --filter "**/users/**"
|
|
75
81
|
|
|
76
82
|
# Generate an initial config
|
|
77
83
|
npx sxy-test-runner init
|
|
78
84
|
```
|
|
79
85
|
|
|
80
|
-
The `--files`
|
|
81
|
-
|
|
82
|
-
|
|
86
|
+
The `--test-files` / `-t` option overrides the configured test pattern in both watch and
|
|
87
|
+
`once` modes. The `--filter` / `-f` option adds a second constraint without replacing the
|
|
88
|
+
configured pattern. Both options are resolved relative to `testsBase` and can be combined.
|
|
83
89
|
|
|
84
90
|
Test discovery uses Node's built-in glob implementation. Patterns are resolved relative to
|
|
85
91
|
`testsBase`, and ignore patterns are resolved from that same base.
|
|
@@ -211,6 +217,8 @@ on parallel `it` execution.
|
|
|
211
217
|
Watch mode builds a static dependency tree for every test. When a file changes, it reruns
|
|
212
218
|
the changed test itself and tests whose static import graph includes that file. If
|
|
213
219
|
`watch.reRunFailingTests` is true, previously failing files are included until they pass.
|
|
220
|
+
Keyboard commands normally require Enter; set `watch.ttyActionsOnKeypress` to `true` to
|
|
221
|
+
trigger `r`, `l`, `a`, and `f` immediately on keypress in a TTY session.
|
|
214
222
|
|
|
215
223
|
Important limitations:
|
|
216
224
|
|
|
@@ -258,7 +266,8 @@ export default {
|
|
|
258
266
|
watchFiles: '**/*.js',
|
|
259
267
|
watchFilesIgnore: '**/node_modules/**',
|
|
260
268
|
runAllOnStartup: true,
|
|
261
|
-
reRunFailingTests: true
|
|
269
|
+
reRunFailingTests: true,
|
|
270
|
+
ttyActionsOnKeypress: false
|
|
262
271
|
}
|
|
263
272
|
}
|
|
264
273
|
```
|
package/dist/cli/help.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAIA,wBAAgB,IAAI,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAIA,wBAAgB,IAAI,IAAI,IAAI,CA4C3B"}
|
package/dist/cli/help.js
CHANGED
|
@@ -24,16 +24,21 @@ export function help() {
|
|
|
24
24
|
' help Show this help',
|
|
25
25
|
'',
|
|
26
26
|
'Options:',
|
|
27
|
-
' -c, --config <file>
|
|
28
|
-
' -
|
|
27
|
+
' -c, --config <file> Use a specific configuration file',
|
|
28
|
+
' -t, --test-files <glob> Override the configured test pattern',
|
|
29
|
+
' -f, --filter <glob> Further constrain the configured test pattern',
|
|
29
30
|
'',
|
|
30
31
|
'Watch controls:',
|
|
31
|
-
' r + Enter
|
|
32
|
+
' r/l + Enter Re-run the last set of tests',
|
|
33
|
+
' a + Enter Re-run all tests',
|
|
34
|
+
' f + Enter Re-run failing tests',
|
|
35
|
+
' Set watch.ttyActionsOnKeypress to true to run these without Enter',
|
|
32
36
|
'',
|
|
33
37
|
'Examples:',
|
|
34
38
|
` ${cliName}`,
|
|
35
39
|
` ${cliName} once`,
|
|
36
|
-
` ${cliName} watch --files "**/*.focused.test.js"`,
|
|
40
|
+
` ${cliName} watch --test-files "**/*.focused.test.js"`,
|
|
41
|
+
` ${cliName} once --filter "**/users/**"`,
|
|
37
42
|
` ${cliName} once --config config/sxyt.config.js`,
|
|
38
43
|
'',
|
|
39
44
|
`Configuration: ${configNames} in ${configDirectories}.`,
|
package/dist/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrF,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAElC,MAAM,UAAU,IAAI;IAChB,MAAM,WAAW,GAAG,eAAe;SAC9B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,eAAe,CAAC;SACnC,IAAI,CAAC,MAAM,CAAC,CAAA;IACjB,MAAM,iBAAiB,GAAG,eAAe;SACpC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC;SACtE,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjB,GAAG,CAAC;QACA,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7B,EAAE;QACF,QAAQ;QACR,KAAK,OAAO,oBAAoB;QAChC,KAAK,OAAO,iBAAiB;QAC7B,KAAK,OAAO,OAAO;QACnB,KAAK,OAAO,OAAO;QACnB,EAAE;QACF,WAAW;QACX,iEAAiE;QACjE,2CAA2C;QAC3C,+CAA+C;QAC/C,yBAAyB;QACzB,EAAE;QACF,UAAU;QACV,
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrF,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAElC,MAAM,UAAU,IAAI;IAChB,MAAM,WAAW,GAAG,eAAe;SAC9B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,eAAe,CAAC;SACnC,IAAI,CAAC,MAAM,CAAC,CAAA;IACjB,MAAM,iBAAiB,GAAG,eAAe;SACpC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC;SACtE,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjB,GAAG,CAAC;QACA,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7B,EAAE;QACF,QAAQ;QACR,KAAK,OAAO,oBAAoB;QAChC,KAAK,OAAO,iBAAiB;QAC7B,KAAK,OAAO,OAAO;QACnB,KAAK,OAAO,OAAO;QACnB,EAAE;QACF,WAAW;QACX,iEAAiE;QACjE,2CAA2C;QAC3C,+CAA+C;QAC/C,yBAAyB;QACzB,EAAE;QACF,UAAU;QACV,8DAA8D;QAC9D,iEAAiE;QACjE,0EAA0E;QAC1E,EAAE;QACF,iBAAiB;QACjB,sDAAsD;QACtD,0CAA0C;QAC1C,8CAA8C;QAC9C,qEAAqE;QACrE,EAAE;QACF,WAAW;QACX,KAAK,OAAO,EAAE;QACd,KAAK,OAAO,OAAO;QACnB,KAAK,OAAO,4CAA4C;QACxD,KAAK,OAAO,8BAA8B;QAC1C,KAAK,OAAO,sCAAsC;QAClD,EAAE;QACF,kBAAkB,WAAW,OAAO,iBAAiB,GAAG;QACxD,6BAA6B,OAAO,KAAK,WAAW,GAAG;KAC1D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AACjB,CAAC"}
|
|
@@ -16,8 +16,12 @@ mochaDescribe('help command', function () {
|
|
|
16
16
|
output.should.include('sxy-test [watch] [options]');
|
|
17
17
|
output.should.include('once Run the test suite once and exit');
|
|
18
18
|
output.should.include('-c, --config <file>');
|
|
19
|
-
output.should.include('-
|
|
20
|
-
output.should.include('
|
|
19
|
+
output.should.include('-t, --test-files <glob>');
|
|
20
|
+
output.should.include('-f, --filter <glob>');
|
|
21
|
+
output.should.include('r/l + Enter');
|
|
22
|
+
output.should.include('a + Enter');
|
|
23
|
+
output.should.include('f + Enter');
|
|
24
|
+
output.should.include('watch.ttyActionsOnKeypress');
|
|
21
25
|
output.should.include('sxyt.config.{js,cjs,mjs}');
|
|
22
26
|
output.should.include('the project root or config/');
|
|
23
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.unitTest.js","sourceRoot":"","sources":["../../src/cli/help.unitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,aAAa,CAAC,cAAc,EAAE;IAC1B,OAAO,CAAC,6DAA6D,EAAE;QACnE,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAA,CAAC,iCAAiC;QACxE,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,KAAgB,EAAE,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC,CAAA;QAED,IAAI,CAAC;YACD,IAAI,EAAE,CAAA;QACV,CAAC;gBAAS,CAAC;YACP,OAAO,CAAC,GAAG,GAAG,kBAAkB,CAAA,CAAC,iCAAiC;QACtE,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAA;QAChE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"help.unitTest.js","sourceRoot":"","sources":["../../src/cli/help.unitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,aAAa,CAAC,cAAc,EAAE;IAC1B,OAAO,CAAC,6DAA6D,EAAE;QACnE,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAA,CAAC,iCAAiC;QACxE,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,KAAgB,EAAE,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC,CAAA;QAED,IAAI,CAAC;YACD,IAAI,EAAE,CAAA;QACV,CAAC;gBAAS,CAAC;YACP,OAAO,CAAC,GAAG,GAAG,kBAAkB,CAAA,CAAC,iCAAiC;QACtE,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAA;QAChE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAA;QAChD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAClC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAClC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACjD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
package/dist/cli/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/cli/init.ts"],"names":[],"mappings":"AAMA,wBAAgB,IAAI,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/cli/init.ts"],"names":[],"mappings":"AAMA,wBAAgB,IAAI,IAAI,IAAI,CAyI3B"}
|
package/dist/cli/init.js
CHANGED
|
@@ -43,7 +43,7 @@ export function init() {
|
|
|
43
43
|
const defaultConfig = `
|
|
44
44
|
// @ts-check
|
|
45
45
|
|
|
46
|
-
/** @
|
|
46
|
+
/** @satisfies {import('sxy-test-runner').Config} */
|
|
47
47
|
export default {
|
|
48
48
|
|
|
49
49
|
// base folder for tests match and ignore patterns
|
|
@@ -123,6 +123,9 @@ export default {
|
|
|
123
123
|
// re run all previously failed tests on each test run, until they pass
|
|
124
124
|
reRunFailingTests: true,
|
|
125
125
|
|
|
126
|
+
// run watch mode keyboard commands immediately, without waiting for Enter
|
|
127
|
+
ttyActionsOnKeypress: false,
|
|
128
|
+
|
|
126
129
|
},
|
|
127
130
|
|
|
128
131
|
}`;
|
package/dist/cli/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/cli/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrF,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,UAAU,IAAI;IAChB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAEhC,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC3C,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC3C,IAAI,GAAG,CAAA;YACP,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,KAAK,CAAC,CAAA;YAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,mBAAmB,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;YACD,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC,CAAA;YAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,mBAAmB,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;YACD,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC,CAAA;YAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,mBAAmB,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;QACL,CAAC;IACL,CAAC;IAED,SAAS,mBAAmB,CAAC,GAAW;QACpC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAA,IAAI,WAAW,yCAAyC,GAAG,EAAE;cACvE,kEAAkE,OAAO,SAAS,CAAC,CAAA;IAC7F,CAAC;IAED,MAAM,0BAA0B,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IACnE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,KAAK,CAAC,MAAM,CAAA,IAAI,WAAW,2CAA2C;cACpE,gEAAgE;cAChE,iFAAiF,CAAC,CAAA;IAC5F,CAAC;IAED,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAA;IAC1E,mEAAmE;IACnE,MAAM,WAAW,GAAsB,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAEjE,MAAM,gBAAgB,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,CAAC;QACpD,aAAa;QACb,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACxE,SAAS;QACT,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;IAE7E,MAAM,aAAa,GACvB
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/cli/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrF,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,UAAU,IAAI;IAChB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAEhC,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC3C,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC3C,IAAI,GAAG,CAAA;YACP,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,KAAK,CAAC,CAAA;YAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,mBAAmB,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;YACD,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC,CAAA;YAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,mBAAmB,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;YACD,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC,CAAA;YAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,mBAAmB,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;QACL,CAAC;IACL,CAAC;IAED,SAAS,mBAAmB,CAAC,GAAW;QACpC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAA,IAAI,WAAW,yCAAyC,GAAG,EAAE;cACvE,kEAAkE,OAAO,SAAS,CAAC,CAAA;IAC7F,CAAC;IAED,MAAM,0BAA0B,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IACnE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,KAAK,CAAC,MAAM,CAAA,IAAI,WAAW,2CAA2C;cACpE,gEAAgE;cAChE,iFAAiF,CAAC,CAAA;IAC5F,CAAC;IAED,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAA;IAC1E,mEAAmE;IACnE,MAAM,WAAW,GAAsB,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAEjE,MAAM,gBAAgB,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,CAAC;QACpD,aAAa;QACb,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACxE,SAAS;QACT,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;IAE7E,MAAM,aAAa,GACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwFE,CAAA;IAEE,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;IAEjD,GAAG,CAAC,KAAK,CAAC,WAAW,CAAA,IAAI,WAAW,sBAAsB,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;AAC9F,CAAC"}
|
|
@@ -18,6 +18,15 @@ mochaDescribe('applyConfigDefaults() function', function () {
|
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
20
|
finalConfig.watch.watchFiles.should.equal(defaultConfig.watch.watchFiles);
|
|
21
|
+
finalConfig.watch.ttyActionsOnKeypress.should.equal(false);
|
|
22
|
+
});
|
|
23
|
+
mochaIt('retains the immediate keypress setting', function () {
|
|
24
|
+
const finalConfig = applyConfigDefaults({
|
|
25
|
+
watch: {
|
|
26
|
+
ttyActionsOnKeypress: true
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
finalConfig.watch.ttyActionsOnKeypress.should.equal(true);
|
|
21
30
|
});
|
|
22
31
|
});
|
|
23
32
|
//# sourceMappingURL=applyConfigDefaults.unitTest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyConfigDefaults.unitTest.js","sourceRoot":"","sources":["../../../src/cli/lib/applyConfigDefaults.unitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,aAAa,CAAC,gCAAgC,EAAE;IAC5C,OAAO,CAAC,wDAAwD,EAAE;QAC9D,MAAM,WAAW,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAE3C,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAA;IACtE,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,iCAAiC,EAAE;QACvC,MAAM,WAAW,GAAG,mBAAmB,CAAC;YACpC,KAAK,EAAE,KAAK;SACf,CAAC,CAAA;QAEF,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,yDAAyD,EAAE;QAC/D,MAAM,WAAW,GAAG,mBAAmB,CAAC;YACpC,KAAK,EAAE;gBACH,cAAc,EAAE,KAAK;aACxB;SACJ,CAAC,CAAA;QAEF,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"applyConfigDefaults.unitTest.js","sourceRoot":"","sources":["../../../src/cli/lib/applyConfigDefaults.unitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,aAAa,CAAC,gCAAgC,EAAE;IAC5C,OAAO,CAAC,wDAAwD,EAAE;QAC9D,MAAM,WAAW,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAE3C,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAA;IACtE,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,iCAAiC,EAAE;QACvC,MAAM,WAAW,GAAG,mBAAmB,CAAC;YACpC,KAAK,EAAE,KAAK;SACf,CAAC,CAAA;QAEF,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,yDAAyD,EAAE;QAC/D,MAAM,WAAW,GAAG,mBAAmB,CAAC;YACpC,KAAK,EAAE;gBACH,cAAc,EAAE,KAAK;aACxB;SACJ,CAAC,CAAA;QAEF,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACzE,WAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,wCAAwC,EAAE;QAC9C,MAAM,WAAW,GAAG,mBAAmB,CAAC;YACpC,KAAK,EAAE;gBACH,oBAAoB,EAAE,IAAI;aAC7B;SACJ,CAAC,CAAA;QAEF,WAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/defaultConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,eAAO,MAAM,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"defaultConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/defaultConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,eAAO,MAAM,aAAa,EAAE,WAwB3B,CAAA"}
|
|
@@ -19,7 +19,8 @@ export const defaultConfig = {
|
|
|
19
19
|
watchFiles: '**/*.js',
|
|
20
20
|
watchFilesIgnore: '**/node_modules/**/*',
|
|
21
21
|
runAllOnStartup: true,
|
|
22
|
-
reRunFailingTests: true
|
|
22
|
+
reRunFailingTests: true,
|
|
23
|
+
ttyActionsOnKeypress: false
|
|
23
24
|
}
|
|
24
25
|
};
|
|
25
26
|
//# sourceMappingURL=defaultConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../../../src/cli/lib/defaultConfig.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAgB;IACtC,SAAS,EAAE,GAAG;IACd,KAAK,EAAE;QACH,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;QACxB,0BAA0B;QAC1B,8BAA8B;KACjC;IACD,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,KAAK;IACrB,SAAS,EAAE;QACP,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,YAAY;QACvB,KAAK,EAAE,YAAY;KACtB;IACD,KAAK,EAAE;QACH,cAAc,EAAE,GAAG;QACnB,UAAU,EAAE,SAAS;QACrB,gBAAgB,EAAE,sBAAsB;QACxC,eAAe,EAAE,IAAI;QACrB,iBAAiB,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../../../src/cli/lib/defaultConfig.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAgB;IACtC,SAAS,EAAE,GAAG;IACd,KAAK,EAAE;QACH,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;QACxB,0BAA0B;QAC1B,8BAA8B;KACjC;IACD,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,KAAK;IACrB,SAAS,EAAE;QACP,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,YAAY;QACvB,KAAK,EAAE,YAAY;KACtB;IACD,KAAK,EAAE;QACH,cAAc,EAAE,GAAG;QACnB,UAAU,EAAE,SAAS;QACrB,gBAAgB,EAAE,sBAAsB;QACxC,eAAe,EAAE,IAAI;QACrB,iBAAiB,EAAE,IAAI;QACvB,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { FinalConfig } from '../../types.js';
|
|
2
|
-
export declare function findTestFiles(config: FinalConfig): Promise<string[]>;
|
|
2
|
+
export declare function findTestFiles(config: FinalConfig, testFilesFilter?: string): Promise<string[]>;
|
|
3
3
|
//# sourceMappingURL=findTestFiles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findTestFiles.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/findTestFiles.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"findTestFiles.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/findTestFiles.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAKjD,wBAAsB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgBpG"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { glob } from 'fs/promises';
|
|
2
2
|
import slash from '../../packages/slash.js';
|
|
3
3
|
import { addBasePath } from './addBasePath.js';
|
|
4
|
-
|
|
4
|
+
import { matchesTestFilesFilter } from './matchesTestFilesFilter.js';
|
|
5
|
+
export async function findTestFiles(config, testFilesFilter) {
|
|
5
6
|
const testsGlobs = addBasePath(config.testsBase, config.tests);
|
|
6
7
|
const testsIgnoreGlobs = addBasePath(config.testsBase, config.testsIgnore);
|
|
7
8
|
// Node's built-in glob replaces the globby/tinyglobby dependency (no import cost).
|
|
@@ -11,7 +12,9 @@ export async function findTestFiles(config) {
|
|
|
11
12
|
for await (const file of glob(testsGlobs, {
|
|
12
13
|
exclude: Array.isArray(testsIgnoreGlobs) ? testsIgnoreGlobs : [testsIgnoreGlobs]
|
|
13
14
|
})) {
|
|
14
|
-
|
|
15
|
+
const testFile = slash(file);
|
|
16
|
+
if (matchesTestFilesFilter(config, testFile, testFilesFilter))
|
|
17
|
+
files.push(testFile);
|
|
15
18
|
}
|
|
16
19
|
return files;
|
|
17
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findTestFiles.js","sourceRoot":"","sources":["../../../src/cli/lib/findTestFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,MAAM,yBAAyB,CAAA;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"findTestFiles.js","sourceRoot":"","sources":["../../../src/cli/lib/findTestFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,MAAM,yBAAyB,CAAA;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAmB,EAAE,eAAwB;IAC7E,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9D,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;IAE1E,mFAAmF;IACnF,kFAAkF;IAClF,qFAAqF;IACrF,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;QACtC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;KACnF,CAAC,EAAE,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,sBAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvF,CAAC;IAED,OAAO,KAAK,CAAA;AAChB,CAAC"}
|
|
@@ -20,5 +20,10 @@ mochaDescribe('findTestFiles() function', function () {
|
|
|
20
20
|
const testFiles = await findTestFiles(config);
|
|
21
21
|
testFiles.length.should.equal(0);
|
|
22
22
|
});
|
|
23
|
+
mochaIt('applies a filter on top of the configured test pattern', async function () {
|
|
24
|
+
const config = applyConfigDefaults({ tests: 'unitTesting/**/*.test.js' });
|
|
25
|
+
const testFiles = await findTestFiles(config, '**/sampleTests/1.test.js');
|
|
26
|
+
testFiles.should.deep.equal(['unitTesting/sampleTests/1.test.js']);
|
|
27
|
+
});
|
|
23
28
|
});
|
|
24
29
|
//# sourceMappingURL=findTestFiles.unitTest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findTestFiles.unitTest.js","sourceRoot":"","sources":["../../../src/cli/lib/findTestFiles.unitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,wBAAwB;AAExB,aAAa,CAAC,0BAA0B,EAAE;IACtC,OAAO,CAAC,uBAAuB,EAAE,KAAK;QAClC,0BAA0B;QAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAA;QAEzE,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YAC7B,mCAAmC;YACnC,mCAAmC;SACtC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,kCAAkC,EAAE,KAAK;QAC7C,0BAA0B;QAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC;YAC/B,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,0BAA0B;SACpC,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7C,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"findTestFiles.unitTest.js","sourceRoot":"","sources":["../../../src/cli/lib/findTestFiles.unitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,wBAAwB;AAExB,aAAa,CAAC,0BAA0B,EAAE;IACtC,OAAO,CAAC,uBAAuB,EAAE,KAAK;QAClC,0BAA0B;QAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAA;QAEzE,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YAC7B,mCAAmC;YACnC,mCAAmC;SACtC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,kCAAkC,EAAE,KAAK;QAC7C,0BAA0B;QAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC;YAC/B,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,0BAA0B;SACpC,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7C,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,wDAAwD,EAAE,KAAK;QACnE,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAA;QAEzE,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;QAEzE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAA;IACtE,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { WatchRunState } from '../../types.js';
|
|
2
2
|
type RerunTests = (testFiles: string[]) => Promise<unknown>;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function handleUserInput(input: string, watchRunState: WatchRunState, allTestFiles: string[], failingTests: string[], rerunTests: RerunTests): void;
|
|
4
|
+
export declare function listenToUser(watchRunState: WatchRunState, allTestFiles: string[], failingTests: string[], rerunTests: RerunTests, ttyActionsOnKeypress: boolean | undefined, initialTestRun: Promise<boolean> | undefined, input?: NodeJS.ReadStream): Promise<void>;
|
|
4
5
|
export {};
|
|
5
6
|
//# sourceMappingURL=listenToUser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listenToUser.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/listenToUser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"listenToUser.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/listenToUser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAGnD,KAAK,UAAU,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAE3D,wBAAgB,eAAe,CAC3B,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,UAAU,EAAE,UAAU,GACvB,IAAI,CAiBN;AAED,wBAAsB,YAAY,CAC9B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,UAAU,EAAE,UAAU,EACtB,oBAAoB,qBAAQ,EAC5B,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,EAC5C,KAAK,GAAE,MAAM,CAAC,UAA0B,GACzC,OAAO,CAAC,IAAI,CAAC,CA0Cf"}
|
|
@@ -1,17 +1,64 @@
|
|
|
1
|
-
import { createInterface } from 'node:readline';
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import { createInterface, emitKeypressEvents } from 'node:readline';
|
|
2
|
+
import { showTtyHelp } from './showTtyHelp.js';
|
|
3
|
+
export function handleUserInput(input, watchRunState, allTestFiles, failingTests, rerunTests) {
|
|
4
|
+
const command = input.trim().toLowerCase();
|
|
5
|
+
if (watchRunState.activeRuns > 0)
|
|
4
6
|
return;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
7
|
+
let testFiles;
|
|
8
|
+
if (command === 'r' || command === 'l') {
|
|
9
|
+
testFiles = watchRunState.lastTestFiles;
|
|
10
|
+
}
|
|
11
|
+
else if (command === 'a') {
|
|
12
|
+
testFiles = allTestFiles;
|
|
13
|
+
}
|
|
14
|
+
else if (command === 'f') {
|
|
15
|
+
testFiles = failingTests;
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
if (testFiles.length === 0)
|
|
21
|
+
return;
|
|
22
|
+
void rerunTests([...testFiles]);
|
|
23
|
+
}
|
|
24
|
+
export async function listenToUser(watchRunState, allTestFiles, failingTests, rerunTests, ttyActionsOnKeypress = false, initialTestRun, input = process.stdin) {
|
|
25
|
+
if (!input.isTTY)
|
|
26
|
+
return Promise.resolve();
|
|
27
|
+
if (ttyActionsOnKeypress) {
|
|
28
|
+
emitKeypressEvents(input);
|
|
29
|
+
const wasRaw = input.isRaw;
|
|
30
|
+
const restoreRawMode = () => {
|
|
31
|
+
if (input.isRaw === wasRaw)
|
|
32
|
+
return;
|
|
33
|
+
try {
|
|
34
|
+
input.setRawMode(wasRaw);
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
// The terminal stream may already be closed during process shutdown.
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
input.setRawMode(true);
|
|
41
|
+
input.resume();
|
|
42
|
+
input.once('close', restoreRawMode);
|
|
43
|
+
if (input === process.stdin)
|
|
44
|
+
process.once('exit', restoreRawMode);
|
|
45
|
+
input.on('keypress', (keypressInput, key) => {
|
|
46
|
+
if (key.ctrl === true && key.name === 'c') {
|
|
47
|
+
restoreRawMode();
|
|
48
|
+
process.kill(process.pid, 'SIGINT');
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
handleUserInput(keypressInput, watchRunState, allTestFiles, failingTests, rerunTests);
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
const userInput = createInterface({ input });
|
|
56
|
+
userInput.on('line', input => {
|
|
57
|
+
handleUserInput(input, watchRunState, allTestFiles, failingTests, rerunTests);
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
await initialTestRun;
|
|
61
|
+
showTtyHelp();
|
|
62
|
+
return;
|
|
16
63
|
}
|
|
17
64
|
//# sourceMappingURL=listenToUser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listenToUser.js","sourceRoot":"","sources":["../../../src/cli/lib/listenToUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"listenToUser.js","sourceRoot":"","sources":["../../../src/cli/lib/listenToUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"listenToUser.unitTest.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/listenToUser.unitTest.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { PassThrough } from 'node:stream';
|
|
2
|
+
import { handleUserInput, listenToUser } from './listenToUser.js';
|
|
3
|
+
mochaDescribe('handleUserInput() function', function () {
|
|
4
|
+
const makeState = () => ({
|
|
5
|
+
lastTestFiles: ['last.test.js'],
|
|
6
|
+
activeRuns: 0
|
|
7
|
+
});
|
|
8
|
+
const handle = (input, watchRunState = makeState(), allTestFiles = ['all.test.js'], failingTests = ['failed.test.js']) => {
|
|
9
|
+
const reruns = [];
|
|
10
|
+
handleUserInput(input, watchRunState, allTestFiles, failingTests, async (testFiles) => {
|
|
11
|
+
reruns.push(testFiles);
|
|
12
|
+
});
|
|
13
|
+
return reruns;
|
|
14
|
+
};
|
|
15
|
+
mochaIt('re-runs the last set of tests for r and l', function () {
|
|
16
|
+
handle('r').should.deep.equal([['last.test.js']]);
|
|
17
|
+
handle(' L ').should.deep.equal([['last.test.js']]);
|
|
18
|
+
});
|
|
19
|
+
mochaIt('re-runs all tests for a', function () {
|
|
20
|
+
handle('a').should.deep.equal([['all.test.js']]);
|
|
21
|
+
});
|
|
22
|
+
mochaIt('re-runs failing tests for f', function () {
|
|
23
|
+
handle('f').should.deep.equal([['failed.test.js']]);
|
|
24
|
+
});
|
|
25
|
+
mochaIt('does not start a run for unknown commands, empty selections, or an active run', function () {
|
|
26
|
+
handle('unknown').should.deep.equal([]);
|
|
27
|
+
handle('a', makeState(), []).should.deep.equal([]);
|
|
28
|
+
handle('f', makeState(), ['all.test.js'], []).should.deep.equal([]);
|
|
29
|
+
handle('r', { lastTestFiles: ['last.test.js'], activeRuns: 1 }).should.deep.equal([]);
|
|
30
|
+
});
|
|
31
|
+
mochaIt('passes a copy of the selected test files to the runner', function () {
|
|
32
|
+
const allTestFiles = ['all.test.js'];
|
|
33
|
+
const reruns = handle('a', makeState(), allTestFiles);
|
|
34
|
+
reruns[0]?.push('another.test.js');
|
|
35
|
+
allTestFiles.should.deep.equal(['all.test.js']);
|
|
36
|
+
});
|
|
37
|
+
mochaIt('runs commands immediately in keypress mode and restores raw mode', async function () {
|
|
38
|
+
const input = new PassThrough();
|
|
39
|
+
const rawModeChanges = [];
|
|
40
|
+
let isRaw = false;
|
|
41
|
+
Object.defineProperties(input, {
|
|
42
|
+
isTTY: { value: true },
|
|
43
|
+
isRaw: { get: () => isRaw },
|
|
44
|
+
setRawMode: {
|
|
45
|
+
value: (mode) => {
|
|
46
|
+
isRaw = mode;
|
|
47
|
+
rawModeChanges.push(mode);
|
|
48
|
+
return input;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
const reruns = [];
|
|
53
|
+
await listenToUser(makeState(), ['all.test.js'], ['failed.test.js'], async (testFiles) => {
|
|
54
|
+
reruns.push(testFiles);
|
|
55
|
+
}, true, undefined, input);
|
|
56
|
+
input.emit('keypress', 'a', { ctrl: false, name: 'a' });
|
|
57
|
+
reruns.should.deep.equal([['all.test.js']]);
|
|
58
|
+
rawModeChanges.should.deep.equal([true]);
|
|
59
|
+
input.destroy();
|
|
60
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
61
|
+
rawModeChanges.should.deep.equal([true, false]);
|
|
62
|
+
});
|
|
63
|
+
mochaIt('resolves after the Enter-based listener is ready', async function () {
|
|
64
|
+
const input = new PassThrough();
|
|
65
|
+
Object.defineProperty(input, 'isTTY', { value: true });
|
|
66
|
+
const reruns = [];
|
|
67
|
+
await listenToUser(makeState(), ['all.test.js'], ['failed.test.js'], async (testFiles) => {
|
|
68
|
+
reruns.push(testFiles);
|
|
69
|
+
}, false, undefined, input);
|
|
70
|
+
input.write('a\n');
|
|
71
|
+
await new Promise(resolve => setImmediate(resolve));
|
|
72
|
+
reruns.should.deep.equal([['all.test.js']]);
|
|
73
|
+
input.destroy();
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
//# sourceMappingURL=listenToUser.unitTest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"listenToUser.unitTest.js","sourceRoot":"","sources":["../../../src/cli/lib/listenToUser.unitTest.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"matchesTestFilesFilter.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/matchesTestFilesFilter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,GACzB,OAAO,CAKT"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import minimatch from 'minimatch';
|
|
2
|
+
import { addBasePath } from './addBasePath.js';
|
|
3
|
+
import { globArgCombine } from './globArgCombine.js';
|
|
4
|
+
export function matchesTestFilesFilter(config, testFile, testFilesFilter) {
|
|
5
|
+
if (testFilesFilter === undefined)
|
|
6
|
+
return true;
|
|
7
|
+
const filterGlob = addBasePath(config.testsBase, testFilesFilter);
|
|
8
|
+
return minimatch(testFile, globArgCombine(filterGlob));
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=matchesTestFilesFilter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"matchesTestFilesFilter.js","sourceRoot":"","sources":["../../../src/cli/lib/matchesTestFilesFilter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAA;AAEjC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAIpD,MAAM,UAAU,sBAAsB,CAClC,MAAmB,EACnB,QAAgB,EAChB,eAAwB;IAExB,IAAI,eAAe,KAAK,SAAS;QAAE,OAAO,IAAI,CAAA;IAE9C,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;IACjE,OAAO,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTests.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/runTests.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAA6C,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAIlH,wBAAsB,QAAQ,CAC1B,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,CAAC,EAAE,aAAa,EAC7B,SAAS,CAAC,EAAE,KAAK,GAClB,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"runTests.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/runTests.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAA6C,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAIlH,wBAAsB,QAAQ,CAC1B,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,CAAC,EAAE,aAAa,EAC7B,SAAS,CAAC,EAAE,KAAK,GAClB,OAAO,CAAC,OAAO,CAAC,CAmKlB"}
|
package/dist/cli/lib/runTests.js
CHANGED
|
@@ -26,7 +26,10 @@ export async function runTests(config, testFiles, failingTests, watchRunState, c
|
|
|
26
26
|
const test = await loadTestFile(config, testFile);
|
|
27
27
|
if (test.error !== undefined && test.error !== false) {
|
|
28
28
|
erroringTests[testFile] = test;
|
|
29
|
-
|
|
29
|
+
if (!failingTests.includes(testFile)) {
|
|
30
|
+
failingTests.push(testFile);
|
|
31
|
+
}
|
|
32
|
+
await showTestLoadingError(config, test, customOut);
|
|
30
33
|
}
|
|
31
34
|
else {
|
|
32
35
|
const testRunPromise = runTest(config, test);
|
|
@@ -70,6 +73,7 @@ export async function runTests(config, testFiles, failingTests, watchRunState, c
|
|
|
70
73
|
itsPasses: 0
|
|
71
74
|
// itsInvalid: 0 // we don't check whether tests run any asserts (we don't control the assertion lib)
|
|
72
75
|
};
|
|
76
|
+
let describesThrownCount = 0;
|
|
73
77
|
for (const testFile in runTestResults) {
|
|
74
78
|
const runTestResult = runTestResults[testFile];
|
|
75
79
|
if (!runTestResult)
|
|
@@ -82,8 +86,12 @@ export async function runTests(config, testFiles, failingTests, watchRunState, c
|
|
|
82
86
|
testsResultsSummary.describesInvalid += runTestResult.describeResultsSummary.invalid;
|
|
83
87
|
testsResultsSummary.itsTotal += runTestResult.describeResultsSummary.itsTotal;
|
|
84
88
|
testsResultsSummary.itsPasses += runTestResult.describeResultsSummary.itsPasses;
|
|
89
|
+
describesThrownCount += runTestResult.describeResults
|
|
90
|
+
.filter(describeResult => describeResult.error !== undefined)
|
|
91
|
+
.length;
|
|
85
92
|
}
|
|
86
|
-
|
|
93
|
+
const failedToLoadCount = count(erroringTests);
|
|
94
|
+
testsResultsSummary.total += failedToLoadCount;
|
|
87
95
|
out('\n');
|
|
88
96
|
const allPassed = (testsResultsSummary.passes === testsResultsSummary.total
|
|
89
97
|
&& testsResultsSummary.describesPasses === testsResultsSummary.describesTotal
|
|
@@ -109,11 +117,20 @@ export async function runTests(config, testFiles, failingTests, watchRunState, c
|
|
|
109
117
|
? chalk.grey('(+1 describe without tests)')
|
|
110
118
|
: chalk.grey(`(+${testsResultsSummary.describesInvalid} describes without tests)`)
|
|
111
119
|
: '';
|
|
120
|
+
const describesThrownText = (describesThrownCount >= 1)
|
|
121
|
+
? (describesThrownCount === 1)
|
|
122
|
+
? chalk.mediumred('(1 describe errored)')
|
|
123
|
+
: chalk.mediumred(`(${describesThrownCount} describes errored)`)
|
|
124
|
+
: '';
|
|
125
|
+
const describesDetailsText = [invalidDescribesText, describesThrownText]
|
|
126
|
+
.filter(text => text !== '')
|
|
127
|
+
.join(' ');
|
|
128
|
+
const describesDetailsSuffix = describesDetailsText === '' ? '' : ` ${describesDetailsText}`;
|
|
112
129
|
if (testsResultsSummary.describesPasses === testsResultsSummary.describesTotal) {
|
|
113
|
-
out(chalk.mediumgreen(`${describesText}`) +
|
|
130
|
+
out(chalk.mediumgreen(`${describesText}`) + describesDetailsSuffix);
|
|
114
131
|
}
|
|
115
132
|
else {
|
|
116
|
-
out(chalk.mediumred(`${describesText}`) +
|
|
133
|
+
out(chalk.mediumred(`${describesText}`) + describesDetailsSuffix);
|
|
117
134
|
}
|
|
118
135
|
// number of test files successful
|
|
119
136
|
const testFilesText = `Test Files: ${testsResultsSummary.passes}/${testsResultsSummary.total}`;
|
|
@@ -122,13 +139,21 @@ export async function runTests(config, testFiles, failingTests, watchRunState, c
|
|
|
122
139
|
? chalk.grey('(+1 file without tests)')
|
|
123
140
|
: chalk.grey(`(+${testsResultsSummary.invalid} files without tests)`)
|
|
124
141
|
: '';
|
|
142
|
+
const failedToLoadText = (failedToLoadCount >= 1)
|
|
143
|
+
? (failedToLoadCount === 1)
|
|
144
|
+
? chalk.mediumred('(1 file failed to load, or errored)')
|
|
145
|
+
: chalk.mediumred(`(${failedToLoadCount} files failed to load, or errored)`)
|
|
146
|
+
: '';
|
|
147
|
+
const testFilesDetailsText = [invalidTestFilesText, failedToLoadText]
|
|
148
|
+
.filter(text => text !== '')
|
|
149
|
+
.join(' ');
|
|
150
|
+
const testFilesDetailsSuffix = testFilesDetailsText === '' ? '' : ` ${testFilesDetailsText}`;
|
|
125
151
|
if (testsResultsSummary.passes === testsResultsSummary.total) {
|
|
126
|
-
out(chalk.mediumgreen(`${testFilesText}`) +
|
|
152
|
+
out(chalk.mediumgreen(`${testFilesText}`) + testFilesDetailsSuffix);
|
|
127
153
|
}
|
|
128
154
|
else {
|
|
129
|
-
out(chalk.mediumred(`${testFilesText}`) +
|
|
155
|
+
out(chalk.mediumred(`${testFilesText}`) + testFilesDetailsSuffix);
|
|
130
156
|
}
|
|
131
|
-
out(chalk.orange `To do: account for tests with loading errors`);
|
|
132
157
|
// full success?
|
|
133
158
|
// true/false gets returned to the caller of runTests()
|
|
134
159
|
return allPassed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTests.js","sourceRoot":"","sources":["../../../src/cli/lib/runTests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,MAAM,yBAAyB,CAAA;AAC3C,OAAO,EAAE,GAAG,IAAI,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,OAAO,MAAM,2BAA2B,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAIpD,MAAM,EAAE,gBAAgB,EAAE,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;AAElE,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC1B,MAAmB,EACnB,SAAmB,EACnB,YAAsB,EACtB,aAA6B,EAC7B,SAAiB;IAEjB,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9B,aAAa,CAAC,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAA;QAC5C,aAAa,CAAC,UAAU,EAAE,CAAA;IAC9B,CAAC;IACD,IAAI,CAAC;QACD,MAAM,eAAe,GAAwC,EAAE,CAAA;QAC/D,MAAM,aAAa,GAA6B,EAAE,CAAA;QAClD,MAAM,kBAAkB,GAAkC,EAAE,CAAA;QAE5D,MAAM,gBAAgB,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;YAC3C,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBAC/B,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;oBAEjD,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;wBACnD,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAA;wBAC9B,MAAM,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"runTests.js","sourceRoot":"","sources":["../../../src/cli/lib/runTests.ts"],"names":[],"mappings":"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"}
|