@eggjs/bin 7.2.0 → 7.3.1-beta.3
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 +3 -21
- package/bin/dev.js +0 -0
- package/dist/baseCommand.d.ts +52 -0
- package/dist/baseCommand.js +288 -0
- package/dist/commands/cov.d.ts +27 -0
- package/dist/commands/cov.js +86 -0
- package/dist/commands/dev.d.ts +26 -0
- package/dist/commands/dev.js +86 -0
- package/dist/commands/test.d.ts +28 -0
- package/dist/commands/test.js +168 -0
- package/dist/index.d.ts +7 -0
- package/dist/index.js +8 -0
- package/dist/scripts/postinstall.mjs +14 -7
- package/dist/scripts/start-cluster.cjs +3 -2
- package/dist/scripts/start-cluster.mjs +3 -2
- package/{src/types.ts → dist/types.d.ts} +4 -1
- package/dist/utils.js +34 -0
- package/package.json +48 -68
- package/scripts/postinstall.mjs +14 -7
- package/scripts/start-cluster.cjs +3 -2
- package/scripts/start-cluster.mjs +3 -2
- package/dist/commonjs/baseCommand.d.ts +0 -49
- package/dist/commonjs/baseCommand.js +0 -369
- package/dist/commonjs/commands/cov.d.ts +0 -22
- package/dist/commonjs/commands/cov.js +0 -98
- package/dist/commonjs/commands/dev.d.ts +0 -21
- package/dist/commonjs/commands/dev.js +0 -95
- package/dist/commonjs/commands/test.d.ts +0 -23
- package/dist/commonjs/commands/test.js +0 -222
- package/dist/commonjs/index.d.ts +0 -7
- package/dist/commonjs/index.js +0 -30
- package/dist/commonjs/package.json +0 -3
- package/dist/commonjs/types.d.ts +0 -9
- package/dist/commonjs/types.js +0 -3
- package/dist/commonjs/utils.d.ts +0 -4
- package/dist/commonjs/utils.js +0 -45
- package/dist/esm/baseCommand.d.ts +0 -49
- package/dist/esm/baseCommand.js +0 -361
- package/dist/esm/commands/cov.d.ts +0 -22
- package/dist/esm/commands/cov.js +0 -92
- package/dist/esm/commands/dev.d.ts +0 -21
- package/dist/esm/commands/dev.js +0 -92
- package/dist/esm/commands/test.d.ts +0 -23
- package/dist/esm/commands/test.js +0 -216
- package/dist/esm/index.d.ts +0 -7
- package/dist/esm/index.js +0 -8
- package/dist/esm/package.json +0 -3
- package/dist/esm/types.d.ts +0 -9
- package/dist/esm/types.js +0 -2
- package/dist/esm/utils.d.ts +0 -4
- package/dist/esm/utils.js +0 -36
- package/dist/package.json +0 -4
- package/src/baseCommand.ts +0 -390
- package/src/commands/cov.ts +0 -101
- package/src/commands/dev.ts +0 -99
- package/src/commands/test.ts +0 -236
- package/src/index.ts +0 -9
- package/src/utils.ts +0 -37
package/dist/esm/baseCommand.js
DELETED
|
@@ -1,361 +0,0 @@
|
|
|
1
|
-
import { debuglog } from 'node:util';
|
|
2
|
-
import { pathToFileURL } from 'node:url';
|
|
3
|
-
import path from 'node:path';
|
|
4
|
-
import { fork } from 'node:child_process';
|
|
5
|
-
import { Command, Flags } from '@oclif/core';
|
|
6
|
-
import { importResolve } from '@eggjs/utils';
|
|
7
|
-
import { runScript } from 'runscript';
|
|
8
|
-
import { getSourceDirname, readPackageJSON, hasTsConfig, } from './utils.js';
|
|
9
|
-
const debug = debuglog('@eggjs/bin/baseCommand');
|
|
10
|
-
// only hook once and only when ever start any child.
|
|
11
|
-
const children = new Set();
|
|
12
|
-
let hadHook = false;
|
|
13
|
-
function graceful(proc) {
|
|
14
|
-
// save child ref
|
|
15
|
-
children.add(proc);
|
|
16
|
-
// only hook once
|
|
17
|
-
/* c8 ignore else */
|
|
18
|
-
if (!hadHook) {
|
|
19
|
-
hadHook = true;
|
|
20
|
-
let signal;
|
|
21
|
-
['SIGINT', 'SIGQUIT', 'SIGTERM'].forEach(event => {
|
|
22
|
-
process.once(event, () => {
|
|
23
|
-
signal = event;
|
|
24
|
-
process.exit(0);
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
process.once('exit', (code) => {
|
|
28
|
-
for (const child of children) {
|
|
29
|
-
debug('process exit code: %o, kill child %o with %o', code, child.pid, signal);
|
|
30
|
-
child.kill(signal);
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
export class ForkError extends Error {
|
|
36
|
-
code;
|
|
37
|
-
constructor(message, code) {
|
|
38
|
-
super(message);
|
|
39
|
-
this.code = code;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
export class BaseCommand extends Command {
|
|
43
|
-
// add the --json flag
|
|
44
|
-
static enableJsonFlag = false;
|
|
45
|
-
// define flags that can be inherited by any command that extends BaseCommand
|
|
46
|
-
static baseFlags = {
|
|
47
|
-
// 'log-level': Flags.option({
|
|
48
|
-
// default: 'info',
|
|
49
|
-
// helpGroup: 'GLOBAL',
|
|
50
|
-
// options: ['debug', 'warn', 'error', 'info', 'trace'] as const,
|
|
51
|
-
// summary: 'Specify level for logging.',
|
|
52
|
-
// })(),
|
|
53
|
-
'dry-run': Flags.boolean({
|
|
54
|
-
default: false,
|
|
55
|
-
helpGroup: 'GLOBAL',
|
|
56
|
-
summary: 'whether show full command script only',
|
|
57
|
-
char: 'd',
|
|
58
|
-
}),
|
|
59
|
-
require: Flags.string({
|
|
60
|
-
helpGroup: 'GLOBAL',
|
|
61
|
-
summary: 'require the given module',
|
|
62
|
-
char: 'r',
|
|
63
|
-
multiple: true,
|
|
64
|
-
}),
|
|
65
|
-
import: Flags.string({
|
|
66
|
-
helpGroup: 'GLOBAL',
|
|
67
|
-
summary: 'import the given module, only work on ESM',
|
|
68
|
-
multiple: true,
|
|
69
|
-
}),
|
|
70
|
-
base: Flags.string({
|
|
71
|
-
helpGroup: 'GLOBAL',
|
|
72
|
-
summary: 'directory of application',
|
|
73
|
-
aliases: ['baseDir'],
|
|
74
|
-
default: process.cwd(),
|
|
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
|
-
}),
|
|
111
|
-
};
|
|
112
|
-
flags;
|
|
113
|
-
args;
|
|
114
|
-
env = { ...process.env };
|
|
115
|
-
pkg;
|
|
116
|
-
isESM;
|
|
117
|
-
pkgEgg;
|
|
118
|
-
globalExecArgv = [];
|
|
119
|
-
async init() {
|
|
120
|
-
await super.init();
|
|
121
|
-
debug('[init] raw args: %o, NODE_ENV: %o', this.argv, this.env.NODE_ENV);
|
|
122
|
-
const { args, flags } = await this.parse({
|
|
123
|
-
flags: this.ctor.flags,
|
|
124
|
-
baseFlags: super.ctor.baseFlags,
|
|
125
|
-
enableJsonFlag: this.ctor.enableJsonFlag,
|
|
126
|
-
args: this.ctor.args,
|
|
127
|
-
strict: this.ctor.strict,
|
|
128
|
-
});
|
|
129
|
-
this.flags = flags;
|
|
130
|
-
this.args = args;
|
|
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
|
-
let rootDir = path.dirname(getSourceDirname());
|
|
187
|
-
if (path.basename(rootDir) === 'dist') {
|
|
188
|
-
rootDir = path.dirname(rootDir);
|
|
189
|
-
}
|
|
190
|
-
// try app baseDir first on custom tscompiler
|
|
191
|
-
// then try to find tscompiler in @eggjs/bin/node_modules
|
|
192
|
-
const findPaths = [flags.base, rootDir];
|
|
193
|
-
this.isESM = pkg.type === 'module';
|
|
194
|
-
if (typescript) {
|
|
195
|
-
flags.tscompiler = flags.tscompiler ?? 'ts-node/register';
|
|
196
|
-
const tsNodeRegister = importResolve(flags.tscompiler, {
|
|
197
|
-
paths: findPaths,
|
|
198
|
-
});
|
|
199
|
-
flags.tscompiler = tsNodeRegister;
|
|
200
|
-
// should require tsNodeRegister on current process, let it can require *.ts files
|
|
201
|
-
// e.g.: dev command will execute egg loader to find configs and plugins
|
|
202
|
-
// await importModule(tsNodeRegister);
|
|
203
|
-
// let child process auto require ts-node too
|
|
204
|
-
this.addNodeOptions(this.formatImportModule(tsNodeRegister));
|
|
205
|
-
// tell egg loader to load ts file
|
|
206
|
-
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L443
|
|
207
|
-
this.env.EGG_TYPESCRIPT = 'true';
|
|
208
|
-
// set current process.env.EGG_TYPESCRIPT too
|
|
209
|
-
process.env.EGG_TYPESCRIPT = 'true';
|
|
210
|
-
// load files from tsconfig on startup
|
|
211
|
-
this.env.TS_NODE_FILES = process.env.TS_NODE_FILES ?? 'true';
|
|
212
|
-
// keep same logic with egg-core, test cmd load files need it
|
|
213
|
-
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L49
|
|
214
|
-
const tsConfigPathsRegister = importResolve('tsconfig-paths/register', {
|
|
215
|
-
paths: findPaths,
|
|
216
|
-
});
|
|
217
|
-
this.addNodeOptions(this.formatImportModule(tsConfigPathsRegister));
|
|
218
|
-
}
|
|
219
|
-
if (this.isESM) {
|
|
220
|
-
// use ts-node/esm loader on esm
|
|
221
|
-
let esmLoader = importResolve('ts-node/esm', {
|
|
222
|
-
paths: findPaths,
|
|
223
|
-
});
|
|
224
|
-
// ES Module loading with absolute path fails on windows
|
|
225
|
-
// https://github.com/nodejs/node/issues/31710#issuecomment-583916239
|
|
226
|
-
// https://nodejs.org/api/url.html#url_url_pathtofileurl_path
|
|
227
|
-
// 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:'
|
|
228
|
-
esmLoader = pathToFileURL(esmLoader).href;
|
|
229
|
-
// wait for https://github.com/nodejs/node/issues/40940
|
|
230
|
-
this.addNodeOptions('--no-warnings');
|
|
231
|
-
this.addNodeOptions(`--loader ${esmLoader}`);
|
|
232
|
-
}
|
|
233
|
-
if (flags.declarations === undefined) {
|
|
234
|
-
if (typeof this.pkgEgg.declarations === 'boolean') {
|
|
235
|
-
// read `egg.declarations` from package.json if not pass argv
|
|
236
|
-
flags.declarations = this.pkgEgg.declarations;
|
|
237
|
-
debug('detect declarations from pkg.egg.declarations=%o', this.pkgEgg.declarations);
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
if (flags.declarations) {
|
|
241
|
-
const etsBin = importResolve('egg-ts-helper/dist/bin', {
|
|
242
|
-
paths: findPaths,
|
|
243
|
-
});
|
|
244
|
-
debug('run ets first: %o', etsBin);
|
|
245
|
-
await runScript(`node ${etsBin}`);
|
|
246
|
-
}
|
|
247
|
-
if (this.pkgEgg.revert) {
|
|
248
|
-
const reverts = Array.isArray(this.pkgEgg.revert) ? this.pkgEgg.revert : [this.pkgEgg.revert];
|
|
249
|
-
for (const revert of reverts) {
|
|
250
|
-
this.globalExecArgv.push(`--security-revert=${revert}`);
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
let hasInspectOption = false;
|
|
254
|
-
if (flags.inspect) {
|
|
255
|
-
this.addNodeOptions('--inspect');
|
|
256
|
-
hasInspectOption = true;
|
|
257
|
-
}
|
|
258
|
-
if (flags['inspect-brk']) {
|
|
259
|
-
this.addNodeOptions('--inspect-brk');
|
|
260
|
-
hasInspectOption = true;
|
|
261
|
-
}
|
|
262
|
-
if (hasInspectOption) {
|
|
263
|
-
Reflect.set(flags, 'timeout', 0);
|
|
264
|
-
debug('set timeout = 0 when inspect enable');
|
|
265
|
-
}
|
|
266
|
-
else if (this.env.JB_DEBUG_FILE) {
|
|
267
|
-
// others like WebStorm 2019 will pass NODE_OPTIONS, and @eggjs/bin itself will be debug, so could detect `process.env.JB_DEBUG_FILE`.
|
|
268
|
-
Reflect.set(flags, 'timeout', 0);
|
|
269
|
-
debug('set timeout = false when process.env.JB_DEBUG_FILE=%o', this.env.JB_DEBUG_FILE);
|
|
270
|
-
}
|
|
271
|
-
debug('baseDir: %o, isESM: %o', flags.base, this.isESM);
|
|
272
|
-
debug('set NODE_OPTIONS: %o', this.env.NODE_OPTIONS);
|
|
273
|
-
debug('after: args: %o, flags: %o', args, flags);
|
|
274
|
-
debug('enter real command: %o', this.id);
|
|
275
|
-
}
|
|
276
|
-
async catch(err) {
|
|
277
|
-
// add any custom logic to handle errors from the command
|
|
278
|
-
// or simply return the parent class error handling
|
|
279
|
-
return super.catch(err);
|
|
280
|
-
}
|
|
281
|
-
async finally(_) {
|
|
282
|
-
// called after run and catch regardless of whether or not the command errored
|
|
283
|
-
return super.finally(_);
|
|
284
|
-
}
|
|
285
|
-
async formatRequires() {
|
|
286
|
-
const requires = this.flags.require ?? [];
|
|
287
|
-
const imports = this.flags.import ?? [];
|
|
288
|
-
let eggRequires = this.pkgEgg.require ?? [];
|
|
289
|
-
if (typeof eggRequires === 'string') {
|
|
290
|
-
eggRequires = [eggRequires];
|
|
291
|
-
}
|
|
292
|
-
let eggImports = this.pkgEgg.import ?? [];
|
|
293
|
-
if (typeof eggImports === 'string') {
|
|
294
|
-
eggImports = [eggImports];
|
|
295
|
-
}
|
|
296
|
-
return [
|
|
297
|
-
...requires,
|
|
298
|
-
...imports,
|
|
299
|
-
...eggRequires,
|
|
300
|
-
...eggImports,
|
|
301
|
-
];
|
|
302
|
-
}
|
|
303
|
-
formatImportModule(modulePath) {
|
|
304
|
-
if (this.isESM) {
|
|
305
|
-
return `--import ${pathToFileURL(modulePath).href}`;
|
|
306
|
-
}
|
|
307
|
-
return `--require ${modulePath}`;
|
|
308
|
-
}
|
|
309
|
-
addNodeOptions(options) {
|
|
310
|
-
if (this.env.NODE_OPTIONS) {
|
|
311
|
-
if (!this.env.NODE_OPTIONS.includes(options)) {
|
|
312
|
-
this.env.NODE_OPTIONS = `${this.env.NODE_OPTIONS} ${options}`;
|
|
313
|
-
}
|
|
314
|
-
}
|
|
315
|
-
else {
|
|
316
|
-
this.env.NODE_OPTIONS = options;
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
async forkNode(modulePath, forkArgs, options = {}) {
|
|
320
|
-
const env = {
|
|
321
|
-
...this.env,
|
|
322
|
-
...options.env,
|
|
323
|
-
};
|
|
324
|
-
const forkExecArgv = [
|
|
325
|
-
...this.globalExecArgv,
|
|
326
|
-
...options.execArgv || [],
|
|
327
|
-
];
|
|
328
|
-
const NODE_OPTIONS = env.NODE_OPTIONS ? `NODE_OPTIONS='${env.NODE_OPTIONS}' ` : '';
|
|
329
|
-
const forkExecArgvString = forkExecArgv.length ? ' ' + forkExecArgv.join(' ') + ' ' : ' ';
|
|
330
|
-
const forkArgsString = forkArgs.map(a => `'${a}'`).join(' ');
|
|
331
|
-
const fullCommand = `${NODE_OPTIONS}${process.execPath}${forkExecArgvString}${modulePath} ${forkArgsString}`;
|
|
332
|
-
if (options.dryRun) {
|
|
333
|
-
console.log('dry run: $ %s', fullCommand);
|
|
334
|
-
return;
|
|
335
|
-
}
|
|
336
|
-
options = {
|
|
337
|
-
stdio: 'inherit',
|
|
338
|
-
env,
|
|
339
|
-
cwd: this.flags.base,
|
|
340
|
-
...options,
|
|
341
|
-
execArgv: forkExecArgv,
|
|
342
|
-
};
|
|
343
|
-
const proc = fork(modulePath, forkArgs, options);
|
|
344
|
-
debug('Run fork pid: %o\n\n$ %s\n\n', proc.pid, fullCommand);
|
|
345
|
-
graceful(proc);
|
|
346
|
-
return new Promise((resolve, reject) => {
|
|
347
|
-
proc.once('exit', code => {
|
|
348
|
-
debug('fork pid: %o exit code %o', proc.pid, code);
|
|
349
|
-
children.delete(proc);
|
|
350
|
-
if (code !== 0) {
|
|
351
|
-
const err = new ForkError(modulePath + ' ' + forkArgs.join(' ') + ' exit with code ' + code, code);
|
|
352
|
-
reject(err);
|
|
353
|
-
}
|
|
354
|
-
else {
|
|
355
|
-
resolve();
|
|
356
|
-
}
|
|
357
|
-
});
|
|
358
|
-
});
|
|
359
|
-
}
|
|
360
|
-
}
|
|
361
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../../src/baseCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import Test from './test.js';
|
|
2
|
-
import { ForkNodeOptions } from '../baseCommand.js';
|
|
3
|
-
export default class Cov<T extends typeof Cov> extends Test<T> {
|
|
4
|
-
static description: string;
|
|
5
|
-
static examples: string[];
|
|
6
|
-
static flags: {
|
|
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>;
|
|
19
|
-
};
|
|
20
|
-
protected get defaultExcludes(): string[];
|
|
21
|
-
protected forkNode(modulePath: string, forkArgs: string[], options?: ForkNodeOptions): Promise<void>;
|
|
22
|
-
}
|
package/dist/esm/commands/cov.js
DELETED
|
@@ -1,92 +0,0 @@
|
|
|
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';
|
|
10
|
-
static examples = [
|
|
11
|
-
'<%= config.bin %> <%= command.id %>',
|
|
12
|
-
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
13
|
-
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
14
|
-
];
|
|
15
|
-
static flags = {
|
|
16
|
-
...Test.flags,
|
|
17
|
-
// will use on egg-mock https://github.com/eggjs/egg-mock/blob/84a64bd19d0569ec94664c898fb1b28367b95d60/index.js#L7
|
|
18
|
-
prerequire: Flags.boolean({
|
|
19
|
-
description: 'prerequire files for coverage instrument',
|
|
20
|
-
}),
|
|
21
|
-
exclude: Flags.string({
|
|
22
|
-
description: 'coverage ignore, one or more files patterns`',
|
|
23
|
-
multiple: true,
|
|
24
|
-
char: 'x',
|
|
25
|
-
}),
|
|
26
|
-
c8: Flags.string({
|
|
27
|
-
description: 'c8 instruments passthrough`',
|
|
28
|
-
default: '--temp-directory node_modules/.c8_output -r text-summary -r json-summary -r json -r lcov -r cobertura',
|
|
29
|
-
}),
|
|
30
|
-
};
|
|
31
|
-
get defaultExcludes() {
|
|
32
|
-
return [
|
|
33
|
-
'example/',
|
|
34
|
-
'examples/',
|
|
35
|
-
'mocks**/',
|
|
36
|
-
'docs/',
|
|
37
|
-
// https://github.com/JaKXz/test-exclude/blob/620a7be412d4fc2070d50f0f63e3228314066fc9/index.js#L73
|
|
38
|
-
'test/**',
|
|
39
|
-
'test{,-*}.js',
|
|
40
|
-
'**/*.test.js',
|
|
41
|
-
'**/__tests__/**',
|
|
42
|
-
'**/node_modules/**',
|
|
43
|
-
'typings',
|
|
44
|
-
'**/*.d.ts',
|
|
45
|
-
];
|
|
46
|
-
}
|
|
47
|
-
async forkNode(modulePath, forkArgs, options = {}) {
|
|
48
|
-
const { flags } = this;
|
|
49
|
-
if (flags.prerequire) {
|
|
50
|
-
this.env.EGG_BIN_PREREQUIRE = 'true';
|
|
51
|
-
}
|
|
52
|
-
// add c8 args
|
|
53
|
-
// https://github.com/eggjs/egg/issues/3930
|
|
54
|
-
const c8Args = [
|
|
55
|
-
// '--show-process-tree',
|
|
56
|
-
...flags.c8.split(' ').filter(a => a.trim()),
|
|
57
|
-
];
|
|
58
|
-
if (flags.typescript) {
|
|
59
|
-
this.env.SPAWN_WRAP_SHIM_ROOT = path.join(flags.base, 'node_modules');
|
|
60
|
-
c8Args.push('--extension');
|
|
61
|
-
c8Args.push('.ts');
|
|
62
|
-
}
|
|
63
|
-
const excludes = new Set([
|
|
64
|
-
...process.env.COV_EXCLUDES?.split(',') ?? [],
|
|
65
|
-
...this.defaultExcludes,
|
|
66
|
-
...Array.from(flags.exclude ?? []),
|
|
67
|
-
]);
|
|
68
|
-
for (const exclude of excludes) {
|
|
69
|
-
c8Args.push('-x');
|
|
70
|
-
c8Args.push(exclude);
|
|
71
|
-
}
|
|
72
|
-
const c8File = importResolve('c8/bin/c8.js');
|
|
73
|
-
const outputDir = path.join(flags.base, 'node_modules/.c8_output');
|
|
74
|
-
await fs.rm(outputDir, { force: true, recursive: true });
|
|
75
|
-
const coverageDir = path.join(flags.base, 'coverage');
|
|
76
|
-
await fs.rm(coverageDir, { force: true, recursive: true });
|
|
77
|
-
const execArgv = [
|
|
78
|
-
...this.globalExecArgv,
|
|
79
|
-
...options.execArgv || [],
|
|
80
|
-
];
|
|
81
|
-
this.globalExecArgv = [];
|
|
82
|
-
// $ c8 node mocha
|
|
83
|
-
await super.forkNode(c8File, [
|
|
84
|
-
...c8Args,
|
|
85
|
-
process.execPath,
|
|
86
|
-
...execArgv,
|
|
87
|
-
modulePath,
|
|
88
|
-
...forkArgs,
|
|
89
|
-
]);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY292LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2Nvdi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwQyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUc3Qyw2REFBNkQ7QUFDN0QsYUFBYTtBQUNiLE1BQU0sQ0FBQyxPQUFPLE9BQU8sR0FBMEIsU0FBUSxJQUFPO0lBQzVELE1BQU0sQ0FBVSxXQUFXLEdBQUcsNEJBQTRCLENBQUM7SUFFM0QsTUFBTSxDQUFVLFFBQVEsR0FBRztRQUN6QixxQ0FBcUM7UUFDckMsd0RBQXdEO1FBQ3hELDhFQUE4RTtLQUMvRSxDQUFDO0lBRUYsTUFBTSxDQUFVLEtBQUssR0FBRztRQUN0QixHQUFHLElBQUksQ0FBQyxLQUFLO1FBQ2IsbUhBQW1IO1FBQ25ILFVBQVUsRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDO1lBQ3hCLFdBQVcsRUFBRSwwQ0FBMEM7U0FDeEQsQ0FBQztRQUNGLE9BQU8sRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ3BCLFdBQVcsRUFBRSw4Q0FBOEM7WUFDM0QsUUFBUSxFQUFFLElBQUk7WUFDZCxJQUFJLEVBQUUsR0FBRztTQUNWLENBQUM7UUFDRixFQUFFLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNmLFdBQVcsRUFBRSw2QkFBNkI7WUFDMUMsT0FBTyxFQUFFLHVHQUF1RztTQUNqSCxDQUFDO0tBQ0gsQ0FBQztJQUVGLElBQWMsZUFBZTtRQUMzQixPQUFPO1lBQ0wsVUFBVTtZQUNWLFdBQVc7WUFDWCxVQUFVO1lBQ1YsT0FBTztZQUNQLG1HQUFtRztZQUNuRyxTQUFTO1lB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
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import { BaseCommand } from '../baseCommand.js';
|
|
2
|
-
export default class Dev<T extends typeof Dev> extends BaseCommand<T> {
|
|
3
|
-
static description: string;
|
|
4
|
-
static examples: string[];
|
|
5
|
-
static flags: {
|
|
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>;
|
|
10
|
-
};
|
|
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
|
-
}>;
|
|
21
|
-
}
|
package/dist/esm/commands/dev.js
DELETED
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
import { debuglog } from 'node:util';
|
|
2
|
-
import { Flags } from '@oclif/core';
|
|
3
|
-
import { getConfig, getFrameworkPath } from '@eggjs/utils';
|
|
4
|
-
import { detect } from 'detect-port';
|
|
5
|
-
import { getSourceFilename } from '../utils.js';
|
|
6
|
-
import { BaseCommand } from '../baseCommand.js';
|
|
7
|
-
const debug = debuglog('@eggjs/bin/commands/dev');
|
|
8
|
-
export default class Dev extends BaseCommand {
|
|
9
|
-
static description = 'Start server at local dev mode';
|
|
10
|
-
static examples = [
|
|
11
|
-
'<%= config.bin %> <%= command.id %>',
|
|
12
|
-
];
|
|
13
|
-
static flags = {
|
|
14
|
-
port: Flags.integer({
|
|
15
|
-
description: 'listening port, default to 7001',
|
|
16
|
-
char: 'p',
|
|
17
|
-
}),
|
|
18
|
-
workers: Flags.integer({
|
|
19
|
-
char: 'c',
|
|
20
|
-
aliases: ['cluster'],
|
|
21
|
-
description: 'numbers of app workers',
|
|
22
|
-
default: 1,
|
|
23
|
-
}),
|
|
24
|
-
framework: Flags.string({
|
|
25
|
-
description: 'specify framework that can be absolute path or npm package, default is "egg"',
|
|
26
|
-
}),
|
|
27
|
-
sticky: Flags.boolean({
|
|
28
|
-
description: 'start a sticky cluster server',
|
|
29
|
-
}),
|
|
30
|
-
};
|
|
31
|
-
async run() {
|
|
32
|
-
debug('NODE_ENV: %o', this.env);
|
|
33
|
-
this.env.NODE_ENV = this.env.NODE_ENV ?? 'development';
|
|
34
|
-
this.env.EGG_MASTER_CLOSE_TIMEOUT = '1000';
|
|
35
|
-
const ext = this.isESM ? 'mjs' : 'cjs';
|
|
36
|
-
const serverBin = getSourceFilename(`../scripts/start-cluster.${ext}`);
|
|
37
|
-
const eggStartOptions = await this.formatEggStartOptions();
|
|
38
|
-
const args = [JSON.stringify(eggStartOptions)];
|
|
39
|
-
const requires = await this.formatRequires();
|
|
40
|
-
const execArgv = [];
|
|
41
|
-
for (const r of requires) {
|
|
42
|
-
const imports = this.formatImportModule(r).split(' ');
|
|
43
|
-
execArgv.push(...imports);
|
|
44
|
-
}
|
|
45
|
-
await this.forkNode(serverBin, args, { execArgv });
|
|
46
|
-
}
|
|
47
|
-
async formatEggStartOptions() {
|
|
48
|
-
const { flags } = this;
|
|
49
|
-
flags.framework = getFrameworkPath({
|
|
50
|
-
framework: flags.framework,
|
|
51
|
-
baseDir: flags.base,
|
|
52
|
-
});
|
|
53
|
-
if (!flags.port) {
|
|
54
|
-
let configuredPort;
|
|
55
|
-
try {
|
|
56
|
-
const configuration = await getConfig({
|
|
57
|
-
framework: flags.framework,
|
|
58
|
-
baseDir: flags.base,
|
|
59
|
-
env: 'local',
|
|
60
|
-
});
|
|
61
|
-
configuredPort = configuration?.cluster?.listen?.port;
|
|
62
|
-
}
|
|
63
|
-
catch (err) {
|
|
64
|
-
/** skip when failing to read the configuration */
|
|
65
|
-
debug('getConfig error: %s, framework: %o, baseDir: %o, env: local', err, flags.framework, flags.base);
|
|
66
|
-
}
|
|
67
|
-
if (configuredPort) {
|
|
68
|
-
flags.port = configuredPort;
|
|
69
|
-
debug(`use port ${flags.port} from configuration file`);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
const defaultPort = parseInt(process.env.EGG_BIN_DEFAULT_PORT ?? '7001');
|
|
73
|
-
debug('detect available port');
|
|
74
|
-
flags.port = await detect(defaultPort);
|
|
75
|
-
if (flags.port !== defaultPort) {
|
|
76
|
-
console.warn('[@eggjs/bin] server port %o is unavailable, now using port %o', defaultPort, flags.port);
|
|
77
|
-
}
|
|
78
|
-
debug(`use available port ${flags.port}`);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return {
|
|
82
|
-
baseDir: flags.base,
|
|
83
|
-
workers: flags.workers,
|
|
84
|
-
port: flags.port,
|
|
85
|
-
framework: flags.framework,
|
|
86
|
-
typescript: flags.typescript,
|
|
87
|
-
tscompiler: flags.tscompiler,
|
|
88
|
-
sticky: flags.sticky,
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV2LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2Rldi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDcEMsT0FBTyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMzRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNoRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLHlCQUF5QixDQUFDLENBQUM7QUFFbEQsTUFBTSxDQUFDLE9BQU8sT0FBTyxHQUEwQixTQUFRLFdBQWM7SUFDbkUsTUFBTSxDQUFVLFdBQVcsR0FBRyxnQ0FBZ0MsQ0FBQztJQUUvRCxNQUFNLENBQVUsUUFBUSxHQUFHO1FBQ3pCLHFDQUFxQztLQUN0QyxDQUFDO0lBRUYsTUFBTSxDQUFVLEtBQUssR0FBRztRQUN0QixJQUFJLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQztZQUNsQixXQUFXLEVBQUUsaUNBQWlDO1lBQzlDLElBQUksRUFBRSxHQUFHO1NBQ1YsQ0FBQztRQUNGLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDO1lBQ3JCLElBQUksRUFBRSxHQUFHO1lBQ1QsT0FBTyxFQUFFLENBQUUsU0FBUyxDQUFFO1lBQ3RCLFdBQVcsRUFBRSx3QkFBd0I7WUFDckMsT0FBTyxFQUFFLENBQUM7U0FDWCxDQUFDO1FBQ0YsU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDdEIsV0FBVyxFQUFFLDhFQUE4RTtTQUM1RixDQUFDO1FBQ0YsTUFBTSxFQUFFLEtBQUssQ0FBQyxP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
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import { BaseCommand } from '../baseCommand.js';
|
|
2
|
-
export default class Test<T extends typeof Test> extends BaseCommand<T> {
|
|
3
|
-
static args: {
|
|
4
|
-
file: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
|
|
5
|
-
};
|
|
6
|
-
static description: string;
|
|
7
|
-
static examples: string[];
|
|
8
|
-
static flags: {
|
|
9
|
-
bail: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
10
|
-
timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
11
|
-
'no-timeout': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
12
|
-
grep: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
13
|
-
changed: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
14
|
-
mochawesome: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
15
|
-
parallel: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
16
|
-
jobs: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
|
-
'auto-agent': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
18
|
-
};
|
|
19
|
-
run(): Promise<void>;
|
|
20
|
-
protected runMocha(mochaFile: string, mochaArgs: string[]): Promise<void>;
|
|
21
|
-
protected formatMochaArgs(): Promise<string[] | undefined>;
|
|
22
|
-
protected getChangedTestFiles(dir: string, ext: string): Promise<string[]>;
|
|
23
|
-
}
|