@rsdk/core 3.4.2-next.2 → 3.5.0-next.0
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
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
|
+
## [3.5.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.4.2-next.2...v3.5.0-next.0) (2023-09-07)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* **testing:** force set appName on create testing module ([37f1be8](https://github.com/R-Vision/rsdk/commit/37f1be85bda5c848eb18ec6781e8a9360b60f9ff))
|
|
11
|
+
|
|
6
12
|
## [3.4.2-next.2](https://github.com/R-Vision/rsdk/compare/v3.4.2-next.1...v3.4.2-next.2) (2023-09-07)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @rsdk/core
|
|
@@ -11,6 +11,7 @@ export declare class PlatformContext {
|
|
|
11
11
|
readonly options: PlatformOptions;
|
|
12
12
|
readonly strictnessOptions?: {
|
|
13
13
|
skipAssertAppName?: boolean;
|
|
14
|
+
forceAppName?: string;
|
|
14
15
|
} | undefined;
|
|
15
16
|
readonly logger: import("@rsdk/logging").ILogger;
|
|
16
17
|
private microservices;
|
|
@@ -24,9 +25,11 @@ export declare class PlatformContext {
|
|
|
24
25
|
*
|
|
25
26
|
* А также инициализирует конфигурацию согласно требованиям платформы
|
|
26
27
|
* @param options
|
|
28
|
+
* @param strictnessOptions
|
|
27
29
|
*/
|
|
28
30
|
constructor(options: PlatformOptions, strictnessOptions?: {
|
|
29
31
|
skipAssertAppName?: boolean;
|
|
32
|
+
forceAppName?: string;
|
|
30
33
|
} | undefined);
|
|
31
34
|
get extendedOptions(): PlatformExtendedOptions;
|
|
32
35
|
private static assertPluginCompatability;
|
package/dist/platform.context.js
CHANGED
|
@@ -29,6 +29,7 @@ class PlatformContext {
|
|
|
29
29
|
*
|
|
30
30
|
* А также инициализирует конфигурацию согласно требованиям платформы
|
|
31
31
|
* @param options
|
|
32
|
+
* @param strictnessOptions
|
|
32
33
|
*/
|
|
33
34
|
constructor(options, strictnessOptions) {
|
|
34
35
|
this.options = options;
|
|
@@ -44,15 +45,16 @@ class PlatformContext {
|
|
|
44
45
|
}
|
|
45
46
|
const manifestData = manifest_1.Manifest.getData(this.options.manifestPath);
|
|
46
47
|
const { name, description, version } = manifestData;
|
|
48
|
+
const appName = this.strictnessOptions?.forceAppName ?? name;
|
|
47
49
|
if (this.strictnessOptions?.skipAssertAppName) {
|
|
48
50
|
this.logger.warn('assert app name skipped');
|
|
49
51
|
}
|
|
50
52
|
else {
|
|
51
|
-
(0, app_metadata_1.assertAppName)(
|
|
53
|
+
(0, app_metadata_1.assertAppName)(appName);
|
|
52
54
|
}
|
|
53
55
|
const extendedOptions = {
|
|
54
56
|
description,
|
|
55
|
-
name,
|
|
57
|
+
name: appName,
|
|
56
58
|
version,
|
|
57
59
|
...this.options,
|
|
58
60
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":";;;AAKA,2CAA8C;AAE9C,mCAA+C;AAE/C,yFAAoF;AACpF,kDAA+C;AAC/C,iDAA+C;AAE/C,6DAAyD;AACzD,6CAGsB;AACtB,uCAA8C;AAC9C,2DAAsD;AAQtD,mCAMiB;AAEjB;;GAEG;AACH,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.0-next.0",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"reflect-metadata": "^0.1.13",
|
|
44
44
|
"rxjs": "^7.0.0"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "9c91e5c5a30c014250137615d21c3d870f2641f8"
|
|
47
47
|
}
|
package/src/platform.context.ts
CHANGED
|
@@ -52,10 +52,16 @@ export class PlatformContext {
|
|
|
52
52
|
*
|
|
53
53
|
* А также инициализирует конфигурацию согласно требованиям платформы
|
|
54
54
|
* @param options
|
|
55
|
+
* @param strictnessOptions
|
|
55
56
|
*/
|
|
56
57
|
constructor(
|
|
57
58
|
readonly options: PlatformOptions,
|
|
58
|
-
readonly strictnessOptions?: {
|
|
59
|
+
readonly strictnessOptions?: {
|
|
60
|
+
// check appName on validity by regex
|
|
61
|
+
skipAssertAppName?: boolean;
|
|
62
|
+
// force set appName
|
|
63
|
+
forceAppName?: string;
|
|
64
|
+
},
|
|
59
65
|
) {
|
|
60
66
|
PlatformContext.assertTransportCompatability(options);
|
|
61
67
|
PlatformContext.assertPluginCompatability(options);
|
|
@@ -70,16 +76,16 @@ export class PlatformContext {
|
|
|
70
76
|
}
|
|
71
77
|
const manifestData = Manifest.getData(this.options.manifestPath);
|
|
72
78
|
const { name, description, version } = manifestData;
|
|
73
|
-
|
|
79
|
+
const appName = this.strictnessOptions?.forceAppName ?? name;
|
|
74
80
|
if (this.strictnessOptions?.skipAssertAppName) {
|
|
75
81
|
this.logger.warn('assert app name skipped');
|
|
76
82
|
} else {
|
|
77
|
-
assertAppName(
|
|
83
|
+
assertAppName(appName);
|
|
78
84
|
}
|
|
79
85
|
|
|
80
86
|
const extendedOptions: PlatformExtendedOptions = {
|
|
81
87
|
description,
|
|
82
|
-
name,
|
|
88
|
+
name: appName,
|
|
83
89
|
version,
|
|
84
90
|
...this.options,
|
|
85
91
|
};
|