@eggjs/bin 7.0.1 → 7.0.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 +1 -1
- package/dist/commonjs/baseCommand.js +14 -15
- package/dist/commonjs/commands/cov.js +2 -1
- package/dist/commonjs/commands/test.js +2 -1
- package/dist/esm/baseCommand.js +14 -15
- package/dist/esm/commands/cov.js +2 -1
- package/dist/esm/commands/test.js +2 -1
- package/dist/package.json +1 -1
- package/dist/scripts/postinstall.mjs +1 -1
- package/package.json +3 -3
- package/scripts/postinstall.mjs +1 -1
- package/src/baseCommand.ts +13 -15
- package/src/commands/cov.ts +1 -0
- package/src/commands/test.ts +1 -0
package/README.md
CHANGED
|
@@ -190,14 +190,15 @@ class BaseCommand extends core_1.Command {
|
|
|
190
190
|
}
|
|
191
191
|
}
|
|
192
192
|
flags.typescript = typescript;
|
|
193
|
+
let rootDir = node_path_1.default.dirname((0, utils_js_1.getSourceDirname)());
|
|
194
|
+
if (node_path_1.default.basename(rootDir) === 'dist') {
|
|
195
|
+
rootDir = node_path_1.default.dirname(rootDir);
|
|
196
|
+
}
|
|
197
|
+
// try app baseDir first on custom tscompiler
|
|
198
|
+
// then try to find tscompiler in @eggjs/bin/node_modules
|
|
199
|
+
const findPaths = [flags.base, rootDir];
|
|
193
200
|
this.isESM = pkg.type === 'module';
|
|
194
201
|
if (typescript) {
|
|
195
|
-
const findPaths = [(0, utils_js_1.getSourceDirname)()];
|
|
196
|
-
if (flags.tscompiler) {
|
|
197
|
-
// try app baseDir first on custom tscompiler
|
|
198
|
-
// then try to find tscompiler in @eggjs/bin/node_modules
|
|
199
|
-
findPaths.unshift(flags.base);
|
|
200
|
-
}
|
|
201
202
|
flags.tscompiler = flags.tscompiler ?? 'ts-node/register';
|
|
202
203
|
const tsNodeRegister = (0, utils_1.importResolve)(flags.tscompiler, {
|
|
203
204
|
paths: findPaths,
|
|
@@ -217,14 +218,15 @@ class BaseCommand extends core_1.Command {
|
|
|
217
218
|
this.env.TS_NODE_FILES = process.env.TS_NODE_FILES ?? 'true';
|
|
218
219
|
// keep same logic with egg-core, test cmd load files need it
|
|
219
220
|
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L49
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
221
|
+
const tsConfigPathsRegister = (0, utils_1.importResolve)('tsconfig-paths/register', {
|
|
222
|
+
paths: findPaths,
|
|
223
|
+
});
|
|
224
|
+
this.addNodeOptions(this.formatImportModule(tsConfigPathsRegister));
|
|
223
225
|
}
|
|
224
226
|
if (this.isESM) {
|
|
225
227
|
// use ts-node/esm loader on esm
|
|
226
228
|
let esmLoader = (0, utils_1.importResolve)('ts-node/esm', {
|
|
227
|
-
paths:
|
|
229
|
+
paths: findPaths,
|
|
228
230
|
});
|
|
229
231
|
// ES Module loading with absolute path fails on windows
|
|
230
232
|
// https://github.com/nodejs/node/issues/31710#issuecomment-583916239
|
|
@@ -244,10 +246,7 @@ class BaseCommand extends core_1.Command {
|
|
|
244
246
|
}
|
|
245
247
|
if (flags.declarations) {
|
|
246
248
|
const etsBin = (0, utils_1.importResolve)('egg-ts-helper/dist/bin', {
|
|
247
|
-
paths:
|
|
248
|
-
flags.base,
|
|
249
|
-
(0, utils_js_1.getSourceDirname)(),
|
|
250
|
-
],
|
|
249
|
+
paths: findPaths,
|
|
251
250
|
});
|
|
252
251
|
debug('run ets first: %o', etsBin);
|
|
253
252
|
await (0, runscript_1.runScript)(`node ${etsBin}`);
|
|
@@ -367,4 +366,4 @@ class BaseCommand extends core_1.Command {
|
|
|
367
366
|
}
|
|
368
367
|
}
|
|
369
368
|
exports.BaseCommand = BaseCommand;
|
|
370
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../../src/baseCommand.ts"],"names":[],"mappings":"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"}
|
|
369
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../../src/baseCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ class Cov extends test_js_1.default {
|
|
|
15
15
|
static examples = [
|
|
16
16
|
'<%= config.bin %> <%= command.id %>',
|
|
17
17
|
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
18
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
18
19
|
];
|
|
19
20
|
static flags = {
|
|
20
21
|
...test_js_1.default.flags,
|
|
@@ -94,4 +95,4 @@ class Cov extends test_js_1.default {
|
|
|
94
95
|
}
|
|
95
96
|
}
|
|
96
97
|
exports.default = Cov;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY292LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2Nvdi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDBEQUE2QjtBQUM3QixnRUFBa0M7QUFDbEMsc0NBQW9DO0FBQ3BDLHdEQUE2QjtBQUM3Qix3Q0FBNkM7QUFHN0MsNkRBQTZEO0FBQzdELGFBQWE7QUFDYixNQUFxQixHQUEwQixTQUFRLGlCQUFPO0lBQzVELE1BQU0sQ0FBVSxXQUFXLEdBQUcsNEJBQTRCLENBQUM7SUFFM0QsTUFBTSxDQUFVLFFBQVEsR0FBRztRQUN6QixxQ0FBcUM7UUFDckMsd0RBQXdEO1FBQ3hELDhFQUE4RTtLQUMvRSxDQUFDO0lBRUYsTUFBTSxDQUFVLEtBQUssR0FBRztRQUN0QixHQUFHLGlCQUFJLENBQUMsS0FBSztRQUNiLG1IQUFtSDtRQUNuSCxVQUFVLEVBQUUsWUFBSyxDQUFDLE9BQU8sQ0FBQztZQUN4QixXQUFXLEVBQUUsMENBQTBDO1NBQ3hELENBQUM7UUFDRixPQUFPLEVBQUUsWUFBSyxDQUFDLE1BQU0sQ0FBQztZQUNwQixXQUFXLEVBQUUsOENBQThDO1lBQzNELFFBQVEsRUFBRSxJQUFJO1lBQ2QsSUFBSSxFQUFFLEdBQUc7U0FDVixDQUFDO1FBQ0YsRUFBRSxFQUFFLFlBQUssQ0FBQyxNQUFNLENBQUM7WUFDZixXQUFXLEVBQUUsNkJBQTZCO1lBQzFDLE9BQU8sRUFBRSx1R0FBdUc7U0FDakgsQ0FBQztLQUNILENBQUM7SUFFRixJQUFjLGVBQWU7UUFDM0IsT0FBTztZQUNMLFVBQVU7WUFDVixXQUFXO1lBQ1gsVUFBVTtZQUNWLE9BQU87WUFDUCxtR0FBbUc7WUFDbkcsU0FBUztZQUNULGNBQWM7WUFDZCxjQUFjO1lBQ2QsaUJBQWlCO1lBQ2pCLG9CQUFvQjtZQUNwQixTQUFTO1lBQ1QsV0FBVztTQUNaLENBQUM7SUFDSixDQUFDO0lBRWtCLEtBQUssQ0FBQyxRQUFRLENBQUMsVUFBa0IsRUFB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
|
|
@@ -23,6 +23,7 @@ class Test extends baseCommand_js_1.BaseCommand {
|
|
|
23
23
|
static examples = [
|
|
24
24
|
'<%= config.bin %> <%= command.id %>',
|
|
25
25
|
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
26
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
26
27
|
'<%= config.bin %> <%= command.id %> --json',
|
|
27
28
|
'<%= config.bin %> <%= command.id %> --log-level debug',
|
|
28
29
|
];
|
|
@@ -205,4 +206,4 @@ class Test extends baseCommand_js_1.BaseCommand {
|
|
|
205
206
|
}
|
|
206
207
|
}
|
|
207
208
|
exports.default = Test;
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/test.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/baseCommand.js
CHANGED
|
@@ -183,14 +183,15 @@ export class BaseCommand extends Command {
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
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];
|
|
186
193
|
this.isESM = pkg.type === 'module';
|
|
187
194
|
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
195
|
flags.tscompiler = flags.tscompiler ?? 'ts-node/register';
|
|
195
196
|
const tsNodeRegister = importResolve(flags.tscompiler, {
|
|
196
197
|
paths: findPaths,
|
|
@@ -210,14 +211,15 @@ export class BaseCommand extends Command {
|
|
|
210
211
|
this.env.TS_NODE_FILES = process.env.TS_NODE_FILES ?? 'true';
|
|
211
212
|
// keep same logic with egg-core, test cmd load files need it
|
|
212
213
|
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L49
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
214
|
+
const tsConfigPathsRegister = importResolve('tsconfig-paths/register', {
|
|
215
|
+
paths: findPaths,
|
|
216
|
+
});
|
|
217
|
+
this.addNodeOptions(this.formatImportModule(tsConfigPathsRegister));
|
|
216
218
|
}
|
|
217
219
|
if (this.isESM) {
|
|
218
220
|
// use ts-node/esm loader on esm
|
|
219
221
|
let esmLoader = importResolve('ts-node/esm', {
|
|
220
|
-
paths:
|
|
222
|
+
paths: findPaths,
|
|
221
223
|
});
|
|
222
224
|
// ES Module loading with absolute path fails on windows
|
|
223
225
|
// https://github.com/nodejs/node/issues/31710#issuecomment-583916239
|
|
@@ -237,10 +239,7 @@ export class BaseCommand extends Command {
|
|
|
237
239
|
}
|
|
238
240
|
if (flags.declarations) {
|
|
239
241
|
const etsBin = importResolve('egg-ts-helper/dist/bin', {
|
|
240
|
-
paths:
|
|
241
|
-
flags.base,
|
|
242
|
-
getSourceDirname(),
|
|
243
|
-
],
|
|
242
|
+
paths: findPaths,
|
|
244
243
|
});
|
|
245
244
|
debug('run ets first: %o', etsBin);
|
|
246
245
|
await runScript(`node ${etsBin}`);
|
|
@@ -359,4 +358,4 @@ export class BaseCommand extends Command {
|
|
|
359
358
|
});
|
|
360
359
|
}
|
|
361
360
|
}
|
|
362
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../../src/baseCommand.ts"],"names":[],"mappings":"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"}
|
|
361
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../../src/baseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,IAAI,EAA6B,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAc,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,gBAAgB,EAChB,eAAe,EAAE,WAAW,GAC7B,MAAM,YAAY,CAAC;AAGpB,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAEjD,qDAAqD;AACrD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAgB,CAAC;AACzC,IAAI,OAAO,GAAG,KAAK,CAAC;AACpB,SAAS,QAAQ,CAAC,IAAkB;IAClC,iBAAiB;IACjB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnB,iBAAiB;IACjB,oBAAoB;IACpB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,MAAsB,CAAC;QAC3B,CAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACjD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;gBACvB,MAAM,GAAG,KAAuB,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAC7B,KAAK,CAAC,8CAA8C,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC/E,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,OAAO,SAAU,SAAQ,KAAK;IAClC,IAAI,CAAgB;IACpB,YAAY,OAAe,EAAE,IAAmB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AASD,MAAM,OAAgB,WAAsC,SAAQ,OAAO;IACzE,sBAAsB;IACtB,MAAM,CAAC,cAAc,GAAG,KAAK,CAAC;IAE9B,6EAA6E;IAC7E,MAAM,CAAC,SAAS,GAAG;QACjB,8BAA8B;QAC9B,qBAAqB;QACrB,yBAAyB;QACzB,mEAAmE;QACnE,2CAA2C;QAC3C,QAAQ;QACR,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;YACvB,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,uCAAuC;YAChD,IAAI,EAAE,GAAG;SACV,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,0BAA0B;YACnC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,2CAA2C;YACpD,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,0BAA0B;YACnC,OAAO,EAAE,CAAE,SAAS,CAAE;YACtB,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;SACvB,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACvB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,4CAA4C;YACrD,OAAO,EAAE,CAAE,KAAK,CAAE;SACnB,CAAC;QACF,oCAAoC;QACpC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC;YACxB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,gDAAgD;YAC7D,OAAO,EAAE,IAAI;SACd,CAAC;QACF,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC;YACf,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,6CAA6C;YAC1D,OAAO,EAAE,CAAE,MAAM,EAAE,OAAO,CAAE;SAC7B,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC;YACxB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,gCAAgC;YAC7C,OAAO,EAAE,CAAE,IAAI,CAAE;SAClB,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;YAC1B,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,qEAAqE;YAClF,OAAO,EAAE,CAAE,KAAK,CAAE;SACnB,CAAC;QACF,+EAA+E;QAC/E,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,oBAAoB;SAClC,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;YAC3B,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,sDAAsD;SACpE,CAAC;KACH,CAAC;IAEQ,KAAK,CAAY;IACjB,IAAI,CAAW;IAEf,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACzB,GAAG,CAAsB;IACzB,KAAK,CAAU;IACf,MAAM,CAAa;IACnB,cAAc,GAAa,EAAE,CAAC;IAEjC,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,CAAC,mCAAmC,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,SAAS,EAAG,KAAK,CAAC,IAA2B,CAAC,SAAS;YACvD,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;YACxC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,KAAiB,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAe,CAAC;QAE5B,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC7B,KAAK,CAAC,6BAA6B,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC5B,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAEtF,IAAI,UAAU,GAAY,KAAK,CAAC,UAAU,CAAC;QAC3C,gEAAgE;QAChE,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;YACxB,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;aAAM,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC;YAChC,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;QAED,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,8EAA8E;YAC9E,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO,EAAE,CAAC;gBACxC,UAAU,GAAG,KAAK,CAAC;gBACnB,KAAK,CAAC,6CAA6C,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACvF,CAAC;iBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC9C,UAAU,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,6CAA6C,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACtF,CAAC;iBAAM,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBACvD,2DAA2D;gBAC3D,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBACpC,KAAK,CAAC,iDAAiD,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC/F,CAAC;iBAAM,IAAI,GAAG,CAAC,YAAY,EAAE,UAAU,EAAE,CAAC;gBACxC,4EAA4E;gBAC5E,UAAU,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,0DAA0D,EAAE,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACvG,CAAC;iBAAM,IAAI,GAAG,CAAC,eAAe,EAAE,UAAU,EAAE,CAAC;gBAC3C,UAAU,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,6DAA6D,EAAE,IAAI,EAAE,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAC7G,CAAC;iBAAM,IAAI,MAAM,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzC,uBAAuB;gBACvB,UAAU,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,iDAAiD,EAAE,IAAI,CAAC,CAAC;YACjE,CAAC;iBAAM,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC5B,UAAU,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,2CAA2C,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC7E,CAAC;QACH,CAAC;QACD,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;YACtC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,6CAA6C;QAC7C,yDAAyD;QACzD,MAAM,SAAS,GAAa,CAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAE,CAAC;QACpD,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC;QACnC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,kBAAkB,CAAC;YAC1D,MAAM,cAAc,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE;gBACrD,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,KAAK,CAAC,UAAU,GAAG,cAAc,CAAC;YAClC,kFAAkF;YAClF,wEAAwE;YACxE,sCAAsC;YACtC,6CAA6C;YAC7C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;YAC7D,kCAAkC;YAClC,kFAAkF;YAClF,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC;YACjC,6CAA6C;YAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC;YACpC,sCAAsC;YACtC,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC;YAC7D,6DAA6D;YAC7D,iFAAiF;YACjF,MAAM,qBAAqB,GAAG,aAAa,CAAC,yBAAyB,EAAE;gBACrE,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,gCAAgC;YAChC,IAAI,SAAS,GAAG,aAAa,CAAC,aAAa,EAAE;gBAC3C,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,wDAAwD;YACxD,qEAAqE;YACrE,6DAA6D;YAC7D,kNAAkN;YAClN,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;YAC1C,uDAAuD;YACvD,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACrC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBAClD,6DAA6D;gBAC7D,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;gBAC9C,KAAK,CAAC,kDAAkD,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;QACD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,aAAa,CAAC,wBAAwB,EAAE;gBACrD,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YACnC,MAAM,SAAS,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAE,CAAC;YAChG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YACjC,gBAAgB,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YACrC,gBAAgB,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;YACjC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YAClC,sIAAsI;YACtI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;YACjC,KAAK,CAAC,uDAAuD,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACzF,CAAC;QAED,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxD,KAAK,CAAC,sBAAsB,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACrD,KAAK,CAAC,4BAA4B,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,KAAK,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,GAAgC;QACpD,yDAAyD;QACzD,mDAAmD;QACnD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,CAAoB;QAC1C,8EAA8E;QAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,cAAc;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;QACxC,IAAI,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,OAAmB,IAAI,EAAE,CAAC;QACxD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,WAAW,GAAG,CAAE,WAAW,CAAE,CAAC;QAChC,CAAC;QACD,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAkB,IAAI,EAAE,CAAC;QACtD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,UAAU,GAAG,CAAE,UAAU,CAAE,CAAC;QAC9B,CAAC;QACD,OAAO;YACL,GAAG,QAAQ;YACX,GAAG,OAAO;YACV,GAAG,WAAW;YACd,GAAG,UAAU;SACd,CAAC;IACJ,CAAC;IAES,kBAAkB,CAAC,UAAkB;QAC7C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,YAAY,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,CAAC;QACD,OAAO,aAAa,UAAU,EAAE,CAAC;IACnC,CAAC;IAES,cAAc,CAAC,OAAe;QACtC,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,EAAE,CAAC;YAChE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC;QAClC,CAAC;IACH,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,UAAkB,EAAE,QAAkB,EAAE,UAA2B,EAAE;QAC5F,MAAM,GAAG,GAAG;YACV,GAAG,IAAI,CAAC,GAAG;YACX,GAAG,OAAO,CAAC,GAAG;SACf,CAAC;QACF,MAAM,YAAY,GAAG;YACnB,GAAG,IAAI,CAAC,cAAc;YACtB,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE;SAC1B,CAAC;QACF,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1F,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,GAAG,YAAY,GAAG,OAAO,CAAC,QAAQ,GAAG,kBAAkB,GAAG,UAAU,IAAI,cAAc,EAAE,CAAC;QAC7G,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,OAAO,GAAG;YACR,KAAK,EAAE,SAAS;YAChB,GAAG;YACH,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACpB,GAAG,OAAO;YACV,QAAQ,EAAE,YAAY;SACvB,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,CAAC,8BAA8B,EAClC,IAAI,CAAC,GAAG,EACR,WAAW,CAAC,CAAC;QACf,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEf,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACvB,KAAK,CAAC,2BAA2B,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACnD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACtB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,UAAU,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,kBAAkB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;oBACnG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC"}
|
package/dist/esm/commands/cov.js
CHANGED
|
@@ -10,6 +10,7 @@ export default class Cov extends Test {
|
|
|
10
10
|
static examples = [
|
|
11
11
|
'<%= config.bin %> <%= command.id %>',
|
|
12
12
|
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
13
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
13
14
|
];
|
|
14
15
|
static flags = {
|
|
15
16
|
...Test.flags,
|
|
@@ -88,4 +89,4 @@ export default class Cov extends Test {
|
|
|
88
89
|
]);
|
|
89
90
|
}
|
|
90
91
|
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY292LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2Nvdi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwQyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUc3Qyw2REFBNkQ7QUFDN0QsYUFBYTtBQUNiLE1BQU0sQ0FBQyxPQUFPLE9BQU8sR0FBMEIsU0FBUSxJQUFPO0lBQzVELE1BQU0sQ0FBVSxXQUFXLEdBQUcsNEJBQTRCLENBQUM7SUFFM0QsTUFBTSxDQUFVLFFBQVEsR0FBRztRQUN6QixxQ0FBcUM7UUFDckMsd0RBQXdEO1FBQ3hELDhFQUE4RTtLQUMvRSxDQUFDO0lBRUYsTUFBTSxDQUFVLEtBQUssR0FBRztRQUN0QixHQUFHLElBQUksQ0FBQyxLQUFLO1FBQ2IsbUhBQW1IO1FBQ25ILFVBQVUsRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDO1lBQ3hCLFdBQVcsRUFBRSwwQ0FBMEM7U0FDeEQsQ0FBQztRQUNGLE9BQU8sRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ3BCLFdBQVcsRUFBRSw4Q0FBOEM7WUFDM0QsUUFBUSxFQUFFLElBQUk7WUFDZCxJQUFJLEVBQUUsR0FBRztTQUNWLENBQUM7UUFDRixFQUFFLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNmLFdBQVcsRUFBRSw2QkFBNkI7WUFDMUMsT0FBTyxFQUFFLHVHQUF1RztTQUNqSCxDQUFDO0tBQ0gsQ0FBQztJQUVGLElBQWMsZUFBZTtRQUMzQixPQUFPO1lBQ0wsVUFBVTtZQUNWLFdBQVc7WUFDWCxVQUFVO1lBQ1YsT0FBTztZQUNQLG1HQUFtRztZQUNuRyxTQUFTO1lBQ1QsY0FBYztZQUNkLGNBQWM7WUFDZCxpQkFBaUI7WUFDakIsb0JBQW9CO1lBQ3BCLFNBQVM7WUFDVCxXQUFXO1NBQ1osQ0FBQztJQUNKLENBQUM7SUFFa0IsS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUFrQixFQUFFLFFBQWtCLEVBQUUsVUFBMkIsRUFBRTtRQUNyRyxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsSUFBSSxDQUFDO1FBQ3ZCLElBQUksS0FBSyxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ3JCLElBQUksQ0FBQyxHQUFHLENBQUMsa0JBQWtCLEdBQUcsTUFBTSxDQUFDO1FBQ3ZDLENBQUM7UUFFRCxjQUFjO1FBQ2QsMkNBQTJDO1FBQzNDLE1BQU0sTUFBTSxHQUFHO1lBQ2IseUJBQXlCO1lBQ3pCLEdBQUcsS0FBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1NBQzdDLENBQUM7UUFDRixJQUFJLEtBQUssQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsR0FBRyxDQUFDLG9CQUFvQixHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxjQUFjLENBQUMsQ0FBQztZQUN0RSxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDckIsQ0FBQztRQUVELE1BQU0sUUFBUSxHQUFHLElBQUksR0FBRyxDQUFDO1lBQ3ZCLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUU7WUFDN0MsR0FBRyxJQUFJLENBQUMsZUFBZTtZQUN2QixHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7U0FDbkMsQ0FBQyxDQUFDO1FBQ0gsS0FBSyxNQUFNLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUMvQixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdkIsQ0FBQztRQUNELE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUM3QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUseUJBQXlCLENBQUMsQ0FBQztRQUNuRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN6RCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDdEQsTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFM0QsTUFBTSxRQUFRLEdBQUc7WUFDZixHQUFHLElBQUksQ0FBQyxjQUFjO1lBQ3RCLEdBQUcsT0FBTyxDQUFDLFFBQVEsSUFBSSxFQUFFO1NBQzFCLENBQUM7UUFDRixJQUFJLENBQUMsY0FBYyxHQUFHLEVBQUUsQ0FBQztRQUV6QixrQkFBa0I7UUFDbEIsTUFBTSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtZQUMzQixHQUFHLE1BQU07WUFDVCxPQUFPLENBQUMsUUFBUTtZQUNoQixHQUFHLFFBQVE7WUFDWCxVQUFVO1lBQ1YsR0FBRyxRQUFRO1NBQ1osQ0FBQyxDQUFDO0lBQ0wsQ0FBQyJ9
|
|
@@ -18,6 +18,7 @@ export default class Test extends BaseCommand {
|
|
|
18
18
|
static examples = [
|
|
19
19
|
'<%= config.bin %> <%= command.id %>',
|
|
20
20
|
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
21
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
21
22
|
'<%= config.bin %> <%= command.id %> --json',
|
|
22
23
|
'<%= config.bin %> <%= command.id %> --log-level debug',
|
|
23
24
|
];
|
|
@@ -199,4 +200,4 @@ export default class Test extends BaseCommand {
|
|
|
199
200
|
return files;
|
|
200
201
|
}
|
|
201
202
|
}
|
|
202
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/test.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -12,7 +12,7 @@ const __dirname = path.dirname(__filename);
|
|
|
12
12
|
|
|
13
13
|
async function main() {
|
|
14
14
|
// node postintall.js </path/to/egg-ts-helper/dist/bin> <framework-package-name>
|
|
15
|
-
const etsBinFile = process.argv[2] || importResolve('egg-ts-helper/dist/bin', {
|
|
15
|
+
const etsBinFile = process.argv[2] || importResolve('egg-ts-helper/dist/bin.js', {
|
|
16
16
|
paths: [ __dirname ],
|
|
17
17
|
});
|
|
18
18
|
const frameworkPackageName = process.argv[3] || 'egg';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/bin",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"cpy": "^8.1.2",
|
|
55
55
|
"cpy-cli": "^5.0.0",
|
|
56
56
|
"cross-env": "^7.0.3",
|
|
57
|
-
"egg": "
|
|
57
|
+
"egg": "^4.0.7",
|
|
58
58
|
"esbuild": "^0.17.7",
|
|
59
59
|
"esbuild-register": "^3.4.2",
|
|
60
60
|
"eslint": "8",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"typescript": "5"
|
|
68
68
|
},
|
|
69
69
|
"scripts": {
|
|
70
|
-
"postinstall
|
|
70
|
+
"postinstall": "node scripts/postinstall.mjs",
|
|
71
71
|
"lint": "eslint --cache src test --ext .ts",
|
|
72
72
|
"pretest": "npm run clean && npm run lint -- --fix && npm run prepublishOnly",
|
|
73
73
|
"test": "node bin/run.js test",
|
package/scripts/postinstall.mjs
CHANGED
|
@@ -12,7 +12,7 @@ const __dirname = path.dirname(__filename);
|
|
|
12
12
|
|
|
13
13
|
async function main() {
|
|
14
14
|
// node postintall.js </path/to/egg-ts-helper/dist/bin> <framework-package-name>
|
|
15
|
-
const etsBinFile = process.argv[2] || importResolve('egg-ts-helper/dist/bin', {
|
|
15
|
+
const etsBinFile = process.argv[2] || importResolve('egg-ts-helper/dist/bin.js', {
|
|
16
16
|
paths: [ __dirname ],
|
|
17
17
|
});
|
|
18
18
|
const frameworkPackageName = process.argv[3] || 'egg';
|
package/src/baseCommand.ts
CHANGED
|
@@ -201,15 +201,15 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
|
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
203
|
flags.typescript = typescript;
|
|
204
|
-
|
|
204
|
+
let rootDir = path.dirname(getSourceDirname());
|
|
205
|
+
if (path.basename(rootDir) === 'dist') {
|
|
206
|
+
rootDir = path.dirname(rootDir);
|
|
207
|
+
}
|
|
208
|
+
// try app baseDir first on custom tscompiler
|
|
209
|
+
// then try to find tscompiler in @eggjs/bin/node_modules
|
|
210
|
+
const findPaths: string[] = [ flags.base, rootDir ];
|
|
205
211
|
this.isESM = pkg.type === 'module';
|
|
206
212
|
if (typescript) {
|
|
207
|
-
const findPaths: string[] = [ getSourceDirname() ];
|
|
208
|
-
if (flags.tscompiler) {
|
|
209
|
-
// try app baseDir first on custom tscompiler
|
|
210
|
-
// then try to find tscompiler in @eggjs/bin/node_modules
|
|
211
|
-
findPaths.unshift(flags.base);
|
|
212
|
-
}
|
|
213
213
|
flags.tscompiler = flags.tscompiler ?? 'ts-node/register';
|
|
214
214
|
const tsNodeRegister = importResolve(flags.tscompiler, {
|
|
215
215
|
paths: findPaths,
|
|
@@ -229,14 +229,15 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
|
|
|
229
229
|
this.env.TS_NODE_FILES = process.env.TS_NODE_FILES ?? 'true';
|
|
230
230
|
// keep same logic with egg-core, test cmd load files need it
|
|
231
231
|
// see https://github.com/eggjs/egg-core/blob/master/lib/loader/egg_loader.js#L49
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
232
|
+
const tsConfigPathsRegister = importResolve('tsconfig-paths/register', {
|
|
233
|
+
paths: findPaths,
|
|
234
|
+
});
|
|
235
|
+
this.addNodeOptions(this.formatImportModule(tsConfigPathsRegister));
|
|
235
236
|
}
|
|
236
237
|
if (this.isESM) {
|
|
237
238
|
// use ts-node/esm loader on esm
|
|
238
239
|
let esmLoader = importResolve('ts-node/esm', {
|
|
239
|
-
paths:
|
|
240
|
+
paths: findPaths,
|
|
240
241
|
});
|
|
241
242
|
// ES Module loading with absolute path fails on windows
|
|
242
243
|
// https://github.com/nodejs/node/issues/31710#issuecomment-583916239
|
|
@@ -257,10 +258,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
|
|
|
257
258
|
}
|
|
258
259
|
if (flags.declarations) {
|
|
259
260
|
const etsBin = importResolve('egg-ts-helper/dist/bin', {
|
|
260
|
-
paths:
|
|
261
|
-
flags.base,
|
|
262
|
-
getSourceDirname(),
|
|
263
|
-
],
|
|
261
|
+
paths: findPaths,
|
|
264
262
|
});
|
|
265
263
|
debug('run ets first: %o', etsBin);
|
|
266
264
|
await runScript(`node ${etsBin}`);
|
package/src/commands/cov.ts
CHANGED
|
@@ -13,6 +13,7 @@ export default class Cov<T extends typeof Cov> extends Test<T> {
|
|
|
13
13
|
static override examples = [
|
|
14
14
|
'<%= config.bin %> <%= command.id %>',
|
|
15
15
|
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
16
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
16
17
|
];
|
|
17
18
|
|
|
18
19
|
static override flags = {
|
package/src/commands/test.ts
CHANGED
|
@@ -22,6 +22,7 @@ export default class Test<T extends typeof Test> extends BaseCommand<T> {
|
|
|
22
22
|
static override examples = [
|
|
23
23
|
'<%= config.bin %> <%= command.id %>',
|
|
24
24
|
'<%= config.bin %> <%= command.id %> test/index.test.ts',
|
|
25
|
+
'<%= config.bin %> <%= command.id %> test/index.test.ts,test/user.test.ts,...',
|
|
25
26
|
'<%= config.bin %> <%= command.id %> --json',
|
|
26
27
|
'<%= config.bin %> <%= command.id %> --log-level debug',
|
|
27
28
|
];
|