@pristine-ts/cli 1.0.440 → 2.0.1

package/dist/lib/esm/event-handlers/cli.event-handler.js

@@ -21,86 +21,107 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { inject, injectable, injectAll } from "tsyringe";
 import { CommandEventPayload } from "../event-payloads/command.event-payload";
-import { CommandEventResponse } from "../types/command-event-response.type";
 import { moduleScoped, ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
 import { CommandNotFoundError } from "../errors/command-not-found.error";
 import { Validator } from "@pristine-ts/class-validator";
 import { ConsoleManager } from "../managers/console.manager";
 import { ExitCodeEnum } from "../enums/exit-code.enum";
 import { CliModuleKeyname } from "../cli.module.keyname";
-import { AutoDataMappingBuilderOptions, DataMapper } from "@pristine-ts/data-mapping-common";
+import { plainToInstance } from "class-transformer";
 let CliEventHandler = class CliEventHandler {
-    constructor(logHandler, validator, consoleManager, dataMapper, commands) {
+    constructor(logHandler, validator, consoleManager, commands) {
         this.logHandler = logHandler;
         this.validator = validator;
         this.consoleManager = consoleManager;
-        this.dataMapper = dataMapper;
         this.commands = commands;
     }
     handle(event) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Check if a command is matched
-            const command = this.commands.find(command => command.name === event.payload.name);
+            var _a;
+            const command = this.commands.find(c => c.name === event.payload.name);
             if (command === undefined) {
                 throw new CommandNotFoundError(event.payload.name);
             }
-            let mappedArguments;
-            if (event.payload.arguments !== undefined) {
-                try {
-                    mappedArguments = yield this.dataMapper.autoMap(event.payload.arguments, command.optionsType, new AutoDataMappingBuilderOptions({
-                        isOptionalDefaultValue: true,
-                        excludeExtraneousValues: false,
-                    }));
-                }
-                catch (e) {
-                    // Trying without the arguments being mapped.
-                    mappedArguments = event.payload.arguments;
-                }
+            const resolution = yield this.resolveArgs(command, (_a = event.payload.arguments) !== null && _a !== void 0 ? _a : {});
+            if (resolution.exitCode !== undefined) {
+                // Mapping or validation failed. Already-rendered errors are on the console.
+                this.logExitStatus(event.payload.name, resolution.exitCode);
+                process.exit(resolution.exitCode);
+            }
+            const exitCode = yield command.run(resolution.args);
+            this.logExitStatus(event.payload.name, exitCode);
+            process.exit(exitCode);
+        });
+    }
+    /**
+     * Maps `rawArgs` (the parsed argv shape produced by `CommandEventMapper`) into a typed
+     * instance of `command.optionsType`, then runs `class-validator` against the instance.
+     *
+     * For commands that opt out of typed options (`optionsType === null`), passes the raw
+     * args through unchanged — the legacy escape hatch for commands that want to handle
+     * argv parsing themselves.
+     *
+     * Mapping or validation failures print the underlying error to the console and return an
+     * `exitCode` so the caller can exit non-zero. Success returns the typed instance under
+     * `args`. The two are mutually exclusive — see `ResolvedCommandArgs`.
+     */
+    resolveArgs(command, rawArgs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (command.optionsType === null) {
+                return { args: rawArgs };
             }
-            // Validates if all the conditions are respected in the expected type.
-            const errors = yield this.validator.validate(mappedArguments);
-            if (errors.length !== 0) {
-                // list the errors and return
-                errors.forEach(error => {
-                    this.consoleManager.writeLine("Errors with argument '" + error.property + "'. The following constraints failed:");
-                    for (const constraint in error.constraints) {
-                        const message = error.constraints[constraint];
-                        this.consoleManager.writeLine("/t/t- [" + constraint + "]: " + message);
-                    }
-                });
-                return new CommandEventResponse(event, ExitCodeEnum.Error);
+            let mapped;
+            try {
+                // class-transformer's plainToInstance is what produces a real instance of the
+                // options class (with the prototype, decorator metadata, and class-validator hooks
+                // intact). DataMapper.autoMap would return a plain object instead, which causes
+                // class-validator to silently report no errors because it can't find decorator
+                // metadata on a non-instance — exactly the bug this rewrite fixes.
+                mapped = plainToInstance(command.optionsType, rawArgs);
             }
-            // Execute the command
-            const exitCode = yield command.run(
-            // @ts-ignore Needs to be ignored since we know we are casting it into the expected type.
-            mappedArguments);
-            // Log the status and the command
-            let status;
-            switch (exitCode) {
-                case ExitCodeEnum.Success:
-                    status = "Success";
-                    break;
-                default:
-                    status = "Error";
-                    break;
+            catch (error) {
+                this.consoleManager.writeError(`Failed to map CLI arguments to '${command.optionsType.name}': ${error.message}`);
+                return { exitCode: ExitCodeEnum.Error };
             }
-            this.consoleManager.writeLine(`[status:'${status}', code:'${exitCode}'] - Command '` + event.payload.name + "' exited.");
-            process.exit(exitCode);
+            const validationErrors = yield this.validator.validate(mapped);
+            if (validationErrors.length === 0) {
+                return { args: mapped };
+            }
+            for (const error of validationErrors) {
+                this.consoleManager.writeLine(`Errors with argument '${error.property}'. The following constraints failed:`);
+                for (const constraintKey in error.constraints) {
+                    // `@pristine-ts/class-validator` stores constraints as `{keyname, message}` objects
+                    // rather than the plain strings vanilla class-validator uses. Extract the message
+                    // when present, falling back to JSON for unknown shapes so we never print
+                    // `[object Object]`.
+                    const constraint = error.constraints[constraintKey];
+                    const message = typeof constraint === "string"
+                        ? constraint
+                        : (constraint && typeof constraint === "object" && typeof constraint.message === "string")
+                            ? constraint.message
+                            : JSON.stringify(constraint);
+                    this.consoleManager.writeLine(`\t- [${constraintKey}]: ${message}`);
+                }
+            }
+            return { exitCode: ExitCodeEnum.Error };
         });
     }
     supports(event) {
         return event.payload instanceof CommandEventPayload;
     }
+    logExitStatus(commandName, exitCode) {
+        const status = exitCode === ExitCodeEnum.Success ? "Success" : "Error";
+        this.consoleManager.writeLine(`[status:'${status}', code:'${exitCode}'] - Command '${commandName}' exited.`);
+    }
 };
 CliEventHandler = __decorate([
     tag(ServiceDefinitionTagEnum.EventHandler),
     moduleScoped(CliModuleKeyname),
     injectable(),
     __param(0, inject("LogHandlerInterface")),
-    __param(4, injectAll(ServiceDefinitionTagEnum.Command)),
+    __param(3, injectAll(ServiceDefinitionTagEnum.Command)),
     __metadata("design:paramtypes", [Object, Validator,
-        ConsoleManager,
-        DataMapper, Array])
+        ConsoleManager, Array])
 ], CliEventHandler);
 export { CliEventHandler };
 //# sourceMappingURL=cli.event-handler.js.map

package/dist/lib/esm/event-handlers/cli.event-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.event-handler.js","sourceRoot":"","sources":["../../../../src/event-handlers/cli.event-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.event-handler.js","sourceRoot":"","sources":["../../../../src/event-handlers/cli.event-handler.ts"],"names":[],"mappings":"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"}