@rsdk/cli.common 4.10.0-next.3 → 4.10.0-next.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/CHANGELOG.md +6 -0
- package/dist/cmd.core.js +13 -8
- package/dist/cmd.core.js.map +1 -1
- package/dist/env.provider.d.ts +2 -0
- package/dist/env.provider.js +12 -2
- package/dist/env.provider.js.map +1 -1
- package/package.json +4 -4
- package/src/cmd.core.ts +14 -8
- package/src/env.provider.ts +15 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.10.0-next.4](https://github.com/R-Vision/rsdk/compare/v4.10.0-next.3...v4.10.0-next.4) (2024-06-11)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **cli.common:** correctly prioritize value sources ([#246](https://github.com/R-Vision/rsdk/issues/246)) ([72b4e0e](https://github.com/R-Vision/rsdk/commit/72b4e0ee009aa62978923a0c117020fafd7a35bc))
|
|
11
|
+
|
|
6
12
|
## [4.10.0-next.3](https://github.com/R-Vision/rsdk/compare/v4.10.0-next.2...v4.10.0-next.3) (2024-06-10)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @rsdk/cli.common
|
package/dist/cmd.core.js
CHANGED
|
@@ -35,32 +35,37 @@ function createCommandHandler(argMap, handler) {
|
|
|
35
35
|
const key = lodash_1.default.camelCase(optionMetadata.name);
|
|
36
36
|
const v = opts[key];
|
|
37
37
|
const isNotProvided = Object.hasOwn(opts, key);
|
|
38
|
-
const
|
|
39
|
-
v
|
|
38
|
+
const isDefaultValue = optionMetadata.defaultValue !== undefined &&
|
|
39
|
+
v === optionMetadata.defaultValue;
|
|
40
|
+
const isNotDefaultValue = !isDefaultValue;
|
|
40
41
|
const envKey = createEnvKey(optionMetadata);
|
|
41
42
|
cliLogger.trace('use env key for option', {
|
|
42
43
|
envKey,
|
|
43
44
|
});
|
|
44
|
-
const
|
|
45
|
+
const envHasValue = env_provider_1.Env.has(envKey);
|
|
46
|
+
const envValue = env_provider_1.Env.get(envKey);
|
|
45
47
|
cliLogger.trace('option value state', {
|
|
46
48
|
isNotProvided,
|
|
47
|
-
|
|
49
|
+
isDefaultValue,
|
|
48
50
|
envKey,
|
|
49
51
|
envValue,
|
|
50
52
|
optionMetadata,
|
|
51
53
|
});
|
|
52
|
-
if (
|
|
54
|
+
if (isNotDefaultValue && envHasValue && envValue !== v) {
|
|
53
55
|
cliLogger.warn('Flag value override env value', {
|
|
54
56
|
optionMetadata,
|
|
55
57
|
envKey,
|
|
56
58
|
envValue,
|
|
59
|
+
isDefaultValue,
|
|
57
60
|
flagValue: v,
|
|
58
61
|
});
|
|
59
62
|
}
|
|
60
|
-
|
|
61
|
-
|
|
63
|
+
// Если нам пробросили не значение по умолчанию - берем v, иначе берем значение из env или проброшенное
|
|
64
|
+
const result = isNotDefaultValue ? v : envValue ?? v;
|
|
65
|
+
if (optionMetadata.parser) {
|
|
66
|
+
return optionMetadata.parser(result);
|
|
62
67
|
}
|
|
63
|
-
return
|
|
68
|
+
return result;
|
|
64
69
|
});
|
|
65
70
|
handler(...args);
|
|
66
71
|
};
|
package/dist/cmd.core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.core.js","sourceRoot":"","sources":["../src/cmd.core.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA8C;AAC9C,yCAAoC;AACpC,oDAAuB;AAEvB,iDAAqC;AAErC,mCAAmC;AAEnC,MAAM,SAAS,GAAG,uBAAa,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAG3D,SAAS,cAAc,CAAC,cAAmB;IACzC,MAAM,CAAC,GAAG,cAAc,EAAE,GAAG,CAAC,gBAAQ,CAAC,IAAI,CAAC,CAAC;IAE7C,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IACD,OAAO,IAAI,mBAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,YAAY,CAAC,cAA8B;IAClD,OAAO,gBAAC,CAAC,SAAS,CAChB,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CACjF,CAAC,WAAW,EAAE,CAAC;AAClB,CAAC;AAED,SAAS,oBAAoB,CAC3B,MAA2C,EAC3C,OAAgC;IAEhC,OAAO,CAAC,EAAE,EAAE,GAAY,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAExB,MAAM,iBAAiB,GAGjB,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,KAAK;YACL,cAAc;SACf,CAAC,CAAC,CAAC;QACJ,MAAM,aAAa,GACjB,gBAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAEzC,MAAM,IAAI,GAA2B,aAAa,CAAC,GAAG,CACpD,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;YACrB,SAAS,CAAC,KAAK,CAAC,YAAY,EAAE;gBAC5B,cAAc;aACf,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,gBAAC,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAEpB,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE/C,MAAM,
|
|
1
|
+
{"version":3,"file":"cmd.core.js","sourceRoot":"","sources":["../src/cmd.core.ts"],"names":[],"mappings":"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"}
|
package/dist/env.provider.d.ts
CHANGED
package/dist/env.provider.js
CHANGED
|
@@ -7,13 +7,23 @@ exports.Env = void 0;
|
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
class Env {
|
|
9
9
|
static get(key, parser) {
|
|
10
|
-
const
|
|
11
|
-
|
|
10
|
+
const nk = this.normalizeKey(key);
|
|
11
|
+
if (!Env.has(nk)) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
const v = process.env[nk];
|
|
12
15
|
if (parser) {
|
|
13
16
|
return parser(v);
|
|
14
17
|
}
|
|
15
18
|
return v;
|
|
16
19
|
}
|
|
20
|
+
static normalizeKey(key) {
|
|
21
|
+
return lodash_1.default.snakeCase(key).toUpperCase();
|
|
22
|
+
}
|
|
23
|
+
static has(key) {
|
|
24
|
+
const nk = Env.normalizeKey(key);
|
|
25
|
+
return nk in process.env;
|
|
26
|
+
}
|
|
17
27
|
}
|
|
18
28
|
exports.Env = Env;
|
|
19
29
|
//# sourceMappingURL=env.provider.js.map
|
package/dist/env.provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.provider.js","sourceRoot":"","sources":["../src/env.provider.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,MAAa,GAAG;IAGd,MAAM,CAAC,GAAG,CACR,GAAW,EACX,MAAqC;QAErC,MAAM,
|
|
1
|
+
{"version":3,"file":"env.provider.js","sourceRoot":"","sources":["../src/env.provider.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,MAAa,GAAG;IAGd,MAAM,CAAC,GAAG,CACR,GAAW,EACX,MAAqC;QAErC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACjB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,GAAW;QACrC,OAAO,gBAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAW;QACpB,MAAM,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEjC,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC;IAC3B,CAAC;CACF;AA3BD,kBA2BC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/cli.common",
|
|
3
|
-
"version": "4.10.0-next.
|
|
3
|
+
"version": "4.10.0-next.4",
|
|
4
4
|
"description": "Shared types and helpers for build work with cli",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
],
|
|
16
16
|
"license": "Apache License 2.0",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@rsdk/common": "4.10.0-next.
|
|
19
|
-
"@rsdk/logging": "4.10.0-next.
|
|
18
|
+
"@rsdk/common": "4.10.0-next.4",
|
|
19
|
+
"@rsdk/logging": "4.10.0-next.4",
|
|
20
20
|
"@sinclair/typebox": "^0.32.13",
|
|
21
21
|
"commander": "^12.0.0",
|
|
22
22
|
"dotenv": "^16.3.1",
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"@rsdk/core": "*",
|
|
30
30
|
"reflect-metadata": "^0.1.12 || ^0.2.0"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "359903a0743d0ece3f7d33afe67dc75ee527d015"
|
|
33
33
|
}
|
package/src/cmd.core.ts
CHANGED
|
@@ -51,9 +51,10 @@ function createCommandHandler(
|
|
|
51
51
|
|
|
52
52
|
const isNotProvided = Object.hasOwn(opts, key);
|
|
53
53
|
|
|
54
|
-
const
|
|
54
|
+
const isDefaultValue =
|
|
55
55
|
optionMetadata.defaultValue !== undefined &&
|
|
56
|
-
v
|
|
56
|
+
v === optionMetadata.defaultValue;
|
|
57
|
+
const isNotDefaultValue = !isDefaultValue;
|
|
57
58
|
|
|
58
59
|
const envKey = createEnvKey(optionMetadata);
|
|
59
60
|
|
|
@@ -61,29 +62,34 @@ function createCommandHandler(
|
|
|
61
62
|
envKey,
|
|
62
63
|
});
|
|
63
64
|
|
|
64
|
-
const
|
|
65
|
+
const envHasValue = Env.has(envKey);
|
|
66
|
+
const envValue = Env.get(envKey);
|
|
65
67
|
|
|
66
68
|
cliLogger.trace('option value state', {
|
|
67
69
|
isNotProvided,
|
|
68
|
-
|
|
70
|
+
isDefaultValue,
|
|
69
71
|
envKey,
|
|
70
72
|
envValue,
|
|
71
73
|
optionMetadata,
|
|
72
74
|
});
|
|
73
75
|
|
|
74
|
-
if (
|
|
76
|
+
if (isNotDefaultValue && envHasValue && envValue !== v) {
|
|
75
77
|
cliLogger.warn('Flag value override env value', {
|
|
76
78
|
optionMetadata,
|
|
77
79
|
envKey,
|
|
78
80
|
envValue,
|
|
81
|
+
isDefaultValue,
|
|
79
82
|
flagValue: v,
|
|
80
83
|
});
|
|
81
84
|
}
|
|
82
85
|
|
|
83
|
-
|
|
84
|
-
|
|
86
|
+
// Если нам пробросили не значение по умолчанию - берем v, иначе берем значение из env или проброшенное
|
|
87
|
+
const result = isNotDefaultValue ? v : envValue ?? v;
|
|
88
|
+
|
|
89
|
+
if (optionMetadata.parser) {
|
|
90
|
+
return optionMetadata.parser(result);
|
|
85
91
|
}
|
|
86
|
-
return
|
|
92
|
+
return result;
|
|
87
93
|
},
|
|
88
94
|
);
|
|
89
95
|
|
package/src/env.provider.ts
CHANGED
|
@@ -7,11 +7,24 @@ export class Env {
|
|
|
7
7
|
key: string,
|
|
8
8
|
parser?: (v: string | undefined) => V,
|
|
9
9
|
): V | undefined | string {
|
|
10
|
-
const
|
|
11
|
-
|
|
10
|
+
const nk = this.normalizeKey(key);
|
|
11
|
+
if (!Env.has(nk)) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
const v = process.env[nk];
|
|
12
15
|
if (parser) {
|
|
13
16
|
return parser(v);
|
|
14
17
|
}
|
|
15
18
|
return v;
|
|
16
19
|
}
|
|
20
|
+
|
|
21
|
+
private static normalizeKey(key: string): string {
|
|
22
|
+
return _.snakeCase(key).toUpperCase();
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
static has(key: string): boolean {
|
|
26
|
+
const nk = Env.normalizeKey(key);
|
|
27
|
+
|
|
28
|
+
return nk in process.env;
|
|
29
|
+
}
|
|
17
30
|
}
|