@git.zone/tstest 3.2.0 → 3.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 +3 -3
- package/dist_ts/tstest.classes.runtime.deno.d.ts +4 -0
- package/dist_ts/tstest.classes.runtime.deno.js +16 -21
- package/dist_ts/tstest.classes.testfile.directives.d.ts +38 -0
- package/dist_ts/tstest.classes.testfile.directives.js +191 -0
- package/dist_ts/tstest.classes.tstest.js +17 -3
- package/npmextra.json +1 -1
- package/package.json +9 -9
- package/readme.md +64 -0
- package/ts/00_commitinfo_data.ts +2 -2
- package/ts/tstest.classes.runtime.deno.ts +16 -20
- package/ts/tstest.classes.testfile.directives.ts +226 -0
- package/ts/tstest.classes.tstest.ts +24 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tstest',
|
|
6
|
-
version: '3.
|
|
7
|
-
description: '
|
|
6
|
+
version: '3.3.0',
|
|
7
|
+
description: 'A powerful, modern test runner for TypeScript with multi-runtime support (Node.js, Deno, Bun, Chromium) and a batteries-included test framework.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGtKQUFrSjtDQUNoSyxDQUFBIn0=
|
|
@@ -2,6 +2,10 @@ import { RuntimeAdapter, type DenoOptions, type RuntimeCommand, type RuntimeAvai
|
|
|
2
2
|
import { TapParser } from './tstest.classes.tap.parser.js';
|
|
3
3
|
import { TsTestLogger } from './tstest.logging.js';
|
|
4
4
|
import type { Runtime } from './tstest.classes.runtime.parser.js';
|
|
5
|
+
/**
|
|
6
|
+
* Default Deno permissions used when no directives override them.
|
|
7
|
+
*/
|
|
8
|
+
export declare const DENO_DEFAULT_PERMISSIONS: string[];
|
|
5
9
|
/**
|
|
6
10
|
* Deno runtime adapter
|
|
7
11
|
* Executes tests using the Deno runtime
|
|
@@ -3,6 +3,19 @@ import { coloredString as cs } from '@push.rocks/consolecolor';
|
|
|
3
3
|
import { RuntimeAdapter, } from './tstest.classes.runtime.adapter.js';
|
|
4
4
|
import { TapParser } from './tstest.classes.tap.parser.js';
|
|
5
5
|
import { TsTestLogger } from './tstest.logging.js';
|
|
6
|
+
/**
|
|
7
|
+
* Default Deno permissions used when no directives override them.
|
|
8
|
+
*/
|
|
9
|
+
export const DENO_DEFAULT_PERMISSIONS = [
|
|
10
|
+
'--allow-read',
|
|
11
|
+
'--allow-env',
|
|
12
|
+
'--allow-net',
|
|
13
|
+
'--allow-write',
|
|
14
|
+
'--allow-sys',
|
|
15
|
+
'--allow-import',
|
|
16
|
+
'--node-modules-dir',
|
|
17
|
+
'--sloppy-imports',
|
|
18
|
+
];
|
|
6
19
|
/**
|
|
7
20
|
* Deno runtime adapter
|
|
8
21
|
* Executes tests using the Deno runtime
|
|
@@ -35,16 +48,7 @@ export class DenoRuntimeAdapter extends RuntimeAdapter {
|
|
|
35
48
|
return {
|
|
36
49
|
...super.getDefaultOptions(),
|
|
37
50
|
configPath,
|
|
38
|
-
permissions: [
|
|
39
|
-
'--allow-read',
|
|
40
|
-
'--allow-env',
|
|
41
|
-
'--allow-net',
|
|
42
|
-
'--allow-write',
|
|
43
|
-
'--allow-sys', // Allow system info access
|
|
44
|
-
'--allow-import', // Allow npm/node imports
|
|
45
|
-
'--node-modules-dir', // Enable Node.js compatibility mode
|
|
46
|
-
'--sloppy-imports', // Allow .js imports to resolve to .ts files
|
|
47
|
-
],
|
|
51
|
+
permissions: [...DENO_DEFAULT_PERMISSIONS],
|
|
48
52
|
};
|
|
49
53
|
}
|
|
50
54
|
/**
|
|
@@ -86,16 +90,7 @@ export class DenoRuntimeAdapter extends RuntimeAdapter {
|
|
|
86
90
|
const mergedOptions = this.mergeOptions(options);
|
|
87
91
|
const args = ['run'];
|
|
88
92
|
// Add permissions
|
|
89
|
-
const permissions = mergedOptions.permissions || [
|
|
90
|
-
'--allow-read',
|
|
91
|
-
'--allow-env',
|
|
92
|
-
'--allow-net',
|
|
93
|
-
'--allow-write',
|
|
94
|
-
'--allow-sys',
|
|
95
|
-
'--allow-import',
|
|
96
|
-
'--node-modules-dir',
|
|
97
|
-
'--sloppy-imports',
|
|
98
|
-
];
|
|
93
|
+
const permissions = mergedOptions.permissions || [...DENO_DEFAULT_PERMISSIONS];
|
|
99
94
|
args.push(...permissions);
|
|
100
95
|
// Add config file if specified
|
|
101
96
|
if (mergedOptions.configPath) {
|
|
@@ -231,4 +226,4 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
|
|
|
231
226
|
return tapParser;
|
|
232
227
|
}
|
|
233
228
|
}
|
|
234
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.runtime.deno.js","sourceRoot":"","sources":["../ts/tstest.classes.runtime.deno.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { RuntimeOptions } from './tstest.classes.runtime.adapter.js';
|
|
2
|
+
import type { Runtime } from './tstest.classes.runtime.parser.js';
|
|
3
|
+
type DirectiveScope = Runtime | 'global';
|
|
4
|
+
export interface ITestFileDirective {
|
|
5
|
+
scope: DirectiveScope;
|
|
6
|
+
key: string;
|
|
7
|
+
value?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface IParsedDirectives {
|
|
10
|
+
deno: ITestFileDirective[];
|
|
11
|
+
node: ITestFileDirective[];
|
|
12
|
+
bun: ITestFileDirective[];
|
|
13
|
+
chromium: ITestFileDirective[];
|
|
14
|
+
global: ITestFileDirective[];
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Parse tstest directives from file content.
|
|
18
|
+
* Scans comments at the top of the file (before any code).
|
|
19
|
+
*/
|
|
20
|
+
export declare function parseDirectivesFromContent(content: string): IParsedDirectives;
|
|
21
|
+
/**
|
|
22
|
+
* Parse directives from a test file on disk.
|
|
23
|
+
*/
|
|
24
|
+
export declare function parseDirectivesFromFile(filePath: string): Promise<IParsedDirectives>;
|
|
25
|
+
/**
|
|
26
|
+
* Merge directives from 00init.ts and the test file.
|
|
27
|
+
* Test file directives are appended (take effect after init directives).
|
|
28
|
+
*/
|
|
29
|
+
export declare function mergeDirectives(init: IParsedDirectives, testFile: IParsedDirectives): IParsedDirectives;
|
|
30
|
+
/**
|
|
31
|
+
* Check if any directives exist for any scope.
|
|
32
|
+
*/
|
|
33
|
+
export declare function hasDirectives(directives: IParsedDirectives): boolean;
|
|
34
|
+
/**
|
|
35
|
+
* Convert parsed directives into RuntimeOptions for a specific runtime.
|
|
36
|
+
*/
|
|
37
|
+
export declare function directivesToRuntimeOptions(directives: IParsedDirectives, runtime: Runtime): RuntimeOptions | undefined;
|
|
38
|
+
export {};
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
import * as plugins from './tstest.plugins.js';
|
|
2
|
+
import { DENO_DEFAULT_PERMISSIONS } from './tstest.classes.runtime.deno.js';
|
|
3
|
+
const VALID_SCOPES = new Set(['deno', 'node', 'bun', 'chromium']);
|
|
4
|
+
const DENO_PERMISSION_MAP = {
|
|
5
|
+
allowAll: '--allow-all',
|
|
6
|
+
allowRun: '--allow-run',
|
|
7
|
+
allowFfi: '--allow-ffi',
|
|
8
|
+
allowHrtime: '--allow-hrtime',
|
|
9
|
+
allowRead: '--allow-read',
|
|
10
|
+
allowWrite: '--allow-write',
|
|
11
|
+
allowNet: '--allow-net',
|
|
12
|
+
allowEnv: '--allow-env',
|
|
13
|
+
allowSys: '--allow-sys',
|
|
14
|
+
};
|
|
15
|
+
function createEmptyDirectives() {
|
|
16
|
+
return { deno: [], node: [], bun: [], chromium: [], global: [] };
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Parse tstest directives from file content.
|
|
20
|
+
* Scans comments at the top of the file (before any code).
|
|
21
|
+
*/
|
|
22
|
+
export function parseDirectivesFromContent(content) {
|
|
23
|
+
const result = createEmptyDirectives();
|
|
24
|
+
const lines = content.split('\n');
|
|
25
|
+
const maxLines = Math.min(lines.length, 30);
|
|
26
|
+
for (let i = 0; i < maxLines; i++) {
|
|
27
|
+
const line = lines[i].trim();
|
|
28
|
+
// Skip empty lines
|
|
29
|
+
if (line === '')
|
|
30
|
+
continue;
|
|
31
|
+
// Stop at first non-comment line
|
|
32
|
+
if (!line.startsWith('//'))
|
|
33
|
+
break;
|
|
34
|
+
// Match tstest directive: // tstest:<rest>
|
|
35
|
+
const match = line.match(/^\/\/\s*tstest:(.+)$/);
|
|
36
|
+
if (!match)
|
|
37
|
+
continue;
|
|
38
|
+
const parts = match[1].split(':');
|
|
39
|
+
if (parts.length < 2) {
|
|
40
|
+
console.warn(`Warning: malformed tstest directive: "${line}"`);
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
const scopeStr = parts[0].trim();
|
|
44
|
+
const key = parts[1].trim();
|
|
45
|
+
const value = parts.length > 2 ? parts.slice(2).join(':').trim() : undefined;
|
|
46
|
+
// Handle global directives (env, timeout)
|
|
47
|
+
if (scopeStr === 'env' || scopeStr === 'timeout') {
|
|
48
|
+
result.global.push({
|
|
49
|
+
scope: 'global',
|
|
50
|
+
key: scopeStr,
|
|
51
|
+
value: key + (value !== undefined ? ':' + value : ''),
|
|
52
|
+
});
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
if (!VALID_SCOPES.has(scopeStr)) {
|
|
56
|
+
console.warn(`Warning: unknown tstest directive scope "${scopeStr}" in: "${line}"`);
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
const scope = scopeStr;
|
|
60
|
+
result[scope].push({ scope, key, value });
|
|
61
|
+
}
|
|
62
|
+
return result;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Parse directives from a test file on disk.
|
|
66
|
+
*/
|
|
67
|
+
export async function parseDirectivesFromFile(filePath) {
|
|
68
|
+
try {
|
|
69
|
+
const content = plugins.fs.readFileSync(filePath, 'utf8');
|
|
70
|
+
return parseDirectivesFromContent(content);
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
return createEmptyDirectives();
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Merge directives from 00init.ts and the test file.
|
|
78
|
+
* Test file directives are appended (take effect after init directives).
|
|
79
|
+
*/
|
|
80
|
+
export function mergeDirectives(init, testFile) {
|
|
81
|
+
return {
|
|
82
|
+
deno: [...init.deno, ...testFile.deno],
|
|
83
|
+
node: [...init.node, ...testFile.node],
|
|
84
|
+
bun: [...init.bun, ...testFile.bun],
|
|
85
|
+
chromium: [...init.chromium, ...testFile.chromium],
|
|
86
|
+
global: [...init.global, ...testFile.global],
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Check if any directives exist for any scope.
|
|
91
|
+
*/
|
|
92
|
+
export function hasDirectives(directives) {
|
|
93
|
+
return (directives.deno.length > 0 ||
|
|
94
|
+
directives.node.length > 0 ||
|
|
95
|
+
directives.bun.length > 0 ||
|
|
96
|
+
directives.chromium.length > 0 ||
|
|
97
|
+
directives.global.length > 0);
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Convert parsed directives into DenoOptions.
|
|
101
|
+
*/
|
|
102
|
+
function directivesToDenoOptions(directives) {
|
|
103
|
+
const denoDirectives = directives.deno;
|
|
104
|
+
if (denoDirectives.length === 0 && directives.global.length === 0)
|
|
105
|
+
return undefined;
|
|
106
|
+
const options = {};
|
|
107
|
+
const extraPermissions = [];
|
|
108
|
+
const extraArgs = [];
|
|
109
|
+
const env = {};
|
|
110
|
+
let useAllowAll = false;
|
|
111
|
+
for (const d of denoDirectives) {
|
|
112
|
+
if (d.key === 'allowAll') {
|
|
113
|
+
useAllowAll = true;
|
|
114
|
+
}
|
|
115
|
+
else if (DENO_PERMISSION_MAP[d.key]) {
|
|
116
|
+
extraPermissions.push(DENO_PERMISSION_MAP[d.key]);
|
|
117
|
+
}
|
|
118
|
+
else if (d.key === 'flag' && d.value) {
|
|
119
|
+
extraArgs.push(d.value);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
// Process global directives
|
|
123
|
+
for (const d of directives.global) {
|
|
124
|
+
if (d.key === 'env' && d.value) {
|
|
125
|
+
const eqIndex = d.value.indexOf('=');
|
|
126
|
+
if (eqIndex > 0) {
|
|
127
|
+
env[d.value.substring(0, eqIndex)] = d.value.substring(eqIndex + 1);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
if (useAllowAll) {
|
|
132
|
+
// --allow-all replaces individual permissions, but keep compatibility flags
|
|
133
|
+
options.permissions = ['--allow-all', '--node-modules-dir', '--sloppy-imports'];
|
|
134
|
+
}
|
|
135
|
+
else if (extraPermissions.length > 0) {
|
|
136
|
+
// Start with defaults and add extra permissions (deduplicated)
|
|
137
|
+
const allPermissions = [...DENO_DEFAULT_PERMISSIONS];
|
|
138
|
+
for (const p of extraPermissions) {
|
|
139
|
+
if (!allPermissions.includes(p)) {
|
|
140
|
+
allPermissions.push(p);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
options.permissions = allPermissions;
|
|
144
|
+
}
|
|
145
|
+
if (extraArgs.length > 0)
|
|
146
|
+
options.extraArgs = extraArgs;
|
|
147
|
+
if (Object.keys(env).length > 0)
|
|
148
|
+
options.env = env;
|
|
149
|
+
// Return undefined if nothing was set
|
|
150
|
+
if (!options.permissions && !options.extraArgs && !options.env)
|
|
151
|
+
return undefined;
|
|
152
|
+
return options;
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Convert parsed directives into RuntimeOptions for Node/Bun (flag directives only).
|
|
156
|
+
*/
|
|
157
|
+
function directivesToGenericOptions(directives, globalDirectives) {
|
|
158
|
+
const extraArgs = [];
|
|
159
|
+
const env = {};
|
|
160
|
+
for (const d of directives) {
|
|
161
|
+
if (d.key === 'flag' && d.value) {
|
|
162
|
+
extraArgs.push(d.value);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
for (const d of globalDirectives) {
|
|
166
|
+
if (d.key === 'env' && d.value) {
|
|
167
|
+
const eqIndex = d.value.indexOf('=');
|
|
168
|
+
if (eqIndex > 0) {
|
|
169
|
+
env[d.value.substring(0, eqIndex)] = d.value.substring(eqIndex + 1);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
if (extraArgs.length === 0 && Object.keys(env).length === 0)
|
|
174
|
+
return undefined;
|
|
175
|
+
const options = {};
|
|
176
|
+
if (extraArgs.length > 0)
|
|
177
|
+
options.extraArgs = extraArgs;
|
|
178
|
+
if (Object.keys(env).length > 0)
|
|
179
|
+
options.env = env;
|
|
180
|
+
return options;
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Convert parsed directives into RuntimeOptions for a specific runtime.
|
|
184
|
+
*/
|
|
185
|
+
export function directivesToRuntimeOptions(directives, runtime) {
|
|
186
|
+
if (runtime === 'deno') {
|
|
187
|
+
return directivesToDenoOptions(directives);
|
|
188
|
+
}
|
|
189
|
+
return directivesToGenericOptions(directives[runtime] || [], directives.global);
|
|
190
|
+
}
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.testfile.directives.js","sourceRoot":"","sources":["../ts/tstest.classes.testfile.directives.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ import { ChromiumRuntimeAdapter } from './tstest.classes.runtime.chromium.js';
|
|
|
14
14
|
import { DenoRuntimeAdapter } from './tstest.classes.runtime.deno.js';
|
|
15
15
|
import { BunRuntimeAdapter } from './tstest.classes.runtime.bun.js';
|
|
16
16
|
import { DockerRuntimeAdapter } from './tstest.classes.runtime.docker.js';
|
|
17
|
+
// Test file directives
|
|
18
|
+
import { parseDirectivesFromFile, mergeDirectives, directivesToRuntimeOptions, hasDirectives, } from './tstest.classes.testfile.directives.js';
|
|
17
19
|
export class TsTest {
|
|
18
20
|
constructor(cwdArg, testPathArg, executionModeArg, logOptions = {}, tags = [], startFromFile = null, stopAtFile = null, timeoutSeconds = null) {
|
|
19
21
|
this.smartshellInstance = new plugins.smartshell.Smartshell({
|
|
@@ -182,11 +184,22 @@ export class TsTest {
|
|
|
182
184
|
this.logger.tapOutput(`Skipping ${fileNameArg} - no runtime adapters available`);
|
|
183
185
|
return;
|
|
184
186
|
}
|
|
187
|
+
// Parse directives from the test file (e.g., // tstest:deno:allowAll)
|
|
188
|
+
let directives = await parseDirectivesFromFile(fileNameArg);
|
|
189
|
+
// Also check for directives in 00init.ts
|
|
190
|
+
const testDir = plugins.path.dirname(fileNameArg);
|
|
191
|
+
const initFile = plugins.path.join(testDir, '00init.ts');
|
|
192
|
+
const initFileExists = await plugins.smartfsInstance.file(initFile).exists();
|
|
193
|
+
if (initFileExists) {
|
|
194
|
+
const initDirectives = await parseDirectivesFromFile(initFile);
|
|
195
|
+
directives = mergeDirectives(initDirectives, directives);
|
|
196
|
+
}
|
|
185
197
|
// Execute tests for each runtime
|
|
186
198
|
if (adapters.length === 1) {
|
|
187
199
|
// Single runtime - no sections needed
|
|
188
200
|
const adapter = adapters[0];
|
|
189
|
-
const
|
|
201
|
+
const options = hasDirectives(directives) ? directivesToRuntimeOptions(directives, adapter.id) : undefined;
|
|
202
|
+
const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles, options);
|
|
190
203
|
tapCombinator.addTapParser(tapParser);
|
|
191
204
|
}
|
|
192
205
|
else {
|
|
@@ -194,7 +207,8 @@ export class TsTest {
|
|
|
194
207
|
for (let i = 0; i < adapters.length; i++) {
|
|
195
208
|
const adapter = adapters[i];
|
|
196
209
|
this.logger.sectionStart(`Part ${i + 1}: ${adapter.displayName}`);
|
|
197
|
-
const
|
|
210
|
+
const options = hasDirectives(directives) ? directivesToRuntimeOptions(directives, adapter.id) : undefined;
|
|
211
|
+
const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles, options);
|
|
198
212
|
tapCombinator.addTapParser(tapParser);
|
|
199
213
|
this.logger.sectionEnd();
|
|
200
214
|
}
|
|
@@ -558,4 +572,4 @@ import '${absoluteTestFile.replace(/\\/g, '/')}';
|
|
|
558
572
|
}
|
|
559
573
|
}
|
|
560
574
|
}
|
|
561
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tstest.js","sourceRoot":"","sources":["../ts/tstest.classes.tstest.ts"],"names":[],"mappings":"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"}
|
|
575
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tstest.js","sourceRoot":"","sources":["../ts/tstest.classes.tstest.ts"],"names":[],"mappings":"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"}
|
package/npmextra.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"githost": "code.foss.global",
|
|
6
6
|
"gitscope": "git.zone",
|
|
7
7
|
"gitrepo": "tstest",
|
|
8
|
-
"description": "
|
|
8
|
+
"description": "A powerful, modern test runner for TypeScript with multi-runtime support (Node.js, Deno, Bun, Chromium) and a batteries-included test framework.",
|
|
9
9
|
"npmPackagename": "@git.zone/tstest",
|
|
10
10
|
"license": "MIT"
|
|
11
11
|
},
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tstest",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"private": false,
|
|
5
|
-
"description": "
|
|
5
|
+
"description": "A powerful, modern test runner for TypeScript with multi-runtime support (Node.js, Deno, Bun, Chromium) and a batteries-included test framework.",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dist_ts/index.js",
|
|
8
8
|
"./tapbundle": "./dist_ts_tapbundle/index.js",
|
|
@@ -25,12 +25,12 @@
|
|
|
25
25
|
"buildDocs": "tsdoc"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@git.zone/tsbuild": "^4.
|
|
29
|
-
"@types/node": "^
|
|
28
|
+
"@git.zone/tsbuild": "^4.3.0",
|
|
29
|
+
"@types/node": "^25.3.5"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@api.global/typedserver": "^8.4.
|
|
33
|
-
"@git.zone/tsbundle": "^2.9.
|
|
32
|
+
"@api.global/typedserver": "^8.4.2",
|
|
33
|
+
"@git.zone/tsbundle": "^2.9.1",
|
|
34
34
|
"@git.zone/tsrun": "^2.0.1",
|
|
35
35
|
"@push.rocks/consolecolor": "^2.0.3",
|
|
36
36
|
"@push.rocks/qenv": "^6.1.3",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@push.rocks/smartenv": "^6.0.0",
|
|
41
41
|
"@push.rocks/smartexpect": "^2.5.0",
|
|
42
42
|
"@push.rocks/smartfile": "^13.1.2",
|
|
43
|
-
"@push.rocks/smartfs": "^1.
|
|
43
|
+
"@push.rocks/smartfs": "^1.4.0",
|
|
44
44
|
"@push.rocks/smartjson": "^6.0.0",
|
|
45
45
|
"@push.rocks/smartlog": "^3.2.1",
|
|
46
46
|
"@push.rocks/smartmongo": "^5.1.0",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
50
50
|
"@push.rocks/smartrequest": "^5.0.1",
|
|
51
51
|
"@push.rocks/smarts3": "^5.3.0",
|
|
52
|
-
"@push.rocks/smartshell": "^3.3.
|
|
53
|
-
"@push.rocks/smartwatch": "^6.3.0",
|
|
52
|
+
"@push.rocks/smartshell": "^3.3.7",
|
|
54
53
|
"@push.rocks/smarttime": "^4.2.3",
|
|
54
|
+
"@push.rocks/smartwatch": "^6.3.0",
|
|
55
55
|
"@types/ws": "^8.18.1",
|
|
56
56
|
"figures": "^6.1.0",
|
|
57
57
|
"ws": "^8.19.0"
|
package/readme.md
CHANGED
|
@@ -442,6 +442,70 @@ const s3 = await tapNodeTools.createSmarts3();
|
|
|
442
442
|
await s3.stop();
|
|
443
443
|
```
|
|
444
444
|
|
|
445
|
+
## Test File Directives
|
|
446
|
+
|
|
447
|
+
Control runtime behavior directly from your test files using special comment directives at the top of the file. Directives must appear before any `import` statements.
|
|
448
|
+
|
|
449
|
+
### Deno Permissions
|
|
450
|
+
|
|
451
|
+
By default, Deno tests run with `--allow-read`, `--allow-env`, `--allow-net`, `--allow-write`, `--allow-sys`, and `--allow-import`. Add directives to request additional permissions:
|
|
452
|
+
|
|
453
|
+
```typescript
|
|
454
|
+
// tstest:deno:allowAll
|
|
455
|
+
import { tap, expect } from '@git.zone/tstest/tapbundle';
|
|
456
|
+
|
|
457
|
+
tap.test('test with full Deno permissions', async () => {
|
|
458
|
+
// Runs with --allow-all (e.g., for FFI, subprocess spawning, etc.)
|
|
459
|
+
});
|
|
460
|
+
|
|
461
|
+
export default tap.start();
|
|
462
|
+
```
|
|
463
|
+
|
|
464
|
+
### Available Directives
|
|
465
|
+
|
|
466
|
+
| Directive | Effect |
|
|
467
|
+
|---|---|
|
|
468
|
+
| `// tstest:deno:allowAll` | Grants all Deno permissions (`--allow-all`) |
|
|
469
|
+
| `// tstest:deno:allowRun` | Adds `--allow-run` for subprocess spawning |
|
|
470
|
+
| `// tstest:deno:allowFfi` | Adds `--allow-ffi` for native library calls |
|
|
471
|
+
| `// tstest:deno:allowHrtime` | Adds `--allow-hrtime` for high-res timers |
|
|
472
|
+
| `// tstest:deno:flag:--unstable-ffi` | Passes any arbitrary Deno flag |
|
|
473
|
+
| `// tstest:node:flag:--max-old-space-size=4096` | Passes flags to Node.js |
|
|
474
|
+
| `// tstest:bun:flag:--smol` | Passes flags to Bun |
|
|
475
|
+
|
|
476
|
+
### Multiple Directives
|
|
477
|
+
|
|
478
|
+
Combine as many directives as needed:
|
|
479
|
+
|
|
480
|
+
```typescript
|
|
481
|
+
// tstest:deno:allowRun
|
|
482
|
+
// tstest:deno:allowFfi
|
|
483
|
+
// tstest:deno:flag:--unstable-ffi
|
|
484
|
+
import { tap, expect } from '@git.zone/tstest/tapbundle';
|
|
485
|
+
|
|
486
|
+
tap.test('test with Rust FFI', async () => {
|
|
487
|
+
// Has --allow-run, --allow-ffi, and --unstable-ffi in addition to defaults
|
|
488
|
+
});
|
|
489
|
+
|
|
490
|
+
export default tap.start();
|
|
491
|
+
```
|
|
492
|
+
|
|
493
|
+
### Shared Directives via 00init.ts
|
|
494
|
+
|
|
495
|
+
Directives in a `00init.ts` file apply to all test files in that directory. Test file directives are merged with (and extend) init file directives.
|
|
496
|
+
|
|
497
|
+
```typescript
|
|
498
|
+
// test/00init.ts
|
|
499
|
+
// tstest:deno:allowRun
|
|
500
|
+
```
|
|
501
|
+
|
|
502
|
+
```typescript
|
|
503
|
+
// test/test.mytest.deno.ts
|
|
504
|
+
// tstest:deno:allowFfi
|
|
505
|
+
// Both --allow-run (from 00init.ts) and --allow-ffi are active
|
|
506
|
+
import { tap, expect } from '@git.zone/tstest/tapbundle';
|
|
507
|
+
```
|
|
508
|
+
|
|
445
509
|
## Advanced Features
|
|
446
510
|
|
|
447
511
|
### Watch Mode
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tstest',
|
|
6
|
-
version: '3.
|
|
7
|
-
description: '
|
|
6
|
+
version: '3.3.0',
|
|
7
|
+
description: 'A powerful, modern test runner for TypeScript with multi-runtime support (Node.js, Deno, Bun, Chromium) and a batteries-included test framework.'
|
|
8
8
|
}
|
|
@@ -10,6 +10,20 @@ import { TapParser } from './tstest.classes.tap.parser.js';
|
|
|
10
10
|
import { TsTestLogger } from './tstest.logging.js';
|
|
11
11
|
import type { Runtime } from './tstest.classes.runtime.parser.js';
|
|
12
12
|
|
|
13
|
+
/**
|
|
14
|
+
* Default Deno permissions used when no directives override them.
|
|
15
|
+
*/
|
|
16
|
+
export const DENO_DEFAULT_PERMISSIONS = [
|
|
17
|
+
'--allow-read',
|
|
18
|
+
'--allow-env',
|
|
19
|
+
'--allow-net',
|
|
20
|
+
'--allow-write',
|
|
21
|
+
'--allow-sys',
|
|
22
|
+
'--allow-import',
|
|
23
|
+
'--node-modules-dir',
|
|
24
|
+
'--sloppy-imports',
|
|
25
|
+
];
|
|
26
|
+
|
|
13
27
|
/**
|
|
14
28
|
* Deno runtime adapter
|
|
15
29
|
* Executes tests using the Deno runtime
|
|
@@ -45,16 +59,7 @@ export class DenoRuntimeAdapter extends RuntimeAdapter {
|
|
|
45
59
|
return {
|
|
46
60
|
...super.getDefaultOptions(),
|
|
47
61
|
configPath,
|
|
48
|
-
permissions: [
|
|
49
|
-
'--allow-read',
|
|
50
|
-
'--allow-env',
|
|
51
|
-
'--allow-net',
|
|
52
|
-
'--allow-write',
|
|
53
|
-
'--allow-sys', // Allow system info access
|
|
54
|
-
'--allow-import', // Allow npm/node imports
|
|
55
|
-
'--node-modules-dir', // Enable Node.js compatibility mode
|
|
56
|
-
'--sloppy-imports', // Allow .js imports to resolve to .ts files
|
|
57
|
-
],
|
|
62
|
+
permissions: [...DENO_DEFAULT_PERMISSIONS],
|
|
58
63
|
};
|
|
59
64
|
}
|
|
60
65
|
|
|
@@ -102,16 +107,7 @@ export class DenoRuntimeAdapter extends RuntimeAdapter {
|
|
|
102
107
|
const args: string[] = ['run'];
|
|
103
108
|
|
|
104
109
|
// Add permissions
|
|
105
|
-
const permissions = mergedOptions.permissions || [
|
|
106
|
-
'--allow-read',
|
|
107
|
-
'--allow-env',
|
|
108
|
-
'--allow-net',
|
|
109
|
-
'--allow-write',
|
|
110
|
-
'--allow-sys',
|
|
111
|
-
'--allow-import',
|
|
112
|
-
'--node-modules-dir',
|
|
113
|
-
'--sloppy-imports',
|
|
114
|
-
];
|
|
110
|
+
const permissions = mergedOptions.permissions || [...DENO_DEFAULT_PERMISSIONS];
|
|
115
111
|
args.push(...permissions);
|
|
116
112
|
|
|
117
113
|
// Add config file if specified
|
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
import * as plugins from './tstest.plugins.js';
|
|
2
|
+
import type { DenoOptions, RuntimeOptions } from './tstest.classes.runtime.adapter.js';
|
|
3
|
+
import type { Runtime } from './tstest.classes.runtime.parser.js';
|
|
4
|
+
import { DENO_DEFAULT_PERMISSIONS } from './tstest.classes.runtime.deno.js';
|
|
5
|
+
|
|
6
|
+
type DirectiveScope = Runtime | 'global';
|
|
7
|
+
|
|
8
|
+
export interface ITestFileDirective {
|
|
9
|
+
scope: DirectiveScope;
|
|
10
|
+
key: string;
|
|
11
|
+
value?: string;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface IParsedDirectives {
|
|
15
|
+
deno: ITestFileDirective[];
|
|
16
|
+
node: ITestFileDirective[];
|
|
17
|
+
bun: ITestFileDirective[];
|
|
18
|
+
chromium: ITestFileDirective[];
|
|
19
|
+
global: ITestFileDirective[];
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const VALID_SCOPES = new Set<string>(['deno', 'node', 'bun', 'chromium']);
|
|
23
|
+
|
|
24
|
+
const DENO_PERMISSION_MAP: Record<string, string> = {
|
|
25
|
+
allowAll: '--allow-all',
|
|
26
|
+
allowRun: '--allow-run',
|
|
27
|
+
allowFfi: '--allow-ffi',
|
|
28
|
+
allowHrtime: '--allow-hrtime',
|
|
29
|
+
allowRead: '--allow-read',
|
|
30
|
+
allowWrite: '--allow-write',
|
|
31
|
+
allowNet: '--allow-net',
|
|
32
|
+
allowEnv: '--allow-env',
|
|
33
|
+
allowSys: '--allow-sys',
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
function createEmptyDirectives(): IParsedDirectives {
|
|
37
|
+
return { deno: [], node: [], bun: [], chromium: [], global: [] };
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Parse tstest directives from file content.
|
|
42
|
+
* Scans comments at the top of the file (before any code).
|
|
43
|
+
*/
|
|
44
|
+
export function parseDirectivesFromContent(content: string): IParsedDirectives {
|
|
45
|
+
const result = createEmptyDirectives();
|
|
46
|
+
const lines = content.split('\n');
|
|
47
|
+
const maxLines = Math.min(lines.length, 30);
|
|
48
|
+
|
|
49
|
+
for (let i = 0; i < maxLines; i++) {
|
|
50
|
+
const line = lines[i].trim();
|
|
51
|
+
|
|
52
|
+
// Skip empty lines
|
|
53
|
+
if (line === '') continue;
|
|
54
|
+
|
|
55
|
+
// Stop at first non-comment line
|
|
56
|
+
if (!line.startsWith('//')) break;
|
|
57
|
+
|
|
58
|
+
// Match tstest directive: // tstest:<rest>
|
|
59
|
+
const match = line.match(/^\/\/\s*tstest:(.+)$/);
|
|
60
|
+
if (!match) continue;
|
|
61
|
+
|
|
62
|
+
const parts = match[1].split(':');
|
|
63
|
+
if (parts.length < 2) {
|
|
64
|
+
console.warn(`Warning: malformed tstest directive: "${line}"`);
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const scopeStr = parts[0].trim();
|
|
69
|
+
const key = parts[1].trim();
|
|
70
|
+
const value = parts.length > 2 ? parts.slice(2).join(':').trim() : undefined;
|
|
71
|
+
|
|
72
|
+
// Handle global directives (env, timeout)
|
|
73
|
+
if (scopeStr === 'env' || scopeStr === 'timeout') {
|
|
74
|
+
result.global.push({
|
|
75
|
+
scope: 'global',
|
|
76
|
+
key: scopeStr,
|
|
77
|
+
value: key + (value !== undefined ? ':' + value : ''),
|
|
78
|
+
});
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
if (!VALID_SCOPES.has(scopeStr)) {
|
|
83
|
+
console.warn(`Warning: unknown tstest directive scope "${scopeStr}" in: "${line}"`);
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
const scope = scopeStr as Runtime;
|
|
88
|
+
result[scope].push({ scope, key, value });
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
return result;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Parse directives from a test file on disk.
|
|
96
|
+
*/
|
|
97
|
+
export async function parseDirectivesFromFile(filePath: string): Promise<IParsedDirectives> {
|
|
98
|
+
try {
|
|
99
|
+
const content = plugins.fs.readFileSync(filePath, 'utf8');
|
|
100
|
+
return parseDirectivesFromContent(content);
|
|
101
|
+
} catch {
|
|
102
|
+
return createEmptyDirectives();
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* Merge directives from 00init.ts and the test file.
|
|
108
|
+
* Test file directives are appended (take effect after init directives).
|
|
109
|
+
*/
|
|
110
|
+
export function mergeDirectives(init: IParsedDirectives, testFile: IParsedDirectives): IParsedDirectives {
|
|
111
|
+
return {
|
|
112
|
+
deno: [...init.deno, ...testFile.deno],
|
|
113
|
+
node: [...init.node, ...testFile.node],
|
|
114
|
+
bun: [...init.bun, ...testFile.bun],
|
|
115
|
+
chromium: [...init.chromium, ...testFile.chromium],
|
|
116
|
+
global: [...init.global, ...testFile.global],
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* Check if any directives exist for any scope.
|
|
122
|
+
*/
|
|
123
|
+
export function hasDirectives(directives: IParsedDirectives): boolean {
|
|
124
|
+
return (
|
|
125
|
+
directives.deno.length > 0 ||
|
|
126
|
+
directives.node.length > 0 ||
|
|
127
|
+
directives.bun.length > 0 ||
|
|
128
|
+
directives.chromium.length > 0 ||
|
|
129
|
+
directives.global.length > 0
|
|
130
|
+
);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/**
|
|
134
|
+
* Convert parsed directives into DenoOptions.
|
|
135
|
+
*/
|
|
136
|
+
function directivesToDenoOptions(directives: IParsedDirectives): DenoOptions | undefined {
|
|
137
|
+
const denoDirectives = directives.deno;
|
|
138
|
+
if (denoDirectives.length === 0 && directives.global.length === 0) return undefined;
|
|
139
|
+
|
|
140
|
+
const options: DenoOptions = {};
|
|
141
|
+
const extraPermissions: string[] = [];
|
|
142
|
+
const extraArgs: string[] = [];
|
|
143
|
+
const env: Record<string, string> = {};
|
|
144
|
+
let useAllowAll = false;
|
|
145
|
+
|
|
146
|
+
for (const d of denoDirectives) {
|
|
147
|
+
if (d.key === 'allowAll') {
|
|
148
|
+
useAllowAll = true;
|
|
149
|
+
} else if (DENO_PERMISSION_MAP[d.key]) {
|
|
150
|
+
extraPermissions.push(DENO_PERMISSION_MAP[d.key]);
|
|
151
|
+
} else if (d.key === 'flag' && d.value) {
|
|
152
|
+
extraArgs.push(d.value);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// Process global directives
|
|
157
|
+
for (const d of directives.global) {
|
|
158
|
+
if (d.key === 'env' && d.value) {
|
|
159
|
+
const eqIndex = d.value.indexOf('=');
|
|
160
|
+
if (eqIndex > 0) {
|
|
161
|
+
env[d.value.substring(0, eqIndex)] = d.value.substring(eqIndex + 1);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
if (useAllowAll) {
|
|
167
|
+
// --allow-all replaces individual permissions, but keep compatibility flags
|
|
168
|
+
options.permissions = ['--allow-all', '--node-modules-dir', '--sloppy-imports'];
|
|
169
|
+
} else if (extraPermissions.length > 0) {
|
|
170
|
+
// Start with defaults and add extra permissions (deduplicated)
|
|
171
|
+
const allPermissions = [...DENO_DEFAULT_PERMISSIONS];
|
|
172
|
+
for (const p of extraPermissions) {
|
|
173
|
+
if (!allPermissions.includes(p)) {
|
|
174
|
+
allPermissions.push(p);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
options.permissions = allPermissions;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
if (extraArgs.length > 0) options.extraArgs = extraArgs;
|
|
181
|
+
if (Object.keys(env).length > 0) options.env = env;
|
|
182
|
+
|
|
183
|
+
// Return undefined if nothing was set
|
|
184
|
+
if (!options.permissions && !options.extraArgs && !options.env) return undefined;
|
|
185
|
+
return options;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
/**
|
|
189
|
+
* Convert parsed directives into RuntimeOptions for Node/Bun (flag directives only).
|
|
190
|
+
*/
|
|
191
|
+
function directivesToGenericOptions(directives: ITestFileDirective[], globalDirectives: ITestFileDirective[]): RuntimeOptions | undefined {
|
|
192
|
+
const extraArgs: string[] = [];
|
|
193
|
+
const env: Record<string, string> = {};
|
|
194
|
+
|
|
195
|
+
for (const d of directives) {
|
|
196
|
+
if (d.key === 'flag' && d.value) {
|
|
197
|
+
extraArgs.push(d.value);
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
for (const d of globalDirectives) {
|
|
202
|
+
if (d.key === 'env' && d.value) {
|
|
203
|
+
const eqIndex = d.value.indexOf('=');
|
|
204
|
+
if (eqIndex > 0) {
|
|
205
|
+
env[d.value.substring(0, eqIndex)] = d.value.substring(eqIndex + 1);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
if (extraArgs.length === 0 && Object.keys(env).length === 0) return undefined;
|
|
211
|
+
|
|
212
|
+
const options: RuntimeOptions = {};
|
|
213
|
+
if (extraArgs.length > 0) options.extraArgs = extraArgs;
|
|
214
|
+
if (Object.keys(env).length > 0) options.env = env;
|
|
215
|
+
return options;
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
/**
|
|
219
|
+
* Convert parsed directives into RuntimeOptions for a specific runtime.
|
|
220
|
+
*/
|
|
221
|
+
export function directivesToRuntimeOptions(directives: IParsedDirectives, runtime: Runtime): RuntimeOptions | undefined {
|
|
222
|
+
if (runtime === 'deno') {
|
|
223
|
+
return directivesToDenoOptions(directives);
|
|
224
|
+
}
|
|
225
|
+
return directivesToGenericOptions(directives[runtime] || [], directives.global);
|
|
226
|
+
}
|
|
@@ -19,6 +19,14 @@ import { DenoRuntimeAdapter } from './tstest.classes.runtime.deno.js';
|
|
|
19
19
|
import { BunRuntimeAdapter } from './tstest.classes.runtime.bun.js';
|
|
20
20
|
import { DockerRuntimeAdapter } from './tstest.classes.runtime.docker.js';
|
|
21
21
|
|
|
22
|
+
// Test file directives
|
|
23
|
+
import {
|
|
24
|
+
parseDirectivesFromFile,
|
|
25
|
+
mergeDirectives,
|
|
26
|
+
directivesToRuntimeOptions,
|
|
27
|
+
hasDirectives,
|
|
28
|
+
} from './tstest.classes.testfile.directives.js';
|
|
29
|
+
|
|
22
30
|
export class TsTest {
|
|
23
31
|
public testDir: TestDirectory;
|
|
24
32
|
public executionMode: TestExecutionMode;
|
|
@@ -256,18 +264,32 @@ export class TsTest {
|
|
|
256
264
|
return;
|
|
257
265
|
}
|
|
258
266
|
|
|
267
|
+
// Parse directives from the test file (e.g., // tstest:deno:allowAll)
|
|
268
|
+
let directives = await parseDirectivesFromFile(fileNameArg);
|
|
269
|
+
|
|
270
|
+
// Also check for directives in 00init.ts
|
|
271
|
+
const testDir = plugins.path.dirname(fileNameArg);
|
|
272
|
+
const initFile = plugins.path.join(testDir, '00init.ts');
|
|
273
|
+
const initFileExists = await plugins.smartfsInstance.file(initFile).exists();
|
|
274
|
+
if (initFileExists) {
|
|
275
|
+
const initDirectives = await parseDirectivesFromFile(initFile);
|
|
276
|
+
directives = mergeDirectives(initDirectives, directives);
|
|
277
|
+
}
|
|
278
|
+
|
|
259
279
|
// Execute tests for each runtime
|
|
260
280
|
if (adapters.length === 1) {
|
|
261
281
|
// Single runtime - no sections needed
|
|
262
282
|
const adapter = adapters[0];
|
|
263
|
-
const
|
|
283
|
+
const options = hasDirectives(directives) ? directivesToRuntimeOptions(directives, adapter.id) : undefined;
|
|
284
|
+
const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles, options);
|
|
264
285
|
tapCombinator.addTapParser(tapParser);
|
|
265
286
|
} else {
|
|
266
287
|
// Multiple runtimes - use sections
|
|
267
288
|
for (let i = 0; i < adapters.length; i++) {
|
|
268
289
|
const adapter = adapters[i];
|
|
269
290
|
this.logger.sectionStart(`Part ${i + 1}: ${adapter.displayName}`);
|
|
270
|
-
const
|
|
291
|
+
const options = hasDirectives(directives) ? directivesToRuntimeOptions(directives, adapter.id) : undefined;
|
|
292
|
+
const tapParser = await adapter.run(fileNameArg, fileIndex, totalFiles, options);
|
|
271
293
|
tapCombinator.addTapParser(tapParser);
|
|
272
294
|
this.logger.sectionEnd();
|
|
273
295
|
}
|