@haibun/cli 1.19.0 → 1.21.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/build/cli.js +13 -13
- package/build/cli.js.map +1 -1
- package/package.json +4 -4
package/build/cli.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import sourceMapSupport from 'source-map-support';
|
|
3
|
-
sourceMapSupport.install();
|
|
4
|
-
process.on('unhandledRejection', console.error);
|
|
5
3
|
import repl from 'repl';
|
|
6
|
-
import { findStepper, getConfigFromBase, getDefaultOptions } from '@haibun/core/build/lib/util/index.js';
|
|
4
|
+
import { findStepper, getConfigFromBase, getDefaultOptions, basesFrom } from '@haibun/core/build/lib/util/index.js';
|
|
7
5
|
import runWithOptions from '@haibun/core/build/lib/run-with-options.js';
|
|
8
6
|
import { processBaseEnvToOptionsAndErrors, usageThenExit } from './lib.js';
|
|
9
7
|
import { Timer } from '@haibun/core/build/lib/Timer.js';
|
|
8
|
+
sourceMapSupport.install();
|
|
9
|
+
process.on('unhandledRejection', console.error);
|
|
10
10
|
go();
|
|
11
11
|
async function go() {
|
|
12
12
|
const featureFilter = process.argv[3] ? process.argv[3].split(',') : undefined;
|
|
13
|
-
const
|
|
14
|
-
const specl = getSpeclOrExit(
|
|
13
|
+
const bases = basesFrom(process.argv[2]?.replace(/\/$/, ''));
|
|
14
|
+
const specl = getSpeclOrExit(bases, featureFilter);
|
|
15
15
|
const { protoOptions, errors } = processBaseEnvToOptionsAndErrors(process.env, specl.options);
|
|
16
16
|
const splits = protoOptions.options.SPLITS || [{}];
|
|
17
17
|
if (errors.length > 0) {
|
|
@@ -21,7 +21,7 @@ async function go() {
|
|
|
21
21
|
const loops = protoOptions.options.LOOPS || 1;
|
|
22
22
|
const members = protoOptions.options.MEMBERS || 1;
|
|
23
23
|
const trace = protoOptions.options.TRACE;
|
|
24
|
-
const title = protoOptions.options.TITLE ||
|
|
24
|
+
const title = protoOptions.options.TITLE || bases + ' ' + [...featureFilter || []].join(',');
|
|
25
25
|
const startRunCallback = (world) => {
|
|
26
26
|
if (protoOptions.options.CLI)
|
|
27
27
|
repl.start().context.runtime = world.runtime;
|
|
@@ -35,13 +35,13 @@ async function go() {
|
|
|
35
35
|
await tracker.writeTracksFile({ ...loc, mediaType: "json" /* EMediaTypes.json */ }, title, result, Timer.startTime, startOffset);
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
|
-
const runOptions = { featureFilter, loops, members, splits, trace, specl,
|
|
38
|
+
const runOptions = { featureFilter, loops, members, splits, trace, specl, bases, protoOptions, startRunCallback, endFeatureCallback };
|
|
39
39
|
const { ok, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime } = await runWithOptions(runOptions);
|
|
40
40
|
if (ok && exceptionResults.length < 1) {
|
|
41
|
-
logger.log(ranResults.every((r) => r.output));
|
|
41
|
+
logger.log('OK ' + ranResults.every((r) => r.output));
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
|
-
|
|
44
|
+
logger.error('failures:' + JSON.stringify(allFailures, null, 2));
|
|
45
45
|
}
|
|
46
46
|
console.info('\nRESULT>>>', { ok, startDate: Timer.startTime, startTime: Timer.startTime, passed, failed, totalRan, runTime, 'features/s:': totalRan / runTime });
|
|
47
47
|
if (ok && exceptionResults.length < 1 && protoOptions.options.STAY !== 'always') {
|
|
@@ -51,12 +51,12 @@ async function go() {
|
|
|
51
51
|
process.exit(1);
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
-
function getSpeclOrExit(
|
|
55
|
-
const specl = getConfigFromBase(
|
|
54
|
+
function getSpeclOrExit(bases, featureFilter) {
|
|
55
|
+
const specl = getConfigFromBase(bases);
|
|
56
56
|
const askForHelp = featureFilter?.find(f => f === '--help' || f === '-h');
|
|
57
|
-
if (specl === null || !
|
|
57
|
+
if (specl === null || !bases || askForHelp) {
|
|
58
58
|
if (specl === null) {
|
|
59
|
-
console.error(`missing or unusable ${
|
|
59
|
+
console.error(`missing or unusable ${bases}/config.json`);
|
|
60
60
|
}
|
|
61
61
|
usageThenExit(specl ? specl : getDefaultOptions());
|
|
62
62
|
}
|
package/build/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/cli",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.21.0",
|
|
5
5
|
"description": "command line execution for @haibun",
|
|
6
6
|
"bin": {
|
|
7
7
|
"haibun-cli": "build/cli.js"
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"author": "",
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@haibun/core": "^1.
|
|
25
|
-
"@haibun/domain-storage": "^1.
|
|
24
|
+
"@haibun/core": "^1.21.0",
|
|
25
|
+
"@haibun/domain-storage": "^1.20.0",
|
|
26
26
|
"source-map-support": "^0.5.21"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "7cf9680bd922fb622fb59f1e6bf5b65284cb8fd5"
|
|
29
29
|
}
|