@haibun/cli 1.12.0 → 1.13.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
CHANGED
|
@@ -67,6 +67,10 @@ export declare class BaseOptions implements IHasOptions {
|
|
|
67
67
|
desc: string;
|
|
68
68
|
parse: (result: string) => {
|
|
69
69
|
result: string;
|
|
70
|
+
error?: undefined;
|
|
71
|
+
} | {
|
|
72
|
+
error: string;
|
|
73
|
+
result?: undefined;
|
|
70
74
|
};
|
|
71
75
|
};
|
|
72
76
|
ENV: {
|
|
@@ -76,10 +80,10 @@ export declare class BaseOptions implements IHasOptions {
|
|
|
76
80
|
env?: undefined;
|
|
77
81
|
} | {
|
|
78
82
|
env: {
|
|
79
|
-
[
|
|
83
|
+
[name: string]: string;
|
|
80
84
|
};
|
|
81
85
|
error?: undefined;
|
|
82
|
-
}
|
|
86
|
+
};
|
|
83
87
|
};
|
|
84
88
|
ENVC: {
|
|
85
89
|
desc: string;
|
|
@@ -1 +1 @@
|
|
|
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;;;;;;;;;;4BAIL,MAAM;;;;;;2BAIP,MAAM;;;;;;;;;;4BAIL,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM
|
|
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;;;;;;;;;;4BAIL,MAAM;;;;;;2BAIP,MAAM;;;;;;;;;;4BAIL,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;4BAIN,MAAM;;;;;;;;;;2BAIP,MAAM,OAAO,QAAQ;;;;;;;;;;;;2BAerB,MAAM,OAAO,QAAQ;;;;;;;;;;2BAoBrB,MAAM;;;;;;;;;;2BAKN,MAAM;;;;;;;;;;2BAYN,MAAM;;;;;;;;;;4BAQL,MAAM;;;;;;2BAIP,MAAM;;MAE3B;CACL"}
|
package/build/BaseOptions.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BaseOptions = void 0;
|
|
4
4
|
const defs_1 = require("@haibun/core/build/lib/defs");
|
|
5
|
+
const Logger_1 = require("@haibun/core/build/lib/Logger");
|
|
5
6
|
const util_1 = require("@haibun/core/build/lib/util");
|
|
6
7
|
class BaseOptions {
|
|
7
8
|
}
|
|
@@ -48,20 +49,22 @@ BaseOptions.options = {
|
|
|
48
49
|
parse: (result) => ({ result })
|
|
49
50
|
},
|
|
50
51
|
LOG_LEVEL: {
|
|
51
|
-
desc: '
|
|
52
|
-
parse: (result) => ({ result })
|
|
52
|
+
desc: Object.keys(Logger_1.LOGGER_LEVELS).join(', '),
|
|
53
|
+
parse: (result) => Object.keys(Logger_1.LOGGER_LEVELS).includes(result) ? { result } : { error: `${result} not in ${Object.keys(Logger_1.LOGGER_LEVELS).join(', ')}` }
|
|
53
54
|
},
|
|
54
55
|
ENV: {
|
|
55
|
-
desc: 'pass an environment variable: var=value',
|
|
56
|
+
desc: 'pass an environment variable: var=value[,var2=value]',
|
|
56
57
|
parse: (input, cur) => {
|
|
57
58
|
const pairs = input?.split(',');
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
const env = {};
|
|
60
|
+
for (const pair of pairs) {
|
|
61
|
+
const [k, v] = pair.split('=').map(i => i.trim());
|
|
62
|
+
if (cur[k] || env[k]) {
|
|
63
|
+
return { error: `ENV ${k} already defined` };
|
|
62
64
|
}
|
|
63
|
-
|
|
65
|
+
env[k] = v;
|
|
64
66
|
}
|
|
67
|
+
return { env };
|
|
65
68
|
},
|
|
66
69
|
},
|
|
67
70
|
ENVC: {
|
package/build/BaseOptions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseOptions.js","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":";;;AAAA,sDAAkF;AAClF,sDAAsE;
|
|
1
|
+
{"version":3,"file":"BaseOptions.js","sourceRoot":"","sources":["../src/BaseOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,4 +17,17 @@ describe('applyEnvCollections', () => {
|
|
|
17
17
|
expect(res.error).toBeDefined();
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
+
describe('apply ENV', () => {
|
|
21
|
+
it('creates env', () => {
|
|
22
|
+
const p = { DEST: defs_1.DEFAULT_DEST };
|
|
23
|
+
const res = BaseOptions_1.BaseOptions.options.ENV.parse('a=1', p);
|
|
24
|
+
expect(res.error).not.toBeDefined();
|
|
25
|
+
expect(res.env).toEqual({ a: "1" });
|
|
26
|
+
});
|
|
27
|
+
it('prevents collision', () => {
|
|
28
|
+
const p = { DEST: defs_1.DEFAULT_DEST, a: 1 };
|
|
29
|
+
const res = BaseOptions_1.BaseOptions.options.ENV.parse('a=1', p);
|
|
30
|
+
expect(res.error).toBeDefined();
|
|
31
|
+
});
|
|
32
|
+
});
|
|
20
33
|
//# sourceMappingURL=BaseOptions.test.js.map
|
|
@@ -1 +1 @@
|
|
|
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,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QAC5B,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"}
|
|
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,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QAC5B,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,CAAC;AAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;QACrB,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,mBAAY,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,yBAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC5B,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,mBAAY,EAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,yBAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.13.1",
|
|
4
4
|
"description": "command line execution for @haibun",
|
|
5
5
|
"bin": {
|
|
6
6
|
"haibun-cli": "build/cli.js"
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
"author": "",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@haibun/core": "1.
|
|
22
|
-
"@haibun/domain-storage": "1.
|
|
21
|
+
"@haibun/core": "1.13.1",
|
|
22
|
+
"@haibun/domain-storage": "1.13.1"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@types/jest": "^27.4.0",
|