@pristine-ts/cli 0.0.305 → 0.0.306
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/dist/lib/cjs/event-handlers/cli.event-handler.js +16 -5
- package/dist/lib/cjs/event-handlers/cli.event-handler.js.map +1 -1
- package/dist/lib/esm/event-handlers/cli.event-handler.js +16 -5
- package/dist/lib/esm/event-handlers/cli.event-handler.js.map +1 -1
- package/dist/types/event-handlers/cli.event-handler.d.ts +3 -1
- package/package.json +7 -7
|
@@ -28,15 +28,16 @@ const command_event_response_type_1 = require("../types/command-event-response.t
|
|
|
28
28
|
const common_1 = require("@pristine-ts/common");
|
|
29
29
|
const command_not_found_error_1 = require("../errors/command-not-found.error");
|
|
30
30
|
const class_validator_1 = require("@pristine-ts/class-validator");
|
|
31
|
-
const class_transformer_1 = require("class-transformer");
|
|
32
31
|
const console_manager_1 = require("../managers/console.manager");
|
|
33
32
|
const exit_code_enum_1 = require("../enums/exit-code.enum");
|
|
34
33
|
const cli_module_keyname_1 = require("../cli.module.keyname");
|
|
34
|
+
const data_mapping_common_1 = require("@pristine-ts/data-mapping-common");
|
|
35
35
|
let CliEventHandler = class CliEventHandler {
|
|
36
|
-
constructor(logHandler, validator, consoleManager, commands) {
|
|
36
|
+
constructor(logHandler, validator, consoleManager, dataMapper, commands) {
|
|
37
37
|
this.logHandler = logHandler;
|
|
38
38
|
this.validator = validator;
|
|
39
39
|
this.consoleManager = consoleManager;
|
|
40
|
+
this.dataMapper = dataMapper;
|
|
40
41
|
this.commands = commands;
|
|
41
42
|
}
|
|
42
43
|
handle(event) {
|
|
@@ -48,7 +49,16 @@ let CliEventHandler = class CliEventHandler {
|
|
|
48
49
|
}
|
|
49
50
|
let mappedArguments;
|
|
50
51
|
if (event.payload.arguments !== undefined) {
|
|
51
|
-
|
|
52
|
+
try {
|
|
53
|
+
mappedArguments = yield this.dataMapper.autoMap(event.payload.arguments, command.optionsType, {
|
|
54
|
+
isOptionalDefaultValue: true,
|
|
55
|
+
excludeExtraneousValues: false,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
catch (e) {
|
|
59
|
+
// Trying without the arguments being mapped.
|
|
60
|
+
mappedArguments = event.payload.arguments;
|
|
61
|
+
}
|
|
52
62
|
}
|
|
53
63
|
// Validates if all the conditions are respected in the expected type.
|
|
54
64
|
const errors = yield this.validator.validate(mappedArguments);
|
|
@@ -91,8 +101,9 @@ exports.CliEventHandler = CliEventHandler = __decorate([
|
|
|
91
101
|
(0, common_1.moduleScoped)(cli_module_keyname_1.CliModuleKeyname),
|
|
92
102
|
(0, tsyringe_1.injectable)(),
|
|
93
103
|
__param(0, (0, tsyringe_1.inject)("LogHandlerInterface")),
|
|
94
|
-
__param(
|
|
104
|
+
__param(4, (0, tsyringe_1.injectAll)(common_1.ServiceDefinitionTagEnum.Command)),
|
|
95
105
|
__metadata("design:paramtypes", [Object, class_validator_1.Validator,
|
|
96
|
-
console_manager_1.ConsoleManager,
|
|
106
|
+
console_manager_1.ConsoleManager,
|
|
107
|
+
data_mapping_common_1.DataMapper, Array])
|
|
97
108
|
], CliEventHandler);
|
|
98
109
|
//# sourceMappingURL=cli.event-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.event-handler.js","sourceRoot":"","sources":["../../../../src/event-handlers/cli.event-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAuD;AAEvD,mFAA4E;AAE5E,sFAA0E;AAE1E,gDAAgF;AAChF,+EAAuE;AAEvE,kEAAuD;
|
|
1
|
+
{"version":3,"file":"cli.event-handler.js","sourceRoot":"","sources":["../../../../src/event-handlers/cli.event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,15 +25,16 @@ import { CommandEventResponse } from "../types/command-event-response.type";
|
|
|
25
25
|
import { moduleScoped, ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
|
|
26
26
|
import { CommandNotFoundError } from "../errors/command-not-found.error";
|
|
27
27
|
import { Validator } from "@pristine-ts/class-validator";
|
|
28
|
-
import { plainToInstance } from "class-transformer";
|
|
29
28
|
import { ConsoleManager } from "../managers/console.manager";
|
|
30
29
|
import { ExitCodeEnum } from "../enums/exit-code.enum";
|
|
31
30
|
import { CliModuleKeyname } from "../cli.module.keyname";
|
|
31
|
+
import { DataMapper } from "@pristine-ts/data-mapping-common";
|
|
32
32
|
let CliEventHandler = class CliEventHandler {
|
|
33
|
-
constructor(logHandler, validator, consoleManager, commands) {
|
|
33
|
+
constructor(logHandler, validator, consoleManager, dataMapper, commands) {
|
|
34
34
|
this.logHandler = logHandler;
|
|
35
35
|
this.validator = validator;
|
|
36
36
|
this.consoleManager = consoleManager;
|
|
37
|
+
this.dataMapper = dataMapper;
|
|
37
38
|
this.commands = commands;
|
|
38
39
|
}
|
|
39
40
|
handle(event) {
|
|
@@ -45,7 +46,16 @@ let CliEventHandler = class CliEventHandler {
|
|
|
45
46
|
}
|
|
46
47
|
let mappedArguments;
|
|
47
48
|
if (event.payload.arguments !== undefined) {
|
|
48
|
-
|
|
49
|
+
try {
|
|
50
|
+
mappedArguments = yield this.dataMapper.autoMap(event.payload.arguments, command.optionsType, {
|
|
51
|
+
isOptionalDefaultValue: true,
|
|
52
|
+
excludeExtraneousValues: false,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
// Trying without the arguments being mapped.
|
|
57
|
+
mappedArguments = event.payload.arguments;
|
|
58
|
+
}
|
|
49
59
|
}
|
|
50
60
|
// Validates if all the conditions are respected in the expected type.
|
|
51
61
|
const errors = yield this.validator.validate(mappedArguments);
|
|
@@ -87,9 +97,10 @@ CliEventHandler = __decorate([
|
|
|
87
97
|
moduleScoped(CliModuleKeyname),
|
|
88
98
|
injectable(),
|
|
89
99
|
__param(0, inject("LogHandlerInterface")),
|
|
90
|
-
__param(
|
|
100
|
+
__param(4, injectAll(ServiceDefinitionTagEnum.Command)),
|
|
91
101
|
__metadata("design:paramtypes", [Object, Validator,
|
|
92
|
-
ConsoleManager,
|
|
102
|
+
ConsoleManager,
|
|
103
|
+
DataMapper, Array])
|
|
93
104
|
], CliEventHandler);
|
|
94
105
|
export { CliEventHandler };
|
|
95
106
|
//# sourceMappingURL=cli.event-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.event-handler.js","sourceRoot":"","sources":["../../../../src/event-handlers/cli.event-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AAEvD,OAAO,EAAC,mBAAmB,EAAC,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAC,YAAY,EAAE,wBAAwB,EAAE,GAAG,EAAC,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAC,oBAAoB,EAAC,MAAM,mCAAmC,CAAC;AAEvE,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.event-handler.js","sourceRoot":"","sources":["../../../../src/event-handlers/cli.event-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,14 @@ import { CommandInterface } from "../interfaces/command.interface";
|
|
|
5
5
|
import { LogHandlerInterface } from "@pristine-ts/logging";
|
|
6
6
|
import { Validator } from "@pristine-ts/class-validator";
|
|
7
7
|
import { ConsoleManager } from "../managers/console.manager";
|
|
8
|
+
import { DataMapper } from "@pristine-ts/data-mapping-common";
|
|
8
9
|
export declare class CliEventHandler implements EventHandlerInterface<any, any> {
|
|
9
10
|
private readonly logHandler;
|
|
10
11
|
private readonly validator;
|
|
11
12
|
private readonly consoleManager;
|
|
13
|
+
private readonly dataMapper;
|
|
12
14
|
private readonly commands;
|
|
13
|
-
constructor(logHandler: LogHandlerInterface, validator: Validator, consoleManager: ConsoleManager, commands: CommandInterface<any>[]);
|
|
15
|
+
constructor(logHandler: LogHandlerInterface, validator: Validator, consoleManager: ConsoleManager, dataMapper: DataMapper, commands: CommandInterface<any>[]);
|
|
14
16
|
handle(event: CommandEvent): Promise<CommandEventResponse>;
|
|
15
17
|
supports(event: Event<any>): boolean;
|
|
16
18
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pristine-ts/cli",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.306",
|
|
4
4
|
"description": "",
|
|
5
5
|
"module": "dist/lib/esm/cli.module.js",
|
|
6
6
|
"main": "dist/lib/cjs/cli.module.js",
|
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
"access": "public"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@pristine-ts/common": "^0.0.
|
|
28
|
-
"@pristine-ts/core": "^0.0.
|
|
29
|
-
"@pristine-ts/file": "^0.0.
|
|
30
|
-
"@pristine-ts/logging": "^0.0.
|
|
31
|
-
"@pristine-ts/validation": "^0.0.
|
|
27
|
+
"@pristine-ts/common": "^0.0.306",
|
|
28
|
+
"@pristine-ts/core": "^0.0.306",
|
|
29
|
+
"@pristine-ts/file": "^0.0.306",
|
|
30
|
+
"@pristine-ts/logging": "^0.0.306",
|
|
31
|
+
"@pristine-ts/validation": "^0.0.306",
|
|
32
32
|
"class-transformer": "^0.5.1"
|
|
33
33
|
},
|
|
34
34
|
"jest": {
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"src/*.{js,ts}"
|
|
66
66
|
]
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "7cd470d729226102adc8a4785c5b6918ac65f9fc"
|
|
69
69
|
}
|