@haibun/cli 1.27.2 → 1.27.4
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/BaseOptions.d.ts +4 -0
- package/build/BaseOptions.js +4 -4
- package/build/BaseOptions.js.map +1 -1
- package/build/cli.js +11 -8
- package/build/cli.js.map +1 -1
- package/build/lib.test.js +4 -4
- package/build/lib.test.js.map +1 -1
- package/package.json +3 -3
package/build/BaseOptions.d.ts
CHANGED
package/build/BaseOptions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { DEFAULT_DEST } from "@haibun/core/build/lib/defs.js";
|
|
1
|
+
import { DEFAULT_DEST, STAY_ALWAYS } from "@haibun/core/build/lib/defs.js";
|
|
2
2
|
import { LOGGER_LEVELS } from "@haibun/core/build/lib/Logger.js";
|
|
3
|
-
import { boolOrError, intOrError } from "@haibun/core/build/lib/util/index.js";
|
|
3
|
+
import { boolOrError, intOrError, optionOrError } from "@haibun/core/build/lib/util/index.js";
|
|
4
4
|
export class BaseOptions {
|
|
5
5
|
static options = {
|
|
6
6
|
SPLIT_SHARED: {
|
|
@@ -36,8 +36,8 @@ export class BaseOptions {
|
|
|
36
36
|
parse: (result) => ({ result })
|
|
37
37
|
},
|
|
38
38
|
STAY: {
|
|
39
|
-
desc: 'stay running after execution:
|
|
40
|
-
parse: (result) => (
|
|
39
|
+
desc: 'stay running after execution: ${STAY_ALWAYS}',
|
|
40
|
+
parse: (result) => optionOrError(result, [STAY_ALWAYS])
|
|
41
41
|
},
|
|
42
42
|
LOG_FOLLOW: {
|
|
43
43
|
desc: 'filter for output',
|
package/build/BaseOptions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseOptions.js","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"BaseOptions.js","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":"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"}
|
package/build/cli.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import sourceMapSupport from 'source-map-support';
|
|
3
3
|
import repl from 'repl';
|
|
4
|
+
import { STAY_ALWAYS } from '@haibun/core/build/lib/defs.js';
|
|
4
5
|
import { findStepper, getConfigFromBase, getDefaultOptions, basesFrom } from '@haibun/core/build/lib/util/index.js';
|
|
5
6
|
import runWithOptions from '@haibun/core/build/lib/run-with-options.js';
|
|
6
7
|
import { processArgs, processBaseEnvToOptionsAndErrors, usageThenExit } from './lib.js';
|
|
@@ -8,12 +9,12 @@ import { Timer } from '@haibun/core/build/lib/Timer.js';
|
|
|
8
9
|
import { writeFileSync } from 'fs';
|
|
9
10
|
sourceMapSupport.install();
|
|
10
11
|
process.on('unhandledRejection', console.error);
|
|
11
|
-
go();
|
|
12
|
+
go().catch(console.error);
|
|
12
13
|
async function go() {
|
|
13
14
|
const { params, configLoc, showHelp } = processArgs(process.argv.slice(2));
|
|
14
15
|
const featureFilter = params[1] ? params[1].split(',') : undefined;
|
|
15
16
|
const bases = basesFrom(params[0]?.replace(/\/$/, ''));
|
|
16
|
-
const specl = getSpeclOrExit(configLoc ? [configLoc] : bases);
|
|
17
|
+
const specl = await getSpeclOrExit(configLoc ? [configLoc] : bases);
|
|
17
18
|
if (showHelp) {
|
|
18
19
|
await usageThenExit(specl);
|
|
19
20
|
}
|
|
@@ -30,9 +31,9 @@ async function go() {
|
|
|
30
31
|
if (outputDest && !output) {
|
|
31
32
|
await usageThenExit(specl, 'OUTPUT_DEST requires OUTPUT');
|
|
32
33
|
}
|
|
34
|
+
let running;
|
|
33
35
|
const startRunCallback = (world) => {
|
|
34
|
-
|
|
35
|
-
repl.start().context.runtime = world.runtime;
|
|
36
|
+
running = (protoOptions.options.CLI) ? repl.start({ prompt: 'repl: ', useColors: true, useGlobal: true }).context.haibun = { world } : undefined;
|
|
36
37
|
};
|
|
37
38
|
let endFeatureCallback = undefined;
|
|
38
39
|
if (trace) {
|
|
@@ -40,6 +41,8 @@ async function go() {
|
|
|
40
41
|
const { world, result, steppers, startOffset } = params;
|
|
41
42
|
const tracker = findStepper(steppers, 'OutReviews');
|
|
42
43
|
const loc = { ...world };
|
|
44
|
+
if (running)
|
|
45
|
+
running.context.haibun.step = { world, result, steppers, startOffset };
|
|
43
46
|
await tracker.writeTracksFile({ ...loc, mediaType: "json" /* EMediaTypes.json */ }, title, result, Timer.startTime, startOffset);
|
|
44
47
|
};
|
|
45
48
|
}
|
|
@@ -65,20 +68,20 @@ async function go() {
|
|
|
65
68
|
logger.error('failures:' + JSON.stringify(allFailures, null, 2));
|
|
66
69
|
}
|
|
67
70
|
console.info('\nRESULT>>>', { ok, startDate: Timer.startTime, startTime: Timer.startTime, passed, failed, totalRan, runTime, 'features/s:': totalRan / runTime });
|
|
68
|
-
if (ok && exceptionResults.length < 1 && protoOptions.options.STAY !==
|
|
71
|
+
if (ok && exceptionResults.length < 1 && protoOptions.options.STAY !== STAY_ALWAYS) {
|
|
69
72
|
process.exit(0);
|
|
70
73
|
}
|
|
71
|
-
else if (protoOptions.options.STAY !==
|
|
74
|
+
else if (protoOptions.options.STAY !== STAY_ALWAYS) {
|
|
72
75
|
process.exit(1);
|
|
73
76
|
}
|
|
74
77
|
}
|
|
75
|
-
function getSpeclOrExit(bases) {
|
|
78
|
+
async function getSpeclOrExit(bases) {
|
|
76
79
|
const specl = getConfigFromBase(bases);
|
|
77
80
|
if (specl === null || bases?.length < 1) {
|
|
78
81
|
if (specl === null) {
|
|
79
82
|
console.error(`missing or unusable config.json from ${bases}`);
|
|
80
83
|
}
|
|
81
|
-
usageThenExit(specl ? specl : getDefaultOptions());
|
|
84
|
+
await usageThenExit(specl ? specl : getDefaultOptions());
|
|
82
85
|
}
|
|
83
86
|
return specl;
|
|
84
87
|
}
|
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;AAClD,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/build/lib.test.js
CHANGED
|
@@ -8,17 +8,17 @@ import * as lib from './lib.js';
|
|
|
8
8
|
import { processBaseEnvToOptionsAndErrors } from './lib.js';
|
|
9
9
|
const s = s => s.split(' ');
|
|
10
10
|
describe('usageThenExit', () => {
|
|
11
|
-
it('exits with success', () => {
|
|
11
|
+
it('exits with success', async () => {
|
|
12
12
|
const ranOnce = (code) => { expect(code).toBe(0); return undefined; };
|
|
13
13
|
jest.spyOn(process, 'exit').mockImplementationOnce(ranOnce);
|
|
14
14
|
jest.spyOn(console, 'info').mockImplementationOnce(() => undefined);
|
|
15
|
-
lib.usageThenExit({ ...getDefaultOptions(), steppers: ['../core/build/lib/test/TestStepsWithOptions'] });
|
|
15
|
+
await lib.usageThenExit({ ...getDefaultOptions(), steppers: ['../core/build/lib/test/TestStepsWithOptions'] });
|
|
16
16
|
});
|
|
17
|
-
it('exits with error', () => {
|
|
17
|
+
it('exits with error', async () => {
|
|
18
18
|
const ranOnce = (code) => { expect(code).toBe(1); return undefined; };
|
|
19
19
|
jest.spyOn(process, 'exit').mockImplementationOnce(ranOnce);
|
|
20
20
|
jest.spyOn(console, 'error').mockImplementationOnce(() => undefined);
|
|
21
|
-
lib.usageThenExit({ ...getDefaultOptions(), steppers: ['../core/build/lib/test/TestStepsWithOptions'] }, 'woops');
|
|
21
|
+
await lib.usageThenExit({ ...getDefaultOptions(), steppers: ['../core/build/lib/test/TestStepsWithOptions'] }, 'woops');
|
|
22
22
|
});
|
|
23
23
|
});
|
|
24
24
|
describe('options', () => {
|
package/build/lib.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../src/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,oCAAoC,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC5G,OAAO,SAAS,MAAM,0CAA0C,CAAC;AACjE,OAAO,oBAAoB,MAAM,qDAAqD,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAE5D,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE5B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../src/lib.test.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.27.
|
|
4
|
+
"version": "1.27.4",
|
|
5
5
|
"description": "command line execution for @haibun",
|
|
6
6
|
"bin": {
|
|
7
7
|
"haibun-cli": "build/cli.js"
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
"author": "",
|
|
23
23
|
"license": "ISC",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@haibun/core": "1.27.
|
|
26
|
-
"@haibun/domain-storage": "1.27.
|
|
25
|
+
"@haibun/core": "1.27.4",
|
|
26
|
+
"@haibun/domain-storage": "1.27.4",
|
|
27
27
|
"source-map-support": "^0.5.21"
|
|
28
28
|
},
|
|
29
29
|
"gitHead": "7cf9680bd922fb622fb59f1e6bf5b65284cb8fd5"
|