@sap/cli-core 2024.3.0 → 2024.5.0

package/CHANGELOG.md

@@ -5,6 +5,70 @@ 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
+
+- Support for Node versions `18`, `19`, `20`, `21`.
+
+- When using the CLI as a [As a Node.js module dependency](README.md#as-a-nodejs-module-dependency) and running a command which creates an entity where the CLI would print the command to retrieve the result when running the command to create the entity in the terminal, for example:
+
+  ```bash
+  <cli> spaces create -H https://mytenant.eu10.hcs.cloud.sap/ -f ./MY_SPACE.json
+  Use <cli> spaces read --space-id MY_SPACE to retrieve the entity you just created
+  ```
+
+  the CLI now returns the command to execute as an object:
+
+  ```bash
+  const retrieveCommand = await commands["spaces create"]({
+    "--file-path": "MY_SPACE.json",
+    "--host": "https://mytenant.eu10.hcs.cloud.sap/",
+  });
+
+  console.log(retrieveCommand);
+  // {
+  //   command: "spaces read",
+  //   options: {
+  //     "--space-id": "MY_SPACE"
+  //   },
+  // }
+  ```
+
+  You can use the returned response to immediately issue the command to read the entity:
+
+  ```bash
+  const retrieveCommand = await commands["spaces create"]({
+    "--file-path": "MY_SPACE.json",
+    "--host": "https://mytenant.eu10.hcs.cloud.sap/",
+  });
+
+  const response = await commands[retrieveCommand.command]({
+    ...retrieveCommand.options,
+    "--host": "https://mytenant.eu10.hcs.cloud.sap/",
+  });
+
+  console.log(response);
+  // {
+  //   MY_SPACE: {
+  //     version: "1.0.4",
+  //     ...
+  //   }
+  // }
+  ```
+
+- The CLI core module now supports retrieving the discovery documents from multiple endpoints for the same tenant. This allows you to define a list of endpoints from which the discovery documents should be retrieved. Multiple services, reachable through the same tenant, can expose their own, distinct discovery documents. There is no need to have a single service expose the full document for the tenant. The retrieved discovery documents are merged into a single document. All commands are shown to the user, not distinguished by endpoint or service. Only OAuth authentication is supported when specifying multiple endpoints.
+
+### Fixed
+
+- When the host is globally configured via the command `<cli> config host set <host>`, any other host specified via option `-H, --host` was ignored when running a command. This often led to confusion when users specify the host explicitly via option `-H, --host`, but are not aware that the host was globally configured, too. Now, option `-H, --host` always takes precedence over the globally configured host.
+
 ## 2024.2.0
 
 ### Changed

package/README.md

@@ -2,7 +2,7 @@
 
 Command-Line Interface (CLI) Core Module.
 
-[![Node Version](https://img.shields.io/badge/node-20.10.0-brightgreen)](https://nodejs.org/dist/latest-v20.x/docs/api/#) [![npm version](https://badge.fury.io/js/@sap%2Fcli-core.svg)](https://badge.fury.io/js/@sap%2Fcli-core)
+[![Node Version](https://img.shields.io/badge/node-18.xx.x-brightgreen)](https://nodejs.org/dist/latest-v18.x/docs/api/#) [![Node Version](https://img.shields.io/badge/node-19.xx.x-brightgreen)](https://nodejs.org/dist/latest-v19.x/docs/api/#) [![Node Version](https://img.shields.io/badge/node-20.xx.x-brightgreen)](https://nodejs.org/dist/latest-v20.x/docs/api/#) [![Node Version](https://img.shields.io/badge/node-21.xx.x-brightgreen)](https://nodejs.org/dist/latest-v21.x/docs/api/#) [![npm version](https://badge.fury.io/js/@sap%2Fcli-core.svg)](https://badge.fury.io/js/@sap%2Fcli-core)
 
 ## Content
 

package/commands/config.command/cache.command/{init.command.d.ts → init.command/index.d.ts}

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

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

@@ -0,0 +1,71 @@
+"use strict";
+/* eslint-disable no-await-in-loop */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const constants_1 = require("../../../../constants");
+const discovery_1 = require("../../../../discovery");
+const handler_1 = require("../../../handler");
+const config_1 = require("../../../../config");
+const core_1 = require("../../../../config/core");
+const ResultHandlerFactory_1 = require("../../../../result/ResultHandlerFactory");
+const utils_1 = require("./utils");
+const utils_2 = require("../../../handler/utils");
+const logger_1 = require("../../../../logger");
+const pre = () => {
+    (0, config_1.set)({
+        doNotStoreResult: false,
+        doNotProcessResponseData: true,
+    });
+};
+const post = async (discovery) => {
+    const config = (0, config_1.get)();
+    await (0, discovery_1.addMetadata)({
+        tenant: config.publicfqdn,
+        addedAt: new Date().getTime(),
+    });
+    (0, discovery_1.clear)();
+    const { options } = config;
+    delete options[constants_1.OPTION_OUTPUT.longName];
+    (0, config_1.set)({ options });
+    ResultHandlerFactory_1.ResultHandlerFactory.get().setResult(undefined);
+    await fs_extra_1.default.writeFile((0, discovery_1.getPathToDiscoveryDocument)(), JSON.stringify(discovery));
+};
+const init = async () => async () => {
+    pre();
+    const { output } = (0, logger_1.get)("init.command");
+    const discovery = {
+        info: {
+            version: constants_1.VERSION,
+            "x-document-version": constants_1.VERSION,
+        },
+        openapi: "3.0.3",
+        paths: {},
+        tags: [],
+        components: {},
+    };
+    const paths = (0, core_1.getDiscoveryPaths)();
+    if (paths.length > 1 &&
+        (0, utils_2.getAuthenticationMethod)() !== constants_1.AuthenticationMethod.oauth) {
+        output("Only OAuth authentication is supported");
+        throw new Error("only oauth authentication is supported");
+    }
+    for (const path of paths) {
+        await (await (0, handler_1.createFetchHandler)("GET", path)({}))();
+        const newDiscovery = ResultHandlerFactory_1.ResultHandlerFactory.get().getResult();
+        (0, utils_1.mergeDiscoveries)(discovery, newDiscovery);
+    }
+    await post(discovery);
+};
+exports.init = init;
+const initCommand = {
+    type: "command",
+    command: "init",
+    description: "initialize the local CLI cache",
+    options: [],
+    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/init.command/utils.d.ts

@@ -0,0 +1,3 @@
+import { Discovery } from "../../../../types";
+export declare function getLowerVersion(a: string, b: string): string;
+export declare function mergeDiscoveries(discovery: Discovery, newDiscovery: Discovery): void;

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

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeDiscoveries = exports.getLowerVersion = void 0;
+const compare_versions_1 = require("compare-versions");
+const lodash_1 = __importDefault(require("lodash"));
+function getLowerVersion(a, b) {
+    return [a, b].sort(compare_versions_1.compareVersions)[0];
+}
+exports.getLowerVersion = getLowerVersion;
+function mergeDiscoveries(discovery, newDiscovery) {
+    lodash_1.default.merge(discovery, newDiscovery);
+    // eslint-disable-next-line no-param-reassign
+    discovery.info.version = getLowerVersion(discovery.info.version, newDiscovery.info.version);
+    // eslint-disable-next-line no-param-reassign
+    discovery.info["x-document-version"] = getLowerVersion(discovery.info["x-document-version"], newDiscovery.info["x-document-version"]);
+}
+exports.mergeDiscoveries = mergeDiscoveries;

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/fetch/utils.js

@@ -123,6 +123,9 @@ const handleResponseData = async (data, outputPath) => {
     if (!config.doNotStoreResult) {
         ResultHandlerFactory_1.ResultHandlerFactory.get().setResult(data);
     }
+    if (config.doNotProcessResponseData) {
+        return;
+    }
     const { output } = (0, logger_1.get)("handler.fetch");
     const formatted = config.options.pretty
         ? JSON.stringify(data, null, 2)

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();