@haibun/cli 1.41.1-alpha → 1.41.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.js +24 -21
- package/build/cli.js.map +1 -1
- package/package.json +3 -3
package/build/cli.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import sourceMapSupport from 'source-map-support';
|
|
3
|
-
import { STAY_ALWAYS, STAY
|
|
3
|
+
import { STAY_ALWAYS, STAY } from '@haibun/core/build/lib/defs.js';
|
|
4
4
|
import { HANDLE_RESULT_HISTORY } from '@haibun/domain-storage/build/domain-storage.js';
|
|
5
5
|
import { findHandlers, getDefaultOptions, basesFrom } from '@haibun/core/build/lib/util/index.js';
|
|
6
6
|
import { getConfigFromBase } from '@haibun/core/build/lib/util/workspace-lib.js';
|
|
@@ -16,38 +16,22 @@ process.on('unhandledRejection', console.error);
|
|
|
16
16
|
go().catch(console.error);
|
|
17
17
|
async function go() {
|
|
18
18
|
const { params, configLoc, showHelp } = processArgs(process.argv.slice(2));
|
|
19
|
-
const featureFilter = params[1] ? params[1].split(',') : undefined;
|
|
20
19
|
const bases = basesFrom(params[0]?.replace(/\/$/, ''));
|
|
21
20
|
const specl = await getSpeclOrExit(configLoc ? [configLoc] : bases);
|
|
22
21
|
if (showHelp) {
|
|
23
22
|
await usageThenExit(specl);
|
|
24
23
|
}
|
|
24
|
+
const featureFilter = params[1] ? params[1].split(',') : undefined;
|
|
25
25
|
const { protoOptions, errors } = processBaseEnvToOptionsAndErrors(process.env, specl.options);
|
|
26
26
|
if (errors.length > 0) {
|
|
27
27
|
await usageThenExit(specl, errors.join('\n'));
|
|
28
28
|
}
|
|
29
|
-
const {
|
|
30
|
-
const tag = getDefaultTag(0);
|
|
31
|
-
const logger = new Logger({ level: logLevel || 'debug', follow: logFollow });
|
|
32
|
-
const shared = new WorldContext(tag);
|
|
33
|
-
const timer = new Timer();
|
|
34
|
-
const { KEY: keyIn, TRACE: trace, OUTPUT: output, OUTPUT_DEST: outputDest } = protoOptions.options;
|
|
35
|
-
const key = keyIn || Timer.key;
|
|
36
|
-
Timer.key = key;
|
|
37
|
-
const description = protoOptions.options.DESCRIPTION || bases + ' ' + [...(featureFilter || [])].join(',');
|
|
38
|
-
const world = {
|
|
39
|
-
tag,
|
|
40
|
-
shared,
|
|
41
|
-
runtime: {},
|
|
42
|
-
logger,
|
|
43
|
-
options: protoOptions.options,
|
|
44
|
-
moduleOptions: protoOptions.moduleOptions,
|
|
45
|
-
timer,
|
|
46
|
-
bases,
|
|
47
|
-
};
|
|
29
|
+
const { TRACE: trace, OUTPUT: output, OUTPUT_DEST: outputDest } = protoOptions.options;
|
|
48
30
|
if (outputDest && !output) {
|
|
49
31
|
await usageThenExit(specl, 'OUTPUT_DEST requires OUTPUT');
|
|
50
32
|
}
|
|
33
|
+
const description = protoOptions.options.DESCRIPTION || bases + ' ' + [...(featureFilter || [])].join(',');
|
|
34
|
+
const world = getWorld(protoOptions, bases);
|
|
51
35
|
let endFeatureCallback = undefined;
|
|
52
36
|
if (trace) {
|
|
53
37
|
endFeatureCallback = async (params) => {
|
|
@@ -73,6 +57,25 @@ async function go() {
|
|
|
73
57
|
process.exit(1);
|
|
74
58
|
}
|
|
75
59
|
}
|
|
60
|
+
function getWorld(protoOptions, bases) {
|
|
61
|
+
const { KEY: keyIn, LOG_LEVEL: logLevel, LOG_FOLLOW: logFollow } = protoOptions.options;
|
|
62
|
+
const tag = getDefaultTag(0);
|
|
63
|
+
const logger = new Logger({ level: logLevel || 'debug', follow: logFollow });
|
|
64
|
+
const shared = new WorldContext(tag);
|
|
65
|
+
const timer = new Timer();
|
|
66
|
+
const key = keyIn || Timer.key;
|
|
67
|
+
Timer.key = key;
|
|
68
|
+
const world = {
|
|
69
|
+
tag,
|
|
70
|
+
shared,
|
|
71
|
+
runtime: {},
|
|
72
|
+
logger,
|
|
73
|
+
...protoOptions,
|
|
74
|
+
timer,
|
|
75
|
+
bases,
|
|
76
|
+
};
|
|
77
|
+
return world;
|
|
78
|
+
}
|
|
76
79
|
async function getSpeclOrExit(bases) {
|
|
77
80
|
const specl = getConfigFromBase(bases);
|
|
78
81
|
if (specl === null || bases?.length < 1) {
|
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;AAElD,OAAO,
|
|
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.41.
|
|
4
|
+
"version": "1.41.2",
|
|
5
5
|
"description": "command line execution for @haibun",
|
|
6
6
|
"bin": { "haibun-cli": "build/cli.js" },
|
|
7
7
|
"main": "build/cli.js",
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"author": "",
|
|
20
20
|
"license": "ISC",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@haibun/core": "1.
|
|
23
|
-
"@haibun/domain-storage": "1.
|
|
22
|
+
"@haibun/core": "1.41.2",
|
|
23
|
+
"@haibun/domain-storage": "1.41.2",
|
|
24
24
|
"source-map-support": "^0.5.21"
|
|
25
25
|
},
|
|
26
26
|
"gitHead": "7cf9680bd922fb622fb59f1e6bf5b65284cb8fd5"
|