@sap/cli-core 2025.16.0 → 2025.19.0

package/utils/http/utils.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.printError = exports.printCorrelationId = void 0;
-const logger_1 = require("../../logger");
-const getLogger = () => (0, logger_1.get)("handler.http.utils");
+import { get } from "../../logger/index.js";
+const getLogger = () => get("handler.http.utils");
 const CORRELATION_ID_KEYS = [
     "x-correlationid",
     "x-vcap-request-id",
     "x-request-id",
 ];
-const printCorrelationId = (response) => {
+export const printCorrelationId = (response) => {
     if (!response) {
         return;
     }
@@ -22,8 +19,7 @@ const printCorrelationId = (response) => {
     const { output } = getLogger();
     output(corrId ? `Correlation ID ${corrId}` : "No correlation ID available");
 };
-exports.printCorrelationId = printCorrelationId;
-const printError = (err) => {
+export const printError = (err) => {
     const { output, debug } = getLogger();
     if (err.response) {
         output("Request failed with %i %s", err.response.status, err.response.statusText);
@@ -44,4 +40,3 @@ const printError = (err) => {
         output("Request failed with an unknown error");
     }
 };
-exports.printError = printError;

package/utils/openUtils.js

@@ -1,13 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.openUrlInBrowser = void 0;
-exports.getSupportedBrowsers = getSupportedBrowsers;
-exports.getDefaultBrowser = getDefaultBrowser;
-const constants_1 = require("../constants");
-const logger_1 = require("../logger");
-const options_1 = require("./options");
-const getLogger = () => (0, logger_1.get)("utils.open");
-async function getSupportedBrowsers() {
+import { OPTION_BROWSER } from "../constants.js";
+import { get as getLoggerOrig } from "../logger/index.js";
+import { getOptionValueFromConfig } from "./options.js";
+const getLogger = () => getLoggerOrig("utils.open");
+export async function getSupportedBrowsers() {
     const { apps } = await import("open");
     return (Object.entries(apps)
         // Private browser is not supported
@@ -17,16 +12,16 @@ async function getSupportedBrowsers() {
         app: value,
     })));
 }
-async function getDefaultBrowser() {
+export async function getDefaultBrowser() {
     const { apps } = await import("open");
     return apps.browser;
 }
 async function getBrowser() {
     const { apps } = await import("open");
-    const browser = (0, options_1.getOptionValueFromConfig)(constants_1.OPTION_BROWSER, await getDefaultBrowser());
+    const browser = getOptionValueFromConfig(OPTION_BROWSER, await getDefaultBrowser());
     return apps[browser];
 }
-const openUrlInBrowser = async (url, queryParameters = {}) => {
+export const openUrlInBrowser = async (url, queryParameters = {}) => {
     const u = new URL(url);
     for (const [key, value] of Object.entries(queryParameters)) {
         u.searchParams.append(key, value);
@@ -51,4 +46,3 @@ const openUrlInBrowser = async (url, queryParameters = {}) => {
         }
     }
 };
-exports.openUrlInBrowser = openUrlInBrowser;

package/utils/options.d.ts

@@ -1,3 +1,3 @@
-import { Option } from "../types";
+import { Option } from "../types.js";
 export declare const getOptionValueFromConfig: (option: Option, defaultValue?: string) => string;
 export declare const getOptionValueFromConfigGracefully: (option: Option) => string | undefined;

package/utils/options.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOptionValueFromConfigGracefully = exports.getOptionValueFromConfig = void 0;
-const config_1 = require("../config");
-const getOptionValueFromConfig = (option, defaultValue) => {
-    const config = (0, config_1.get)();
+import { get } from "../config/index.js";
+export const getOptionValueFromConfig = (option, defaultValue) => {
+    const config = get();
     if (!config.options[option.longName] &&
         typeof defaultValue !== "string" &&
         !defaultValue) {
@@ -13,13 +10,11 @@ const getOptionValueFromConfig = (option, defaultValue) => {
         ? config.options[option.longName]
         : defaultValue;
 };
-exports.getOptionValueFromConfig = getOptionValueFromConfig;
-const getOptionValueFromConfigGracefully = (option) => {
+export const getOptionValueFromConfigGracefully = (option) => {
     try {
-        return (0, exports.getOptionValueFromConfig)(option);
+        return getOptionValueFromConfig(option);
     }
     catch (err) {
         return undefined;
     }
 };
-exports.getOptionValueFromConfigGracefully = getOptionValueFromConfigGracefully;

package/utils/utils.d.ts

@@ -1,11 +1,11 @@
 import { Command } from "commander";
-import { Option, PackageJson } from "../types";
+import { Option, PackageJson } from "../types.js";
 export declare function buildOptionName(command: Command, option: Option): string;
 export declare const parseVersion: (version: string) => {
     major: number;
     minor: number;
 };
-export declare const requireFile: (p: string) => any;
+export declare const requireFile: (p: string) => PackageJson;
 export declare const readPackageJson: (cwd?: string, force?: boolean) => PackageJson;
 export declare const getVersion: (cwd?: string) => string;
 export declare const getName: (cwd?: string) => string;

package/utils/utils.js

@@ -1,124 +1,76 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toConstantCase = exports.sha256 = exports.getInfoFromTenant = exports.parseTenant = exports.removeScopeFromPackageName = exports.getBin = exports.getEngines = exports.getDescription = exports.getPackageName = exports.getName = exports.getVersion = exports.readPackageJson = exports.requireFile = exports.parseVersion = void 0;
-exports.buildOptionName = buildOptionName;
-exports.isValidURL = isValidURL;
-exports.removeQueryParametersFromUrl = removeQueryParametersFromUrl;
-const crypto = __importStar(require("crypto"));
-const path_1 = __importDefault(require("path"));
-const lodash_1 = require("lodash");
-const logger_1 = require("../logger");
-const commands_1 = require("./commands");
+import * as crypto from "crypto";
+import path from "path";
+import { upperCase } from "lodash-es";
+import fs from "fs";
+import { get as getLoggerOrig } from "../logger/index.js";
+import { getShortFlagForLongName } from "./commands.js";
 let pgk;
-const getLogger = () => (0, logger_1.get)("utils.utils");
+const getLogger = () => getLoggerOrig("utils.utils");
 const REGEX_HTTPS = /http(s)*:\/\//;
-function buildOptionName(command, option) {
-    const shortFlag = (0, commands_1.getShortFlagForLongName)(command, option);
+export function buildOptionName(command, option) {
+    const shortFlag = getShortFlagForLongName(command, option);
     return `-${shortFlag}, --${option.longName}`;
 }
-const parseVersion = (version) => {
+export const parseVersion = (version) => {
     const segments = version.split(".");
     return { major: parseInt(segments[0], 10), minor: parseInt(segments[1], 10) };
 };
-exports.parseVersion = parseVersion;
-// eslint-disable-next-line import/no-dynamic-require, global-require
-const requireFile = (p) => require(p);
-exports.requireFile = requireFile;
-const readPackageJson = (cwd = "", force = false) => {
+export const requireFile = (p) => {
+    const content = fs.readFileSync(p, "utf-8");
+    return JSON.parse(content);
+};
+export const readPackageJson = (cwd = "", force = false) => {
     if (!pgk || force) {
+        const cwdPath = cwd || import.meta.dirname;
         const { trace } = getLogger();
         try {
-            const p = path_1.default.join(cwd, "./package.json");
+            const p = path.join(cwdPath, "./package.json");
             trace(`reading ${p}`);
-            pgk = (0, exports.requireFile)(p);
+            pgk = requireFile(p);
         }
         catch (err) {
             trace("failed to read package.json first time", err.stack);
             try {
-                const p = path_1.default.join(cwd, "../package.json");
+                const p = path.join(cwdPath, "../package.json");
                 trace(`reading ${p}`);
-                pgk = (0, exports.requireFile)(p);
+                pgk = requireFile(p);
             }
             catch (err2) {
                 trace("failed to read package.json second time", err.stack);
-                const p = path_1.default.join(cwd, "../../package.json");
+                const p = path.join(cwdPath, "../../package.json");
                 trace(`reading ${p}`);
-                pgk = (0, exports.requireFile)(p);
+                pgk = requireFile(p);
             }
         }
     }
     return pgk;
 };
-exports.readPackageJson = readPackageJson;
-const getVersion = (cwd = "") => {
-    return (0, exports.readPackageJson)(cwd, true).version;
+export const getVersion = (cwd = "") => {
+    return readPackageJson(cwd, true).version;
 };
-exports.getVersion = getVersion;
-const getName = (cwd = "") => {
-    const segments = (0, exports.readPackageJson)(cwd, true).name.split(/^@.*\//);
+export const getName = (cwd = "") => {
+    const segments = readPackageJson(cwd, true).name.split(/^@.*\//);
     return segments[segments.length - 1];
 };
-exports.getName = getName;
-const getPackageName = (cwd = "") => {
-    return (0, exports.readPackageJson)(cwd, true).name;
+export const getPackageName = (cwd = "") => {
+    return readPackageJson(cwd, true).name;
 };
-exports.getPackageName = getPackageName;
-const getDescription = (cwd = "") => {
-    return (0, exports.readPackageJson)(cwd, true).description;
+export const getDescription = (cwd = "") => {
+    return readPackageJson(cwd, true).description;
 };
-exports.getDescription = getDescription;
-const getEngines = (cwd = "") => {
-    return (0, exports.readPackageJson)(cwd, true).engines;
+export const getEngines = (cwd = "") => {
+    return readPackageJson(cwd, true).engines;
 };
-exports.getEngines = getEngines;
-const getBin = (cwd = "") => {
-    const keys = Object.keys((0, exports.readPackageJson)(cwd, true).bin || {});
+export const getBin = (cwd = "") => {
+    const keys = Object.keys(readPackageJson(cwd, true).bin || {});
     if (keys.length === 0) {
         throw new Error("no bin property defined in package.json or bin property is empty");
     }
     return keys[0];
 };
-exports.getBin = getBin;
-const removeScopeFromPackageName = (packageName) => packageName.split("/").pop();
-exports.removeScopeFromPackageName = removeScopeFromPackageName;
+export const removeScopeFromPackageName = (packageName) => packageName.split("/").pop();
 const removeProtocol = (tenant) => tenant.replace(REGEX_HTTPS, "");
-const parseTenant = (tenant) => {
+export const parseTenant = (tenant) => {
     const t = REGEX_HTTPS.test(tenant) ? tenant : `https://${tenant}`;
     /*
         One can enter the tenant in different ways, for example
@@ -134,8 +86,7 @@ const parseTenant = (tenant) => {
        */
     return new URL(t).host;
 };
-exports.parseTenant = parseTenant;
-function isValidURL(url) {
+export function isValidURL(url) {
     const { debug, error } = getLogger();
     try {
         // eslint-disable-next-line no-new
@@ -148,7 +99,7 @@ function isValidURL(url) {
         return false;
     }
 }
-const getInfoFromTenant = (tenant, verbose, printOutput = true) => {
+export const getInfoFromTenant = (tenant, verbose, printOutput = true) => {
     let protocol;
     try {
         protocol = new URL(tenant).protocol;
@@ -171,7 +122,7 @@ const getInfoFromTenant = (tenant, verbose, printOutput = true) => {
         error("invalid region", region);
         throw new Error("invalid region");
     }
-    const parsedTenant = (0, exports.parseTenant)(tenant);
+    const parsedTenant = parseTenant(tenant);
     return {
         host: `${protocol}//dwaas-core.sac${region}.cfapps.orca.net.sap`,
         publicfqdn: parsedTenant,
@@ -181,14 +132,11 @@ const getInfoFromTenant = (tenant, verbose, printOutput = true) => {
         tenantUrl: `${protocol}//${parsedTenant}`,
     };
 };
-exports.getInfoFromTenant = getInfoFromTenant;
-function removeQueryParametersFromUrl(sUrl) {
+export function removeQueryParametersFromUrl(sUrl) {
     const url = new URL(sUrl);
     return `${url.protocol}//${url.host}${url.pathname}`;
 }
-const sha256 = (string) => 
+export const sha256 = (string) => 
 // NOSONAR actually sha256 (or SHA-256) is considered secure according to SonarQube
 crypto.createHash("sha256").update(string).digest("base64");
-exports.sha256 = sha256;
-const toConstantCase = (string) => (0, lodash_1.upperCase)(string).replace(/ /g, "_");
-exports.toConstantCase = toConstantCase;
+export const toConstantCase = (string) => upperCase(string).replace(/ /g, "_");