@eggjs/bin 7.0.0-beta.4 → 7.0.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/README.md +5 -10
- package/bin/dev.js +6 -4
- package/bin/run.js +2 -2
- package/dist/commonjs/baseCommand.d.ts +49 -0
- package/dist/commonjs/baseCommand.js +370 -0
- package/dist/commonjs/commands/cov.d.ts +22 -0
- package/dist/commonjs/commands/cov.js +97 -0
- package/dist/commonjs/commands/dev.d.ts +21 -0
- package/dist/commonjs/commands/dev.js +95 -0
- package/dist/commonjs/commands/test.d.ts +23 -0
- package/dist/commonjs/commands/test.js +204 -0
- package/dist/commonjs/index.d.ts +7 -0
- package/dist/commonjs/index.js +30 -0
- package/dist/commonjs/package.json +3 -0
- package/dist/commonjs/types.d.ts +9 -0
- package/dist/commonjs/types.js +3 -0
- package/dist/commonjs/utils.d.ts +4 -0
- package/dist/commonjs/utils.js +45 -0
- package/dist/esm/baseCommand.d.ts +33 -6
- package/dist/esm/baseCommand.js +246 -40
- package/dist/esm/commands/cov.d.ts +17 -8
- package/dist/esm/commands/cov.js +83 -17
- package/dist/esm/commands/dev.d.ts +15 -7
- package/dist/esm/commands/dev.js +83 -16
- package/dist/esm/commands/test.d.ts +11 -5
- package/dist/esm/commands/test.js +89 -51
- package/dist/esm/index.d.ts +7 -5
- package/dist/esm/index.js +8 -6
- package/dist/esm/types.d.ts +9 -0
- package/dist/esm/types.js +2 -0
- package/dist/esm/utils.d.ts +0 -1
- package/dist/esm/utils.js +1 -11
- package/dist/package.json +1 -1
- package/dist/scripts/start-cluster.cjs +15 -0
- package/package.json +12 -28
- package/scripts/start-cluster.cjs +15 -0
- package/src/baseCommand.ts +254 -43
- package/src/commands/cov.ts +87 -17
- package/src/commands/dev.ts +84 -15
- package/src/commands/test.ts +92 -51
- package/src/index.ts +9 -5
- package/src/types.ts +9 -0
- package/src/utils.ts +0 -10
- package/dist/esm/bin/cli.d.ts +0 -2
- package/dist/esm/bin/cli.js +0 -34
- package/dist/esm/cmd/base.d.ts +0 -12
- package/dist/esm/cmd/base.js +0 -135
- package/dist/esm/cmd/cov.d.ts +0 -8
- package/dist/esm/cmd/cov.js +0 -103
- package/dist/esm/cmd/debug.d.ts +0 -5
- package/dist/esm/cmd/debug.js +0 -28
- package/dist/esm/cmd/dev.d.ts +0 -17
- package/dist/esm/cmd/dev.js +0 -118
- package/dist/esm/cmd/test.d.ts +0 -15
- package/dist/esm/cmd/test.js +0 -237
- package/dist/esm/commands/debug.d.ts +0 -13
- package/dist/esm/commands/debug.js +0 -25
- package/dist/esm/config/framework.d.ts +0 -4
- package/dist/esm/config/framework.js +0 -4
- package/dist/esm/config/plugin.d.ts +0 -11
- package/dist/esm/config/plugin.js +0 -11
- package/dist/esm/hooks/init/options.d.ts +0 -3
- package/dist/esm/hooks/init/options.js +0 -5
- package/dist/esm/middleware/global_options.d.ts +0 -5
- package/dist/esm/middleware/global_options.js +0 -182
- package/dist/esm/middleware/handle_error.d.ts +0 -5
- package/dist/esm/middleware/handle_error.js +0 -47
- package/dist/esm/middleware/inspect.d.ts +0 -5
- package/dist/esm/middleware/inspect.js +0 -69
- package/src/bin/cli.ts +0 -37
- package/src/cmd/base.ts +0 -133
- package/src/cmd/cov.ts +0 -89
- package/src/cmd/debug.ts +0 -14
- package/src/cmd/dev.ts +0 -102
- package/src/cmd/test.ts +0 -219
- package/src/commands/debug.ts +0 -30
- package/src/config/framework.ts +0 -3
- package/src/config/plugin.ts +0 -10
- package/src/hooks/init/options.ts +0 -7
- package/src/middleware/global_options.ts +0 -169
- package/src/middleware/handle_error.ts +0 -30
- package/src/middleware/inspect.ts +0 -54
package/dist/esm/baseCommand.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { debuglog } from 'node:util';
|
|
2
|
-
// import path from 'node:path';
|
|
3
2
|
import { pathToFileURL } from 'node:url';
|
|
3
|
+
import path from 'node:path';
|
|
4
4
|
import { fork } from 'node:child_process';
|
|
5
5
|
import { Command, Flags } from '@oclif/core';
|
|
6
6
|
import { importResolve } from '@eggjs/utils';
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
} from './utils.js';
|
|
7
|
+
import { runScript } from 'runscript';
|
|
8
|
+
import { getSourceDirname, readPackageJSON, hasTsConfig, } from './utils.js';
|
|
10
9
|
const debug = debuglog('@eggjs/bin/baseCommand');
|
|
11
10
|
// only hook once and only when ever start any child.
|
|
12
11
|
const children = new Set();
|
|
@@ -33,7 +32,7 @@ function graceful(proc) {
|
|
|
33
32
|
});
|
|
34
33
|
}
|
|
35
34
|
}
|
|
36
|
-
class ForkError extends Error {
|
|
35
|
+
export class ForkError extends Error {
|
|
37
36
|
code;
|
|
38
37
|
constructor(message, code) {
|
|
39
38
|
super(message);
|
|
@@ -51,7 +50,7 @@ export class BaseCommand extends Command {
|
|
|
51
50
|
// options: ['debug', 'warn', 'error', 'info', 'trace'] as const,
|
|
52
51
|
// summary: 'Specify level for logging.',
|
|
53
52
|
// })(),
|
|
54
|
-
|
|
53
|
+
'dry-run': Flags.boolean({
|
|
55
54
|
default: false,
|
|
56
55
|
helpGroup: 'GLOBAL',
|
|
57
56
|
summary: 'whether show full command script only',
|
|
@@ -63,18 +62,63 @@ export class BaseCommand extends Command {
|
|
|
63
62
|
char: 'r',
|
|
64
63
|
multiple: true,
|
|
65
64
|
}),
|
|
65
|
+
import: Flags.string({
|
|
66
|
+
helpGroup: 'GLOBAL',
|
|
67
|
+
summary: 'import the given module, only work on ESM',
|
|
68
|
+
multiple: true,
|
|
69
|
+
}),
|
|
66
70
|
base: Flags.string({
|
|
67
71
|
helpGroup: 'GLOBAL',
|
|
68
|
-
summary: 'directory of application
|
|
72
|
+
summary: 'directory of application',
|
|
69
73
|
aliases: ['baseDir'],
|
|
70
74
|
default: process.cwd(),
|
|
71
75
|
}),
|
|
76
|
+
tscompiler: Flags.string({
|
|
77
|
+
helpGroup: 'GLOBAL',
|
|
78
|
+
summary: 'TypeScript compiler, like ts-node/register',
|
|
79
|
+
aliases: ['tsc'],
|
|
80
|
+
}),
|
|
81
|
+
// flag with no value (--typescript)
|
|
82
|
+
typescript: Flags.boolean({
|
|
83
|
+
helpGroup: 'GLOBAL',
|
|
84
|
+
description: '[default: true] use TypeScript to run the test',
|
|
85
|
+
allowNo: true,
|
|
86
|
+
}),
|
|
87
|
+
ts: Flags.string({
|
|
88
|
+
helpGroup: 'GLOBAL',
|
|
89
|
+
description: 'shortcut for --typescript, e.g.: --ts=false',
|
|
90
|
+
options: ['true', 'false'],
|
|
91
|
+
}),
|
|
92
|
+
javascript: Flags.boolean({
|
|
93
|
+
helpGroup: 'GLOBAL',
|
|
94
|
+
description: 'use JavaScript to run the test',
|
|
95
|
+
aliases: ['js'],
|
|
96
|
+
}),
|
|
97
|
+
declarations: Flags.boolean({
|
|
98
|
+
helpGroup: 'GLOBAL',
|
|
99
|
+
description: 'whether create typings, will add `--require egg-ts-helper/register`',
|
|
100
|
+
aliases: ['dts'],
|
|
101
|
+
}),
|
|
102
|
+
// https://nodejs.org/dist/latest-v18.x/docs/api/cli.html#--inspect-brkhostport
|
|
103
|
+
inspect: Flags.boolean({
|
|
104
|
+
helpGroup: 'GLOBAL',
|
|
105
|
+
description: 'Activate inspector',
|
|
106
|
+
}),
|
|
107
|
+
'inspect-brk': Flags.boolean({
|
|
108
|
+
helpGroup: 'GLOBAL',
|
|
109
|
+
description: 'Activate inspector and break at start of user script',
|
|
110
|
+
}),
|
|
72
111
|
};
|
|
73
112
|
flags;
|
|
74
113
|
args;
|
|
75
|
-
env = process.env;
|
|
114
|
+
env = { ...process.env };
|
|
115
|
+
pkg;
|
|
116
|
+
isESM;
|
|
117
|
+
pkgEgg;
|
|
118
|
+
globalExecArgv = [];
|
|
76
119
|
async init() {
|
|
77
120
|
await super.init();
|
|
121
|
+
debug('[init] raw args: %o, NODE_ENV: %o', this.argv, this.env.NODE_ENV);
|
|
78
122
|
const { args, flags } = await this.parse({
|
|
79
123
|
flags: this.ctor.flags,
|
|
80
124
|
baseFlags: super.ctor.baseFlags,
|
|
@@ -84,18 +128,151 @@ export class BaseCommand extends Command {
|
|
|
84
128
|
});
|
|
85
129
|
this.flags = flags;
|
|
86
130
|
this.args = args;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
131
|
+
await this.#afterInit();
|
|
132
|
+
}
|
|
133
|
+
async #afterInit() {
|
|
134
|
+
const { args, flags } = this;
|
|
135
|
+
debug('before: args: %o, flags: %o', args, flags);
|
|
136
|
+
if (!path.isAbsolute(flags.base)) {
|
|
137
|
+
flags.base = path.join(process.cwd(), flags.base);
|
|
138
|
+
}
|
|
139
|
+
const pkg = await readPackageJSON(flags.base);
|
|
140
|
+
this.pkg = pkg;
|
|
141
|
+
this.pkgEgg = pkg.egg ?? {};
|
|
142
|
+
flags.tscompiler = flags.tscompiler ?? this.env.TS_COMPILER ?? this.pkgEgg.tscompiler;
|
|
143
|
+
let typescript = flags.typescript;
|
|
144
|
+
// keep compatible with old ts flag: `--ts=true` or `--ts=false`
|
|
145
|
+
if (flags.ts === 'true') {
|
|
146
|
+
typescript = true;
|
|
147
|
+
}
|
|
148
|
+
else if (flags.ts === 'false') {
|
|
149
|
+
typescript = false;
|
|
150
|
+
}
|
|
151
|
+
if (typescript === undefined) {
|
|
152
|
+
// try to ready EGG_TYPESCRIPT env first, only accept 'true' or 'false' string
|
|
153
|
+
if (this.env.EGG_TYPESCRIPT === 'false') {
|
|
154
|
+
typescript = false;
|
|
155
|
+
debug('detect typescript=%o from EGG_TYPESCRIPT=%o', false, this.env.EGG_TYPESCRIPT);
|
|
156
|
+
}
|
|
157
|
+
else if (this.env.EGG_TYPESCRIPT === 'true') {
|
|
158
|
+
typescript = true;
|
|
159
|
+
debug('detect typescript=%o from EGG_TYPESCRIPT=%o', true, this.env.EGG_TYPESCRIPT);
|
|
160
|
+
}
|
|
161
|
+
else if (typeof this.pkgEgg.typescript === 'boolean') {
|
|
162
|
+
// read `egg.typescript` from package.json if not pass argv
|
|
163
|
+
typescript = this.pkgEgg.typescript;
|
|
164
|
+
debug('detect typescript=%o from pkg.egg.typescript=%o', typescript, this.pkgEgg.typescript);
|
|
165
|
+
}
|
|
166
|
+
else if (pkg.dependencies?.typescript) {
|
|
167
|
+
// auto detect pkg.dependencies.typescript or pkg.devDependencies.typescript
|
|
168
|
+
typescript = true;
|
|
169
|
+
debug('detect typescript=%o from pkg.dependencies.typescript=%o', true, pkg.dependencies.typescript);
|
|
170
|
+
}
|
|
171
|
+
else if (pkg.devDependencies?.typescript) {
|
|
172
|
+
typescript = true;
|
|
173
|
+
debug('detect typescript=%o from pkg.devDependencies.typescript=%o', true, pkg.devDependencies.typescript);
|
|
174
|
+
}
|
|
175
|
+
else if (await hasTsConfig(flags.base)) {
|
|
176
|
+
// tsconfig.json exists
|
|
177
|
+
typescript = true;
|
|
178
|
+
debug('detect typescript=%o cause tsconfig.json exists', true);
|
|
179
|
+
}
|
|
180
|
+
else if (flags.tscompiler) {
|
|
181
|
+
typescript = true;
|
|
182
|
+
debug('detect typescript=%o from --tscompiler=%o', true, flags.tscompiler);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
flags.typescript = typescript;
|
|
186
|
+
this.isESM = pkg.type === 'module';
|
|
187
|
+
if (typescript) {
|
|
188
|
+
const findPaths = [getSourceDirname()];
|
|
189
|
+
if (flags.tscompiler) {
|
|
190
|
+
// try app baseDir first on custom tscompiler
|
|
191
|
+
// then try to find tscompiler in @eggjs/bin/node_modules
|
|
192
|
+
findPaths.unshift(flags.base);
|
|
193
|
+
}
|
|
194
|
+
flags.tscompiler = flags.tscompiler ?? 'ts-node/register';
|
|
195
|
+
const tsNodeRegister = importResolve(flags.tscompiler, {
|
|
196
|
+
paths: findPaths,
|
|
197
|
+
});
|
|
198
|
+
flags.tscompiler = tsNodeRegister;
|
|
199
|
+
// should require tsNodeRegister on current process, let it can require *.ts files
|
|
200
|
+
// e.g.: dev command will execute egg loader to find configs and plugins
|
|
201
|
+
// await importModule(tsNodeRegister);
|
|
202
|
+
// let child process auto require ts-node too
|
|
203
|
+
this.addNodeOptions(this.formatImportModule(tsNodeRegister));
|
|
204
|
+
// tell egg loader to load ts file
|
|
205
|
+
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L443
|
|
206
|
+
this.env.EGG_TYPESCRIPT = 'true';
|
|
207
|
+
// set current process.env.EGG_TYPESCRIPT too
|
|
208
|
+
process.env.EGG_TYPESCRIPT = 'true';
|
|
209
|
+
// load files from tsconfig on startup
|
|
210
|
+
this.env.TS_NODE_FILES = process.env.TS_NODE_FILES ?? 'true';
|
|
211
|
+
// keep same logic with egg-core, test cmd load files need it
|
|
212
|
+
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L49
|
|
213
|
+
// addNodeOptionsToEnv(`--require ${importResolve('tsconfig-paths/register', {
|
|
214
|
+
// paths: [ getSourceDirname() ],
|
|
215
|
+
// })}`, ctx.env);
|
|
216
|
+
}
|
|
217
|
+
if (this.isESM) {
|
|
218
|
+
// use ts-node/esm loader on esm
|
|
219
|
+
let esmLoader = importResolve('ts-node/esm', {
|
|
220
|
+
paths: [getSourceDirname()],
|
|
221
|
+
});
|
|
222
|
+
// ES Module loading with absolute path fails on windows
|
|
223
|
+
// https://github.com/nodejs/node/issues/31710#issuecomment-583916239
|
|
224
|
+
// https://nodejs.org/api/url.html#url_url_pathtofileurl_path
|
|
225
|
+
// Error [ERR_UNSUPPORTED_ESM_URL_SCHEME]: Only URLs with a scheme in: file, data, and node are supported by the default ESM loader. On Windows, absolute paths must be valid file:// URLs. Received protocol 'd:'
|
|
226
|
+
esmLoader = pathToFileURL(esmLoader).href;
|
|
227
|
+
// wait for https://github.com/nodejs/node/issues/40940
|
|
228
|
+
this.addNodeOptions('--no-warnings');
|
|
229
|
+
this.addNodeOptions(`--loader ${esmLoader}`);
|
|
230
|
+
}
|
|
231
|
+
if (flags.declarations === undefined) {
|
|
232
|
+
if (typeof this.pkgEgg.declarations === 'boolean') {
|
|
233
|
+
// read `egg.declarations` from package.json if not pass argv
|
|
234
|
+
flags.declarations = this.pkgEgg.declarations;
|
|
235
|
+
debug('detect declarations from pkg.egg.declarations=%o', this.pkgEgg.declarations);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
if (flags.declarations) {
|
|
239
|
+
const etsBin = importResolve('egg-ts-helper/dist/bin', {
|
|
240
|
+
paths: [
|
|
241
|
+
flags.base,
|
|
242
|
+
getSourceDirname(),
|
|
243
|
+
],
|
|
244
|
+
});
|
|
245
|
+
debug('run ets first: %o', etsBin);
|
|
246
|
+
await runScript(`node ${etsBin}`);
|
|
247
|
+
}
|
|
248
|
+
if (this.pkgEgg.revert) {
|
|
249
|
+
const reverts = Array.isArray(this.pkgEgg.revert) ? this.pkgEgg.revert : [this.pkgEgg.revert];
|
|
250
|
+
for (const revert of reverts) {
|
|
251
|
+
this.globalExecArgv.push(`--security-revert=${revert}`);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
let hasInspectOption = false;
|
|
255
|
+
if (flags.inspect) {
|
|
256
|
+
this.addNodeOptions('--inspect');
|
|
257
|
+
hasInspectOption = true;
|
|
258
|
+
}
|
|
259
|
+
if (flags['inspect-brk']) {
|
|
260
|
+
this.addNodeOptions('--inspect-brk');
|
|
261
|
+
hasInspectOption = true;
|
|
262
|
+
}
|
|
263
|
+
if (hasInspectOption) {
|
|
264
|
+
Reflect.set(flags, 'timeout', 0);
|
|
265
|
+
debug('set timeout = 0 when inspect enable');
|
|
266
|
+
}
|
|
267
|
+
else if (this.env.JB_DEBUG_FILE) {
|
|
268
|
+
// others like WebStorm 2019 will pass NODE_OPTIONS, and @eggjs/bin itself will be debug, so could detect `process.env.JB_DEBUG_FILE`.
|
|
269
|
+
Reflect.set(flags, 'timeout', 0);
|
|
270
|
+
debug('set timeout = false when process.env.JB_DEBUG_FILE=%o', this.env.JB_DEBUG_FILE);
|
|
271
|
+
}
|
|
272
|
+
debug('baseDir: %o, isESM: %o', flags.base, this.isESM);
|
|
273
|
+
debug('set NODE_OPTIONS: %o', this.env.NODE_OPTIONS);
|
|
274
|
+
debug('after: args: %o, flags: %o', args, flags);
|
|
275
|
+
debug('enter real command: %o', this.id);
|
|
99
276
|
}
|
|
100
277
|
async catch(err) {
|
|
101
278
|
// add any custom logic to handle errors from the command
|
|
@@ -107,36 +284,65 @@ export class BaseCommand extends Command {
|
|
|
107
284
|
return super.finally(_);
|
|
108
285
|
}
|
|
109
286
|
async formatRequires() {
|
|
110
|
-
const requires = this.
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
287
|
+
const requires = this.flags.require ?? [];
|
|
288
|
+
const imports = this.flags.import ?? [];
|
|
289
|
+
let eggRequires = this.pkgEgg.require ?? [];
|
|
290
|
+
if (typeof eggRequires === 'string') {
|
|
291
|
+
eggRequires = [eggRequires];
|
|
292
|
+
}
|
|
293
|
+
let eggImports = this.pkgEgg.import ?? [];
|
|
294
|
+
if (typeof eggImports === 'string') {
|
|
295
|
+
eggImports = [eggImports];
|
|
296
|
+
}
|
|
297
|
+
return [
|
|
298
|
+
...requires,
|
|
299
|
+
...imports,
|
|
300
|
+
...eggRequires,
|
|
301
|
+
...eggImports,
|
|
302
|
+
];
|
|
120
303
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
304
|
+
formatImportModule(modulePath) {
|
|
305
|
+
if (this.isESM) {
|
|
306
|
+
return `--import ${pathToFileURL(modulePath).href}`;
|
|
307
|
+
}
|
|
308
|
+
return `--require ${modulePath}`;
|
|
309
|
+
}
|
|
310
|
+
addNodeOptions(options) {
|
|
311
|
+
if (this.env.NODE_OPTIONS) {
|
|
312
|
+
if (!this.env.NODE_OPTIONS.includes(options)) {
|
|
313
|
+
this.env.NODE_OPTIONS = `${this.env.NODE_OPTIONS} ${options}`;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
else {
|
|
317
|
+
this.env.NODE_OPTIONS = options;
|
|
126
318
|
}
|
|
319
|
+
}
|
|
320
|
+
async forkNode(modulePath, forkArgs, options = {}) {
|
|
321
|
+
const env = {
|
|
322
|
+
...this.env,
|
|
323
|
+
...options.env,
|
|
324
|
+
};
|
|
127
325
|
const forkExecArgv = [
|
|
128
|
-
|
|
326
|
+
...this.globalExecArgv,
|
|
129
327
|
...options.execArgv || [],
|
|
130
328
|
];
|
|
329
|
+
const NODE_OPTIONS = env.NODE_OPTIONS ? `NODE_OPTIONS='${env.NODE_OPTIONS}' ` : '';
|
|
330
|
+
const forkExecArgvString = forkExecArgv.length ? ' ' + forkExecArgv.join(' ') + ' ' : ' ';
|
|
331
|
+
const forkArgsString = forkArgs.map(a => `'${a}'`).join(' ');
|
|
332
|
+
const fullCommand = `${NODE_OPTIONS}${process.execPath}${forkExecArgvString}${modulePath} ${forkArgsString}`;
|
|
333
|
+
if (options.dryRun) {
|
|
334
|
+
console.log('dry run: $ %s', fullCommand);
|
|
335
|
+
return;
|
|
336
|
+
}
|
|
131
337
|
options = {
|
|
132
338
|
stdio: 'inherit',
|
|
133
|
-
env
|
|
134
|
-
cwd:
|
|
339
|
+
env,
|
|
340
|
+
cwd: this.flags.base,
|
|
135
341
|
...options,
|
|
136
342
|
execArgv: forkExecArgv,
|
|
137
343
|
};
|
|
138
344
|
const proc = fork(modulePath, forkArgs, options);
|
|
139
|
-
debug('Run fork pid: %o\n\n$ %s
|
|
345
|
+
debug('Run fork pid: %o\n\n$ %s\n\n', proc.pid, fullCommand);
|
|
140
346
|
graceful(proc);
|
|
141
347
|
return new Promise((resolve, reject) => {
|
|
142
348
|
proc.once('exit', code => {
|
|
@@ -153,4 +359,4 @@ export class BaseCommand extends Command {
|
|
|
153
359
|
});
|
|
154
360
|
}
|
|
155
361
|
}
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZUNvbW1hbmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmFzZUNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxnQ0FBZ0M7QUFDaEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN6QyxPQUFPLEVBQUUsSUFBSSxFQUE2QixNQUFNLG9CQUFvQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFjLE1BQU0sYUFBYSxDQUFDO0FBQ3pELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDN0MsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixnQkFBZ0I7QUFDaEIsbURBQW1EO0VBQ3BELE1BQU0sWUFBWSxDQUFDO0FBRXBCLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0FBRWpELHFEQUFxRDtBQUNyRCxNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsRUFBZ0IsQ0FBQztBQUN6QyxJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUM7QUFDcEIsU0FBUyxRQUFRLENBQUMsSUFBa0I7SUFDbEMsaUJBQWlCO0lBQ2pCLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFbkIsaUJBQWlCO0lBQ2pCLG9CQUFvQjtJQUNwQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixPQUFPLEdBQUcsSUFBSSxDQUFDO1FBQ2YsSUFBSSxNQUFzQixDQUFDO1FBQzNCLENBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxTQUFTLENBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDakQsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFO2dCQUN2QixNQUFNLEdBQUcsS0FBdUIsQ0FBQztnQkFDakMsT0FBTyxDQUFDLElBQUks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
|
|
362
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../../src/baseCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,22 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
file: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
|
|
5
|
-
};
|
|
1
|
+
import Test from './test.js';
|
|
2
|
+
import { ForkNodeOptions } from '../baseCommand.js';
|
|
3
|
+
export default class Cov<T extends typeof Cov> extends Test<T> {
|
|
6
4
|
static description: string;
|
|
7
5
|
static examples: string[];
|
|
8
6
|
static flags: {
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
prerequire: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
8
|
+
exclude: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
9
|
+
c8: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
10
|
+
bail: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
11
|
+
timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
|
+
'no-timeout': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
13
|
+
grep: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
|
+
changed: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
15
|
+
mochawesome: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
16
|
+
parallel: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
17
|
+
jobs: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
18
|
+
'auto-agent': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
11
19
|
};
|
|
12
|
-
|
|
20
|
+
protected get defaultExcludes(): string[];
|
|
21
|
+
protected forkNode(modulePath: string, forkArgs: string[], options?: ForkNodeOptions): Promise<void>;
|
|
13
22
|
}
|
package/dist/esm/commands/cov.js
CHANGED
|
@@ -1,25 +1,91 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import { Flags } from '@oclif/core';
|
|
4
|
+
import Test from './test.js';
|
|
5
|
+
import { importResolve } from '@eggjs/utils';
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
7
|
+
// @ts-ignore
|
|
8
|
+
export default class Cov extends Test {
|
|
9
|
+
static description = 'Run the test with coverage';
|
|
7
10
|
static examples = [
|
|
8
11
|
'<%= config.bin %> <%= command.id %>',
|
|
12
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
9
13
|
];
|
|
10
14
|
static flags = {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
...Test.flags,
|
|
16
|
+
// will use on egg-mock https://github.com/eggjs/egg-mock/blob/84a64bd19d0569ec94664c898fb1b28367b95d60/index.js#L7
|
|
17
|
+
prerequire: Flags.boolean({
|
|
18
|
+
description: 'prerequire files for coverage instrument',
|
|
19
|
+
}),
|
|
20
|
+
exclude: Flags.string({
|
|
21
|
+
description: 'coverage ignore, one or more files patterns`',
|
|
22
|
+
multiple: true,
|
|
23
|
+
char: 'x',
|
|
24
|
+
}),
|
|
25
|
+
c8: Flags.string({
|
|
26
|
+
description: 'c8 instruments passthrough`',
|
|
27
|
+
default: '--temp-directory node_modules/.c8_output -r text-summary -r json-summary -r json -r lcov -r cobertura',
|
|
28
|
+
}),
|
|
15
29
|
};
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
30
|
+
get defaultExcludes() {
|
|
31
|
+
return [
|
|
32
|
+
'example/',
|
|
33
|
+
'examples/',
|
|
34
|
+
'mocks**/',
|
|
35
|
+
'docs/',
|
|
36
|
+
// https://github.com/JaKXz/test-exclude/blob/620a7be412d4fc2070d50f0f63e3228314066fc9/index.js#L73
|
|
37
|
+
'test/**',
|
|
38
|
+
'test{,-*}.js',
|
|
39
|
+
'**/*.test.js',
|
|
40
|
+
'**/__tests__/**',
|
|
41
|
+
'**/node_modules/**',
|
|
42
|
+
'typings',
|
|
43
|
+
'**/*.d.ts',
|
|
44
|
+
];
|
|
45
|
+
}
|
|
46
|
+
async forkNode(modulePath, forkArgs, options = {}) {
|
|
47
|
+
const { flags } = this;
|
|
48
|
+
if (flags.prerequire) {
|
|
49
|
+
this.env.EGG_BIN_PREREQUIRE = 'true';
|
|
50
|
+
}
|
|
51
|
+
// add c8 args
|
|
52
|
+
// https://github.com/eggjs/egg/issues/3930
|
|
53
|
+
const c8Args = [
|
|
54
|
+
// '--show-process-tree',
|
|
55
|
+
...flags.c8.split(' ').filter(a => a.trim()),
|
|
56
|
+
];
|
|
57
|
+
if (flags.typescript) {
|
|
58
|
+
this.env.SPAWN_WRAP_SHIM_ROOT = path.join(flags.base, 'node_modules');
|
|
59
|
+
c8Args.push('--extension');
|
|
60
|
+
c8Args.push('.ts');
|
|
61
|
+
}
|
|
62
|
+
const excludes = new Set([
|
|
63
|
+
...process.env.COV_EXCLUDES?.split(',') ?? [],
|
|
64
|
+
...this.defaultExcludes,
|
|
65
|
+
...Array.from(flags.exclude ?? []),
|
|
66
|
+
]);
|
|
67
|
+
for (const exclude of excludes) {
|
|
68
|
+
c8Args.push('-x');
|
|
69
|
+
c8Args.push(exclude);
|
|
22
70
|
}
|
|
71
|
+
const c8File = importResolve('c8/bin/c8.js');
|
|
72
|
+
const outputDir = path.join(flags.base, 'node_modules/.c8_output');
|
|
73
|
+
await fs.rm(outputDir, { force: true, recursive: true });
|
|
74
|
+
const coverageDir = path.join(flags.base, 'coverage');
|
|
75
|
+
await fs.rm(coverageDir, { force: true, recursive: true });
|
|
76
|
+
const execArgv = [
|
|
77
|
+
...this.globalExecArgv,
|
|
78
|
+
...options.execArgv || [],
|
|
79
|
+
];
|
|
80
|
+
this.globalExecArgv = [];
|
|
81
|
+
// $ c8 node mocha
|
|
82
|
+
await super.forkNode(c8File, [
|
|
83
|
+
...c8Args,
|
|
84
|
+
process.execPath,
|
|
85
|
+
...execArgv,
|
|
86
|
+
modulePath,
|
|
87
|
+
...forkArgs,
|
|
88
|
+
]);
|
|
23
89
|
}
|
|
24
90
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY292LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2Nvdi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwQyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUc3Qyw2REFBNkQ7QUFDN0QsYUFBYTtBQUNiLE1BQU0sQ0FBQyxPQUFPLE9BQU8sR0FBMEIsU0FBUSxJQUFPO0lBQzVELE1BQU0sQ0FBVSxXQUFXLEdBQUcsNEJBQTRCLENBQUM7SUFFM0QsTUFBTSxDQUFVLFFBQVEsR0FBRztRQUN6QixxQ0FBcUM7UUFDckMsd0RBQXdEO0tBQ3pELENBQUM7SUFFRixNQUFNLENBQVUsS0FBSyxHQUFHO1FBQ3RCLEdBQUcsSUFBSSxDQUFDLEtBQUs7UUFDYixtSEFBbUg7UUFDbkgsVUFBVSxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUM7WUFDeEIsV0FBVyxFQUFFLDBDQUEwQztTQUN4RCxDQUFDO1FBQ0YsT0FBTyxFQUFFLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDcEIsV0FBVyxFQUFFLDhDQUE4QztZQUMzRCxRQUFRLEVBQUUsSUFBSTtZQUNkLElBQUksRUFBRSxHQUFHO1NBQ1YsQ0FBQztRQUNGLEVBQUUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ2YsV0FBVyxFQUFFLDZCQUE2QjtZQUMxQyxPQUFPLEVBQUUsdUdBQXVHO1NBQ2pILENBQUM7S0FDSCxDQUFDO0lBRUYsSUFBYyxlQUFlO1FBQzNCLE9BQU87WUFDTCxVQUFVO1lBQ1YsV0FBVztZQUNYLFVBQVU7WUFDVixPQUFPO1lBQ1AsbUdBQW1HO1lBQ25HLFNBQVM7WUFDVCxjQUFjO1lBQ2Qs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
|
|
@@ -1,13 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export default class Dev extends
|
|
3
|
-
static args: {
|
|
4
|
-
file: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
|
|
5
|
-
};
|
|
1
|
+
import { BaseCommand } from '../baseCommand.js';
|
|
2
|
+
export default class Dev<T extends typeof Dev> extends BaseCommand<T> {
|
|
6
3
|
static description: string;
|
|
7
4
|
static examples: string[];
|
|
8
5
|
static flags: {
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
port: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
7
|
+
workers: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
8
|
+
framework: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
9
|
+
sticky: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
11
10
|
};
|
|
12
11
|
run(): Promise<void>;
|
|
12
|
+
protected formatEggStartOptions(): Promise<{
|
|
13
|
+
baseDir: string;
|
|
14
|
+
workers: number;
|
|
15
|
+
port: number;
|
|
16
|
+
framework: string;
|
|
17
|
+
typescript: boolean;
|
|
18
|
+
tscompiler: string | undefined;
|
|
19
|
+
sticky: boolean;
|
|
20
|
+
}>;
|
|
13
21
|
}
|