@sap/cli-core 2024.3.0 → 2024.5.0

package/commands/openAPI.command/utils.js

@@ -30,6 +30,7 @@ const logger_1 = require("../../logger");
 const utils_1 = require("../../utils/utils");
 const config_1 = require("../../config");
 const handler_1 = require("../handler");
+const ResultHandlerFactory_1 = require("../../result/ResultHandlerFactory");
 const getLogger = () => (0, logger_1.get)("commands.openAPI.utils");
 const updatePath = (doc, path) => {
     const version = (0, utils_1.parseVersion)(doc.info.version);
@@ -41,7 +42,10 @@ const updatePath = (doc, path) => {
 exports.updatePath = updatePath;
 const isPathParameter = (segment) => /^{.*}$/.test(segment);
 exports.isPathParameter = isPathParameter;
-const writeParameter = (parameter, value) => `--${(0, lodash_1.kebabCase)(parameter.slice(1, -1))} ${value}`;
+function getParameterName(parameter) {
+    return `--${(0, lodash_1.kebabCase)(parameter.slice(1, -1))}`;
+}
+const writeParameter = (parameter, value) => `${getParameterName(parameter)} ${value}`;
 exports.writeParameter = writeParameter;
 const getSegments = (value) => {
     const segments = value.split("/");
@@ -66,14 +70,26 @@ const getPathItem = (doc, operation, path) => {
     }
     throw new Error(`path ${operation["x-read-path"]} does not support GET operation`);
 };
+function handleOptions(options, option, value) {
+    if ((0, exports.isPathParameter)(option)) {
+        return { ...options, [getParameterName(option)]: value };
+    }
+    return options;
+}
 const outputReadCommand = (doc, operation, response, path) => {
     const locationSegments = (0, exports.getSegments)(response.headers.location);
     const pathSegments = (0, exports.getSegments)(path);
     let params = "";
+    let options = {};
     for (let i = 0; i < pathSegments.length; i++) {
         params = handleParameter(params, pathSegments[i], locationSegments[i]);
+        options = handleOptions(options, pathSegments[i], locationSegments[i]);
     }
     const pathItem = getPathItem(doc, operation, path);
+    ResultHandlerFactory_1.ResultHandlerFactory.get().setResult({
+        command: pathItem.get.operationId,
+        options,
+    });
     const { output } = getLogger();
     output(`Use ${(0, config_1.get)()[constants_1.CLI_NAME]} ${pathItem.get.operationId} ${params} to retrieve the entity you just created`);
 };

package/config/core.d.ts

@@ -2,7 +2,7 @@ import { AuthenticationMethod } from "../constants";
 export declare const getName: () => string;
 export declare const getPackageName: () => string;
 export declare const getDescription: () => string;
-export declare const getDiscoveryPath: () => string;
+export declare const getDiscoveryPaths: () => Array<string>;
 export declare const getSapHelp: () => string;
 export declare const getAuthenticationMethods: () => Array<AuthenticationMethod>;
 export declare const getVersion: () => string;

package/config/core.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGenericOptionsHelp = exports.getDeprecationMessage = exports.isDeprecated = exports.getVersion = exports.getAuthenticationMethods = exports.getSapHelp = exports.getDiscoveryPath = exports.getDescription = exports.getPackageName = exports.getName = void 0;
+exports.getGenericOptionsHelp = exports.getDeprecationMessage = exports.isDeprecated = exports.getVersion = exports.getAuthenticationMethods = exports.getSapHelp = exports.getDiscoveryPaths = exports.getDescription = exports.getPackageName = exports.getName = void 0;
 /* jscpd:ignore-start */
 const constants_1 = require("../constants");
 /* jscpd:ignore-end */
@@ -11,8 +11,8 @@ const getPackageName = () => (0, index_1.get)()[constants_1.CLI_PACKAGE_NAME];
 exports.getPackageName = getPackageName;
 const getDescription = () => (0, index_1.get)()[constants_1.CLI_DESCRIPTION];
 exports.getDescription = getDescription;
-const getDiscoveryPath = () => (0, index_1.get)()[constants_1.CLI_DISCOVERY_PATH];
-exports.getDiscoveryPath = getDiscoveryPath;
+const getDiscoveryPaths = () => (0, index_1.get)()[constants_1.CLI_DISCOVERY_PATHS];
+exports.getDiscoveryPaths = getDiscoveryPaths;
 const getSapHelp = () => (0, index_1.get)()[constants_1.CLI_SAP_HELP];
 exports.getSapHelp = getSapHelp;
 const getAuthenticationMethods = () => (0, index_1.get)()[constants_1.CLI_SUPPORTED_AUTHENTICATION_METHODS];

package/config/index.js

@@ -16,7 +16,7 @@ let config;
 const CONFIGS_TO_KEEP = [
     constants_1.CONFIG_PASSCODE_FUNCTION,
     constants_1.CLI_DESCRIPTION,
-    constants_1.CLI_DISCOVERY_PATH,
+    constants_1.CLI_DISCOVERY_PATHS,
     constants_1.CLI_NAME,
     constants_1.CLI_PACKAGE_NAME,
     constants_1.CLI_SAP_HELP,

package/constants.d.ts

@@ -1,14 +1,27 @@
 import { Option } from "./types";
 export declare const VERSION: string;
+export type CoreConfiguration = {
+    getName: () => string;
+    getPackageName: () => string;
+    getDescription: () => string;
+    getDiscoveryPaths: () => Array<string>;
+    getSapHelp: () => string;
+    getAuthenticationMethods: () => Array<AuthenticationMethod>;
+    getVersion: () => string;
+    isDeprecated: () => boolean;
+    getDeprecationMessage: () => string;
+    getGenericOptionsHelp: () => string;
+};
 export declare const DISCOVERY_DOCUMENT_PREFIX = "discovery-";
 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";
-export declare const CLI_DISCOVERY_PATH = "cli-discovery-path";
+export declare const CLI_DISCOVERY_PATHS = "cli-discovery-paths";
 export declare const CLI_SAP_HELP = "cli-sap-help";
 export declare const CLI_VERSION = "cli-version";
 export declare const CLI_DEPRECATED = "cli-deprecated";

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_PATH = 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,10 +13,11 @@ 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";
-exports.CLI_DISCOVERY_PATH = "cli-discovery-path";
+exports.CLI_DISCOVERY_PATHS = "cli-discovery-paths";
 exports.CLI_SAP_HELP = "cli-sap-help";
 exports.CLI_VERSION = "cli-version";
 exports.CLI_DEPRECATED = "cli-deprecated";
@@ -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/discovery/index.js

@@ -20,7 +20,7 @@ let metadata;
 const getDocumentName = () => {
     const { trace } = getLogger();
     const config = (0, config_1.get)();
-    const sha = (0, utils_2.sha256)(`${config.publicfqdn}${(0, core_1.getDiscoveryPath)()}`).replace(/[/\\]/g, "_");
+    const sha = (0, utils_2.sha256)(`${config.publicfqdn}${JSON.stringify((0, core_1.getDiscoveryPaths)())}`).replace(/[/\\]/g, "_");
     const name = `${constants_1.DISCOVERY_DOCUMENT_PREFIX}${sha}.json`;
     trace(`calculating document name for host ${config.host}, name ${name}`);
     return name;

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,8 +73,12 @@ const setTenant = async () => {
         trace(`trying to ${name}`);
         try {
             // eslint-disable-next-line no-await-in-loop
-            const host = await func();
-            (0, config_1.set)({ tenant: host });
+            const host = (0, utils_3.replaceLeadingTrailingSingleQuotes)(await func());
+            (0, config_1.set)({
+                tenant: host,
+                options: { ...config.options, [constants_1.OPTION_HOST.longName]: host },
+            });
+            break;
         }
         catch (err) {
             trace(`failed to ${name}`, err);
@@ -95,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();
@@ -124,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)()}`);
@@ -135,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/index.d.ts

@@ -3,10 +3,10 @@ export { run } from "./dwc/run";
 export { configure, getCommands } from "./module";
 export { AuthenticationMethod };
 export { getVersion, getBin, getDescription, getName, getPackageName, } from "./utils/utils";
-export declare const configureCoreModule: ({ name, packageName, discoveryPath, description, sapHelpLink, authenticationMethods, version, genericOptionsHelp, deprecated, deprecationMessage, }: {
+export declare const configureCoreModule: ({ name, packageName, discoveryPaths, description, sapHelpLink, authenticationMethods, version, genericOptionsHelp, deprecated, deprecationMessage, }: {
     name: string;
     packageName: string;
-    discoveryPath: string;
+    discoveryPaths: Array<string>;
     description: string;
     sapHelpLink: string;
     authenticationMethods?: AuthenticationMethod[] | undefined;

package/index.js

@@ -45,12 +45,12 @@ Object.defineProperty(exports, "getBin", { enumerable: true, get: function () {
 Object.defineProperty(exports, "getDescription", { enumerable: true, get: function () { return utils_1.getDescription; } });
 Object.defineProperty(exports, "getName", { enumerable: true, get: function () { return utils_1.getName; } });
 Object.defineProperty(exports, "getPackageName", { enumerable: true, get: function () { return utils_1.getPackageName; } });
-const configureCoreModule = ({ name, packageName, discoveryPath, description, sapHelpLink, authenticationMethods = [constants_1.AuthenticationMethod.oauth], version, genericOptionsHelp, deprecated = false, deprecationMessage, }) => {
+const configureCoreModule = ({ name, packageName, discoveryPaths, description, sapHelpLink, authenticationMethods = [constants_1.AuthenticationMethod.oauth], version, genericOptionsHelp, deprecated = false, deprecationMessage, }) => {
     (0, config_1.set)({
         [constants_1.CLI_NAME]: name,
         [constants_1.CLI_PACKAGE_NAME]: packageName,
         [constants_1.CLI_DESCRIPTION]: description,
-        [constants_1.CLI_DISCOVERY_PATH]: discoveryPath,
+        [constants_1.CLI_DISCOVERY_PATHS]: discoveryPaths,
         [constants_1.CLI_SAP_HELP]: sapHelpLink,
         [constants_1.CLI_SUPPORTED_AUTHENTICATION_METHODS]: authenticationMethods,
         [constants_1.CLI_VERSION]: version,

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@sap/cli-core",
-  "version": "2024.3.0",
+  "version": "2024.5.0",
   "description": "Command-Line Interface (CLI) Core Module",
   "license": "SEE LICENSE IN LICENSE",
   "author": "SAP SE",
   "homepage": "https://www.sap.com",
   "main": "index.js",
   "engines": {
-    "node": "^20",
-    "npm": "^10"
+    "node": "^18 || ^19 || ^20 || ^21",
+    "npm": "^9 || ^10"
   },
   "keywords": [
     "cli",
@@ -18,11 +18,11 @@
   ],
   "dependencies": {
     "ajv": "8.12.0",
-    "axios": "1.6.4",
+    "axios": "1.6.7",
     "commander": "11.1.0",
     "compare-versions": "6.1.0",
-    "config": "3.3.9",
-    "dotenv": "16.3.1",
+    "config": "3.3.10",
+    "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) => {
@@ -104,9 +116,9 @@ const buildCommand = async (topCommand, command) => {
     const comm = (0, exports.createCommand)(name);
     comm.description(description);
     comm.enablePositionalOptions();
-    for (const option of options || []) {
+    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;