@sap/cli-core 2024.4.0 → 2024.5.0

package/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2024.5.0
+
+### Fixed
+
+- Fixed an issue with parsing the discovery document if more than 52 distinct options are defined. Now, the short flags are calculated per command. This allows for having up to 52 options per command. However, the same option used across different commands might not share the same short flag depending on other available options for the commands. It is recommended to always use the option's long name as the long name remains stable.
+
 ## 2024.4.0
 
 ### Added

package/commands/config.command/cache.command/init.command/index.js

@@ -66,6 +66,6 @@ const initCommand = {
     command: "init",
     description: "initialize the local CLI cache",
     options: [],
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createMandatoryOptionsHandler)(), (0, handler_1.createAuthenticationHandler)(), exports.init),
+    handler: (0, handler_1.createNextHandler)("command.config.cache.init", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createMandatoryOptionsHandler)(), (0, handler_1.createAuthenticationHandler)(), exports.init),
 };
 exports.default = initCommand;

package/commands/config.command/cache.command/show.command.js

@@ -25,6 +25,6 @@ const showCommand = {
     type: "command",
     command: "show",
     description: "display local CLI cache entries",
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), show),
+    handler: (0, handler_1.createNextHandler)("command.config.cache.show", (0, handler_1.createParseArgumentsHandler)(), show),
 };
 exports.default = showCommand;

package/commands/config.command/host.command.js

@@ -48,7 +48,7 @@ const addCommands = async (program) => {
                 command: "set",
                 description: "set global host",
                 args: [{ argument: "host", description: "global host" }],
-                handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)([{ argument: "host" }]), set),
+                handler: (0, handler_1.createNextHandler)("command.config.host.set", (0, handler_1.createParseArgumentsHandler)([{ argument: "host" }]), set),
             },
             {
                 type: "command",

package/commands/config.command/passcode.command.js

@@ -16,7 +16,7 @@ const passcodeCommand = {
     type: "command",
     command: "passcode-url",
     description: "display the passcode url",
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createMandatoryOptionsHandler)(), passcode),
+    handler: (0, handler_1.createNextHandler)("commands.config.passcode-url", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createMandatoryOptionsHandler)(), passcode),
 };
 const addCommands = async (program) => {
     if ((0, core_1.getAuthenticationMethods)().includes(constants_1.AuthenticationMethod.passcode)) {

package/commands/config.command/secrets.command/reset.command.js

@@ -12,6 +12,6 @@ const resetCommand = {
     type: "command",
     command: "reset",
     description: "remove all locally stored secrets for interactive OAuth authentication",
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createResilientHandler)((0, cache_1.create)()), removeSecrets),
+    handler: (0, handler_1.createNextHandler)("commands.config.secrets.reset", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createResilientHandler)((0, cache_1.create)()), removeSecrets),
 };
 exports.default = resetCommand;

package/commands/config.command/secrets.command/show.command.js

@@ -27,6 +27,6 @@ const showCommand = {
     type: "command",
     command: "show",
     description: "display locally stored secrets for interactive OAuth authentication",
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createResilientHandler)((0, cache_1.create)()), showSecrets),
+    handler: (0, handler_1.createNextHandler)("commands.config.secrets.show", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createResilientHandler)((0, cache_1.create)()), showSecrets),
 };
 exports.default = showCommand;

package/commands/handler/authentication/index.js

@@ -16,6 +16,6 @@ const core_1 = require("../../../config/core");
 const succeed_1 = require("../succeed");
 exports.create = process.env.SUPPORT === "true"
     ? technicalJWT_1.create
-    : () => (0, next_1.create)((0, resilient_1.create)((0, next_1.create)((0, cache_1.create)(), (0, refreshToken_1.create)())), (0, options_1.create)(constants_1.OPTION_CLIENT_ID), (0, options_1.create)(constants_1.OPTION_CLIENT_SECRET), (0, options_1.create)(constants_1.OPTION_ACCESS_TOKEN), (0, options_1.create)(constants_1.OPTION_REFRESH_TOKEN), (0, options_1.create)(constants_1.OPTION_CODE), (0, options_1.create)(constants_1.OPTION_TOKEN_URL), (0, options_1.create)(constants_1.OPTION_AUTHORIZATION_URL), (0, core_1.getAuthenticationMethods)().includes(constants_1.AuthenticationMethod.passcode)
+    : () => (0, next_1.create)("commands.handler.authentication", (0, resilient_1.create)((0, next_1.create)("commands.handler.authentication$oauth", (0, cache_1.create)(), (0, refreshToken_1.create)())), (0, options_1.create)(constants_1.OPTION_CLIENT_ID), (0, options_1.create)(constants_1.OPTION_CLIENT_SECRET), (0, options_1.create)(constants_1.OPTION_ACCESS_TOKEN), (0, options_1.create)(constants_1.OPTION_REFRESH_TOKEN), (0, options_1.create)(constants_1.OPTION_CODE), (0, options_1.create)(constants_1.OPTION_TOKEN_URL), (0, options_1.create)(constants_1.OPTION_AUTHORIZATION_URL), (0, core_1.getAuthenticationMethods)().includes(constants_1.AuthenticationMethod.passcode)
         ? (0, options_1.create)(constants_1.OPTION_PASSCODE)
-        : (0, succeed_1.create)(), (0, options_1.create)(constants_1.OPTION_SECRETS_FILE), (0, or_1.create)((0, setAuthorization_1.create)(), (0, passcode_1.create)(), (0, oauth_1.create)()));
+        : (0, succeed_1.create)(), (0, options_1.create)(constants_1.OPTION_SECRETS_FILE), (0, or_1.create)("commands.handler.authentication$handler", (0, setAuthorization_1.create)(), (0, passcode_1.create)(), (0, oauth_1.create)()));

package/commands/handler/authentication/oauth/index.js

@@ -11,7 +11,7 @@ const constants_1 = require("../../../../constants");
 const core_1 = require("../../../../config/core");
 const create = () => {
     if ((0, core_1.getAuthenticationMethods)().includes(constants_1.AuthenticationMethod.oauth)) {
-        return (0, error_1.create)("failed to handle OAuth authorization", (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_PASSCODE), (0, secretsProvider_1.create)(), (0, tokenProvider_1.create)()));
+        return (0, error_1.create)("failed to handle OAuth authorization", (0, next_1.create)("commands.handler.authentication.oauth", (0, checkOptionsExistence_1.create)(constants_1.OPTION_PASSCODE), (0, secretsProvider_1.create)(), (0, tokenProvider_1.create)()));
     }
     return (0, fail_1.create)();
 };

package/commands/handler/authentication/oauth/secretsProvider/file.js

@@ -21,5 +21,5 @@ const handler = async () => async () => {
         throw err;
     }
 };
-const create = () => (0, next_1.create)((0, options_2.create)([constants_1.OPTION_SECRETS_FILE]), handler);
+const create = () => (0, next_1.create)("commands.handler.authentication.oauth.secretsProvider.file", (0, options_2.create)([constants_1.OPTION_SECRETS_FILE]), handler);
 exports.create = create;

package/commands/handler/authentication/oauth/secretsProvider/index.js

@@ -6,5 +6,5 @@ const error_1 = require("../../../error");
 const options_1 = require("./options");
 const file_1 = require("./file");
 const cache_1 = require("./cache");
-const create = () => (0, error_1.create)("Failed to read secrets from cache, file or options", (0, or_1.create)((0, cache_1.create)(), (0, file_1.create)(), (0, options_1.create)()));
+const create = () => (0, error_1.create)("Failed to read secrets from cache, file or options", (0, or_1.create)("commands.handler.authentication.oauth.secretsProvider", (0, cache_1.create)(), (0, file_1.create)(), (0, options_1.create)()));
 exports.create = create;

package/commands/handler/authentication/oauth/secretsProvider/options.js

@@ -27,7 +27,7 @@ const pre = async () => async () => {
     const { info } = getLogger();
     info("reading secrets from options");
 };
-const create = () => (0, next_1.create)(pre, (0, or_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_ACCESS_TOKEN, false), (0, next_1.create)(createOptHandler(constants_1.OPTION_CLIENT_ID), createOptHandler(constants_1.OPTION_CLIENT_SECRET), (0, options_1.create)([
+const create = () => (0, next_1.create)("handler.authentication.oauth.secretsProvider.options$outer", pre, (0, or_1.create)("commands.handler.authentication.oauth.secretsProvider.options", (0, checkOptionsExistence_1.create)(constants_1.OPTION_ACCESS_TOKEN, false), (0, next_1.create)("handler.authentication.oauth.secretsProvider.options$inner", createOptHandler(constants_1.OPTION_CLIENT_ID), createOptHandler(constants_1.OPTION_CLIENT_SECRET), (0, options_1.create)([
     constants_1.OPTION_AUTHORIZATION_URL,
     constants_1.OPTION_TOKEN_URL,
     constants_1.OPTION_REFRESH_TOKEN,

package/commands/handler/authentication/oauth/tokenProvider/getToken.js

@@ -28,5 +28,5 @@ const handler = async () => async () => {
         throw new Error("access token not available");
     }
 };
-const create = () => (0, next_1.create)((0, options_1.create)(constants_1.OPTION_CODE), handler);
+const create = () => (0, next_1.create)("commands.handler.authentication.oauth.tokenProvider.getToken", (0, options_1.create)(constants_1.OPTION_CODE), handler);
 exports.create = create;

package/commands/handler/authentication/oauth/tokenProvider/index.js

@@ -7,5 +7,5 @@ const or_1 = require("../../../or");
 const refreshToken_1 = require("./refreshToken");
 const setAuthorization_1 = require("./setAuthorization");
 const getToken_1 = require("./getToken");
-const create = () => (0, error_1.create)("failed to handle token", (0, next_1.create)((0, or_1.create)((0, getToken_1.create)(), (0, refreshToken_1.create)(true)), (0, setAuthorization_1.create)()));
+const create = () => (0, error_1.create)("failed to handle token", (0, next_1.create)("commands.handler.authentication.oauth.tokenProvider", (0, or_1.create)("commands.handler.authentication.oauth.tokenProvider", (0, getToken_1.create)(), (0, refreshToken_1.create)(true)), (0, setAuthorization_1.create)()));
 exports.create = create;

package/commands/handler/authentication/passcode/index.js

@@ -12,7 +12,7 @@ const constants_1 = require("../../../../constants");
 const core_1 = require("../../../../config/core");
 const create = () => {
     if ((0, core_1.getAuthenticationMethods)().includes(constants_1.AuthenticationMethod.passcode)) {
-        return (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_CLIENT_ID), (0, checkOptionsExistence_1.create)(constants_1.OPTION_ACCESS_TOKEN), (0, checkOptionsExistence_1.create)(constants_1.OPTION_SECRETS_FILE), (0, or_1.create)((0, function_1.create)(), (0, input_1.create)()), (0, setPasscode_1.create)());
+        return (0, next_1.create)("commands.handler.authentication.passcode", (0, checkOptionsExistence_1.create)(constants_1.OPTION_CLIENT_ID), (0, checkOptionsExistence_1.create)(constants_1.OPTION_ACCESS_TOKEN), (0, checkOptionsExistence_1.create)(constants_1.OPTION_SECRETS_FILE), (0, or_1.create)("commands.handler.authentication.passcode$value", (0, function_1.create)(), (0, input_1.create)()), (0, setPasscode_1.create)());
     }
     return (0, fail_1.create)();
 };

package/commands/handler/authentication/technicalJWT/index.js

@@ -6,7 +6,7 @@ const commands_1 = require("../../../../utils/commands");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
 const create = () => async (command) => {
-    command.addOption(await (0, commands_1.buildOption)(types_1.OPTION_SECRET));
+    command.addOption(await (0, commands_1.buildOption)(command.name(), types_1.OPTION_SECRET));
     return async () => {
         const token = await (0, utils_1.getTechnicalJwt)();
         (0, config_1.set)({ authorization: { Authorization: `Bearer ${token}` } });

package/commands/handler/fetch/index.js

@@ -18,7 +18,7 @@ const createCsrfTokenFetchHandler = (path, parameterMappings) => (0, fetch_1.cre
 const create = (method, path, parameterMappings, responsePostProcessor) => {
     /* jscpd:ignore-end */
     if (requiresCsrfToken(parameterMappings)) {
-        return (0, next_1.create)(createCsrfTokenFetchHandler(path, parameterMappings), (0, fetch_1.create)(method, path, parameterMappings, responsePostProcessor));
+        return (0, next_1.create)("commands.handler.fetch", createCsrfTokenFetchHandler(path, parameterMappings), (0, fetch_1.create)(method, path, parameterMappings, responsePostProcessor));
     }
     return (0, fetch_1.create)(method, path, parameterMappings, responsePostProcessor);
 };

package/commands/handler/input/file.js

@@ -30,5 +30,5 @@ const readBodyFromFile = async () => async () => {
         throw err;
     }
 };
-const create = () => (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_INPUT), (0, options_1.create)(constants_1.OPTION_FILE_PATH, { readEnv: true, readFile: true, readOptions: true }, true, true), readBodyFromFile);
+const create = () => (0, next_1.create)("file.input.handler", (0, checkOptionsExistence_1.create)(constants_1.OPTION_INPUT), (0, options_1.create)(constants_1.OPTION_FILE_PATH, { readEnv: true, readFile: true, readOptions: true }, true, true), readBodyFromFile);
 exports.create = create;

package/commands/handler/input/index.js

@@ -4,5 +4,5 @@ exports.create = void 0;
 const or_1 = require("../or");
 const input_1 = require("./input");
 const file_1 = require("./file");
-const create = () => (0, or_1.create)((0, file_1.create)(), (0, input_1.create)());
+const create = () => (0, or_1.create)("commands.handler.input", (0, file_1.create)(), (0, input_1.create)());
 exports.create = create;

package/commands/handler/input/input.js

@@ -10,7 +10,7 @@ const constants_1 = require("../../../constants");
 const logger_1 = require("../../../logger");
 const commands_1 = require("../../../utils/commands");
 const create = () => async (command) => {
-    command.addOption(await (0, commands_1.buildOption)(constants_1.OPTION_INPUT));
+    command.addOption(await (0, commands_1.buildOption)(command.name(), constants_1.OPTION_INPUT));
     return async () => {
         const config = (0, config_1.get)();
         const { debug } = (0, logger_1.get)("handler.input.input");

package/commands/handler/mandatoryOptions.js

@@ -21,5 +21,5 @@ const post = async () => async () => {
         }
     }
 };
-const create = () => (0, next_1.create)((0, options_1.create)(MANDATORY_OPTIONS), post);
+const create = () => (0, next_1.create)("mandatoryOptions.handler", (0, options_1.create)(MANDATORY_OPTIONS), post);
 exports.create = create;

package/commands/handler/next.d.ts

@@ -1,2 +1,2 @@
 import { Handler } from "../../types";
-export declare const create: (...handlers: Array<Handler>) => Handler;
+export declare const create: (origin: string, ...handlers: Array<Handler>) => Handler;

package/commands/handler/next.js

@@ -2,19 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const stackTrace_1 = require("./stackTrace");
-const nextHandler = (...handlers) => async (command) => {
+const logger_1 = require("../../logger");
+function getLogger(origin) {
+    return (0, logger_1.get)(`commands.handler.next:${origin}`);
+}
+const nextHandler = (origin, ...handlers) => async (command) => {
+    getLogger(origin).trace(`next:${origin}: preparing handlers`);
     const commandHandlers = [];
     for (const handler of handlers) {
         // eslint-disable-next-line no-await-in-loop
         commandHandlers.push(await handler(command));
     }
     return async (...args) => {
+        getLogger(origin).trace(`next:${origin}: processing handlers`);
         for (const handler of commandHandlers) {
             // eslint-disable-next-line
             await handler(...args);
         }
     };
 };
-const create = (...handlers) => (0, stackTrace_1.create)(nextHandler(...handlers));
+const create = (origin, ...handlers) => (0, stackTrace_1.create)(nextHandler(origin, ...handlers));
 exports.create = create;
 /* jscpd:ignore-end */

package/commands/handler/options/index.js

@@ -11,7 +11,7 @@ const option_1 = require("./option");
 const succeed_1 = require("../succeed");
 const fail_1 = require("../fail");
 const env_1 = require("./env");
-const createHandler = (use, option, handler) => (0, next_1.create)((0, checkOptionsExistence_1.create)(option), use ? handler : (0, succeed_1.create)());
+const createHandler = (use, option, handler) => (0, next_1.create)("commands.handler.options", (0, checkOptionsExistence_1.create)(option), use ? handler : (0, succeed_1.create)());
 const create = (options, { readEnv, readFile, readOptions } = {
     readEnv: true,
     readFile: true,
@@ -21,7 +21,7 @@ const create = (options, { readEnv, readFile, readOptions } = {
     await (0, utils_1.checkOptions)(intOptions, command);
     return async () => {
         for (const option of intOptions) {
-            const handler = (0, or_1.create)((0, checkOptionsExistence_1.create)(option, false), (0, or_1.create)(createHandler(readEnv, option, (0, env_1.create)(option)), createHandler(readFile, option, (0, file_1.create)(option)), createHandler(readOptions, option, (0, option_1.create)(option, promptAlways))), throwIfHandlersFailed
+            const handler = (0, or_1.create)("commands.handler.options$outer", (0, checkOptionsExistence_1.create)(option, false), (0, or_1.create)("commands.handler.options$inner", createHandler(readEnv, option, (0, env_1.create)(option)), createHandler(readFile, option, (0, file_1.create)(option)), createHandler(readOptions, option, (0, option_1.create)(option, promptAlways))), throwIfHandlersFailed
                 ? (0, fail_1.create)()
                 : (0, succeed_1.create)());
             await (await handler(command))();

package/commands/handler/options/utils.js

@@ -13,8 +13,9 @@ const checkOptions = async (options, command) => {
     const intOptions = Array.isArray(options) ? options : [options];
     for (const option of intOptions) {
         if (!(0, commands_1.isOptionAlreadyRegistered)(option, command)) {
+            command.addOption(
             // eslint-disable-next-line no-await-in-loop
-            command.addOption(await (0, commands_1.buildOption)({ ...option, required: false }));
+            await (0, commands_1.buildOption)(command.name(), { ...option, required: false }));
         }
     }
 };

package/commands/handler/or.d.ts

@@ -1,2 +1,2 @@
 import { Handler } from "../../types";
-export declare const create: (...handlers: Array<Handler>) => Handler;
+export declare const create: (origin: string, ...handlers: Array<Handler>) => Handler;

package/commands/handler/or.js

@@ -2,17 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const logger_1 = require("../../logger");
-const getLogger = () => (0, logger_1.get)("commands.handlers.or");
-const create = (...handlers) => {
+function getLogger(origin) {
+    return (0, logger_1.get)(`commands.handler.or:${origin}`);
+}
+const create = (origin, ...handlers) => {
     const { stack } = new Error();
     return async (command) => {
+        const { trace } = getLogger(origin);
+        trace(`or:${origin}: preparing handlers`);
         const commandHandlers = [];
         for (const handler of handlers) {
             // eslint-disable-next-line no-await-in-loop
             commandHandlers.push(await handler(command));
         }
         return async (...args) => {
-            const { debug, trace } = getLogger();
+            const { debug } = getLogger(origin);
+            trace(`or:${origin}: processing handlers`);
             let handlerFailed = false;
             for (const handler of commandHandlers) {
                 handlerFailed = false;

package/commands/handler/utils.d.ts

@@ -1,5 +1,6 @@
 import { AuthenticationMethod } from "../../constants";
 export declare const getBooleanOption: (value: unknown) => boolean;
+export declare const replaceLeadingTrailingSingleQuotes: (value: string) => string;
 export declare const parseOption: (value: string) => string;
 export declare const setAuthenticationMethod: (authenticationMethod: AuthenticationMethod) => void;
 export declare const getAuthenticationMethod: () => AuthenticationMethod;

package/commands/handler/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetHost = exports.setTargetHost = exports.getAuthenticationMethod = exports.setAuthenticationMethod = exports.parseOption = exports.getBooleanOption = void 0;
+exports.getTargetHost = exports.setTargetHost = exports.getAuthenticationMethod = exports.setAuthenticationMethod = exports.parseOption = exports.replaceLeadingTrailingSingleQuotes = exports.getBooleanOption = void 0;
 const logger_1 = require("../../logger");
 const config_1 = require("../../config");
 const constants_1 = require("../../constants");
@@ -24,13 +24,14 @@ const replaceLeadingTrailingSingleQuotes = (value) => {
     }
     return value;
 };
+exports.replaceLeadingTrailingSingleQuotes = replaceLeadingTrailingSingleQuotes;
 const parseOption = (value) => {
     if (typeof value !== "string") {
         return value;
     }
     let v = value.trim();
     v = decodeURIComponentInt(v);
-    v = replaceLeadingTrailingSingleQuotes(v);
+    v = (0, exports.replaceLeadingTrailingSingleQuotes)(v);
     return v;
 };
 exports.parseOption = parseOption;

package/commands/login.command.d.ts

@@ -1,3 +1,4 @@
-import { LeafCommand } from "../types";
+import { CommanderHandler, LeafCommand } from "../types";
+export declare const verifyHost: () => Promise<CommanderHandler>;
 declare const loginCommand: LeafCommand;
 export default loginCommand;

package/commands/login.command.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyHost = void 0;
 const handler_1 = require("./handler");
 const constants_1 = require("../constants");
 const logger_1 = require("../logger");
@@ -23,6 +24,7 @@ const verifyHost = async () => async () => {
         throw new Error("tenant URL not defined. use option -H, --host");
     }
 };
+exports.verifyHost = verifyHost;
 const initializeCache = async () => async () => {
     const { warn, info } = getLogger();
     info("initializing cache after successful login");
@@ -31,7 +33,7 @@ const initializeCache = async () => async () => {
         await (await (0, init_command_1.init)())();
     }
     catch (err) {
-        warn(`option ${(0, utils_3.buildOptionName)(constants_1.OPTION_HOST)} not defined, skipping cache init`);
+        warn(`option ${(0, utils_3.buildOptionName)(constants_1.ROOT_COMMAND_NAME, constants_1.OPTION_HOST)} not defined, skipping cache init`);
     }
 };
 const loginCommand = {
@@ -39,7 +41,7 @@ const loginCommand = {
     command: "login",
     description: "log in to your account using interactive OAuth authentication",
     options: [],
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createOptionsHandler)([
+    handler: (0, handler_1.createNextHandler)("login.command", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createOptionsHandler)([
         { ...constants_1.OPTION_HOST, hidden: false, required: true },
         constants_1.OPTION_VERBOSE,
         constants_1.OPTION_OPTIONS_FILE,
@@ -56,6 +58,6 @@ const loginCommand = {
             choices: utils_4.getBrowserChoices,
             default: openUtils_1.getDefaultBrowser,
         },
-    ]), (0, handler_1.createMandatoryOptionsHandler)(), verifyHost, (0, handler_1.createOauthHandler)(), initializeCache),
+    ]), (0, handler_1.createMandatoryOptionsHandler)(), exports.verifyHost, (0, handler_1.createOauthHandler)(), initializeCache),
 };
 exports.default = loginCommand;

package/commands/logout.command.js

@@ -22,7 +22,7 @@ const logoutCommand = {
     type: "command",
     command: "logout",
     description: "log out from your account",
-    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createOptionsHandler)([
+    handler: (0, handler_1.createNextHandler)("logout.command", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createOptionsHandler)([
         { ...constants_1.OPTION_LOGIN_ID, choices: utils_2.getChoices },
         constants_1.OPTION_VERBOSE,
     ]), handler),

package/commands/openAPI.command/index.js

@@ -45,7 +45,7 @@ const addCommandToArray = (document, commands, segments, index) => {
 };
 const setHandler = (command, method, path, parameterMappings, readPathResponseHandler, ...handler) => {
     // eslint-disable-next-line
-    command.handler = (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createMandatoryOptionsHandler)(), (0, handler_1.createAuthenticationHandler)(), ...handler, (0, handler_1.createFetchHandler)(method, path, parameterMappings, readPathResponseHandler));
+    command.handler = (0, handler_1.createNextHandler)("openAPI.command", (0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createMandatoryOptionsHandler)(), (0, handler_1.createAuthenticationHandler)(), ...handler, (0, handler_1.createFetchHandler)(method, path, parameterMappings, readPathResponseHandler));
 };
 const addCommands = async (program) => {
     const { error, debug, trace } = getLogger();

package/constants.d.ts

@@ -17,6 +17,7 @@ export declare enum AuthenticationMethod {
     oauth = "oauth",
     passcode = "passcode"
 }
+export declare const ROOT_COMMAND_NAME = "ROOT";
 export declare const CLI_NAME = "cli-name";
 export declare const CLI_PACKAGE_NAME = "cli-package-name";
 export declare const CLI_DESCRIPTION = "cli-description";

package/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPTION_BROWSER = exports.OPTION_INPUT = exports.OPTION_FILE_PATH = exports.OPTION_OPTIONS_FILE = exports.CONFIG_PASSCODE_FUNCTION = exports.OPTION_PASSCODE = exports.OPTION_CODE = exports.OPTION_SECRETS_FILE = exports.OPTION_EXPIRES_IN = exports.OPTION_REFRESH_TOKEN = exports.OPTION_ACCESS_TOKEN = exports.OPTION_TOKEN_URL = exports.OPTION_AUTHORIZATION_URL = exports.OPTION_CLIENT_SECRET = exports.OPTION_CLIENT_ID = exports.OPTION_FORCE = exports.OPTION_VERBOSE = exports.OPTION_NO_PRETTY = exports.OPTION_OUTPUT = exports.OPTION_LOGIN_ID = exports.OPTION_HOST = exports.OPTION_HELP = exports.OPTION_VERSION = exports.CACHE_SECRETS_FILE = exports.PATH_TO_ERROR_HTML = exports.PATH_TO_SUCCESS_HTML = exports.X_OUTPUT_FILE_NAME = exports.X_CSRF_TOKEN = exports.DISCOVERY_METADATA_PATH = exports.SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = exports.CLI_GENERIC_OPTIONS_HELP = exports.CLI_SUPPORTED_AUTHENTICATION_METHODS = exports.CLI_DEPRECATION_MESSAGE = exports.CLI_DEPRECATED = exports.CLI_VERSION = exports.CLI_SAP_HELP = exports.CLI_DISCOVERY_PATHS = exports.CLI_DESCRIPTION = exports.CLI_PACKAGE_NAME = exports.CLI_NAME = exports.AuthenticationMethod = exports.DISCOVERY_DOCUMENT_PREFIX = exports.VERSION = void 0;
+exports.OPTION_BROWSER = exports.OPTION_INPUT = exports.OPTION_FILE_PATH = exports.OPTION_OPTIONS_FILE = exports.CONFIG_PASSCODE_FUNCTION = exports.OPTION_PASSCODE = exports.OPTION_CODE = exports.OPTION_SECRETS_FILE = exports.OPTION_EXPIRES_IN = exports.OPTION_REFRESH_TOKEN = exports.OPTION_ACCESS_TOKEN = exports.OPTION_TOKEN_URL = exports.OPTION_AUTHORIZATION_URL = exports.OPTION_CLIENT_SECRET = exports.OPTION_CLIENT_ID = exports.OPTION_FORCE = exports.OPTION_VERBOSE = exports.OPTION_NO_PRETTY = exports.OPTION_OUTPUT = exports.OPTION_LOGIN_ID = exports.OPTION_HOST = exports.OPTION_HELP = exports.OPTION_VERSION = exports.CACHE_SECRETS_FILE = exports.PATH_TO_ERROR_HTML = exports.PATH_TO_SUCCESS_HTML = exports.X_OUTPUT_FILE_NAME = exports.X_CSRF_TOKEN = exports.DISCOVERY_METADATA_PATH = exports.SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = exports.CLI_GENERIC_OPTIONS_HELP = exports.CLI_SUPPORTED_AUTHENTICATION_METHODS = exports.CLI_DEPRECATION_MESSAGE = exports.CLI_DEPRECATED = exports.CLI_VERSION = exports.CLI_SAP_HELP = exports.CLI_DISCOVERY_PATHS = exports.CLI_DESCRIPTION = exports.CLI_PACKAGE_NAME = exports.CLI_NAME = exports.ROOT_COMMAND_NAME = exports.AuthenticationMethod = exports.DISCOVERY_DOCUMENT_PREFIX = exports.VERSION = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils/utils");
 exports.VERSION = (0, utils_1.getVersion)();
@@ -13,6 +13,7 @@ var AuthenticationMethod;
     AuthenticationMethod["oauth"] = "oauth";
     AuthenticationMethod["passcode"] = "passcode";
 })(AuthenticationMethod || (exports.AuthenticationMethod = AuthenticationMethod = {}));
+exports.ROOT_COMMAND_NAME = "ROOT";
 exports.CLI_NAME = "cli-name";
 exports.CLI_PACKAGE_NAME = "cli-package-name";
 exports.CLI_DESCRIPTION = "cli-description";
@@ -31,17 +32,20 @@ exports.PATH_TO_SUCCESS_HTML = path_1.default.join(__dirname, "assets", "success
 exports.PATH_TO_ERROR_HTML = path_1.default.join(__dirname, "assets", "error.html");
 exports.CACHE_SECRETS_FILE = "secrets.json";
 exports.OPTION_VERSION = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "version",
     description: "print version",
     hidden: true,
 };
 exports.OPTION_HELP = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "help",
     description: "print help for a command",
     args: [{ name: "command" }],
     hidden: true,
 };
 exports.OPTION_HOST = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "host",
     description: "specifies the url where the tenant is hosted",
     args: [{ name: "host" }],
@@ -52,6 +56,7 @@ exports.OPTION_HOST = {
     },
 };
 exports.OPTION_LOGIN_ID = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "login-id",
     description: "specifies the login ID",
     args: [{ name: "id" }],
@@ -63,26 +68,31 @@ exports.OPTION_LOGIN_ID = {
     },
 };
 exports.OPTION_OUTPUT = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "output",
     description: "specifies the file to store the output of the command",
     args: [{ name: "output", optional: true }],
     hidden: true,
 };
 exports.OPTION_NO_PRETTY = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "no-pretty",
     description: "do not pretty-format JSON responses",
     hidden: true,
 };
 exports.OPTION_VERBOSE = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "verbose",
     description: "print detailed log information to console",
     hidden: true,
 };
 exports.OPTION_FORCE = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "force",
     description: "force the command execution",
 };
 exports.OPTION_CLIENT_ID = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "client-id",
     description: "client id for interactive oauth session authentication",
     args: [{ name: "id" }],
@@ -93,6 +103,7 @@ exports.OPTION_CLIENT_ID = {
     },
 };
 exports.OPTION_CLIENT_SECRET = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "client-secret",
     description: "client secret for interactive oauth session authentication",
     args: [{ name: "secret" }],
@@ -103,6 +114,7 @@ exports.OPTION_CLIENT_SECRET = {
     },
 };
 exports.OPTION_AUTHORIZATION_URL = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "authorization-url",
     description: "authorization url for interactive oauth session authentication",
     args: [{ name: "url" }],
@@ -113,6 +125,7 @@ exports.OPTION_AUTHORIZATION_URL = {
     },
 };
 exports.OPTION_TOKEN_URL = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "token-url",
     description: "token url for interactive oauth session authentication",
     args: [{ name: "url" }],
@@ -123,6 +136,7 @@ exports.OPTION_TOKEN_URL = {
     },
 };
 exports.OPTION_ACCESS_TOKEN = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "access-token",
     description: "access token for interactive oauth session authentication",
     args: [{ name: "token" }],
@@ -133,6 +147,7 @@ exports.OPTION_ACCESS_TOKEN = {
     },
 };
 exports.OPTION_REFRESH_TOKEN = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "refresh-token",
     description: "refresh token for interactive oauth session authentication",
     args: [{ name: "token" }],
@@ -143,6 +158,7 @@ exports.OPTION_REFRESH_TOKEN = {
     },
 };
 exports.OPTION_EXPIRES_IN = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "expires-in",
     description: "expires in information for interactive oauth session authentication",
     args: [{ name: "expires" }],
@@ -153,6 +169,7 @@ exports.OPTION_EXPIRES_IN = {
     },
 };
 exports.OPTION_SECRETS_FILE = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "secrets-file",
     description: "path to secrets file",
     args: [{ name: "file" }],
@@ -163,6 +180,7 @@ exports.OPTION_SECRETS_FILE = {
     },
 };
 exports.OPTION_CODE = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "code",
     description: "code for oauth token retrieval",
     args: [{ name: "code" }],
@@ -173,6 +191,7 @@ exports.OPTION_CODE = {
     },
 };
 exports.OPTION_PASSCODE = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "passcode",
     description: "passcode for interactive session authentication",
     args: [{ name: "passcode" }],
@@ -180,12 +199,14 @@ exports.OPTION_PASSCODE = {
 };
 exports.CONFIG_PASSCODE_FUNCTION = "passcodeFunction";
 exports.OPTION_OPTIONS_FILE = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "options-file",
     description: "path to options file",
     args: [{ name: "file" }],
     hidden: true,
 };
 exports.OPTION_FILE_PATH = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "file-path",
     description: "specifies the file to use as input for the command",
     args: [{ name: "path" }],
@@ -195,6 +216,7 @@ exports.OPTION_FILE_PATH = {
     },
 };
 exports.OPTION_INPUT = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "input",
     description: "specifies input as string to use for the command",
     args: [{ name: "input" }],
@@ -204,6 +226,7 @@ exports.OPTION_INPUT = {
     },
 };
 exports.OPTION_BROWSER = {
+    commandName: exports.ROOT_COMMAND_NAME,
     longName: "browser",
     description: "specifies the browser to open",
     args: [{ name: "browser" }],

package/dwc/dwc.js

@@ -23,6 +23,7 @@ const ResultHandlerImpl_1 = require("../result/ResultHandlerImpl");
 const ResultHandlerFactory_1 = require("../result/ResultHandlerFactory");
 const SecretsStorageImpl_1 = require("../cache/secrets/SecretsStorageImpl");
 const SecretsStorageSingleton_1 = require("../cache/secrets/SecretsStorageSingleton");
+const utils_3 = require("../commands/handler/utils");
 let program;
 let initialized = false;
 const getLogger = () => (0, logger_1.get)("dwc.dwc");
@@ -42,9 +43,9 @@ const setTenant = async () => {
     if (config.host) {
         return;
     }
-    const readHostFromArgv = async () => (0, utils_1.getOptionValueFromArgv)(constants_1.OPTION_HOST);
+    const readHostFromArgv = async () => (0, utils_1.getOptionValueFromArgv)(constants_1.ROOT_COMMAND_NAME, constants_1.OPTION_HOST);
     const readHostFromOptionsFile = async () => {
-        const filePath = (0, utils_1.getOptionValueFromArgv)(constants_1.OPTION_OPTIONS_FILE);
+        const filePath = (0, utils_1.getOptionValueFromArgv)(constants_1.ROOT_COMMAND_NAME, constants_1.OPTION_OPTIONS_FILE);
         return (0, utils_2.getValueFromOptionsFile)(filePath, constants_1.OPTION_HOST);
     };
     const readHostFromOptions = async () => {
@@ -72,7 +73,7 @@ const setTenant = async () => {
         trace(`trying to ${name}`);
         try {
             // eslint-disable-next-line no-await-in-loop
-            const host = await func();
+            const host = (0, utils_3.replaceLeadingTrailingSingleQuotes)(await func());
             (0, config_1.set)({
                 tenant: host,
                 options: { ...config.options, [constants_1.OPTION_HOST.longName]: host },
@@ -99,7 +100,7 @@ const initCacheTolerant = async () => {
     }
 };
 const registerMandatoryOptions = () => {
-    MANDATORY_OPTIONS.forEach((option) => (0, commands_1.registerLongName)(option.longName));
+    MANDATORY_OPTIONS.forEach((option) => (0, commands_1.registerLongName)(constants_1.ROOT_COMMAND_NAME, option));
 };
 async function setupSecretsStorage() {
     const instance = new SecretsStorageImpl_1.SecretsStorageImpl();
@@ -128,8 +129,8 @@ const init = async () => {
         ` config host set "<Server_URL>". Did you initialize the CLI by running ${cliName} config` +
         ` cache init --host "<Server_URL>"?` +
         ` Add option --help, -h or go to ${(0, config_1.get)()[constants_1.CLI_SAP_HELP]} for additional information.`);
-    program.addOption(await (0, commands_1.buildOption)(constants_1.OPTION_HOST));
-    program.addOption(await (0, commands_1.buildOption)(constants_1.OPTION_OPTIONS_FILE));
+    program.addOption(await (0, commands_1.buildOption)(constants_1.ROOT_COMMAND_NAME, constants_1.OPTION_HOST));
+    program.addOption(await (0, commands_1.buildOption)(constants_1.ROOT_COMMAND_NAME, constants_1.OPTION_OPTIONS_FILE));
     program.configureHelp({ sortSubcommands: true });
     program.addHelpText("afterAll", `Only command-specific options are listed here. To learn more about available generic options,` +
         ` visit ${(0, core_1.getGenericOptionsHelp)()}`);
@@ -139,7 +140,7 @@ const init = async () => {
 };
 exports.init = init;
 const executeCommand = async (command) => {
-    await program.parseAsync(command?.split(" ") || undefined);
+    await program.parseAsync(command?.split(" ") ?? undefined);
 };
 exports.executeCommand = executeCommand;
 const buildCommandsObject = (name, command, object = {}) => {

package/dwc/utils.d.ts

@@ -4,4 +4,4 @@ export declare const addCommandsFromFolder: (pathToFolder: string, program: Comm
 export declare function verifyNodeVersion(): void;
 export declare const checkVersion: () => Promise<void>;
 export declare const compareEtags: () => Promise<void>;
-export declare const getOptionValueFromArgv: ({ longName }: Option) => string;
+export declare const getOptionValueFromArgv: (commandName: string, option: Option) => string;

package/dwc/utils.js

@@ -69,12 +69,12 @@ const compareEtags = async () => {
     }
 };
 exports.compareEtags = compareEtags;
-const getOptionValueFromArgv = ({ longName }) => {
-    const shortFlag = (0, commands_1.getShortFlagForLongName)(longName);
-    const index = process.argv.findIndex((a) => a === `-${shortFlag}` || a === `--${longName}`);
+const getOptionValueFromArgv = (commandName, option) => {
+    const shortFlag = (0, commands_1.getShortFlagForLongName)(commandName, option);
+    const index = process.argv.findIndex((a) => a === `-${shortFlag}` || a === `--${option.longName}`);
     if (index > -1) {
         return process.argv[index + 1];
     }
-    throw new Error(`option ${longName} not found in argv`);
+    throw new Error(`option ${option.longName} not found in argv`);
 };
 exports.getOptionValueFromArgv = getOptionValueFromArgv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cli-core",
-  "version": "2024.4.0",
+  "version": "2024.5.0",
   "description": "Command-Line Interface (CLI) Core Module",
   "license": "SEE LICENSE IN LICENSE",
   "author": "SAP SE",
@@ -18,11 +18,11 @@
   ],
   "dependencies": {
     "ajv": "8.12.0",
-    "axios": "1.6.5",
+    "axios": "1.6.7",
     "commander": "11.1.0",
     "compare-versions": "6.1.0",
     "config": "3.3.10",
-    "dotenv": "16.3.1",
+    "dotenv": "16.4.1",
     "fs-extra": "11.2.0",
     "https": "1.0.0",
     "https-proxy-agent": "7.0.2",

package/types.d.ts

@@ -144,6 +144,7 @@ export type DefaultFunction = () => Promise<string>;
 export type ChoicesFunction = () => Promise<Array<string>>;
 export type Choices = Array<string>;
 export type Option = {
+    commandName?: string;
     longName: string;
     description: string;
     default?: string | DefaultFunction;

package/utils/commands.d.ts

@@ -1,8 +1,9 @@
 import commander, { Command, Option } from "commander";
 import { Command as CommandType, Option as OptionType } from "../types";
 export declare const createCommand: (name?: string) => Command;
-export declare const getShortFlagForLongName: (longName: string) => string;
+export declare function getCommandNameForShortFlag(commandName: string, option: OptionType): string;
+export declare const getShortFlagForLongName: (commandName: string, option: OptionType) => string;
 export declare const isOptionAlreadyRegistered: ({ longName }: OptionType, command: Command) => boolean;
-export declare const registerLongName: (longName: string) => string;
-export declare const buildOption: ({ longName, description, choices, required, default: defaultValue, args, hidden, }: OptionType) => Promise<Option>;
+export declare const registerLongName: (commandName: string, option: OptionType) => string;
+export declare const buildOption: (commandName: string, option: OptionType) => Promise<Option>;
 export declare const buildCommand: (topCommand: commander.Command, command: CommandType) => Promise<commander.Command>;

package/utils/commands.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCommand = exports.buildOption = exports.registerLongName = exports.isOptionAlreadyRegistered = exports.getShortFlagForLongName = exports.createCommand = void 0;
+exports.buildCommand = exports.buildOption = exports.registerLongName = exports.isOptionAlreadyRegistered = exports.getShortFlagForLongName = exports.getCommandNameForShortFlag = exports.createCommand = void 0;
 const commander_1 = require("commander");
 const types_1 = require("../types");
 const root_1 = require("../commands/handler/root");
@@ -34,13 +34,18 @@ const createCommand = (name) => {
     return command;
 };
 exports.createCommand = createCommand;
-const getShortFlagForLongName = (longName) => {
-    for (const s of Object.keys(registeredOptions)) {
-        if (registeredOptions[s] === longName) {
+function getCommandNameForShortFlag(commandName, option) {
+    return option.commandName ?? commandName;
+}
+exports.getCommandNameForShortFlag = getCommandNameForShortFlag;
+const getShortFlagForLongName = (commandName, option) => {
+    const cName = getCommandNameForShortFlag(commandName, option);
+    for (const s of Object.keys(registeredOptions[cName] ?? {})) {
+        if (registeredOptions[cName][s] === option.longName) {
             return s;
         }
     }
-    throw new Error(`no short flag registered for long name ${longName}`);
+    throw new Error(`no short flag registered for command ${cName}, long name ${option.longName}`);
 };
 exports.getShortFlagForLongName = getShortFlagForLongName;
 const isOptionAlreadyRegistered = ({ longName }, command) => {
@@ -48,52 +53,59 @@ const isOptionAlreadyRegistered = ({ longName }, command) => {
     return !!opts?.includes(longName);
 };
 exports.isOptionAlreadyRegistered = isOptionAlreadyRegistered;
-const registerLongName = (longName) => {
+const registerLongName = (commandName, option) => {
+    const cName = getCommandNameForShortFlag(commandName, option);
     try {
-        return (0, exports.getShortFlagForLongName)(longName);
+        return (0, exports.getShortFlagForLongName)(cName, option);
     }
     catch (err) {
         for (const c of [
-            longName[0],
-            longName[0].toUpperCase() === longName[0]
-                ? longName[0].toLowerCase()
-                : longName[0].toUpperCase(),
+            option.longName[0],
+            option.longName[0].toUpperCase() === option.longName[0]
+                ? option.longName[0].toLowerCase()
+                : option.longName[0].toUpperCase(),
             ...types_1.CHARACTERS,
         ]) {
-            if (!registeredOptions[c]) {
-                registeredOptions[c] = longName;
+            if (!registeredOptions[cName]?.[c]) {
+                registeredOptions[cName] = registeredOptions[cName] ?? {};
+                registeredOptions[cName][c] = option.longName;
                 return c;
             }
         }
-        throw new Error(`no short flag found for name ${longName}`);
+        throw new Error(`no short flag found for name ${option.longName}, command ${cName}`);
     }
 };
 exports.registerLongName = registerLongName;
-const buildOption = async ({ longName, description, choices, required, default: defaultValue, args, hidden, }) => {
-    const mandatory = !!required;
-    const shortFlag = (0, exports.registerLongName)(longName);
-    let newDescr = description;
+const buildOption = async (commandName, option) => {
+    const mandatory = !!option.required;
+    const shortFlag = (0, exports.registerLongName)(commandName, option);
+    let newDescr = option.description;
     if (!mandatory) {
         newDescr = newDescr ? `${newDescr} (optional)` : "(optional)";
     }
-    const argStr = args
-        ? args.reduce((p, c) => (c.optional ? `${p} [${c.name}]` : `${p} <${c.name}>`), "")
+    const argStr = option.args
+        ? option.args.reduce((p, c) => (c.optional ? `${p} [${c.name}]` : `${p} <${c.name}>`), "")
         : "";
-    const option = new commander_1.Option(`-${shortFlag}, --${longName}${argStr}`, newDescr)
+    const cOption = new commander_1.Option(`-${shortFlag}, --${option.longName}${argStr}`, newDescr)
         .makeOptionMandatory(mandatory)
-        .hideHelp(!!hidden);
-    if (defaultValue) {
-        const defaultStr = typeof defaultValue === "function" ? await defaultValue() : defaultValue;
-        option.default(defaultStr);
+        .hideHelp(!!option.hidden);
+    if (option.default) {
+        const defaultStr = typeof option.default === "function"
+            ? await option.default()
+            : option.default;
+        cOption.default(defaultStr);
     }
     let choicesArr = [];
-    if (choices) {
-        choicesArr = typeof choices === "function" ? await choices() : choices;
+    if (option.choices) {
+        choicesArr =
+            typeof option.choices === "function"
+                ? await option.choices()
+                : option.choices;
     }
     if (choicesArr.length > 0) {
-        option.choices(choicesArr);
+        cOption.choices(choicesArr);
     }
-    return option;
+    return cOption;
 };
 exports.buildOption = buildOption;
 const buildCommand = async (topCommand, command) => {
@@ -106,7 +118,7 @@ const buildCommand = async (topCommand, command) => {
     comm.enablePositionalOptions();
     for (const option of options ?? []) {
         // eslint-disable-next-line no-await-in-loop
-        comm.addOption(await (0, exports.buildOption)(option));
+        comm.addOption(await (0, exports.buildOption)(name, option));
     }
     if (command.type === "topCommand") {
         const { subCommands } = command;

package/utils/utils.d.ts

@@ -1,5 +1,5 @@
 import { Option, PackageJson } from "../types";
-export declare function buildOptionName(option: Option): string;
+export declare function buildOptionName(commandName: string, option: Option): string;
 export declare const parseVersion: (version: string) => {
     major: number;
     minor: number;

package/utils/utils.js

@@ -35,8 +35,8 @@ const commands_1 = require("./commands");
 let pgk;
 const getLogger = () => (0, logger_1.get)("utils.utils");
 const REGEX_HTTPS = /http(s)*:\/\//;
-function buildOptionName(option) {
-    const shortFlag = (0, commands_1.getShortFlagForLongName)(option.longName);
+function buildOptionName(commandName, option) {
+    const shortFlag = (0, commands_1.getShortFlagForLongName)(commandName, option);
     return `-${shortFlag}, --${option.longName}`;
 }
 exports.buildOptionName = buildOptionName;