@haibun/cli 1.0.3 → 1.1.2
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.d.ts.map +1 -1
- package/build/cli.js +19 -16
- package/build/cli.js.map +1 -1
- package/build/lib.d.ts +3 -1
- package/build/lib.d.ts.map +1 -1
- package/build/lib.js +37 -9
- package/build/lib.js.map +1 -1
- package/build/lib.test.d.ts +2 -0
- package/build/lib.test.d.ts.map +1 -0
- package/build/lib.test.js +43 -0
- package/build/lib.test.js.map +1 -0
- package/package.json +4 -2
package/build/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAiB,OAAO,EAAkB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAiB,OAAO,EAAkB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAS/D,oBAAY,UAAU,GAAG;IAAE,MAAM,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,YAAY,CAAC;IAAC,GAAG,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC"}
|
package/build/cli.js
CHANGED
|
@@ -10,28 +10,28 @@ const Logger_1 = __importDefault(require("@haibun/core/build/lib/Logger"));
|
|
|
10
10
|
const run_1 = require("@haibun/core/build/lib/run");
|
|
11
11
|
const util_1 = require("@haibun/core/build/lib/util");
|
|
12
12
|
const lib_1 = require("./lib");
|
|
13
|
+
const Timer_1 = require("@haibun/core/build/lib/Timer");
|
|
13
14
|
go();
|
|
14
15
|
async function go() {
|
|
15
16
|
const featureFilter = process.argv[3];
|
|
17
|
+
const base = process.argv[2].replace(/\/$/, '');
|
|
18
|
+
const specl = util_1.getOptionsOrDefault(base);
|
|
16
19
|
if (!process.argv[2] || featureFilter === '--help') {
|
|
17
|
-
lib_1.usageThenExit();
|
|
20
|
+
await lib_1.usageThenExit(specl);
|
|
18
21
|
}
|
|
19
22
|
console.log('\n_________________________________ start');
|
|
20
|
-
const base = process.argv[2].replace(/\/$/, '');
|
|
21
|
-
const specl = util_1.getOptionsOrDefault(base);
|
|
22
23
|
const { protoOptions, errors } = util_1.processEnv(process.env, specl.options);
|
|
23
24
|
const splits = protoOptions.options.splits || [{}];
|
|
24
25
|
if (errors.length > 0) {
|
|
25
|
-
lib_1.usageThenExit(errors.join('\n'));
|
|
26
|
+
await lib_1.usageThenExit(specl, errors.join('\n'));
|
|
26
27
|
}
|
|
27
28
|
const logger = new Logger_1.default({ level: protoOptions.options.logLevel || 'debug', follow: protoOptions.options.logFollow });
|
|
28
29
|
let allRunResults = [];
|
|
29
30
|
const loops = protoOptions.options.loops || 1;
|
|
30
31
|
const members = protoOptions.options.members || 1;
|
|
31
|
-
const trace =
|
|
32
|
+
const trace = protoOptions.options.trace;
|
|
33
|
+
const timer = new Timer_1.Timer();
|
|
32
34
|
let totalRan = 0;
|
|
33
|
-
let startTime = process.hrtime();
|
|
34
|
-
let startDate = new Date();
|
|
35
35
|
let allFailures = {};
|
|
36
36
|
for (let loop = 1; loop < loops + 1; loop++) {
|
|
37
37
|
if (loops > 1) {
|
|
@@ -46,7 +46,7 @@ async function go() {
|
|
|
46
46
|
const runtime = {};
|
|
47
47
|
const tag = util_1.getRunTag(totalRan, loop, member, split, trace);
|
|
48
48
|
totalRan++;
|
|
49
|
-
return doRun(base, specl, runtime, featureFilter, new contexts_1.WorldContext(tag, split), protoOptions, logger, tag,
|
|
49
|
+
return doRun(base, specl, runtime, featureFilter, new contexts_1.WorldContext(tag, split), protoOptions, logger, tag, timer);
|
|
50
50
|
});
|
|
51
51
|
groupRuns = groupRuns.concat(instances);
|
|
52
52
|
}
|
|
@@ -86,8 +86,8 @@ async function go() {
|
|
|
86
86
|
.filter((i) => i.status === 'rejected')
|
|
87
87
|
.map((i) => i)
|
|
88
88
|
.map((i) => i.reason);
|
|
89
|
-
const ok = ranResults.every((a) => a.result.ok);
|
|
90
|
-
if (ok
|
|
89
|
+
const ok = ranResults.every((a) => a.result.ok) && exceptionResults.length < 1;
|
|
90
|
+
if (ok) {
|
|
91
91
|
logger.log(ranResults.every((r) => r.output));
|
|
92
92
|
}
|
|
93
93
|
else {
|
|
@@ -98,25 +98,28 @@ async function go() {
|
|
|
98
98
|
console.error(ranResults[0].result.failure);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
|
-
const runTime =
|
|
101
|
+
const runTime = timer.since();
|
|
102
102
|
console.log(JSON.stringify(allFailures, null, 2));
|
|
103
|
-
console.log('\nRESULT>>>', { ok, startDate, startTime:
|
|
104
|
-
if (ok &&
|
|
103
|
+
console.log('\nRESULT>>>', { ok, startDate: Timer_1.Timer.startTime, startTime: Timer_1.Timer.startTime.getTime(), passed, failed, totalRan, runTime, 'features/s:': totalRan / runTime });
|
|
104
|
+
if (ok && protoOptions.options.stay !== 'always') {
|
|
105
105
|
process.exit(0);
|
|
106
106
|
}
|
|
107
107
|
else if (protoOptions.options.stay !== 'always') {
|
|
108
108
|
process.exit(1);
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
-
async function doRun(base, specl, runtime, featureFilter, shared, protoOptions, containerLogger, tag,
|
|
111
|
+
async function doRun(base, specl, runtime, featureFilter, shared, protoOptions, containerLogger, tag, timer) {
|
|
112
112
|
if (protoOptions.options.cli) {
|
|
113
113
|
repl_1.default.start().context.runtime = runtime;
|
|
114
114
|
}
|
|
115
115
|
const runStart = process.hrtime();
|
|
116
116
|
const logger = new Logger_1.default({ output: containerLogger, tag });
|
|
117
|
-
const world = { ...protoOptions, shared, logger, runtime, domains: [], tag };
|
|
117
|
+
const world = { ...protoOptions, shared, logger, runtime, domains: [], tag, timer };
|
|
118
118
|
const { result } = await run_1.run({ specl, base, world, featureFilter, protoOptions });
|
|
119
|
+
if (world.options.trace) {
|
|
120
|
+
util_1.writeTraceFile(world.tag, result);
|
|
121
|
+
}
|
|
119
122
|
const output = await util_1.resultOutput(process.env.HAIBUN_OUTPUT, result, shared);
|
|
120
|
-
return { result, shared, output, tag, runStart: runStart[0], runDuration: process.hrtime(runStart)[0], fromStart:
|
|
123
|
+
return { result, shared, output, tag, runStart: runStart[0], runDuration: process.hrtime(runStart)[0], fromStart: timer.since() };
|
|
121
124
|
}
|
|
122
125
|
//# sourceMappingURL=cli.js.map
|
package/build/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AAExB,8DAA+D;AAC/D,2EAAmD;AAEnD,oDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/build/lib.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { TSpecl } from "@haibun/core/build/lib/defs";
|
|
1
2
|
import { TRunResult } from "./cli";
|
|
2
|
-
export declare function usageThenExit(message?: string): void
|
|
3
|
+
export declare function usageThenExit(specl: TSpecl, message?: string): Promise<void>;
|
|
4
|
+
export declare function usage(specl: TSpecl, message?: string): Promise<string>;
|
|
3
5
|
export declare function ranResultError(ranResults: TRunResult[], exceptionResults: any[]): any;
|
|
4
6
|
//# sourceMappingURL=lib.d.ts.map
|
package/build/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAG,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAYnC,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,iBAIlE;AAED,wBAAsB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,mBAuB1D;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG,GAAG,CAWrF"}
|
package/build/lib.js
CHANGED
|
@@ -1,19 +1,47 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ranResultError = exports.usageThenExit = void 0;
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
exports.ranResultError = exports.usage = exports.usageThenExit = void 0;
|
|
4
|
+
const lib_1 = require("@haibun/core/build/lib/test/lib");
|
|
5
|
+
const util_1 = require("@haibun/core/build/lib/util");
|
|
6
|
+
const BASE_VARS = {
|
|
7
|
+
HAIBUN_OUTPUT: { desc: 'Output format (AsXUnit)' },
|
|
8
|
+
HAIBUN_CLI: { desc: 'start a cli for each instance' },
|
|
9
|
+
HAIBUN_LOG_LEVEL: { desc: 'log level (debug, log, info, warn, error, none)' },
|
|
10
|
+
HAIBUN_SPLIT_SHARED: { desc: 'Use vars for split instances (=ex=1,2,3)' },
|
|
11
|
+
PWDEBUG: { desc: '(web) Enable Playwright debugging (0 or 1)' },
|
|
12
|
+
HAIBUN_STEP_DELAY: { desc: 'ms to wait between every step' },
|
|
13
|
+
HAIBUN_STAY: { desc: 'ok or error' }
|
|
14
|
+
};
|
|
15
|
+
async function usageThenExit(specl, message) {
|
|
16
|
+
const output = await usage(specl, message);
|
|
17
|
+
console[message ? 'error' : 'info'](output);
|
|
18
|
+
process.exit(message ? 1 : 0);
|
|
19
|
+
}
|
|
20
|
+
exports.usageThenExit = usageThenExit;
|
|
21
|
+
;
|
|
22
|
+
async function usage(specl, message) {
|
|
23
|
+
let steppers = await util_1.getSteppers({ steppers: specl.steppers, world: lib_1.getDefaultWorld(0).world });
|
|
24
|
+
let a = {};
|
|
25
|
+
steppers.forEach(s => {
|
|
26
|
+
const o = s;
|
|
27
|
+
if (o.options) {
|
|
28
|
+
const p = util_1.getPre(s);
|
|
29
|
+
a = { ...a, ...Object.keys(o.options).reduce((a, i) => ({ ...a, [`${p}${i}`]: o.options[i] }), {}) };
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
const ret = [
|
|
7
33
|
'',
|
|
8
34
|
`usage: ${process.argv[1]} <project base>`,
|
|
9
35
|
message || '',
|
|
10
36
|
'Set these environmental variables to control options:\n',
|
|
11
|
-
...Object.entries(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
37
|
+
...Object.entries(BASE_VARS).map(([k, v]) => `${k.padEnd(55)} ${v.desc}`),
|
|
38
|
+
];
|
|
39
|
+
if (Object.keys(a).length) {
|
|
40
|
+
ret.push('\nThese variables are available for selected extensions (via config.js)\n', ...Object.entries(a).map(([k, v]) => `${k.padEnd(55)} ${v.desc}`));
|
|
41
|
+
}
|
|
42
|
+
return [...ret, ''].join('\n');
|
|
15
43
|
}
|
|
16
|
-
exports.
|
|
44
|
+
exports.usage = usage;
|
|
17
45
|
function ranResultError(ranResults, exceptionResults) {
|
|
18
46
|
return JSON.stringify({
|
|
19
47
|
ran: ranResults
|
package/build/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lib.test.d.ts","sourceRoot":"","sources":["../src/lib.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const lib_1 = require("@haibun/core/build/lib/test/lib");
|
|
7
|
+
const TestSteps_1 = __importDefault(require("@haibun/core/build/lib/test/TestSteps"));
|
|
8
|
+
const TestStepsWithOptions_1 = __importDefault(require("@haibun/core/build/lib/test/TestStepsWithOptions"));
|
|
9
|
+
const util_1 = require("@haibun/core/build/lib/util");
|
|
10
|
+
const lib_2 = require("./lib");
|
|
11
|
+
describe('usageThenExit', () => {
|
|
12
|
+
it('exits with success', () => {
|
|
13
|
+
const ranOnce = (code) => { expect(code).toBe(0); return undefined; };
|
|
14
|
+
jest.spyOn(process, 'exit').mockImplementationOnce(ranOnce);
|
|
15
|
+
jest.spyOn(console, 'info').mockImplementationOnce(any => undefined);
|
|
16
|
+
lib_2.usageThenExit({ ...util_1.getDefaultOptions(), steppers: ['../core/src/lib/test/TestStepsWithOptions'] });
|
|
17
|
+
});
|
|
18
|
+
it('exits with error', () => {
|
|
19
|
+
const ranOnce = (code) => { expect(code).toBe(1); return undefined; };
|
|
20
|
+
jest.spyOn(process, 'exit').mockImplementationOnce(ranOnce);
|
|
21
|
+
jest.spyOn(console, 'error').mockImplementationOnce(() => undefined);
|
|
22
|
+
lib_2.usageThenExit({ ...util_1.getDefaultOptions(), steppers: ['../core/src/lib/test/TestStepsWithOptions'] }, 'woops');
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
describe('options', () => {
|
|
26
|
+
it('stepper options', async () => {
|
|
27
|
+
const feature = { path: '/features/test.feature', content: `When I have a stepper option` };
|
|
28
|
+
const { protoOptions: protoConfig } = util_1.processEnv({ [lib_1.HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS]: 'true' }, {});
|
|
29
|
+
const { result } = await lib_1.testWithDefaults([feature], [TestStepsWithOptions_1.default], protoConfig);
|
|
30
|
+
expect(result.ok).toBe(true);
|
|
31
|
+
expect(result.results?.length).toBe(1);
|
|
32
|
+
expect(result.results[0].stepResults[0].actionResults[0].topics?.options.summary).toEqual('options');
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
describe('builds', () => {
|
|
36
|
+
it('builds with finalizer', async () => {
|
|
37
|
+
const feature = { path: '/features/test.feature', content: `builds with finalizer` };
|
|
38
|
+
const { result, world } = await lib_1.testWithDefaults([feature], [TestSteps_1.default]);
|
|
39
|
+
expect(result.ok).toBe(true);
|
|
40
|
+
expect(world.shared.get('done')).toEqual('ok');
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
//# sourceMappingURL=lib.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../src/lib.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "command line execution for @haibun",
|
|
5
5
|
"bin": {
|
|
6
6
|
"haibun-cli": "build/cli.js"
|
|
@@ -10,7 +10,9 @@
|
|
|
10
10
|
],
|
|
11
11
|
"scripts": {
|
|
12
12
|
"prepublishOnly": "tsc -b .",
|
|
13
|
-
"
|
|
13
|
+
"build": "tsc -b .",
|
|
14
|
+
"test": "jest --config jest.config.ts",
|
|
15
|
+
"test-watch": "jest --watch"
|
|
14
16
|
},
|
|
15
17
|
"keywords": [],
|
|
16
18
|
"author": "",
|