@sap-ux/deploy-tooling 0.18.10 → 0.18.11

package/dist/base/config.d.ts

@@ -1,5 +1,6 @@
 import type { AbapDeployConfig } from '../types';
 import type { BspConfig } from '@sap-ux/axios-extension';
+import type { Logger } from '@sap-ux/logger';
 /**
  * Clones the given config and removes secrets so that it can be printed to a log file.
  *
@@ -26,7 +27,8 @@ export declare function isBspConfig(config: Partial<BspConfig>): config is BspCo
  * Validate the given config. If anything mandatory is missing throw an error.
  *
  * @param config - the config to be validated
+ * @param logger Logger used by deploy tooling
  * @returns reference to the given config
  */
-export declare function validateConfig(config: AbapDeployConfig | undefined): AbapDeployConfig;
+export declare function validateConfig(config: AbapDeployConfig | undefined, logger?: Logger): AbapDeployConfig;
 //# sourceMappingURL=config.d.ts.map

package/dist/base/config.js

@@ -61,12 +61,18 @@ function isBspConfig(config) {
  * Validate the given config. If anything mandatory is missing throw an error.
  *
  * @param config - the config to be validated
+ * @param logger Logger used by deploy tooling
  * @returns reference to the given config
  */
-function validateConfig(config) {
+function validateConfig(config, logger) {
     if (!config) {
         throw new Error('The deployment configuration is missing.');
     }
+    if (config.app.package && config.app.package !== config.app.package.toUpperCase()) {
+        const normalized = config.app.package.toUpperCase();
+        logger?.warn(`Package name '${config.app.package}' was normalized to '${normalized}'. Lowercase package names may cause deployment failures.`);
+        config.app.package = normalized;
+    }
     if (config.target) {
         config.target = validateTarget(config.target);
     }

package/dist/cli/config.d.ts

@@ -1,5 +1,4 @@
 import type { AbapDeployConfig, CliOptions } from '../types';
-import type { Logger } from '@sap-ux/logger';
 /**
  * Tries to read the version of the modules package.json but in case of an error, it returns the manually maintained version matching major.minor of the module.
  *
@@ -18,8 +17,7 @@ export declare function getDeploymentConfig(path: string): Promise<AbapDeployCon
  *
  * @param taskConfig - base configuration from the file
  * @param options - CLI options
- * @param logger - optional logger for warnings
  * @returns the merged config
  */
-export declare function mergeConfig(taskConfig: AbapDeployConfig, options: CliOptions, logger?: Logger): Promise<AbapDeployConfig>;
+export declare function mergeConfig(taskConfig: AbapDeployConfig, options: CliOptions): Promise<AbapDeployConfig>;
 //# sourceMappingURL=config.d.ts.map

package/dist/cli/config.js

@@ -157,21 +157,15 @@ function mergeCredentials(taskConfig, options) {
  *
  * @param taskConfig - base configuration from the file
  * @param options - CLI options
- * @param logger - optional logger for warnings
  * @returns the merged config
  */
-async function mergeConfig(taskConfig, options, logger) {
+async function mergeConfig(taskConfig, options) {
     const app = {
         name: options.name ?? taskConfig.app?.name,
         description: options.description ?? taskConfig.app?.description,
         package: options.package ?? taskConfig.app?.package,
         transport: options.transport ?? taskConfig.app?.transport
     };
-    if (app.package && app.package !== app.package.toUpperCase()) {
-        const normalized = app.package.toUpperCase();
-        logger?.warn(`Package name '${app.package}' was normalized to '${normalized}'. Lowercase package names may cause deployment failures.`);
-        app.package = normalized;
-    }
     const target = mergeTarget(taskConfig.target, options);
     const config = { app, target, credentials: mergeCredentials(taskConfig, options) };
     config.test = mergeFlag(options.test, taskConfig.test);

package/dist/cli/index.js

@@ -74,7 +74,7 @@ function createCommand(name) {
     return command.version((0, config_1.getVersion)(), '-v, --version', 'version of the deploy tooling');
 }
 /**
- * Prepare the run of the task based on on the configured command i.e. read and validate configuration and create logger.
+ * Prepare the run of the task based on the configured command i.e. read and validate configuration and create logger.
  *
  * @param cmd - CLI command configuration to be executed
  * @returns a set of objects required for the command execution
@@ -93,7 +93,7 @@ async function prepareRun(cmd) {
     });
     // Handle empty config when not passed in
     const taskConfig = options.config ? await (0, config_1.getDeploymentConfig)(options.config) : {};
-    const config = await (0, config_1.mergeConfig)(taskConfig, options, logger);
+    const config = await (0, config_1.mergeConfig)(taskConfig, options);
     if (logLevel >= logger_1.LogLevel.Debug) {
         logger.debug((0, base_1.getConfigForLogging)(config));
     }

package/dist/ui5/index.js

@@ -5,6 +5,28 @@ const base_1 = require("../base");
 const archive_1 = require("./archive");
 const dotenv_1 = require("dotenv");
 const ui5_config_1 = require("@sap-ux/ui5-config");
+/**
+ * Resolves a log level value from ui5.yaml configuration to a LogLevel enum value.
+ * ui5.yaml delivers all scalar values as strings (e.g. "verbose"), but LogLevel is
+ * a numeric enum. A numeric value is returned as-is; a string is matched
+ * case-insensitively against the enum keys. Falls back to LogLevel.Info if
+ * the value is absent or unrecognised.
+ *
+ * @param value - raw value from options.configuration.log
+ * @returns resolved LogLevel
+ */
+function resolveLogLevel(value) {
+    if (typeof value === 'number') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const key = Object.keys(logger_1.LogLevel).find((k) => k.toLowerCase() === value.toLowerCase());
+        if (key !== undefined) {
+            return logger_1.LogLevel[key];
+        }
+    }
+    return logger_1.LogLevel.Info;
+}
 /**
  * Custom task to upload the build result to the UI5 ABAP Repository.
  *
@@ -14,15 +36,13 @@ const ui5_config_1 = require("@sap-ux/ui5-config");
  */
 async function task({ workspace, options }) {
     (0, dotenv_1.config)();
-    const logLevel = options.configuration?.log ?? logger_1.LogLevel.Info;
-    const logger = new logger_1.ToolsLogger({
-        transports: [new logger_1.UI5ToolingTransport({ moduleName: `${types_1.NAME} ${options.projectName}` })],
-        logLevel: options.configuration?.log ?? logger_1.LogLevel.Info
-    });
+    const moduleName = `${types_1.NAME} ${options.projectName}`;
+    const logLevel = resolveLogLevel(options.configuration?.log);
+    const logger = new logger_1.ToolsLogger({ transports: [new logger_1.UI5ToolingTransport({ moduleName })], logLevel });
     if (logLevel >= logger_1.LogLevel.Debug) {
         logger.debug({ ...options.configuration, credentials: undefined });
     }
-    const config = (0, base_1.validateConfig)(options.configuration);
+    const config = (0, base_1.validateConfig)(options.configuration, logger);
     (0, ui5_config_1.replaceEnvVariables)(config);
     // The calling client can use either the projectNamespace or projectName when creating the workspace, needs to match when creating the archive.
     const archive = await (0, archive_1.createUi5Archive)(logger, workspace, options.projectNamespace ?? options.projectName, config.exclude);

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Adeploy-tooling"
   },
-  "version": "0.18.10",
+  "version": "0.18.11",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -33,9 +33,9 @@
     "adm-zip": "0.5.16",
     "chalk": "4.1.2",
     "@sap-ux/axios-extension": "1.25.28",
-    "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/inquirer-common": "0.11.33",
     "@sap-ux/logger": "0.8.4",
+    "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/system-access": "0.7.4",
     "@sap-ux/ui5-config": "0.30.1",
     "@sap-ux/project-input-validator": "0.6.74"