@git.zone/tstest 1.2.0 → 1.3.0
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/index.js +4 -5
- package/dist_ts/tstest.classes.tap.parser.js +3 -2
- package/dist_ts/tstest.logging.d.ts +6 -1
- package/dist_ts/tstest.logging.js +76 -16
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +3 -4
- package/ts/tstest.classes.tap.parser.ts +2 -1
- package/ts/tstest.logging.ts +89 -16
- package/readme.plan.md +0 -199
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tstest',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.3.0',
|
|
7
7
|
description: 'a test utility to run tests that match test/**/*.ts'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFEQUFxRDtDQUNuRSxDQUFBIn0=
|
package/dist_ts/index.js
CHANGED
|
@@ -29,9 +29,8 @@ export const runCli = async () => {
|
|
|
29
29
|
logOptions.json = true;
|
|
30
30
|
break;
|
|
31
31
|
case '--log-file':
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
32
|
+
case '--logfile':
|
|
33
|
+
logOptions.logFile = true; // Set this as a flag, not a value
|
|
35
34
|
break;
|
|
36
35
|
default:
|
|
37
36
|
if (!arg.startsWith('-')) {
|
|
@@ -47,7 +46,7 @@ export const runCli = async () => {
|
|
|
47
46
|
console.error(' --verbose, -v Verbose output');
|
|
48
47
|
console.error(' --no-color Disable colored output');
|
|
49
48
|
console.error(' --json Output results as JSON');
|
|
50
|
-
console.error(' --
|
|
49
|
+
console.error(' --logfile Write logs to .nogit/testlogs/[testfile].log');
|
|
51
50
|
process.exit(1);
|
|
52
51
|
}
|
|
53
52
|
let executionMode;
|
|
@@ -64,4 +63,4 @@ export const runCli = async () => {
|
|
|
64
63
|
const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode, logOptions);
|
|
65
64
|
await tsTestInstance.run();
|
|
66
65
|
};
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHcEQsTUFBTSxDQUFOLElBQVksaUJBSVg7QUFKRCxXQUFZLGlCQUFpQjtJQUMzQiw0Q0FBdUIsQ0FBQTtJQUN2QixrQ0FBYSxDQUFBO0lBQ2Isa0NBQWEsQ0FBQTtBQUNmLENBQUMsRUFKVyxpQkFBaUIsS0FBakIsaUJBQWlCLFFBSTVCO0FBRUQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQy9CLCtCQUErQjtJQUMvQixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuQyxNQUFNLFVBQVUsR0FBZSxFQUFFLENBQUM7SUFDbEMsSUFBSSxRQUFRLEdBQWtCLElBQUksQ0FBQztJQUVuQyxnQkFBZ0I7SUFDaEIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNyQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFcEIsUUFBUSxHQUFHLEVBQUUsQ0FBQztZQUNaLEtBQUssU0FBUyxDQUFDO1lBQ2YsS0FBSyxJQUFJO2dCQUNQLFVBQVUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO2dCQUN4QixNQUFNO1lBQ1IsS0FBSyxXQUFXLENBQUM7WUFDakIsS0FBSyxJQUFJO2dCQUNQLFVBQVUsQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDO2dCQUMxQixNQUFNO1lBQ1IsS0FBSyxZQUFZO2dCQUNmLFVBQVUsQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDO2dCQUMxQixNQUFNO1lBQ1IsS0FBSyxRQUFRO2dCQUNYLFVBQVUsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO2dCQUN2QixNQUFNO1lBQ1IsS0FBSyxZQUFZLENBQUM7WUFDbEIsS0FBSyxXQUFXO2dCQUNkLFVBQVUsQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLENBQUMsa0NBQWtDO2dCQUM3RCxNQUFNO1lBQ1I7Z0JBQ0UsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztvQkFDekIsUUFBUSxHQUFHLEdBQUcsQ0FBQztnQkFDakIsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLEtBQUssQ0FBQywrRUFBK0UsQ0FBQyxDQUFDO1FBQy9GLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQztRQUNsRCxPQUFPLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzVCLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQztRQUNsRCxPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUM7UUFDbEQsT0FBTyxDQUFDLEtBQUssQ0FBQywwQ0FBMEMsQ0FBQyxDQUFDO1FBQzFELE9BQU8sQ0FBQyxLQUFLLENBQUMsMENBQTBDLENBQUMsQ0FBQztRQUMxRCxPQUFPLENBQUMsS0FBSyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7UUFDaEYsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQixDQUFDO0lBRUQsSUFBSSxhQUFnQyxDQUFDO0lBRXJDLDhDQUE4QztJQUM5QyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxRQUFRLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN6RyxhQUFhLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDO0lBQ3pDLENBQUM7U0FBTSxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNwQyxhQUFhLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDO0lBQ3pDLENBQUM7U0FBTSxDQUFDO1FBQ04sYUFBYSxHQUFHLGlCQUFpQixDQUFDLFNBQVMsQ0FBQztJQUM5QyxDQUFDO0lBRUQsTUFBTSxjQUFjLEdBQUcsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFFBQVEsRUFBRSxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDdEYsTUFBTSxjQUFjLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDN0IsQ0FBQyxDQUFDIn0=
|
|
@@ -87,7 +87,8 @@ export class TapParser {
|
|
|
87
87
|
this.activeTapTestResult.addLogLine(logLine);
|
|
88
88
|
}
|
|
89
89
|
if (this.logger) {
|
|
90
|
-
|
|
90
|
+
// This is console output from the test file, not TAP protocol
|
|
91
|
+
this.logger.testConsoleOutput(logLine);
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
94
|
if (this.activeTapTestResult && this.activeTapTestResult.testSettled) {
|
|
@@ -186,4 +187,4 @@ export class TapParser {
|
|
|
186
187
|
}
|
|
187
188
|
}
|
|
188
189
|
}
|
|
189
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tap.parser.js","sourceRoot":"","sources":["../ts/tstest.classes.tap.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export interface LogOptions {
|
|
|
3
3
|
verbose?: boolean;
|
|
4
4
|
noColor?: boolean;
|
|
5
5
|
json?: boolean;
|
|
6
|
-
logFile?:
|
|
6
|
+
logFile?: boolean;
|
|
7
7
|
}
|
|
8
8
|
export interface TestFileResult {
|
|
9
9
|
file: string;
|
|
@@ -31,9 +31,13 @@ export declare class TsTestLogger {
|
|
|
31
31
|
private startTime;
|
|
32
32
|
private fileResults;
|
|
33
33
|
private currentFileResult;
|
|
34
|
+
private currentTestLogFile;
|
|
34
35
|
constructor(options?: LogOptions);
|
|
35
36
|
private format;
|
|
36
37
|
private log;
|
|
38
|
+
private logToFile;
|
|
39
|
+
private logToTestFile;
|
|
40
|
+
private logJson;
|
|
37
41
|
sectionStart(title: string): void;
|
|
38
42
|
sectionEnd(): void;
|
|
39
43
|
progress(current: number, total: number, message: string): void;
|
|
@@ -42,6 +46,7 @@ export declare class TsTestLogger {
|
|
|
42
46
|
testResult(testName: string, passed: boolean, duration: number, error?: string): void;
|
|
43
47
|
testFileEnd(passed: number, failed: number, duration: number): void;
|
|
44
48
|
tapOutput(message: string, isError?: boolean): void;
|
|
49
|
+
testConsoleOutput(message: string): void;
|
|
45
50
|
browserConsole(message: string, level?: string): void;
|
|
46
51
|
summary(): void;
|
|
47
52
|
error(message: string, file?: string, stack?: string): void;
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { coloredString as cs } from '@push.rocks/consolecolor';
|
|
2
2
|
import * as plugins from './tstest.plugins.js';
|
|
3
|
+
import * as fs from 'fs';
|
|
4
|
+
import * as path from 'path';
|
|
3
5
|
export class TsTestLogger {
|
|
4
6
|
constructor(options = {}) {
|
|
5
7
|
this.fileResults = [];
|
|
6
8
|
this.currentFileResult = null;
|
|
9
|
+
this.currentTestLogFile = null;
|
|
7
10
|
this.options = options;
|
|
8
11
|
this.startTime = Date.now();
|
|
9
12
|
}
|
|
@@ -14,11 +17,38 @@ export class TsTestLogger {
|
|
|
14
17
|
return cs(text, color);
|
|
15
18
|
}
|
|
16
19
|
log(message) {
|
|
17
|
-
if (this.options.json)
|
|
20
|
+
if (this.options.json) {
|
|
21
|
+
// For JSON mode, skip console output
|
|
22
|
+
// JSON output is handled by logJson method
|
|
18
23
|
return;
|
|
24
|
+
}
|
|
19
25
|
console.log(message);
|
|
20
|
-
if
|
|
21
|
-
|
|
26
|
+
// Log to the current test file log if we're in a test and --logfile is specified
|
|
27
|
+
if (this.currentTestLogFile) {
|
|
28
|
+
this.logToTestFile(message);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
logToFile(message) {
|
|
32
|
+
// This method is no longer used since we use logToTestFile for individual test logs
|
|
33
|
+
// Keeping it for potential future use with a global log file
|
|
34
|
+
}
|
|
35
|
+
logToTestFile(message) {
|
|
36
|
+
try {
|
|
37
|
+
// Remove ANSI color codes for file logging
|
|
38
|
+
const cleanMessage = message.replace(/\u001b\[[0-9;]*m/g, '');
|
|
39
|
+
// Append to test log file
|
|
40
|
+
fs.appendFileSync(this.currentTestLogFile, cleanMessage + '\n');
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
// Silently fail to avoid disrupting the test run
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
logJson(data) {
|
|
47
|
+
const jsonString = JSON.stringify(data);
|
|
48
|
+
console.log(jsonString);
|
|
49
|
+
// Also log to test file if --logfile is specified
|
|
50
|
+
if (this.currentTestLogFile) {
|
|
51
|
+
this.logToTestFile(jsonString);
|
|
22
52
|
}
|
|
23
53
|
}
|
|
24
54
|
// Section separators
|
|
@@ -45,7 +75,7 @@ export class TsTestLogger {
|
|
|
45
75
|
// Test discovery
|
|
46
76
|
testDiscovery(count, pattern, executionMode) {
|
|
47
77
|
if (this.options.json) {
|
|
48
|
-
|
|
78
|
+
this.logJson({ event: 'discovery', count, pattern, executionMode });
|
|
49
79
|
return;
|
|
50
80
|
}
|
|
51
81
|
if (this.options.quiet) {
|
|
@@ -68,8 +98,20 @@ export class TsTestLogger {
|
|
|
68
98
|
duration: 0,
|
|
69
99
|
tests: []
|
|
70
100
|
};
|
|
101
|
+
// Only set up test log file if --logfile option is specified
|
|
102
|
+
if (this.options.logFile) {
|
|
103
|
+
const baseFilename = path.basename(filename, '.ts');
|
|
104
|
+
this.currentTestLogFile = path.join('.nogit', 'testlogs', `${baseFilename}.log`);
|
|
105
|
+
// Ensure the directory exists
|
|
106
|
+
const logDir = path.dirname(this.currentTestLogFile);
|
|
107
|
+
if (!fs.existsSync(logDir)) {
|
|
108
|
+
fs.mkdirSync(logDir, { recursive: true });
|
|
109
|
+
}
|
|
110
|
+
// Clear the log file for this test
|
|
111
|
+
fs.writeFileSync(this.currentTestLogFile, '');
|
|
112
|
+
}
|
|
71
113
|
if (this.options.json) {
|
|
72
|
-
|
|
114
|
+
this.logJson({ event: 'fileStart', filename, runtime, index, total });
|
|
73
115
|
return;
|
|
74
116
|
}
|
|
75
117
|
if (this.options.quiet)
|
|
@@ -90,7 +132,7 @@ export class TsTestLogger {
|
|
|
90
132
|
this.currentFileResult.duration += duration;
|
|
91
133
|
}
|
|
92
134
|
if (this.options.json) {
|
|
93
|
-
|
|
135
|
+
this.logJson({ event: 'testResult', testName, passed, duration, error });
|
|
94
136
|
return;
|
|
95
137
|
}
|
|
96
138
|
const icon = passed ? '✅' : '❌';
|
|
@@ -111,7 +153,7 @@ export class TsTestLogger {
|
|
|
111
153
|
this.currentFileResult = null;
|
|
112
154
|
}
|
|
113
155
|
if (this.options.json) {
|
|
114
|
-
|
|
156
|
+
this.logJson({ event: 'fileEnd', passed, failed, duration });
|
|
115
157
|
return;
|
|
116
158
|
}
|
|
117
159
|
if (!this.options.quiet) {
|
|
@@ -120,21 +162,39 @@ export class TsTestLogger {
|
|
|
120
162
|
const color = failed === 0 ? 'green' : 'red';
|
|
121
163
|
this.log(this.format(` Summary: ${passed}/${total} ${status}`, color));
|
|
122
164
|
}
|
|
165
|
+
// Clear the current test log file reference only if using --logfile
|
|
166
|
+
if (this.options.logFile) {
|
|
167
|
+
this.currentTestLogFile = null;
|
|
168
|
+
}
|
|
123
169
|
}
|
|
124
|
-
// TAP output forwarding
|
|
170
|
+
// TAP output forwarding (for TAP protocol messages)
|
|
125
171
|
tapOutput(message, isError = false) {
|
|
126
172
|
if (this.options.json)
|
|
127
173
|
return;
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
174
|
+
// Never show raw TAP protocol messages in console
|
|
175
|
+
// They are already processed by TapParser and shown in our format
|
|
176
|
+
// Always log to test file if --logfile is specified
|
|
177
|
+
if (this.currentTestLogFile) {
|
|
178
|
+
this.logToTestFile(` ${message}`);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
// Console output from test files (non-TAP output)
|
|
182
|
+
testConsoleOutput(message) {
|
|
183
|
+
if (this.options.json)
|
|
184
|
+
return;
|
|
185
|
+
// Show console output from test files only in verbose mode
|
|
186
|
+
if (this.options.verbose) {
|
|
187
|
+
this.log(this.format(` ${message}`, 'dim'));
|
|
188
|
+
}
|
|
189
|
+
// Always log to test file if --logfile is specified
|
|
190
|
+
if (this.currentTestLogFile) {
|
|
191
|
+
this.logToTestFile(` ${message}`);
|
|
132
192
|
}
|
|
133
193
|
}
|
|
134
194
|
// Browser console
|
|
135
195
|
browserConsole(message, level = 'log') {
|
|
136
196
|
if (this.options.json) {
|
|
137
|
-
|
|
197
|
+
this.logJson({ event: 'browserConsole', message, level });
|
|
138
198
|
return;
|
|
139
199
|
}
|
|
140
200
|
if (!this.options.quiet) {
|
|
@@ -155,7 +215,7 @@ export class TsTestLogger {
|
|
|
155
215
|
fileResults: this.fileResults
|
|
156
216
|
};
|
|
157
217
|
if (this.options.json) {
|
|
158
|
-
|
|
218
|
+
this.logJson({ event: 'summary', summary });
|
|
159
219
|
return;
|
|
160
220
|
}
|
|
161
221
|
if (this.options.quiet) {
|
|
@@ -207,7 +267,7 @@ export class TsTestLogger {
|
|
|
207
267
|
// Error display
|
|
208
268
|
error(message, file, stack) {
|
|
209
269
|
if (this.options.json) {
|
|
210
|
-
|
|
270
|
+
this.logJson({ event: 'error', message, file, stack });
|
|
211
271
|
return;
|
|
212
272
|
}
|
|
213
273
|
if (this.options.quiet) {
|
|
@@ -225,4 +285,4 @@ export class TsTestLogger {
|
|
|
225
285
|
}
|
|
226
286
|
}
|
|
227
287
|
}
|
|
228
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.logging.js","sourceRoot":"","sources":["../ts/tstest.logging.ts"],"names":[],"mappings":"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"}
|
|
288
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.logging.js","sourceRoot":"","sources":["../ts/tstest.logging.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/index.ts
CHANGED
|
@@ -33,9 +33,8 @@ export const runCli = async () => {
|
|
|
33
33
|
logOptions.json = true;
|
|
34
34
|
break;
|
|
35
35
|
case '--log-file':
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
36
|
+
case '--logfile':
|
|
37
|
+
logOptions.logFile = true; // Set this as a flag, not a value
|
|
39
38
|
break;
|
|
40
39
|
default:
|
|
41
40
|
if (!arg.startsWith('-')) {
|
|
@@ -52,7 +51,7 @@ export const runCli = async () => {
|
|
|
52
51
|
console.error(' --verbose, -v Verbose output');
|
|
53
52
|
console.error(' --no-color Disable colored output');
|
|
54
53
|
console.error(' --json Output results as JSON');
|
|
55
|
-
console.error(' --
|
|
54
|
+
console.error(' --logfile Write logs to .nogit/testlogs/[testfile].log');
|
|
56
55
|
process.exit(1);
|
|
57
56
|
}
|
|
58
57
|
|
|
@@ -102,7 +102,8 @@ export class TapParser {
|
|
|
102
102
|
this.activeTapTestResult.addLogLine(logLine);
|
|
103
103
|
}
|
|
104
104
|
if (this.logger) {
|
|
105
|
-
|
|
105
|
+
// This is console output from the test file, not TAP protocol
|
|
106
|
+
this.logger.testConsoleOutput(logLine);
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
109
|
|
package/ts/tstest.logging.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { coloredString as cs } from '@push.rocks/consolecolor';
|
|
2
2
|
import * as plugins from './tstest.plugins.js';
|
|
3
|
+
import * as fs from 'fs';
|
|
4
|
+
import * as path from 'path';
|
|
3
5
|
|
|
4
6
|
export interface LogOptions {
|
|
5
7
|
quiet?: boolean;
|
|
6
8
|
verbose?: boolean;
|
|
7
9
|
noColor?: boolean;
|
|
8
10
|
json?: boolean;
|
|
9
|
-
logFile?:
|
|
11
|
+
logFile?: boolean;
|
|
10
12
|
}
|
|
11
13
|
|
|
12
14
|
export interface TestFileResult {
|
|
@@ -37,6 +39,7 @@ export class TsTestLogger {
|
|
|
37
39
|
private startTime: number;
|
|
38
40
|
private fileResults: TestFileResult[] = [];
|
|
39
41
|
private currentFileResult: TestFileResult | null = null;
|
|
42
|
+
private currentTestLogFile: string | null = null;
|
|
40
43
|
|
|
41
44
|
constructor(options: LogOptions = {}) {
|
|
42
45
|
this.options = options;
|
|
@@ -51,11 +54,44 @@ export class TsTestLogger {
|
|
|
51
54
|
}
|
|
52
55
|
|
|
53
56
|
private log(message: string) {
|
|
54
|
-
if (this.options.json)
|
|
57
|
+
if (this.options.json) {
|
|
58
|
+
// For JSON mode, skip console output
|
|
59
|
+
// JSON output is handled by logJson method
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
|
|
55
63
|
console.log(message);
|
|
56
64
|
|
|
57
|
-
if
|
|
58
|
-
|
|
65
|
+
// Log to the current test file log if we're in a test and --logfile is specified
|
|
66
|
+
if (this.currentTestLogFile) {
|
|
67
|
+
this.logToTestFile(message);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
private logToFile(message: string) {
|
|
72
|
+
// This method is no longer used since we use logToTestFile for individual test logs
|
|
73
|
+
// Keeping it for potential future use with a global log file
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
private logToTestFile(message: string) {
|
|
77
|
+
try {
|
|
78
|
+
// Remove ANSI color codes for file logging
|
|
79
|
+
const cleanMessage = message.replace(/\u001b\[[0-9;]*m/g, '');
|
|
80
|
+
|
|
81
|
+
// Append to test log file
|
|
82
|
+
fs.appendFileSync(this.currentTestLogFile, cleanMessage + '\n');
|
|
83
|
+
} catch (error) {
|
|
84
|
+
// Silently fail to avoid disrupting the test run
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
private logJson(data: any) {
|
|
89
|
+
const jsonString = JSON.stringify(data);
|
|
90
|
+
console.log(jsonString);
|
|
91
|
+
|
|
92
|
+
// Also log to test file if --logfile is specified
|
|
93
|
+
if (this.currentTestLogFile) {
|
|
94
|
+
this.logToTestFile(jsonString);
|
|
59
95
|
}
|
|
60
96
|
}
|
|
61
97
|
|
|
@@ -84,7 +120,7 @@ export class TsTestLogger {
|
|
|
84
120
|
// Test discovery
|
|
85
121
|
testDiscovery(count: number, pattern: string, executionMode: string) {
|
|
86
122
|
if (this.options.json) {
|
|
87
|
-
|
|
123
|
+
this.logJson({ event: 'discovery', count, pattern, executionMode });
|
|
88
124
|
return;
|
|
89
125
|
}
|
|
90
126
|
|
|
@@ -109,8 +145,23 @@ export class TsTestLogger {
|
|
|
109
145
|
tests: []
|
|
110
146
|
};
|
|
111
147
|
|
|
148
|
+
// Only set up test log file if --logfile option is specified
|
|
149
|
+
if (this.options.logFile) {
|
|
150
|
+
const baseFilename = path.basename(filename, '.ts');
|
|
151
|
+
this.currentTestLogFile = path.join('.nogit', 'testlogs', `${baseFilename}.log`);
|
|
152
|
+
|
|
153
|
+
// Ensure the directory exists
|
|
154
|
+
const logDir = path.dirname(this.currentTestLogFile);
|
|
155
|
+
if (!fs.existsSync(logDir)) {
|
|
156
|
+
fs.mkdirSync(logDir, { recursive: true });
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
// Clear the log file for this test
|
|
160
|
+
fs.writeFileSync(this.currentTestLogFile, '');
|
|
161
|
+
}
|
|
162
|
+
|
|
112
163
|
if (this.options.json) {
|
|
113
|
-
|
|
164
|
+
this.logJson({ event: 'fileStart', filename, runtime, index, total });
|
|
114
165
|
return;
|
|
115
166
|
}
|
|
116
167
|
|
|
@@ -133,7 +184,7 @@ export class TsTestLogger {
|
|
|
133
184
|
}
|
|
134
185
|
|
|
135
186
|
if (this.options.json) {
|
|
136
|
-
|
|
187
|
+
this.logJson({ event: 'testResult', testName, passed, duration, error });
|
|
137
188
|
return;
|
|
138
189
|
}
|
|
139
190
|
|
|
@@ -157,7 +208,7 @@ export class TsTestLogger {
|
|
|
157
208
|
}
|
|
158
209
|
|
|
159
210
|
if (this.options.json) {
|
|
160
|
-
|
|
211
|
+
this.logJson({ event: 'fileEnd', passed, failed, duration });
|
|
161
212
|
return;
|
|
162
213
|
}
|
|
163
214
|
|
|
@@ -167,23 +218,45 @@ export class TsTestLogger {
|
|
|
167
218
|
const color = failed === 0 ? 'green' : 'red';
|
|
168
219
|
this.log(this.format(` Summary: ${passed}/${total} ${status}`, color));
|
|
169
220
|
}
|
|
221
|
+
|
|
222
|
+
// Clear the current test log file reference only if using --logfile
|
|
223
|
+
if (this.options.logFile) {
|
|
224
|
+
this.currentTestLogFile = null;
|
|
225
|
+
}
|
|
170
226
|
}
|
|
171
227
|
|
|
172
|
-
// TAP output forwarding
|
|
228
|
+
// TAP output forwarding (for TAP protocol messages)
|
|
173
229
|
tapOutput(message: string, isError: boolean = false) {
|
|
174
230
|
if (this.options.json) return;
|
|
175
231
|
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
232
|
+
// Never show raw TAP protocol messages in console
|
|
233
|
+
// They are already processed by TapParser and shown in our format
|
|
234
|
+
|
|
235
|
+
// Always log to test file if --logfile is specified
|
|
236
|
+
if (this.currentTestLogFile) {
|
|
237
|
+
this.logToTestFile(` ${message}`);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
// Console output from test files (non-TAP output)
|
|
242
|
+
testConsoleOutput(message: string) {
|
|
243
|
+
if (this.options.json) return;
|
|
244
|
+
|
|
245
|
+
// Show console output from test files only in verbose mode
|
|
246
|
+
if (this.options.verbose) {
|
|
247
|
+
this.log(this.format(` ${message}`, 'dim'));
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
// Always log to test file if --logfile is specified
|
|
251
|
+
if (this.currentTestLogFile) {
|
|
252
|
+
this.logToTestFile(` ${message}`);
|
|
180
253
|
}
|
|
181
254
|
}
|
|
182
255
|
|
|
183
256
|
// Browser console
|
|
184
257
|
browserConsole(message: string, level: string = 'log') {
|
|
185
258
|
if (this.options.json) {
|
|
186
|
-
|
|
259
|
+
this.logJson({ event: 'browserConsole', message, level });
|
|
187
260
|
return;
|
|
188
261
|
}
|
|
189
262
|
|
|
@@ -207,7 +280,7 @@ export class TsTestLogger {
|
|
|
207
280
|
};
|
|
208
281
|
|
|
209
282
|
if (this.options.json) {
|
|
210
|
-
|
|
283
|
+
this.logJson({ event: 'summary', summary });
|
|
211
284
|
return;
|
|
212
285
|
}
|
|
213
286
|
|
|
@@ -266,7 +339,7 @@ export class TsTestLogger {
|
|
|
266
339
|
// Error display
|
|
267
340
|
error(message: string, file?: string, stack?: string) {
|
|
268
341
|
if (this.options.json) {
|
|
269
|
-
|
|
342
|
+
this.logJson({ event: 'error', message, file, stack });
|
|
270
343
|
return;
|
|
271
344
|
}
|
|
272
345
|
|
package/readme.plan.md
DELETED
|
@@ -1,199 +0,0 @@
|
|
|
1
|
-
# Plan for improving logging and output in tstest
|
|
2
|
-
|
|
3
|
-
!! FIRST: Reread /home/philkunz/.claude/CLAUDE.md to ensure following all guidelines !!
|
|
4
|
-
|
|
5
|
-
## Goal - ✅ MOSTLY COMPLETED
|
|
6
|
-
- ✅ Make test output cleaner and more visually appealing
|
|
7
|
-
- ✅ Add structured logging capabilities
|
|
8
|
-
- ✅ Support different verbosity levels
|
|
9
|
-
- ✅ Improve CI/CD compatibility
|
|
10
|
-
- ✅ Add progress indicators and timing summaries
|
|
11
|
-
|
|
12
|
-
## Current State - UPDATED
|
|
13
|
-
- ✅ Clean, modern visual design with Unicode characters
|
|
14
|
-
- ✅ Structured output format (JSON support)
|
|
15
|
-
- ✅ Multiple verbosity levels (quiet, normal, verbose)
|
|
16
|
-
- ✅ Real-time output with cleaner formatting
|
|
17
|
-
- ✅ Better error aggregation and display
|
|
18
|
-
- ✅ TAP protocol support integrated with new logger
|
|
19
|
-
|
|
20
|
-
## Completed Improvements
|
|
21
|
-
|
|
22
|
-
### 1. ✅ Created new TsTestLogger class
|
|
23
|
-
- ✅ Centralized logging with consistent formatting
|
|
24
|
-
- ✅ Support for different output modes (normal, quiet, verbose)
|
|
25
|
-
- ✅ Better visual hierarchy with modern Unicode characters
|
|
26
|
-
- ✅ Progress indicators for multiple test files
|
|
27
|
-
- ✅ Structured error collection and display
|
|
28
|
-
|
|
29
|
-
### 2. ✅ Updated visual design
|
|
30
|
-
- ✅ Replaced heavy separators with cleaner alternatives
|
|
31
|
-
- ✅ Used better emoji and Unicode characters
|
|
32
|
-
- ✅ Added indentation for hierarchical display
|
|
33
|
-
- ✅ Grouped related information visually
|
|
34
|
-
- ✅ Added color coding consistently
|
|
35
|
-
|
|
36
|
-
### 3. ✅ Added command-line options
|
|
37
|
-
- ✅ `--quiet` for minimal CI-friendly output
|
|
38
|
-
- ✅ `--verbose` for detailed debugging information
|
|
39
|
-
- ✅ `--no-color` for environments without color support
|
|
40
|
-
- ✅ `--json` for structured JSON output
|
|
41
|
-
- ⏳ `--log-file <path>` for persistent logging (TODO)
|
|
42
|
-
|
|
43
|
-
### 4. ✅ Improved progress feedback
|
|
44
|
-
- ⏳ Show progress bar for multiple files (TODO)
|
|
45
|
-
- ✅ Display current file being executed
|
|
46
|
-
- ✅ Show real-time test counts
|
|
47
|
-
- ⏳ Add ETA for long test suites (TODO)
|
|
48
|
-
|
|
49
|
-
### 5. ✅ Better error and summary display
|
|
50
|
-
- ✅ Collect all errors and display at end
|
|
51
|
-
- ✅ Show timing metrics and performance summary (in verbose mode)
|
|
52
|
-
- ✅ Highlight slowest tests (in verbose mode)
|
|
53
|
-
- ✅ Add test failure context
|
|
54
|
-
|
|
55
|
-
### 6. ✅ Browser console integration
|
|
56
|
-
- ✅ Clearly separate browser logs from test output
|
|
57
|
-
- ⏳ Add browser log filtering options (TODO)
|
|
58
|
-
- ✅ Format browser errors specially
|
|
59
|
-
|
|
60
|
-
## Implementation Steps - COMPLETED
|
|
61
|
-
|
|
62
|
-
### Phase 1: ✅ Core Logger Implementation
|
|
63
|
-
1. ✅ Created `tstest.logging.ts` with TsTestLogger class
|
|
64
|
-
2. ✅ Added LogOptions interface for configuration
|
|
65
|
-
3. ✅ Implemented basic formatting methods
|
|
66
|
-
4. ✅ Added progress and summary methods
|
|
67
|
-
|
|
68
|
-
### Phase 2: ✅ Integration
|
|
69
|
-
1. ✅ Updated CLI to accept new command-line options
|
|
70
|
-
2. ✅ Modified TsTest class to use new logger
|
|
71
|
-
3. ✅ Updated TapParser to use structured logging
|
|
72
|
-
4. ✅ Updated TapCombinator for better summaries
|
|
73
|
-
|
|
74
|
-
### Phase 3: ✅ Visual Improvements
|
|
75
|
-
1. ✅ Replaced all existing separators
|
|
76
|
-
2. ✅ Updated color scheme
|
|
77
|
-
3. ✅ Added emoji and Unicode characters
|
|
78
|
-
4. ✅ Implemented hierarchical output
|
|
79
|
-
|
|
80
|
-
### Phase 4: ✅ Advanced Features
|
|
81
|
-
1. ✅ Add JSON output format
|
|
82
|
-
2. ⏳ Implement file-based logging (TODO)
|
|
83
|
-
3. ✅ Add performance metrics collection
|
|
84
|
-
4. ✅ Create error aggregation system
|
|
85
|
-
|
|
86
|
-
### Phase 5: ✅ Browser Integration
|
|
87
|
-
1. ✅ Update browser console forwarding
|
|
88
|
-
2. ✅ Add browser log formatting
|
|
89
|
-
3. ✅ Implement browser-specific indicators
|
|
90
|
-
|
|
91
|
-
## Files modified
|
|
92
|
-
- ✅ `ts/tstest.logging.ts` - New logger implementation (created)
|
|
93
|
-
- ✅ `ts/index.ts` - Added CLI options parsing
|
|
94
|
-
- ✅ `ts/tstest.classes.tstest.ts` - Integrated new logger
|
|
95
|
-
- ✅ `ts/tstest.classes.tap.parser.ts` - Updated output formatting
|
|
96
|
-
- ✅ `ts/tstest.classes.tap.combinator.ts` - Improved summary display
|
|
97
|
-
- ❌ `ts/tstest.logprefixes.ts` - Still in use, can be deprecated later
|
|
98
|
-
- ❌ `package.json` - No new dependencies needed
|
|
99
|
-
|
|
100
|
-
## Success Criteria - ACHIEVED
|
|
101
|
-
- ✅ Cleaner, more readable test output
|
|
102
|
-
- ✅ Configurable verbosity levels
|
|
103
|
-
- ✅ Better CI/CD integration
|
|
104
|
-
- ✅ Improved error visibility
|
|
105
|
-
- ✅ Performance metrics available
|
|
106
|
-
- ✅ Consistent visual design
|
|
107
|
-
- ✅ Maintained backward compatibility
|
|
108
|
-
|
|
109
|
-
## Example Output Comparison
|
|
110
|
-
|
|
111
|
-
### Current Output
|
|
112
|
-
```
|
|
113
|
-
☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰☰
|
|
114
|
-
**TSTEST** FOUND 4 TESTFILE(S):
|
|
115
|
-
**TSTEST** test/test.ts
|
|
116
|
-
------------------------------------------------
|
|
117
|
-
=> Running test/test.ts in node.js runtime.
|
|
118
|
-
= = = = = = = = = = = = = = = = = = = = = = = =
|
|
119
|
-
```
|
|
120
|
-
|
|
121
|
-
### Actual Output (IMPLEMENTED)
|
|
122
|
-
```
|
|
123
|
-
🔍 Test Discovery
|
|
124
|
-
Mode: directory
|
|
125
|
-
Pattern: test
|
|
126
|
-
Found: 4 test file(s)
|
|
127
|
-
|
|
128
|
-
▶️ test/test.ts (1/4)
|
|
129
|
-
Runtime: node.js
|
|
130
|
-
✅ prepare test (0ms)
|
|
131
|
-
Summary: 1/1 PASSED
|
|
132
|
-
|
|
133
|
-
▶️ test/test.single.ts (2/4)
|
|
134
|
-
Runtime: node.js
|
|
135
|
-
✅ single file test execution (1ms)
|
|
136
|
-
Summary: 1/1 PASSED
|
|
137
|
-
|
|
138
|
-
📊 Test Summary
|
|
139
|
-
┌────────────────────────────────┐
|
|
140
|
-
│ Total Files: 4 │
|
|
141
|
-
│ Total Tests: 4 │
|
|
142
|
-
│ Passed: 4 │
|
|
143
|
-
│ Failed: 0 │
|
|
144
|
-
│ Duration: 5739ms │
|
|
145
|
-
└────────────────────────────────┘
|
|
146
|
-
|
|
147
|
-
ALL TESTS PASSED! 🎉
|
|
148
|
-
```
|
|
149
|
-
|
|
150
|
-
### Additional Features Implemented
|
|
151
|
-
|
|
152
|
-
1. **Quiet Mode**:
|
|
153
|
-
```
|
|
154
|
-
Found 1 tests
|
|
155
|
-
✅ single file test execution
|
|
156
|
-
|
|
157
|
-
Summary: 1/1 | 1210ms | PASSED
|
|
158
|
-
```
|
|
159
|
-
|
|
160
|
-
2. **JSON Mode**:
|
|
161
|
-
```json
|
|
162
|
-
{"event":"discovery","count":1,"pattern":"test/test.single.ts","executionMode":"file"}
|
|
163
|
-
{"event":"fileStart","filename":"test/test.single.ts","runtime":"node.js","index":1,"total":1}
|
|
164
|
-
{"event":"testResult","testName":"single file test execution","passed":true,"duration":0}
|
|
165
|
-
{"event":"summary","summary":{"totalFiles":1,"totalTests":1,"totalPassed":1,"totalFailed":0,"totalDuration":1223,"fileResults":[...]}}
|
|
166
|
-
```
|
|
167
|
-
|
|
168
|
-
3. **Error Display**:
|
|
169
|
-
```
|
|
170
|
-
❌ Failed Tests:
|
|
171
|
-
|
|
172
|
-
test/test.fail.ts
|
|
173
|
-
❌ This test should fail
|
|
174
|
-
|
|
175
|
-
SOME TESTS FAILED! ❌
|
|
176
|
-
```
|
|
177
|
-
|
|
178
|
-
## Summary of Implementation
|
|
179
|
-
|
|
180
|
-
The logging improvement plan has been successfully implemented with the following achievements:
|
|
181
|
-
|
|
182
|
-
1. **Created a new centralized TsTestLogger class** that handles all output formatting
|
|
183
|
-
2. **Added multiple output modes**: quiet, normal, verbose, and JSON
|
|
184
|
-
3. **Improved visual design** with modern Unicode characters and emojis
|
|
185
|
-
4. **Added CLI argument parsing** for all new options
|
|
186
|
-
5. **Integrated the logger throughout the codebase** (TsTest, TapParser, TapCombinator)
|
|
187
|
-
6. **Better error aggregation and display** with failed tests shown at the end
|
|
188
|
-
7. **Performance metrics** available in verbose mode
|
|
189
|
-
8. **Clean, hierarchical output** that's much more readable
|
|
190
|
-
|
|
191
|
-
### Remaining TODOs
|
|
192
|
-
|
|
193
|
-
Only a few minor features remain unimplemented:
|
|
194
|
-
- File-based logging (--log-file option)
|
|
195
|
-
- Progress bar visualization
|
|
196
|
-
- ETA for long test suites
|
|
197
|
-
- Browser log filtering options
|
|
198
|
-
|
|
199
|
-
The core logging improvements are complete and provide a much better user experience!
|