@rsdk/core 4.1.0-next.1 → 4.2.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 +10 -0
- package/dist/app-metadata/app-metadata.const.d.ts +1 -0
- package/dist/app-metadata/app-metadata.const.js +2 -1
- package/dist/app-metadata/app-metadata.const.js.map +1 -1
- package/dist/app-metadata/app-metadata.module.js +4 -0
- package/dist/app-metadata/app-metadata.module.js.map +1 -1
- package/dist/app-metadata/app-name.const.js +1 -1
- package/dist/app-metadata/app-name.const.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/platform.context.js +12 -4
- package/dist/platform.context.js.map +1 -1
- package/dist/types/options.d.ts +3 -1
- package/package.json +10 -10
- package/src/app-metadata/app-metadata.const.ts +1 -0
- package/src/app-metadata/app-metadata.module.ts +10 -1
- package/src/app-metadata/app-name.const.ts +1 -1
- package/src/index.ts +2 -0
- package/src/platform.context.ts +9 -1
- package/src/types/options.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
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.2.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.1.0...v4.2.0-next.0) (2024-02-02)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* **s3:** added @rsdk/s3 package ([03bd9ea](https://github.com/R-Vision/rsdk/commit/03bd9ea7e5f78be6c93b1a2547fe7c2639ca0146))
|
|
11
|
+
|
|
12
|
+
## [4.1.0](https://github.com/R-Vision/rsdk/compare/v4.1.0-next.1...v4.1.0) (2024-01-24)
|
|
13
|
+
|
|
14
|
+
**Note:** Version bump only for package @rsdk/core
|
|
15
|
+
|
|
6
16
|
## [4.1.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.1.0-next.0...v4.1.0-next.1) (2024-01-24)
|
|
7
17
|
|
|
8
18
|
**Note:** Version bump only for package @rsdk/core
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.APP_VERSION = exports.APP_DESCRIPTION = exports.APP_NAME = void 0;
|
|
3
|
+
exports.APP_VERSION = exports.APP_DESCRIPTION = exports.APP_SCOPE = exports.APP_NAME = void 0;
|
|
4
4
|
exports.APP_NAME = Symbol('APP_NAME_TOKEN');
|
|
5
|
+
exports.APP_SCOPE = Symbol('APP_SCOPE_TOKEN');
|
|
5
6
|
exports.APP_DESCRIPTION = Symbol('APP_DESCRIPTION_TOKEN');
|
|
6
7
|
exports.APP_VERSION = Symbol('APP_VERSION_TOKEN');
|
|
7
8
|
//# sourceMappingURL=app-metadata.const.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-metadata.const.js","sourceRoot":"","sources":["../../src/app-metadata/app-metadata.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACpC,QAAA,eAAe,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAClD,QAAA,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"app-metadata.const.js","sourceRoot":"","sources":["../../src/app-metadata/app-metadata.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACpC,QAAA,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACtC,QAAA,eAAe,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAClD,QAAA,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -17,6 +17,10 @@ let AppMetadataModule = AppMetadataModule_1 = class AppMetadataModule {
|
|
|
17
17
|
provide: app_metadata_const_1.APP_NAME,
|
|
18
18
|
useValue: options.name,
|
|
19
19
|
},
|
|
20
|
+
{
|
|
21
|
+
provide: app_metadata_const_1.APP_SCOPE,
|
|
22
|
+
useValue: options.appScope,
|
|
23
|
+
},
|
|
20
24
|
{
|
|
21
25
|
provide: app_metadata_const_1.APP_DESCRIPTION,
|
|
22
26
|
useValue: options.description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-metadata.module.js","sourceRoot":"","sources":["../../src/app-metadata/app-metadata.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAwC;AAIxC,
|
|
1
|
+
{"version":3,"file":"app-metadata.module.js","sourceRoot":"","sources":["../../src/app-metadata/app-metadata.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAwC;AAIxC,6DAK8B;AAGvB,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAgC;QAC7C,MAAM,SAAS,GAAe;YAC5B;gBACE,OAAO,EAAE,6BAAQ;gBACjB,QAAQ,EAAE,OAAO,CAAC,IAAI;aACvB;YACD;gBACE,OAAO,EAAE,8BAAS;gBAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B;YACD;gBACE,OAAO,EAAE,oCAAe;gBACxB,QAAQ,EAAE,OAAO,CAAC,WAAW;aAC9B;YACD;gBACE,OAAO,EAAE,gCAAW;gBACpB,QAAQ,EAAE,OAAO,CAAC,OAAO;aAC1B;SACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,mBAAiB;YACzB,SAAS;YAET,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC;CACF,CAAA;AA7BY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,iBAAiB,CA6B7B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.APP_NAME_PATTERN = void 0;
|
|
4
|
-
exports.APP_NAME_PATTERN =
|
|
4
|
+
exports.APP_NAME_PATTERN = /(^[a-z][a-z-]*)\.[.a-z-]*[a-z]$/;
|
|
5
5
|
//# sourceMappingURL=app-name.const.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-name.const.js","sourceRoot":"","sources":["../../src/app-metadata/app-name.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG
|
|
1
|
+
{"version":3,"file":"app-name.const.js","sourceRoot":"","sources":["../../src/app-metadata/app-name.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,iCAAiC,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import './unhandled-rejection.handler';
|
|
2
|
+
export { APP_SCOPE } from './app-metadata/app-metadata.const';
|
|
2
3
|
export { Manifest } from './manifest/manifest';
|
|
3
4
|
export { ProtocolDetector } from './transport/protocol.detector';
|
|
4
5
|
export { X_REQUEST_ID } from './tracing/constants';
|
package/dist/index.js
CHANGED
|
@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.X_B3_TRACE_ID = exports.X_B3_SPAN_ID = exports.X_B3_PARENT_SPAN_ID = exports.getTransportId = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.InjectLogger = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.Span = exports.ActiveSpanStorage = exports.ActiveSpanModule = exports.createSpan = exports.saveAsyncHooksContext = exports.TracingModule = exports.RequestMetadataStorage = exports.X_REQUEST_ID = exports.ProtocolDetector = exports.Manifest = void 0;
|
|
17
|
+
exports.X_B3_TRACE_ID = exports.X_B3_SPAN_ID = exports.X_B3_PARENT_SPAN_ID = exports.getTransportId = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.InjectLogger = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.Span = exports.ActiveSpanStorage = exports.ActiveSpanModule = exports.createSpan = exports.saveAsyncHooksContext = exports.TracingModule = exports.RequestMetadataStorage = exports.X_REQUEST_ID = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
|
|
18
18
|
require("./unhandled-rejection.handler");
|
|
19
|
+
var app_metadata_const_1 = require("./app-metadata/app-metadata.const");
|
|
20
|
+
Object.defineProperty(exports, "APP_SCOPE", { enumerable: true, get: function () { return app_metadata_const_1.APP_SCOPE; } });
|
|
19
21
|
var manifest_1 = require("./manifest/manifest");
|
|
20
22
|
Object.defineProperty(exports, "Manifest", { enumerable: true, get: function () { return manifest_1.Manifest; } });
|
|
21
23
|
var protocol_detector_1 = require("./transport/protocol.detector");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,iDAAmD;AAA1C,yGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,iHAAA,sBAAsB,OAAA;AACtB,wGAAA,aAAa,OAAA;AACb,gHAAA,qBAAqB,OAAA;AACrB,qGAAA,UAAU,OAAA;AACV,2GAAA,gBAAgB,OAAA;AAChB,4GAAA,iBAAiB,OAAA;AACjB,+FAAA,IAAI,OAAA;AAGN,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAAyC;AAAhC,uGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAClD,iEAA8D;AAArD,kHAAA,cAAc,OAAA;AAEvB,8DAIsC;AAHpC,oHAAA,mBAAmB,OAAA;AACnB,6GAAA,YAAY,OAAA;AACZ,8GAAA,aAAa,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,iDAAmD;AAA1C,yGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,iHAAA,sBAAsB,OAAA;AACtB,wGAAA,aAAa,OAAA;AACb,gHAAA,qBAAqB,OAAA;AACrB,qGAAA,UAAU,OAAA;AACV,2GAAA,gBAAgB,OAAA;AAChB,4GAAA,iBAAiB,OAAA;AACjB,+FAAA,IAAI,OAAA;AAGN,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAAyC;AAAhC,uGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAClD,iEAA8D;AAArD,kHAAA,cAAc,OAAA;AAEvB,8DAIsC;AAHpC,oHAAA,mBAAmB,OAAA;AACnB,6GAAA,YAAY,OAAA;AACZ,8GAAA,aAAa,OAAA"}
|
package/dist/platform.context.js
CHANGED
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PlatformContext = void 0;
|
|
4
4
|
const logging_1 = require("@rsdk/logging");
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
|
+
const app_name_const_1 = require("./app-metadata/app-name.const");
|
|
7
|
+
const exceptions_1 = require("./app-metadata/exceptions");
|
|
6
8
|
const config_metadata_provider_1 = require("./config/metadata/config-metadata.provider");
|
|
7
9
|
const manifest_1 = require("./manifest/manifest");
|
|
8
10
|
const app_metadata_1 = require("./app-metadata");
|
|
9
11
|
const context_aggregator_1 = require("./context.aggregator");
|
|
10
|
-
const
|
|
12
|
+
const exceptions_2 = require("./exceptions");
|
|
11
13
|
const logging_2 = require("./logging");
|
|
12
14
|
const noop_http_adapter_1 = require("./noop.http-adapter");
|
|
13
15
|
const types_1 = require("./types");
|
|
@@ -47,12 +49,18 @@ class PlatformContext {
|
|
|
47
49
|
const { name, description, version } = manifestData;
|
|
48
50
|
const appName = this.strictnessOptions?.forceAppName ?? name;
|
|
49
51
|
if (this.strictnessOptions?.skipAssertAppName) {
|
|
50
|
-
this.logger.warn('
|
|
52
|
+
this.logger.warn('app name asserting was skipped');
|
|
51
53
|
}
|
|
52
54
|
else {
|
|
53
55
|
(0, app_metadata_1.assertAppName)(appName);
|
|
54
56
|
}
|
|
57
|
+
const regexrResult = app_name_const_1.APP_NAME_PATTERN.exec(name);
|
|
58
|
+
const appScope = regexrResult?.[1];
|
|
59
|
+
if (!regexrResult || !appScope) {
|
|
60
|
+
throw new exceptions_1.InvalidAppNameException(name);
|
|
61
|
+
}
|
|
55
62
|
const extendedOptions = {
|
|
63
|
+
appScope,
|
|
56
64
|
description,
|
|
57
65
|
name: appName,
|
|
58
66
|
version,
|
|
@@ -71,7 +79,7 @@ class PlatformContext {
|
|
|
71
79
|
continue;
|
|
72
80
|
}
|
|
73
81
|
if ((0, lodash_1.intersection)(plugin.forTransports(), protocols).length === 0) {
|
|
74
|
-
throw new
|
|
82
|
+
throw new exceptions_2.NoMatchingTransportException(plugin);
|
|
75
83
|
}
|
|
76
84
|
}
|
|
77
85
|
}
|
|
@@ -79,7 +87,7 @@ class PlatformContext {
|
|
|
79
87
|
const grouped = (0, lodash_1.groupBy)(options.transports, (x) => x.getProtocol());
|
|
80
88
|
for (const [protocol, implementations] of Object.entries(grouped)) {
|
|
81
89
|
if (implementations.length > 1) {
|
|
82
|
-
throw new
|
|
90
|
+
throw new exceptions_2.DuplicateProtocolException(protocol, implementations.length);
|
|
83
91
|
}
|
|
84
92
|
}
|
|
85
93
|
}
|
|
@@ -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;IAmBf;IACA;IAnBF,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,aAAa,GAAG,IAAI,GAAG,EAA6C,CAAC;IAE5D,aAAa,CAA6B;IACnD,UAAU,CAAoB;IAE9B,gBAAgB,CAA2B;IAEnD;;;;;;;;OAQG;IACH,YACW,OAAwB,EACxB,iBAKR;QANQ,YAAO,GAAP,OAAO,CAAiB;QACxB,sBAAiB,GAAjB,iBAAiB,CAKzB;QAED,eAAe,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACtD,eAAe,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,uBAAe,CAAC,CAAC;QACjE,IAAI,CAAC,UAAU,GAAG,IAAI,sCAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC;QAC/B,CAAC;QACD,MAAM,YAAY,GAAG,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,IAAI,IAAI,CAAC;QAC7D,IAAI,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":"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"}
|
package/dist/types/options.d.ts
CHANGED
|
@@ -68,4 +68,6 @@ export interface PlatformOptions extends PlatformManifestPathOptions {
|
|
|
68
68
|
plugins?: PlatformAppPlugin[];
|
|
69
69
|
}
|
|
70
70
|
export type PlatformAppOptions = RequiredFields<PlatformOptions, 'transports' | 'modules'>;
|
|
71
|
-
export type PlatformExtendedOptions = PlatformOptions & ManifestData
|
|
71
|
+
export type PlatformExtendedOptions = PlatformOptions & ManifestData & {
|
|
72
|
+
appScope: string;
|
|
73
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0-next.0",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -32,18 +32,18 @@
|
|
|
32
32
|
"@nestjs/common": "^10.0.0",
|
|
33
33
|
"@nestjs/core": "^10.0.0",
|
|
34
34
|
"@nestjs/microservices": "^10.0.0",
|
|
35
|
-
"@rsdk/autodoc.protocol": "^4.
|
|
36
|
-
"@rsdk/common": "^4.
|
|
37
|
-
"@rsdk/common.nestjs": "^4.
|
|
38
|
-
"@rsdk/common.node": "^4.
|
|
39
|
-
"@rsdk/decorators": "^4.
|
|
40
|
-
"@rsdk/logging": "^4.
|
|
41
|
-
"@rsdk/metadata": "^4.
|
|
42
|
-
"@rsdk/nest-tools": "^4.
|
|
35
|
+
"@rsdk/autodoc.protocol": "^4.2.0-next.0",
|
|
36
|
+
"@rsdk/common": "^4.2.0-next.0",
|
|
37
|
+
"@rsdk/common.nestjs": "^4.2.0-next.0",
|
|
38
|
+
"@rsdk/common.node": "^4.2.0-next.0",
|
|
39
|
+
"@rsdk/decorators": "^4.2.0-next.0",
|
|
40
|
+
"@rsdk/logging": "^4.2.0-next.0",
|
|
41
|
+
"@rsdk/metadata": "^4.2.0-next.0",
|
|
42
|
+
"@rsdk/nest-tools": "^4.2.0-next.0",
|
|
43
43
|
"axios": "^1.1.3",
|
|
44
44
|
"pino": "^8.16.1",
|
|
45
45
|
"reflect-metadata": "^0.1.13",
|
|
46
46
|
"rxjs": "^7.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "e4b95e1971841f8492f9df493fa4fe4f13f9bb5f"
|
|
49
49
|
}
|
|
@@ -3,7 +3,12 @@ import { Module } from '@nestjs/common';
|
|
|
3
3
|
|
|
4
4
|
import type { PlatformExtendedOptions } from '../types';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
APP_DESCRIPTION,
|
|
8
|
+
APP_NAME,
|
|
9
|
+
APP_SCOPE,
|
|
10
|
+
APP_VERSION,
|
|
11
|
+
} from './app-metadata.const';
|
|
7
12
|
|
|
8
13
|
@Module({})
|
|
9
14
|
export class AppMetadataModule {
|
|
@@ -13,6 +18,10 @@ export class AppMetadataModule {
|
|
|
13
18
|
provide: APP_NAME,
|
|
14
19
|
useValue: options.name,
|
|
15
20
|
},
|
|
21
|
+
{
|
|
22
|
+
provide: APP_SCOPE,
|
|
23
|
+
useValue: options.appScope,
|
|
24
|
+
},
|
|
16
25
|
{
|
|
17
26
|
provide: APP_DESCRIPTION,
|
|
18
27
|
useValue: options.description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export const APP_NAME_PATTERN =
|
|
1
|
+
export const APP_NAME_PATTERN = /(^[a-z][a-z-]*)\.[.a-z-]*[a-z]$/;
|
package/src/index.ts
CHANGED
package/src/platform.context.ts
CHANGED
|
@@ -7,6 +7,8 @@ import { LoggerFactory } from '@rsdk/logging';
|
|
|
7
7
|
import type { RsdkMetadataProvider } from '@rsdk/metadata';
|
|
8
8
|
import { groupBy, intersection } from 'lodash';
|
|
9
9
|
|
|
10
|
+
import { APP_NAME_PATTERN } from './app-metadata/app-name.const';
|
|
11
|
+
import { InvalidAppNameException } from './app-metadata/exceptions';
|
|
10
12
|
import { ConfigMetadataProvider } from './config/metadata/config-metadata.provider';
|
|
11
13
|
import { Manifest } from './manifest/manifest';
|
|
12
14
|
import { assertAppName } from './app-metadata';
|
|
@@ -78,12 +80,18 @@ export class PlatformContext {
|
|
|
78
80
|
const { name, description, version } = manifestData;
|
|
79
81
|
const appName = this.strictnessOptions?.forceAppName ?? name;
|
|
80
82
|
if (this.strictnessOptions?.skipAssertAppName) {
|
|
81
|
-
this.logger.warn('
|
|
83
|
+
this.logger.warn('app name asserting was skipped');
|
|
82
84
|
} else {
|
|
83
85
|
assertAppName(appName);
|
|
84
86
|
}
|
|
85
87
|
|
|
88
|
+
const regexrResult = APP_NAME_PATTERN.exec(name);
|
|
89
|
+
const appScope = regexrResult?.[1];
|
|
90
|
+
if (!regexrResult || !appScope) {
|
|
91
|
+
throw new InvalidAppNameException(name);
|
|
92
|
+
}
|
|
86
93
|
const extendedOptions: PlatformExtendedOptions = {
|
|
94
|
+
appScope,
|
|
87
95
|
description,
|
|
88
96
|
name: appName,
|
|
89
97
|
version,
|
package/src/types/options.ts
CHANGED