@haibun/cli 1.1.5 → 1.8.1
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 +22 -26
- package/build/BaseOptions.d.ts.map +1 -1
- package/build/BaseOptions.js +32 -19
- package/build/BaseOptions.js.map +1 -1
- package/build/BaseOptions.test.js +3 -2
- package/build/BaseOptions.test.js.map +1 -1
- package/build/cli.js +24 -13
- package/build/cli.js.map +1 -1
- package/build/lib.d.ts.map +1 -1
- package/build/lib.js +9 -8
- package/build/lib.js.map +1 -1
- package/build/lib.test.js +12 -11
- package/build/lib.test.js.map +1 -1
- package/package.json +7 -5
package/build/BaseOptions.d.ts
CHANGED
|
@@ -23,6 +23,16 @@ export declare class BaseOptions implements IHasOptions {
|
|
|
23
23
|
error?: undefined;
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
+
REVIEWS: {
|
|
27
|
+
desc: string;
|
|
28
|
+
parse: (input: string) => {
|
|
29
|
+
error: string;
|
|
30
|
+
result?: undefined;
|
|
31
|
+
} | {
|
|
32
|
+
result: boolean;
|
|
33
|
+
error?: undefined;
|
|
34
|
+
};
|
|
35
|
+
};
|
|
26
36
|
CLI: {
|
|
27
37
|
desc: string;
|
|
28
38
|
parse: (input: string) => {
|
|
@@ -33,6 +43,18 @@ export declare class BaseOptions implements IHasOptions {
|
|
|
33
43
|
error?: undefined;
|
|
34
44
|
};
|
|
35
45
|
};
|
|
46
|
+
SETTING: {
|
|
47
|
+
desc: string;
|
|
48
|
+
parse: (result: string) => {
|
|
49
|
+
result: string;
|
|
50
|
+
};
|
|
51
|
+
};
|
|
52
|
+
DEST: {
|
|
53
|
+
desc: string;
|
|
54
|
+
parse: (result: string) => {
|
|
55
|
+
result: string;
|
|
56
|
+
};
|
|
57
|
+
};
|
|
36
58
|
STAY: {
|
|
37
59
|
desc: string;
|
|
38
60
|
parse: (result: string) => {
|
|
@@ -93,26 +115,6 @@ export declare class BaseOptions implements IHasOptions {
|
|
|
93
115
|
error?: undefined;
|
|
94
116
|
};
|
|
95
117
|
};
|
|
96
|
-
LOOP_START: {
|
|
97
|
-
desc: string;
|
|
98
|
-
parse: (input: string) => {
|
|
99
|
-
error: string;
|
|
100
|
-
result?: undefined;
|
|
101
|
-
} | {
|
|
102
|
-
result: number;
|
|
103
|
-
error?: undefined;
|
|
104
|
-
};
|
|
105
|
-
};
|
|
106
|
-
LOOP_INC: {
|
|
107
|
-
desc: string;
|
|
108
|
-
parse: (input: string) => {
|
|
109
|
-
error: string;
|
|
110
|
-
result?: undefined;
|
|
111
|
-
} | {
|
|
112
|
-
result: number;
|
|
113
|
-
error?: undefined;
|
|
114
|
-
};
|
|
115
|
-
};
|
|
116
118
|
MEMBERS: {
|
|
117
119
|
desc: string;
|
|
118
120
|
parse: (input: string) => {
|
|
@@ -123,12 +125,6 @@ export declare class BaseOptions implements IHasOptions {
|
|
|
123
125
|
error?: undefined;
|
|
124
126
|
};
|
|
125
127
|
};
|
|
126
|
-
CONTINUE_ON_ERROR_IF_SCORED: {
|
|
127
|
-
desc: string;
|
|
128
|
-
parse: (result: string) => {
|
|
129
|
-
result: string;
|
|
130
|
-
};
|
|
131
|
-
};
|
|
132
128
|
OUTPUT: {
|
|
133
129
|
desc: string;
|
|
134
130
|
parse: (result: string) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseOptions.d.ts","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"BaseOptions.d.ts","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGlF,qBAAa,WAAY,YAAW,WAAW;IAC3C,MAAM,CAAC,OAAO;;;2BAGS,MAAM;;;;;;;;;;;;2BAYN,MAAM;;;;;;;;;;2BAIN,MAAM;;;;;;;;;;2BAIN,MAAM;;;;;;;;;;4BAIL,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;2BAIP,MAAM,OAAO,QAAQ;;;;;;;;;;;;2BAarB,MAAM,OAAO,QAAQ;;;;;;;;;;2BAoBrB,MAAM;;;;;;;;;;2BAKN,MAAM;;;;;;;;;;2BAYN,MAAM;;;;;;;;;;4BAQL,MAAM;;;;;;2BAIP,MAAM;;MAE3B;CACL"}
|
package/build/BaseOptions.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BaseOptions = void 0;
|
|
4
|
+
const defs_1 = require("@haibun/core/build/lib/defs");
|
|
4
5
|
const util_1 = require("@haibun/core/build/lib/util");
|
|
5
6
|
class BaseOptions {
|
|
6
7
|
}
|
|
@@ -20,11 +21,23 @@ BaseOptions.options = {
|
|
|
20
21
|
},
|
|
21
22
|
TRACE: {
|
|
22
23
|
desc: 'save trace data',
|
|
23
|
-
parse: (input) => util_1.boolOrError(input)
|
|
24
|
+
parse: (input) => (0, util_1.boolOrError)(input)
|
|
25
|
+
},
|
|
26
|
+
REVIEWS: {
|
|
27
|
+
desc: 'Generates traces and reviews',
|
|
28
|
+
parse: (input) => (0, util_1.boolOrError)(input)
|
|
24
29
|
},
|
|
25
30
|
CLI: {
|
|
26
31
|
desc: 'create a command interface for each member',
|
|
27
|
-
parse: (input) => util_1.boolOrError(input)
|
|
32
|
+
parse: (input) => (0, util_1.boolOrError)(input)
|
|
33
|
+
},
|
|
34
|
+
SETTING: {
|
|
35
|
+
desc: 'execution setting (eg dev, prod)',
|
|
36
|
+
parse: (result) => ({ result })
|
|
37
|
+
},
|
|
38
|
+
DEST: {
|
|
39
|
+
desc: 'destination for captures',
|
|
40
|
+
parse: (result) => ({ result })
|
|
28
41
|
},
|
|
29
42
|
STAY: {
|
|
30
43
|
desc: 'stay running after execution: always',
|
|
@@ -55,7 +68,7 @@ BaseOptions.options = {
|
|
|
55
68
|
desc: 'pass multiple environment variables: var1=a,var2=b',
|
|
56
69
|
parse: (input, cur) => {
|
|
57
70
|
const pairs = new Set(input?.split(',').map(a => a.split('=')[0]));
|
|
58
|
-
let env = {};
|
|
71
|
+
let env = { DEST: defs_1.DEFAULT_DEST };
|
|
59
72
|
for (const pair of pairs) {
|
|
60
73
|
const [k] = Array.from(new Set(pair.split('=')));
|
|
61
74
|
if (cur[k]) {
|
|
@@ -72,28 +85,28 @@ BaseOptions.options = {
|
|
|
72
85
|
},
|
|
73
86
|
STEP_DELAY: {
|
|
74
87
|
desc: 'delay between steps',
|
|
75
|
-
parse: (input) => util_1.intOrError(input)
|
|
88
|
+
parse: (input) => (0, util_1.intOrError)(input)
|
|
76
89
|
},
|
|
77
90
|
LOOPS: {
|
|
78
91
|
desc: 'how many loops',
|
|
79
|
-
parse: (input) => util_1.intOrError(input)
|
|
80
|
-
},
|
|
81
|
-
LOOP_START: {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
},
|
|
85
|
-
LOOP_INC: {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
},
|
|
92
|
+
parse: (input) => (0, util_1.intOrError)(input)
|
|
93
|
+
},
|
|
94
|
+
// LOOP_START: {
|
|
95
|
+
// desc: 'wip',
|
|
96
|
+
// parse: (input: string) => intOrError(input)
|
|
97
|
+
// },
|
|
98
|
+
// LOOP_INC: {
|
|
99
|
+
// desc: 'wip',
|
|
100
|
+
// parse: (input: string) => intOrError(input)
|
|
101
|
+
// },
|
|
89
102
|
MEMBERS: {
|
|
90
103
|
desc: 'number of members in each loop',
|
|
91
|
-
parse: (input) => util_1.intOrError(input)
|
|
92
|
-
},
|
|
93
|
-
CONTINUE_ON_ERROR_IF_SCORED: {
|
|
94
|
-
desc: 'wip',
|
|
95
|
-
parse: (result) => ({ result })
|
|
104
|
+
parse: (input) => (0, util_1.intOrError)(input)
|
|
96
105
|
},
|
|
106
|
+
// CONTINUE_ON_ERROR_IF_SCORED: {
|
|
107
|
+
// desc: 'wip',
|
|
108
|
+
// parse: (result: string) => ({ result })
|
|
109
|
+
// },
|
|
97
110
|
OUTPUT: {
|
|
98
111
|
desc: 'Output format (AsXUnit)',
|
|
99
112
|
parse: (result) => ({ result })
|
package/build/BaseOptions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseOptions.js","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"BaseOptions.js","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const defs_1 = require("@haibun/core/build/lib/defs");
|
|
3
4
|
const BaseOptions_1 = require("./BaseOptions");
|
|
4
5
|
describe('applyEnvCollections', () => {
|
|
5
6
|
it('creates pairs', () => {
|
|
6
|
-
const p = {};
|
|
7
|
+
const p = { DEST: defs_1.DEFAULT_DEST };
|
|
7
8
|
const res = BaseOptions_1.BaseOptions.options.ENVC.parse('a=1,b=2,a=3,b=4', p);
|
|
8
9
|
expect(res.env).toEqual({
|
|
9
10
|
a: ["1", "3"],
|
|
@@ -11,7 +12,7 @@ describe('applyEnvCollections', () => {
|
|
|
11
12
|
});
|
|
12
13
|
});
|
|
13
14
|
it('prevents collision', () => {
|
|
14
|
-
const p = { a: 1 };
|
|
15
|
+
const p = { DEST: defs_1.DEFAULT_DEST, a: 1 };
|
|
15
16
|
const res = BaseOptions_1.BaseOptions.options.ENVC.parse('a=1', p);
|
|
16
17
|
expect(res.error).toBeDefined();
|
|
17
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseOptions.test.js","sourceRoot":"","sources":["../src/BaseOptions.test.ts"],"names":[],"mappings":";;AACA,+CAA4C;AAE5C,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseOptions.test.js","sourceRoot":"","sources":["../src/BaseOptions.test.ts"],"names":[],"mappings":";;AACA,sDAA2D;AAC3D,+CAA4C;AAE5C,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,mBAAY,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,yBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YACtB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YACb,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC5B,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,mBAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,yBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/build/cli.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
require('source-map-support').install();
|
|
7
8
|
const repl_1 = __importDefault(require("repl"));
|
|
8
9
|
const util_1 = require("@haibun/core/build/lib/util");
|
|
9
10
|
const run_with_options_1 = __importDefault(require("@haibun/core/build/lib/run-with-options"));
|
|
@@ -13,36 +14,39 @@ go();
|
|
|
13
14
|
async function go() {
|
|
14
15
|
const featureFilter = !!process.argv[3] ? process.argv[3].split(',') : undefined;
|
|
15
16
|
const base = process.argv[2]?.replace(/\/$/, '');
|
|
16
|
-
const specl =
|
|
17
|
-
|
|
18
|
-
await lib_1.usageThenExit(specl);
|
|
19
|
-
}
|
|
20
|
-
console.info('\n_________________________________ start');
|
|
21
|
-
const { protoOptions, errors } = lib_1.processBaseEnv(process.env, specl.options);
|
|
17
|
+
const specl = getSpeclOrExit(base, featureFilter);
|
|
18
|
+
const { protoOptions, errors } = (0, lib_1.processBaseEnv)(process.env, specl.options);
|
|
22
19
|
const splits = protoOptions.options.SPLITS || [{}];
|
|
23
20
|
if (errors.length > 0) {
|
|
24
|
-
await lib_1.usageThenExit(specl, errors.join('\n'));
|
|
21
|
+
await (0, lib_1.usageThenExit)(specl, errors.join('\n'));
|
|
25
22
|
}
|
|
23
|
+
console.info('\n_________________________________ start');
|
|
26
24
|
const loops = protoOptions.options.LOOPS || 1;
|
|
27
25
|
const members = protoOptions.options.MEMBERS || 1;
|
|
28
|
-
const trace = protoOptions.options.TRACE;
|
|
26
|
+
const trace = protoOptions.options.REVIEWS || protoOptions.options.TRACE;
|
|
27
|
+
const reviews = protoOptions.options.REVIEWS;
|
|
29
28
|
const startRunCallback = (world) => {
|
|
30
29
|
if (protoOptions.options.CLI)
|
|
31
30
|
repl_1.default.start().context.runtime = world.runtime;
|
|
32
31
|
};
|
|
33
|
-
const
|
|
32
|
+
const endFeatureCallback = async (world, result, steppers) => {
|
|
34
33
|
if (trace) {
|
|
35
|
-
util_1.
|
|
34
|
+
const tracer = (0, util_1.findStepper)(steppers, 'OutReviews');
|
|
35
|
+
const loc = { ...world };
|
|
36
|
+
await tracer.writeTraceFile({ ...loc, mediaType: "json" /* json */ }, result);
|
|
37
|
+
if (reviews) {
|
|
38
|
+
await tracer.writeReview({ ...loc, mediaType: "html" /* html */ }, result);
|
|
39
|
+
}
|
|
36
40
|
}
|
|
37
41
|
};
|
|
38
|
-
const runOptions = { featureFilter, loops, members, splits, trace, specl, base, protoOptions, startRunCallback,
|
|
39
|
-
const { ok, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime } = await run_with_options_1.default(runOptions);
|
|
42
|
+
const runOptions = { featureFilter, loops, members, splits, trace, specl, base, protoOptions, startRunCallback, endFeatureCallback };
|
|
43
|
+
const { ok, exceptionResults, ranResults, allFailures, logger, passed, failed, totalRan, runTime } = await (0, run_with_options_1.default)(runOptions);
|
|
40
44
|
if (ok && exceptionResults.length < 1) {
|
|
41
45
|
logger.log(ranResults.every((r) => r.output));
|
|
42
46
|
}
|
|
43
47
|
else {
|
|
44
48
|
try {
|
|
45
|
-
console.error(lib_1.ranResultError(ranResults, exceptionResults));
|
|
49
|
+
console.error((0, lib_1.ranResultError)(ranResults, exceptionResults));
|
|
46
50
|
}
|
|
47
51
|
catch (e) {
|
|
48
52
|
console.error(ranResults[0].result.failure);
|
|
@@ -57,4 +61,11 @@ async function go() {
|
|
|
57
61
|
process.exit(1);
|
|
58
62
|
}
|
|
59
63
|
}
|
|
64
|
+
function getSpeclOrExit(base, featureFilter) {
|
|
65
|
+
const specl = (0, util_1.getConfigFromBase)(base);
|
|
66
|
+
if (specl === null || !process.argv[2] || featureFilter?.find(f => f === '--help' || f === '-h')) {
|
|
67
|
+
(0, lib_1.usageThenExit)(specl ? specl : (0, util_1.getDefaultOptions)());
|
|
68
|
+
}
|
|
69
|
+
return specl;
|
|
70
|
+
}
|
|
60
71
|
//# 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;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/build/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAG,MAAM,6BAA6B,CAAC;AAKnI,aAAK,IAAI,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEnD,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;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ;;;EAkC1D"}
|
package/build/lib.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.processBaseEnv = exports.ranResultError = exports.usage = exports.usageThenExit = void 0;
|
|
4
4
|
const defs_1 = require("@haibun/core/build/lib/defs");
|
|
5
|
+
const lib_1 = require("@haibun/core/build/lib/test/lib");
|
|
5
6
|
const util_1 = require("@haibun/core/build/lib/util");
|
|
6
7
|
const BaseOptions_1 = require("./BaseOptions");
|
|
7
8
|
async function usageThenExit(specl, message) {
|
|
@@ -12,12 +13,12 @@ async function usageThenExit(specl, message) {
|
|
|
12
13
|
exports.usageThenExit = usageThenExit;
|
|
13
14
|
;
|
|
14
15
|
async function usage(specl, message) {
|
|
15
|
-
let steppers = await
|
|
16
|
+
let steppers = await (0, lib_1.getCreateSteppers)(specl.steppers);
|
|
16
17
|
let a = {};
|
|
17
18
|
steppers.forEach(s => {
|
|
18
19
|
const o = s;
|
|
19
20
|
if (o.options) {
|
|
20
|
-
const p = util_1.getPre(s);
|
|
21
|
+
const p = (0, util_1.getPre)(s);
|
|
21
22
|
a = { ...a, ...Object.keys(o.options).reduce((a, i) => ({ ...a, [`${p}${i}`]: o.options[i] }), {}) };
|
|
22
23
|
}
|
|
23
24
|
});
|
|
@@ -26,10 +27,10 @@ async function usage(specl, message) {
|
|
|
26
27
|
`usage: ${process.argv[1]} <project base> <filter>`,
|
|
27
28
|
message || '',
|
|
28
29
|
'Set these environmental variables to control options:\n',
|
|
29
|
-
...Object.entries(BaseOptions_1.BaseOptions.options).map(([k, v]) => `${defs_1.
|
|
30
|
+
...Object.entries(BaseOptions_1.BaseOptions.options).map(([k, v]) => `${defs_1.BASE_PREFIX}${k.padEnd(55)} ${v.desc}`),
|
|
30
31
|
];
|
|
31
32
|
if (Object.keys(a).length) {
|
|
32
|
-
ret.push('\nThese variables are available for selected
|
|
33
|
+
ret.push('\nThese variables are available for extensions selected in config.js\n', ...Object.entries(a).map(([k, v]) => `${k.padEnd(55)} ${v.desc}`));
|
|
33
34
|
}
|
|
34
35
|
return [...ret, ''].join('\n');
|
|
35
36
|
}
|
|
@@ -47,13 +48,13 @@ function processBaseEnv(env, options) {
|
|
|
47
48
|
const protoOptions = { options: { ...options }, extraOptions: {} };
|
|
48
49
|
let errors = [];
|
|
49
50
|
let nenv = {};
|
|
50
|
-
const pfx = `${defs_1.HAIBUN}_`;
|
|
51
51
|
const baseOptions = BaseOptions_1.BaseOptions;
|
|
52
|
+
baseOptions.options && Object.entries(baseOptions.options).forEach(([k, v]) => protoOptions.options[k] = v.default);
|
|
52
53
|
Object.entries(env)
|
|
53
|
-
.filter(([k]) => k.startsWith(
|
|
54
|
+
.filter(([k]) => k.startsWith(defs_1.BASE_PREFIX))
|
|
54
55
|
.map(([k]) => {
|
|
55
56
|
const value = env[k];
|
|
56
|
-
const opt = k.replace(
|
|
57
|
+
const opt = k.replace(defs_1.BASE_PREFIX, '');
|
|
57
58
|
const baseOption = baseOptions.options[opt];
|
|
58
59
|
if (baseOption) {
|
|
59
60
|
const res = baseOption.parse(value, nenv);
|
|
@@ -64,7 +65,7 @@ function processBaseEnv(env, options) {
|
|
|
64
65
|
nenv = { ...nenv, ...res.env };
|
|
65
66
|
}
|
|
66
67
|
else if (!res.result) {
|
|
67
|
-
throw Error(`no
|
|
68
|
+
throw Error(`no option for ${opt} from ${res.result}`);
|
|
68
69
|
}
|
|
69
70
|
else {
|
|
70
71
|
protoOptions.options[opt] = res.result;
|
package/build/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"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"}
|
package/build/lib.test.js
CHANGED
|
@@ -22,6 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
+
const defs_1 = require("@haibun/core/build/lib/defs");
|
|
25
26
|
const lib_1 = require("@haibun/core/build/lib/test/lib");
|
|
26
27
|
const TestSteps_1 = __importDefault(require("@haibun/core/build/lib/test/TestSteps"));
|
|
27
28
|
const TestStepsWithOptions_1 = __importDefault(require("@haibun/core/build/lib/test/TestStepsWithOptions"));
|
|
@@ -33,20 +34,20 @@ describe('usageThenExit', () => {
|
|
|
33
34
|
const ranOnce = (code) => { expect(code).toBe(0); return undefined; };
|
|
34
35
|
jest.spyOn(process, 'exit').mockImplementationOnce(ranOnce);
|
|
35
36
|
jest.spyOn(console, 'info').mockImplementationOnce(any => undefined);
|
|
36
|
-
lib.usageThenExit({ ...util_1.getDefaultOptions(), steppers: ['../core/src/lib/test/TestStepsWithOptions'] });
|
|
37
|
+
lib.usageThenExit({ ...(0, util_1.getDefaultOptions)(), steppers: ['../core/src/lib/test/TestStepsWithOptions'] });
|
|
37
38
|
});
|
|
38
39
|
it('exits with error', () => {
|
|
39
40
|
const ranOnce = (code) => { expect(code).toBe(1); return undefined; };
|
|
40
41
|
jest.spyOn(process, 'exit').mockImplementationOnce(ranOnce);
|
|
41
42
|
jest.spyOn(console, 'error').mockImplementationOnce(() => undefined);
|
|
42
|
-
lib.usageThenExit({ ...util_1.getDefaultOptions(), steppers: ['../core/src/lib/test/TestStepsWithOptions'] }, 'woops');
|
|
43
|
+
lib.usageThenExit({ ...(0, util_1.getDefaultOptions)(), steppers: ['../core/src/lib/test/TestStepsWithOptions'] }, 'woops');
|
|
43
44
|
});
|
|
44
45
|
});
|
|
45
46
|
describe('options', () => {
|
|
46
47
|
it('stepper options', async () => {
|
|
47
48
|
const feature = { path: '/features/test.feature', content: `When I have a stepper option` };
|
|
48
|
-
const { protoOptions: protoConfig } = lib_2.processBaseEnv({ [lib_1.HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS]: 'true' }, {});
|
|
49
|
-
const
|
|
49
|
+
const { protoOptions: protoConfig } = (0, lib_2.processBaseEnv)({ [lib_1.HAIBUN_O_TESTSTEPSWITHOPTIONS_EXISTS]: 'true' }, { DEST: defs_1.DEFAULT_DEST });
|
|
50
|
+
const result = await (0, lib_1.testWithDefaults)([feature], [TestStepsWithOptions_1.default], protoConfig);
|
|
50
51
|
expect(result.ok).toBe(true);
|
|
51
52
|
expect(result.results?.length).toBe(1);
|
|
52
53
|
expect(result.results[0].stepResults[0].actionResults[0].topics?.options.summary).toEqual('options');
|
|
@@ -55,34 +56,34 @@ describe('options', () => {
|
|
|
55
56
|
describe('builds', () => {
|
|
56
57
|
it('builds with finalizer', async () => {
|
|
57
58
|
const feature = { path: '/features/test.feature', content: `builds with finalizer` };
|
|
58
|
-
const
|
|
59
|
+
const result = await (0, lib_1.testWithDefaults)([feature], [TestSteps_1.default]);
|
|
59
60
|
expect(result.ok).toBe(true);
|
|
60
|
-
expect(
|
|
61
|
+
expect(result.shared.get('done')).toEqual('ok');
|
|
61
62
|
});
|
|
62
63
|
});
|
|
63
64
|
describe('processEnv', () => {
|
|
64
65
|
it('carries extra options', () => {
|
|
65
|
-
const specl = util_1.getDefaultOptions();
|
|
66
|
+
const specl = (0, util_1.getDefaultOptions)();
|
|
66
67
|
const { protoOptions } = lib.processBaseEnv({ HAIBUN_TEST: 'true' }, specl.options);
|
|
67
68
|
expect(protoOptions.extraOptions['HAIBUN_TEST']).toBeDefined();
|
|
68
69
|
});
|
|
69
70
|
it('split_shared incorrect message', () => {
|
|
70
|
-
const specl = util_1.getDefaultOptions();
|
|
71
|
+
const specl = (0, util_1.getDefaultOptions)();
|
|
71
72
|
const { errors } = lib.processBaseEnv({ HAIBUN_SPLIT_SHARED: '1,2' }, specl.options);
|
|
72
73
|
expect(errors.length).toBe(1);
|
|
73
74
|
});
|
|
74
75
|
it('processes split_shared', () => {
|
|
75
|
-
const specl = util_1.getDefaultOptions();
|
|
76
|
+
const specl = (0, util_1.getDefaultOptions)();
|
|
76
77
|
const res = lib.processBaseEnv({ HAIBUN_SPLIT_SHARED: 'foo=1,2' }, specl.options).protoOptions.options;
|
|
77
78
|
expect(res.SPLIT_SHARED).toEqual([{ foo: '1' }, { foo: '2' }]);
|
|
78
79
|
});
|
|
79
80
|
it('assigns int', () => {
|
|
80
|
-
const specl = util_1.getDefaultOptions();
|
|
81
|
+
const specl = (0, util_1.getDefaultOptions)();
|
|
81
82
|
const { options } = lib.processBaseEnv({ HAIBUN_LOOPS: '1' }, specl.options).protoOptions;
|
|
82
83
|
expect(options.LOOPS).toBe(1);
|
|
83
84
|
});
|
|
84
85
|
it('errors for string passed as int', () => {
|
|
85
|
-
const specl = util_1.getDefaultOptions();
|
|
86
|
+
const specl = (0, util_1.getDefaultOptions)();
|
|
86
87
|
const { errors } = lib.processBaseEnv({ HAIBUN_LOOPS: '1.2' }, specl.options);
|
|
87
88
|
expect(errors.length).toBe(1);
|
|
88
89
|
});
|
package/build/lib.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../src/lib.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,yDAAyG;AACzG,sFAA8D;AAC9D,4GAAoF;AACpF,sDAAgE;AAChE,2CAA6B;AAC7B,+BAAuC;AAEvC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC5B,MAAM,OAAO,GAAG,CAAC,IAAwB,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAc,SAAS,CAAA,CAAC,CAAC,CAAA;QAC/F,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACrE,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,wBAAiB,
|
|
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.1
|
|
3
|
+
"version": "1.8.1",
|
|
4
4
|
"description": "command line execution for @haibun",
|
|
5
5
|
"bin": {
|
|
6
6
|
"haibun-cli": "build/cli.js"
|
|
@@ -18,10 +18,11 @@
|
|
|
18
18
|
"author": "",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@haibun/core": "^1.0.0"
|
|
21
|
+
"@haibun/core": "^1.0.0",
|
|
22
|
+
"@haibun/domain-storage": "^1.6.0"
|
|
22
23
|
},
|
|
23
24
|
"devDependencies": {
|
|
24
|
-
"@types/jest": "^
|
|
25
|
+
"@types/jest": "^27.4.0",
|
|
25
26
|
"@types/node": "^15.7.0",
|
|
26
27
|
"@typescript-eslint/eslint-plugin": "^4.13.0",
|
|
27
28
|
"@typescript-eslint/parser": "^4.13.0",
|
|
@@ -32,9 +33,10 @@
|
|
|
32
33
|
"eslint-plugin-prefer-arrow": "^1.2.2",
|
|
33
34
|
"eslint-plugin-prettier": "^3.3.1",
|
|
34
35
|
"jest": "^27.0.4",
|
|
36
|
+
"node-notifier": "^10.0.1",
|
|
35
37
|
"prettier": "^2.3.1",
|
|
36
|
-
"ts-jest": "^27.
|
|
38
|
+
"ts-jest": "^27.1.3",
|
|
37
39
|
"ts-node": "^10.0.0",
|
|
38
40
|
"tslint": "^6.1.3"
|
|
39
41
|
}
|
|
40
|
-
}
|
|
42
|
+
}
|