@rsdk/core 3.2.0-next.0 → 3.2.0-next.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/CHANGELOG.md +6 -0
- package/dist/manifest/manifest.js +0 -2
- package/dist/manifest/manifest.js.map +1 -1
- package/dist/platform.context.d.ts +6 -1
- package/dist/platform.context.js +10 -1
- package/dist/platform.context.js.map +1 -1
- package/package.json +6 -6
- package/src/manifest/manifest.ts +0 -2
- package/src/platform.context.ts +11 -1
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.2.0-next.1](https://github.com/R-Vision/rsdk/compare/v3.2.0-next.0...v3.2.0-next.1) (2023-08-09)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* **testing:** create tests is possible outside of applications ([36455da](https://github.com/R-Vision/rsdk/commit/36455da408927b00e0c02bc37a94d0c0f9cbef20))
|
|
11
|
+
|
|
6
12
|
## [3.2.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.1.0...v3.2.0-next.0) (2023-08-09)
|
|
7
13
|
|
|
8
14
|
### Features
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Manifest = void 0;
|
|
4
4
|
const node_path_1 = require("node:path");
|
|
5
5
|
const node_process_1 = require("node:process");
|
|
6
|
-
const app_metadata_1 = require("../app-metadata");
|
|
7
6
|
/**
|
|
8
7
|
* Утилитарный класс для вывода данных из `package.json`
|
|
9
8
|
*/
|
|
@@ -15,7 +14,6 @@ class Manifest {
|
|
|
15
14
|
const path = manifestPath || (0, node_path_1.join)((0, node_process_1.cwd)(), 'package.json');
|
|
16
15
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
17
16
|
const { name, description, version } = require(path);
|
|
18
|
-
(0, app_metadata_1.assertAppName)(name);
|
|
19
17
|
return { name, description, version };
|
|
20
18
|
}
|
|
21
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/manifest/manifest.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,+CAAmC;
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/manifest/manifest.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,+CAAmC;AAInC;;GAEG;AACH,MAAa,QAAQ;IACnB,MAAM,CAAC,OAAO,CAAC,YAAqB;QAClC;;WAEG;QACH,MAAM,IAAI,GAAG,YAAY,IAAI,IAAA,gBAAI,EAAC,IAAA,kBAAG,GAAE,EAAE,cAAc,CAAC,CAAC;QAEzD,8DAA8D;QAC9D,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAiB,CAAC;QAErE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;CACF;AAZD,4BAYC"}
|
|
@@ -9,6 +9,9 @@ import type { PlatformAppMetadata, PlatformExtendedOptions, PlatformOptions } fr
|
|
|
9
9
|
*/
|
|
10
10
|
export declare class PlatformContext {
|
|
11
11
|
readonly options: PlatformOptions;
|
|
12
|
+
readonly strictnessOptions?: {
|
|
13
|
+
skipAssertAppName?: boolean;
|
|
14
|
+
} | undefined;
|
|
12
15
|
readonly logger: import("@rsdk/logging").ILogger;
|
|
13
16
|
private microservices;
|
|
14
17
|
private readonly httpTransport;
|
|
@@ -22,7 +25,9 @@ export declare class PlatformContext {
|
|
|
22
25
|
* А также инициализирует конфигурацию согласно требованиям платформы
|
|
23
26
|
* @param options
|
|
24
27
|
*/
|
|
25
|
-
constructor(options: PlatformOptions
|
|
28
|
+
constructor(options: PlatformOptions, strictnessOptions?: {
|
|
29
|
+
skipAssertAppName?: boolean;
|
|
30
|
+
} | undefined);
|
|
26
31
|
get extendedOptions(): PlatformExtendedOptions;
|
|
27
32
|
private static assertPluginCompatability;
|
|
28
33
|
private static assertTransportCompatability;
|
package/dist/platform.context.js
CHANGED
|
@@ -5,6 +5,7 @@ const logging_1 = require("@rsdk/logging");
|
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
6
|
const config_metadata_provider_1 = require("./config/metadata/config-metadata.provider");
|
|
7
7
|
const manifest_1 = require("./manifest/manifest");
|
|
8
|
+
const app_metadata_1 = require("./app-metadata");
|
|
8
9
|
const context_aggregator_1 = require("./context.aggregator");
|
|
9
10
|
const exceptions_1 = require("./exceptions");
|
|
10
11
|
const logging_2 = require("./logging");
|
|
@@ -15,6 +16,7 @@ const types_1 = require("./types");
|
|
|
15
16
|
*/
|
|
16
17
|
class PlatformContext {
|
|
17
18
|
options;
|
|
19
|
+
strictnessOptions;
|
|
18
20
|
logger = logging_1.LoggerFactory.create('App');
|
|
19
21
|
microservices = new Map();
|
|
20
22
|
httpTransport;
|
|
@@ -28,8 +30,9 @@ class PlatformContext {
|
|
|
28
30
|
* А также инициализирует конфигурацию согласно требованиям платформы
|
|
29
31
|
* @param options
|
|
30
32
|
*/
|
|
31
|
-
constructor(options) {
|
|
33
|
+
constructor(options, strictnessOptions) {
|
|
32
34
|
this.options = options;
|
|
35
|
+
this.strictnessOptions = strictnessOptions;
|
|
33
36
|
PlatformContext.assertTransportCompatability(options);
|
|
34
37
|
PlatformContext.assertPluginCompatability(options);
|
|
35
38
|
this.httpTransport = options.transports?.find?.(types_1.isHttpTransport);
|
|
@@ -41,6 +44,12 @@ class PlatformContext {
|
|
|
41
44
|
}
|
|
42
45
|
const manifestData = manifest_1.Manifest.getData(this.options.manifestPath);
|
|
43
46
|
const { name, description, version } = manifestData;
|
|
47
|
+
if (this.strictnessOptions?.skipAssertAppName) {
|
|
48
|
+
this.logger.warn('assert app name skipped');
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
(0, app_metadata_1.assertAppName)(name);
|
|
52
|
+
}
|
|
44
53
|
const extendedOptions = {
|
|
45
54
|
description,
|
|
46
55
|
name,
|
|
@@ -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;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.2.0-next.
|
|
3
|
+
"version": "3.2.0-next.1",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -31,17 +31,17 @@
|
|
|
31
31
|
"@nestjs/common": "^10.1.3",
|
|
32
32
|
"@nestjs/core": "^10.1.3",
|
|
33
33
|
"@nestjs/microservices": "^10.1.3",
|
|
34
|
-
"@rsdk/autodoc.protocol": "^3.
|
|
34
|
+
"@rsdk/autodoc.protocol": "^3.2.0-next.1",
|
|
35
35
|
"@rsdk/common": "^3.1.0",
|
|
36
36
|
"@rsdk/common.nestjs": "^3.1.0",
|
|
37
37
|
"@rsdk/common.node": "^3.1.0",
|
|
38
|
-
"@rsdk/decorators": "^3.
|
|
39
|
-
"@rsdk/logging": "^3.
|
|
40
|
-
"@rsdk/metadata": "^3.
|
|
38
|
+
"@rsdk/decorators": "^3.2.0-next.1",
|
|
39
|
+
"@rsdk/logging": "^3.2.0-next.1",
|
|
40
|
+
"@rsdk/metadata": "^3.2.0-next.1",
|
|
41
41
|
"@rsdk/nest-tools": "^3.1.0",
|
|
42
42
|
"axios": "^1.1.3",
|
|
43
43
|
"reflect-metadata": "^0.1.13",
|
|
44
44
|
"rxjs": "^7.0.0"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "9f5c3bb74ae420f57f0bcb4a2ea1a11db6f21a8f"
|
|
47
47
|
}
|
package/src/manifest/manifest.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { join } from 'node:path';
|
|
2
2
|
import { cwd } from 'node:process';
|
|
3
3
|
|
|
4
|
-
import { assertAppName } from '../app-metadata';
|
|
5
4
|
import type { ManifestData } from '../types';
|
|
6
5
|
|
|
7
6
|
/**
|
|
@@ -17,7 +16,6 @@ export class Manifest {
|
|
|
17
16
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
18
17
|
const { name, description, version } = require(path) as ManifestData;
|
|
19
18
|
|
|
20
|
-
assertAppName(name);
|
|
21
19
|
return { name, description, version };
|
|
22
20
|
}
|
|
23
21
|
}
|
package/src/platform.context.ts
CHANGED
|
@@ -9,6 +9,7 @@ import { groupBy, intersection } from 'lodash';
|
|
|
9
9
|
|
|
10
10
|
import { ConfigMetadataProvider } from './config/metadata/config-metadata.provider';
|
|
11
11
|
import { Manifest } from './manifest/manifest';
|
|
12
|
+
import { assertAppName } from './app-metadata';
|
|
12
13
|
import type { Config, ConfigContext, SectionMetadata } from './config';
|
|
13
14
|
import { ContextAggregator } from './context.aggregator';
|
|
14
15
|
import {
|
|
@@ -52,7 +53,10 @@ export class PlatformContext {
|
|
|
52
53
|
* А также инициализирует конфигурацию согласно требованиям платформы
|
|
53
54
|
* @param options
|
|
54
55
|
*/
|
|
55
|
-
constructor(
|
|
56
|
+
constructor(
|
|
57
|
+
readonly options: PlatformOptions,
|
|
58
|
+
readonly strictnessOptions?: { skipAssertAppName?: boolean },
|
|
59
|
+
) {
|
|
56
60
|
PlatformContext.assertTransportCompatability(options);
|
|
57
61
|
PlatformContext.assertPluginCompatability(options);
|
|
58
62
|
|
|
@@ -67,6 +71,12 @@ export class PlatformContext {
|
|
|
67
71
|
const manifestData = Manifest.getData(this.options.manifestPath);
|
|
68
72
|
const { name, description, version } = manifestData;
|
|
69
73
|
|
|
74
|
+
if (this.strictnessOptions?.skipAssertAppName) {
|
|
75
|
+
this.logger.warn('assert app name skipped');
|
|
76
|
+
} else {
|
|
77
|
+
assertAppName(name);
|
|
78
|
+
}
|
|
79
|
+
|
|
70
80
|
const extendedOptions: PlatformExtendedOptions = {
|
|
71
81
|
description,
|
|
72
82
|
name,
|