@sap/cli-core 2025.17.0 → 2025.20.0

package/config/core.js

@@ -1,27 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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");
+import { CLI_DEPRECATED, CLI_DEPRECATION_MESSAGE, CLI_DESCRIPTION, CLI_DISCOVERY_PATHS, CLI_GENERIC_OPTIONS_HELP, CLI_NAME, CLI_PACKAGE_NAME, CLI_SAP_HELP, CLI_SUPPORTED_AUTHENTICATION_METHODS, CLI_VERSION, } from "../constants.js";
 /* jscpd:ignore-end */
-const index_1 = require("./index");
-const getName = () => (0, index_1.get)()[constants_1.CLI_NAME];
-exports.getName = getName;
-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 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];
-exports.getAuthenticationMethods = getAuthenticationMethods;
-const getVersion = () => (0, index_1.get)()[constants_1.CLI_VERSION];
-exports.getVersion = getVersion;
-const isDeprecated = () => (0, index_1.get)()[constants_1.CLI_DEPRECATED] || false;
-exports.isDeprecated = isDeprecated;
-const getDeprecationMessage = () => (0, index_1.get)()[constants_1.CLI_DEPRECATION_MESSAGE];
-exports.getDeprecationMessage = getDeprecationMessage;
-const getGenericOptionsHelp = () => (0, index_1.get)()[constants_1.CLI_GENERIC_OPTIONS_HELP];
-exports.getGenericOptionsHelp = getGenericOptionsHelp;
+import { get } from "./index.js";
+export const getName = () => get()[CLI_NAME];
+export const getPackageName = () => get()[CLI_PACKAGE_NAME];
+export const getDescription = () => get()[CLI_DESCRIPTION];
+export const getDiscoveryPaths = () => get()[CLI_DISCOVERY_PATHS];
+export const getSapHelp = () => get()[CLI_SAP_HELP];
+export const getAuthenticationMethods = () => get()[CLI_SUPPORTED_AUTHENTICATION_METHODS];
+export const getVersion = () => get()[CLI_VERSION];
+export const isDeprecated = () => get()[CLI_DEPRECATED] || false;
+export const getDeprecationMessage = () => get()[CLI_DEPRECATION_MESSAGE];
+export const getGenericOptionsHelp = () => get()[CLI_GENERIC_OPTIONS_HELP];

package/config/index.d.ts

@@ -1,4 +1,4 @@
-import { KeyValuePair } from "../types";
+import { KeyValuePair } from "../types.js";
 export declare const initialize: () => void;
 export declare const setCustomConfig: () => void;
 export declare const set: (c: KeyValuePair) => void;

package/config/index.js

@@ -1,32 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.get = exports.set = exports.setCustomConfig = exports.initialize = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const config_1 = __importDefault(require("config"));
-const logger_1 = require("../logger");
-const utils_1 = require("../utils/utils");
-const constants_1 = require("../constants");
+import { createRequire } from "module";
+import { isEqual, merge } from "lodash-es";
+import { get as getLoggerExt } from "../logger/index.js";
+import { getInfoFromTenant, parseTenant } from "../utils/utils.js";
+import { CLI_DEPRECATED, CLI_DEPRECATION_MESSAGE, CLI_DESCRIPTION, CLI_DISCOVERY_PATHS, CLI_GENERIC_OPTIONS_HELP, CLI_NAME, CLI_PACKAGE_NAME, CLI_SAP_HELP, CLI_SUPPORTED_AUTHENTICATION_METHODS, CLI_VERSION, CONFIG_PASSCODE_FUNCTION, } from "../constants.js";
 const CUSTOM_HOST = "tenant.host";
 const CUSTOM_PASSCODE_URL = "tenant.passcodeUrl";
 const CUSTOM_PUBLIC_FQDN = "tenant.publicfqdn";
+const require = createRequire(import.meta.url);
 let config;
 const CONFIGS_TO_KEEP = [
-    constants_1.CONFIG_PASSCODE_FUNCTION,
-    constants_1.CLI_DESCRIPTION,
-    constants_1.CLI_DISCOVERY_PATHS,
-    constants_1.CLI_NAME,
-    constants_1.CLI_PACKAGE_NAME,
-    constants_1.CLI_SAP_HELP,
-    constants_1.CLI_SUPPORTED_AUTHENTICATION_METHODS,
-    constants_1.CLI_VERSION,
-    constants_1.CLI_DEPRECATED,
-    constants_1.CLI_DEPRECATION_MESSAGE,
-    constants_1.CLI_GENERIC_OPTIONS_HELP,
+    CONFIG_PASSCODE_FUNCTION,
+    CLI_DESCRIPTION,
+    CLI_DISCOVERY_PATHS,
+    CLI_NAME,
+    CLI_PACKAGE_NAME,
+    CLI_SAP_HELP,
+    CLI_SUPPORTED_AUTHENTICATION_METHODS,
+    CLI_VERSION,
+    CLI_DEPRECATED,
+    CLI_DEPRECATION_MESSAGE,
+    CLI_GENERIC_OPTIONS_HELP,
 ];
-const initialize = () => {
+export const initialize = () => {
     const keep = {};
     for (const keepConfig of CONFIGS_TO_KEEP) {
         keep[keepConfig] = config?.[keepConfig];
@@ -38,45 +33,48 @@ const initialize = () => {
         }
     }
 };
-exports.initialize = initialize;
-(0, exports.initialize)();
-const getLogger = () => (0, logger_1.get)("config");
-const setCustomConfig = () => {
+initialize();
+const getLogger = () => getLoggerExt("config");
+export const setCustomConfig = () => {
+    if (process.env.SUPPRESS_NO_CONFIG_WARNING === undefined) {
+        process.env.SUPPRESS_NO_CONFIG_WARNING = "true";
+    }
+    // This has to be loaded via dynamic import to ensure that the env variable is set before the config is loaded.
+    const customConfig = require("config");
     const { trace, debug } = getLogger();
     debug("setting custom configuration");
-    const sources = config_1.default.util.getConfigSources();
+    const sources = customConfig.util.getConfigSources();
     trace("config.custom.getConfigSources", JSON.stringify(sources, null, 2));
-    trace("config.custom.NODE_CONFIG_DIR", config_1.default.util.getEnv("NODE_CONFIG_DIR"));
-    trace("config.custom.NODE_ENV", config_1.default.util.getEnv("NODE_ENV"));
-    trace("config.custom.NODE_CONFIG", JSON.stringify(config_1.default.util.getEnv("NODE_CONFIG"), null, 2));
-    trace("config.custom.HOSTNAME", config_1.default.util.getEnv("HOSTNAME"));
-    trace("config.custom.NODE_APP_INSTANCE", config_1.default.util.getEnv("NODE_APP_INSTANCE"));
-    if (config_1.default.has(CUSTOM_HOST)) {
-        config.host = config_1.default.get(CUSTOM_HOST);
+    trace("config.custom.NODE_CONFIG_DIR", customConfig.util.getEnv("NODE_CONFIG_DIR"));
+    trace("config.custom.NODE_ENV", customConfig.util.getEnv("NODE_ENV"));
+    trace("config.custom.NODE_CONFIG", JSON.stringify(customConfig.util.getEnv("NODE_CONFIG"), null, 2));
+    trace("config.custom.HOSTNAME", customConfig.util.getEnv("HOSTNAME"));
+    trace("config.custom.NODE_APP_INSTANCE", customConfig.util.getEnv("NODE_APP_INSTANCE"));
+    if (customConfig.has(CUSTOM_HOST)) {
+        config.host = customConfig.get(CUSTOM_HOST);
         config.hostSetFromCustomConfig = true;
     }
-    if (config_1.default.has(CUSTOM_PASSCODE_URL)) {
-        config.passcodeUrl = config_1.default.get(CUSTOM_PASSCODE_URL);
+    if (customConfig.has(CUSTOM_PASSCODE_URL)) {
+        config.passcodeUrl = customConfig.get(CUSTOM_PASSCODE_URL);
     }
-    if (config_1.default.has(CUSTOM_PUBLIC_FQDN)) {
-        config.publicfqdn = (0, utils_1.parseTenant)(config_1.default.get(CUSTOM_PUBLIC_FQDN));
+    if (customConfig.has(CUSTOM_PUBLIC_FQDN)) {
+        config.publicfqdn = parseTenant(customConfig.get(CUSTOM_PUBLIC_FQDN));
     }
 };
-exports.setCustomConfig = setCustomConfig;
-(0, exports.setCustomConfig)();
+setCustomConfig();
 const setTenant = (tenant) => {
-    const info = (0, utils_1.getInfoFromTenant)(tenant, config.verbose);
+    const info = getInfoFromTenant(tenant, config.verbose);
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    (0, exports.set)({ ...info, newTenant: tenant });
+    set({ ...info, newTenant: tenant });
 };
-const set = (c) => {
+export const set = (c) => {
     const { trace } = getLogger();
     const prev = JSON.parse(JSON.stringify(config));
     if (c.tenant) {
         setTenant(c.tenant);
     }
     else {
-        config = lodash_1.default.merge(config, c);
+        config = merge(config, c);
         if (config.newTenant) {
             config.tenant = config.newTenant;
             delete config.newTenant;
@@ -84,11 +82,9 @@ const set = (c) => {
         if (c.data) {
             config.data = c.data;
         }
-        if (!lodash_1.default.isEqual(prev, config)) {
+        if (!isEqual(prev, config)) {
             trace("configuration changed. previous: %s, current: %s", JSON.stringify(prev), JSON.stringify(config));
         }
     }
 };
-exports.set = set;
-const get = () => config;
-exports.get = get;
+export const get = () => config;

package/configureLoggers.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureLoggers = void 0;
-const logger_1 = require("./logger");
-const configureLoggers = () => (0, logger_1.configure)({
+import { configure } from "./logger/index.js";
+export const configureLoggers = () => configure({
     logLevel: process.env.LOG_LEVEL
         ? parseInt(process.env.LOG_LEVEL, 10)
         : undefined,
     loggers: process.env.LOGGERS ? new RegExp(process.env.LOGGERS) : undefined,
 });
-exports.configureLoggers = configureLoggers;

package/constants.d.ts

@@ -1,5 +1,5 @@
 import { SecureVersion } from "tls";
-import { Option } from "./types";
+import { Option } from "./types.js";
 export declare const VERSION: string;
 export declare const DEFAULT_TLS_VERSION: SecureVersion;
 export type CoreConfiguration = {

package/constants.js

@@ -1,51 +1,45 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPTION_TLS_VERSION = exports.OPTION_AUTHORIZATION_FLOW = 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_DSP_API_DEPRECATED_PROPERTIES = 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 = exports.AuthenticationMethod = exports.DISCOVERY_DOCUMENT_PREFIX = exports.DEFAULT_TLS_VERSION = exports.VERSION = void 0;
-const path_1 = __importDefault(require("path"));
-const types_1 = require("./types");
-const utils_1 = require("./utils/utils");
-exports.VERSION = (0, utils_1.getVersion)();
-exports.DEFAULT_TLS_VERSION = "TLSv1.2";
-exports.DISCOVERY_DOCUMENT_PREFIX = "discovery-";
-var AuthenticationMethod;
+import path from "path";
+import { GrantType } from "./types.js";
+import { getVersion } from "./utils/utils.js";
+export const VERSION = getVersion();
+export const DEFAULT_TLS_VERSION = "TLSv1.2";
+export const DISCOVERY_DOCUMENT_PREFIX = "discovery-";
+export var AuthenticationMethod;
 (function (AuthenticationMethod) {
     AuthenticationMethod["oauth"] = "oauth";
     AuthenticationMethod["passcode"] = "passcode";
-})(AuthenticationMethod || (exports.AuthenticationMethod = AuthenticationMethod = {}));
-exports.ROOT_COMMAND = { name: () => "ROOT", parent: null };
-exports.CLI_NAME = "cli-name";
-exports.CLI_PACKAGE_NAME = "cli-package-name";
-exports.CLI_DESCRIPTION = "cli-description";
-exports.CLI_DISCOVERY_PATHS = "cli-discovery-paths";
-exports.CLI_SAP_HELP = "cli-sap-help";
-exports.CLI_VERSION = "cli-version";
-exports.CLI_DEPRECATED = "cli-deprecated";
-exports.CLI_DEPRECATION_MESSAGE = "cli-deprecation-message";
-exports.CLI_SUPPORTED_AUTHENTICATION_METHODS = "cli-supported-authentication-methods";
-exports.CLI_GENERIC_OPTIONS_HELP = "cli-generic-options-help";
-exports.SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = ["dwaas-core"];
-exports.DISCOVERY_METADATA_PATH = "discovery-metadata.json";
-exports.X_CSRF_TOKEN = "x-csrf-token";
-exports.X_DSP_API_DEPRECATED_PROPERTIES = "x-dsp-api-deprecated-properties";
-exports.X_OUTPUT_FILE_NAME = "x-sap-datasphere-cli-file-name";
-exports.PATH_TO_SUCCESS_HTML = path_1.default.join(__dirname, "assets", "success.html");
-exports.PATH_TO_ERROR_HTML = path_1.default.join(__dirname, "assets", "error.html");
-exports.CACHE_SECRETS_FILE = "secrets.json";
-exports.OPTION_VERSION = {
+})(AuthenticationMethod || (AuthenticationMethod = {}));
+export const ROOT_COMMAND = { name: () => "ROOT", parent: null };
+export const CLI_NAME = "cli-name";
+export const CLI_PACKAGE_NAME = "cli-package-name";
+export const CLI_DESCRIPTION = "cli-description";
+export const CLI_DISCOVERY_PATHS = "cli-discovery-paths";
+export const CLI_SAP_HELP = "cli-sap-help";
+export const CLI_VERSION = "cli-version";
+export const CLI_DEPRECATED = "cli-deprecated";
+export const CLI_DEPRECATION_MESSAGE = "cli-deprecation-message";
+export const CLI_SUPPORTED_AUTHENTICATION_METHODS = "cli-supported-authentication-methods";
+export const CLI_GENERIC_OPTIONS_HELP = "cli-generic-options-help";
+export const SEGMENTS_TO_REMOVE_FOR_PASSCODE_AUTH = ["dwaas-core"];
+export const DISCOVERY_METADATA_PATH = "discovery-metadata.json";
+export const X_CSRF_TOKEN = "x-csrf-token";
+export const X_DSP_API_DEPRECATED_PROPERTIES = "x-dsp-api-deprecated-properties";
+export const X_OUTPUT_FILE_NAME = "x-sap-datasphere-cli-file-name";
+export const PATH_TO_SUCCESS_HTML = path.join(import.meta.dirname, "assets", "success.html");
+export const PATH_TO_ERROR_HTML = path.join(import.meta.dirname, "assets", "error.html");
+export const CACHE_SECRETS_FILE = "secrets.json";
+export const OPTION_VERSION = {
     longName: "version",
     description: "print version",
     hidden: true,
 };
-exports.OPTION_HELP = {
+export const OPTION_HELP = {
     longName: "help",
     description: "print help for a command",
     args: [{ name: "command" }],
     hidden: true,
 };
-exports.OPTION_HOST = {
+export const OPTION_HOST = {
     longName: "host",
     description: "specifies the url where the tenant is hosted",
     args: [{ name: "host" }],
@@ -55,7 +49,7 @@ exports.OPTION_HOST = {
         type: "text",
     },
 };
-exports.OPTION_LOGIN_ID = {
+export const OPTION_LOGIN_ID = {
     longName: "login-id",
     description: "specifies the login ID",
     args: [{ name: "id" }],
@@ -66,27 +60,27 @@ exports.OPTION_LOGIN_ID = {
         type: "select",
     },
 };
-exports.OPTION_OUTPUT = {
+export const OPTION_OUTPUT = {
     longName: "output",
     description: "specifies the file to store the output of the command",
     args: [{ name: "output", optional: true }],
     hidden: true,
 };
-exports.OPTION_NO_PRETTY = {
+export const OPTION_NO_PRETTY = {
     longName: "no-pretty",
     description: "do not pretty-format JSON responses",
     hidden: true,
 };
-exports.OPTION_VERBOSE = {
+export const OPTION_VERBOSE = {
     longName: "verbose",
     description: "print detailed log information to console",
     hidden: true,
 };
-exports.OPTION_FORCE = {
+export const OPTION_FORCE = {
     longName: "force",
     description: "force the command execution",
 };
-exports.OPTION_CLIENT_ID = {
+export const OPTION_CLIENT_ID = {
     longName: "client-id",
     description: "client id for interactive oauth session authentication",
     args: [{ name: "id" }],
@@ -96,7 +90,7 @@ exports.OPTION_CLIENT_ID = {
         message: `Please enter your client ID:`,
     },
 };
-exports.OPTION_CLIENT_SECRET = {
+export const OPTION_CLIENT_SECRET = {
     longName: "client-secret",
     description: "client secret for interactive oauth session authentication",
     args: [{ name: "secret" }],
@@ -106,7 +100,7 @@ exports.OPTION_CLIENT_SECRET = {
         message: `Please enter your client secret:`,
     },
 };
-exports.OPTION_AUTHORIZATION_URL = {
+export const OPTION_AUTHORIZATION_URL = {
     longName: "authorization-url",
     description: "authorization url for interactive oauth session authentication",
     args: [{ name: "url" }],
@@ -116,7 +110,7 @@ exports.OPTION_AUTHORIZATION_URL = {
         message: `Please enter your authorization URL:`,
     },
 };
-exports.OPTION_TOKEN_URL = {
+export const OPTION_TOKEN_URL = {
     longName: "token-url",
     description: "token url for interactive oauth session authentication",
     args: [{ name: "url" }],
@@ -126,7 +120,7 @@ exports.OPTION_TOKEN_URL = {
         message: `Please enter your token URL:`,
     },
 };
-exports.OPTION_ACCESS_TOKEN = {
+export const OPTION_ACCESS_TOKEN = {
     longName: "access-token",
     description: "access token for interactive oauth session authentication",
     args: [{ name: "token" }],
@@ -136,7 +130,7 @@ exports.OPTION_ACCESS_TOKEN = {
         message: `Please enter your access token:`,
     },
 };
-exports.OPTION_REFRESH_TOKEN = {
+export const OPTION_REFRESH_TOKEN = {
     longName: "refresh-token",
     description: "refresh token for interactive oauth session authentication",
     args: [{ name: "token" }],
@@ -146,7 +140,7 @@ exports.OPTION_REFRESH_TOKEN = {
         message: `Please enter your refresh token:`,
     },
 };
-exports.OPTION_EXPIRES_IN = {
+export const OPTION_EXPIRES_IN = {
     longName: "expires-in",
     description: "expires in information for interactive oauth session authentication",
     args: [{ name: "expires" }],
@@ -156,7 +150,7 @@ exports.OPTION_EXPIRES_IN = {
         message: `Please enter a value for expires in:`,
     },
 };
-exports.OPTION_SECRETS_FILE = {
+export const OPTION_SECRETS_FILE = {
     longName: "secrets-file",
     description: "path to secrets file",
     args: [{ name: "file" }],
@@ -166,7 +160,7 @@ exports.OPTION_SECRETS_FILE = {
         message: `Please enter the path to the secrets file:`,
     },
 };
-exports.OPTION_CODE = {
+export const OPTION_CODE = {
     longName: "code",
     description: "code for oauth token retrieval",
     args: [{ name: "code" }],
@@ -176,20 +170,20 @@ exports.OPTION_CODE = {
         message: `Please enter the code for retrieving the oauth access_token and refresh_token:`,
     },
 };
-exports.OPTION_PASSCODE = {
+export const OPTION_PASSCODE = {
     longName: "passcode",
     description: "passcode for interactive session authentication",
     args: [{ name: "passcode" }],
     hidden: true,
 };
-exports.CONFIG_PASSCODE_FUNCTION = "passcodeFunction";
-exports.OPTION_OPTIONS_FILE = {
+export const CONFIG_PASSCODE_FUNCTION = "passcodeFunction";
+export const OPTION_OPTIONS_FILE = {
     longName: "options-file",
     description: "path to options file",
     args: [{ name: "file" }],
     hidden: true,
 };
-exports.OPTION_FILE_PATH = {
+export const OPTION_FILE_PATH = {
     longName: "file-path",
     description: "specifies the file to use as input for the command",
     args: [{ name: "path" }],
@@ -198,7 +192,7 @@ exports.OPTION_FILE_PATH = {
         type: "text",
     },
 };
-exports.OPTION_INPUT = {
+export const OPTION_INPUT = {
     longName: "input",
     description: "specifies input as string to use for the command",
     args: [{ name: "input" }],
@@ -207,7 +201,7 @@ exports.OPTION_INPUT = {
         type: "text",
     },
 };
-exports.OPTION_BROWSER = {
+export const OPTION_BROWSER = {
     longName: "browser",
     description: "specifies the browser to open",
     args: [{ name: "browser" }],
@@ -216,23 +210,23 @@ exports.OPTION_BROWSER = {
         type: "select",
     },
 };
-exports.OPTION_AUTHORIZATION_FLOW = {
+export const OPTION_AUTHORIZATION_FLOW = {
     longName: "authorization-flow",
     description: "specifies the authorization flow to use",
     args: [{ name: "authorization-flow" }],
     choices: [
-        types_1.GrantType.authorization_code,
-        types_1.GrantType.client_credentials,
+        GrantType.authorization_code,
+        GrantType.client_credentials,
     ],
-    default: types_1.GrantType.authorization_code,
+    default: GrantType.authorization_code,
     required: true,
     hidden: true,
 };
-exports.OPTION_TLS_VERSION = {
+export const OPTION_TLS_VERSION = {
     longName: "tls-version",
     description: "specifies the TLS version to use for HTTPS connections",
     args: [{ name: "version" }],
-    choices: [exports.DEFAULT_TLS_VERSION, "TLSv1.3"],
-    default: exports.DEFAULT_TLS_VERSION,
+    choices: [DEFAULT_TLS_VERSION, "TLSv1.3"],
+    default: DEFAULT_TLS_VERSION,
     hidden: true,
 };

package/discovery/index.d.ts

@@ -1,4 +1,4 @@
-import { Discovery, DiscoveryMetadata } from "../types";
+import { Discovery, DiscoveryMetadata } from "../types.js";
 export declare const getPathToDiscoveryDocument: () => string;
 export declare const getMetadata: () => Promise<Array<DiscoveryMetadata>>;
 export declare const addMetadata: ({ tenant, addedAt, }: Omit<DiscoveryMetadata, "hash">) => Promise<void>;

package/discovery/index.js

@@ -1,40 +1,33 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkVersion = exports.compareEtags = exports.init = exports.clear = exports.addMetadata = exports.getMetadata = exports.getPathToDiscoveryDocument = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const cache_1 = require("../cache");
-const utils_1 = require("./utils");
-const utils_2 = require("../utils/utils");
-const logger_1 = require("../logger");
-const config_1 = require("../config");
-const constants_1 = require("../constants");
-const core_1 = require("../config/core");
-const getLogger = () => (0, logger_1.get)("discovery");
+import fs from "fs-extra";
+import path from "path";
+import { getPath, readFile as readFileFromCache, writeFile as writeFileToCache, } from "../cache/index.js";
+import { getDiscoveryPaths, getVersion } from "../config/core.js";
+import { get as getConfig } from "../config/index.js";
+import { DISCOVERY_DOCUMENT_PREFIX, DISCOVERY_METADATA_PATH, } from "../constants.js";
+import { get } from "../logger/index.js";
+import { parseVersion, sha256 } from "../utils/utils.js";
+import { validate } from "./utils.js";
+const getLogger = () => get("discovery");
 let initialized = false;
 let document;
 let metadata;
 function getHash(tenant) {
-    return (0, utils_2.sha256)(`${tenant}${JSON.stringify((0, core_1.getDiscoveryPaths)())}`).replace(/[/\\]/g, "_");
+    return sha256(`${tenant}${JSON.stringify(getDiscoveryPaths())}`).replace(/[/\\]/g, "_");
 }
 const getDocumentName = () => {
     const { trace } = getLogger();
-    const config = (0, config_1.get)();
+    const config = getConfig();
     const hash = getHash(config.publicfqdn);
-    const name = `${constants_1.DISCOVERY_DOCUMENT_PREFIX}${hash}.json`;
+    const name = `${DISCOVERY_DOCUMENT_PREFIX}${hash}.json`;
     trace(`calculating document name for host ${config.host}, name ${name}`);
     return name;
 };
-const getPathToDiscoveryDocument = () => (0, cache_1.getPath)(getDocumentName());
-exports.getPathToDiscoveryDocument = getPathToDiscoveryDocument;
+export const getPathToDiscoveryDocument = () => getPath(getDocumentName());
 const initMetadata = async () => {
     const { error } = getLogger();
     if (!metadata) {
         try {
-            metadata = JSON.parse(await (0, cache_1.readFile)(constants_1.DISCOVERY_METADATA_PATH));
+            metadata = JSON.parse(await readFileFromCache(DISCOVERY_METADATA_PATH));
         }
         catch (err) {
             error("error while reading discovery metadata", err.stack);
@@ -42,27 +35,24 @@ const initMetadata = async () => {
         }
     }
 };
-const getMetadata = async () => {
+export const getMetadata = async () => {
     await initMetadata();
     return metadata;
 };
-exports.getMetadata = getMetadata;
-const addMetadata = async ({ tenant, addedAt, }) => {
+export const addMetadata = async ({ tenant, addedAt, }) => {
     await initMetadata();
     metadata = metadata.filter((t) => t.tenant !== tenant);
     const hash = getHash(tenant);
     metadata.push({ tenant, addedAt, hash });
-    await (0, cache_1.writeFile)(constants_1.DISCOVERY_METADATA_PATH, JSON.stringify(metadata));
+    await writeFileToCache(DISCOVERY_METADATA_PATH, JSON.stringify(metadata));
 };
-exports.addMetadata = addMetadata;
-const clear = () => {
+export const clear = () => {
     initialized = false;
     document = undefined;
     metadata = undefined;
 };
-exports.clear = clear;
 /* jscpd:ignore-start */
-const init = async () => {
+export const init = async () => {
     const { trace, error, debug } = getLogger();
     if (initialized) {
         return document;
@@ -72,7 +62,7 @@ const init = async () => {
     let schema;
     try {
         trace("reading discovery document");
-        const file = await (0, cache_1.readFile)(getDocumentName());
+        const file = await readFileFromCache(getDocumentName());
         document = JSON.parse(file);
     }
     catch (err) {
@@ -82,13 +72,13 @@ const init = async () => {
     try {
         trace("reading schema document");
         try {
-            const file = await fs_extra_1.default.readFile(path_1.default.join(__dirname, "..", "..", "schemas", "discovery.json"), "utf-8");
+            const file = await fs.readFile(path.join(import.meta.dirname, "..", "..", "schemas", "discovery.json"), "utf-8");
             schema = JSON.parse(file);
         }
         catch (err) {
             debug("failed reading schema, trying again", err.stack);
             // path changes after build
-            const file = await fs_extra_1.default.readFile(path_1.default.join(__dirname, "..", "schemas", "discovery.json"), "utf-8");
+            const file = await fs.readFile(path.join(import.meta.dirname, "..", "schemas", "discovery.json"), "utf-8");
             schema = JSON.parse(file);
         }
     }
@@ -97,21 +87,20 @@ const init = async () => {
         throw err;
     }
     debug("validating discovery document against schema");
-    const result = await (0, utils_1.validate)(schema, document);
+    const result = await validate(schema, document);
     if (result.result === "INVALID") {
         error("discovery document contains invalid data", result.errors);
         throw new Error("discovery document contains invalid data");
     }
     return document;
 };
-exports.init = init;
-const compareEtags = async () => {
+export const compareEtags = async () => {
     const { debug, error } = getLogger();
     try {
-        const doc = await (0, exports.init)();
-        const config = (0, config_1.get)();
+        const doc = await init();
+        const config = getConfig();
         if (config.etag && doc) {
-            const etag = (0, utils_2.sha256)(JSON.stringify(doc));
+            const etag = sha256(JSON.stringify(doc));
             if (config.etag === etag) {
                 debug("etags match: %s", config.etag);
                 return true;
@@ -126,12 +115,11 @@ const compareEtags = async () => {
     }
     return true;
 };
-exports.compareEtags = compareEtags;
-const checkVersion = async () => {
+export const checkVersion = async () => {
     const { debug } = getLogger();
-    const doc = await (0, exports.init)();
-    const local = (0, utils_2.parseVersion)((0, core_1.getVersion)());
-    const server = (0, utils_2.parseVersion)(doc.info["x-document-version"]);
+    const doc = await init();
+    const local = parseVersion(getVersion());
+    const server = parseVersion(doc.info["x-document-version"]);
     if (local.major < server.major ||
         (local.major === server.major && local.minor < server.minor)) {
         debug(`CLI is outdated (local: ${JSON.stringify(local)}, server: ${JSON.stringify(server)})`);
@@ -139,4 +127,3 @@ const checkVersion = async () => {
     }
     return { status: "UPTODATE" };
 };
-exports.checkVersion = checkVersion;