@sap-ux/deploy-tooling 0.14.47 → 0.15.2

package/dist/cli/config.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeConfig = exports.getDeploymentConfig = exports.getVersion = void 0;
 const ui5_config_1 = require("@sap-ux/ui5-config");
@@ -35,17 +26,14 @@ exports.getVersion = getVersion;
  * @param path - path to the ui5*.yaml file
  * @returns the configuration object or throws an error if it cannot be read.
  */
-function getDeploymentConfig(path) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const content = (0, fs_1.readFileSync)(path, 'utf-8');
-        const ui5Config = yield ui5_config_1.UI5Config.newInstance(content);
-        const config = (_a = ui5Config.findCustomTask(types_1.NAME)) === null || _a === void 0 ? void 0 : _a.configuration;
-        if (!config) {
-            throw new Error('The deployment configuration is missing.');
-        }
-        return config;
-    });
+async function getDeploymentConfig(path) {
+    const content = (0, fs_1.readFileSync)(path, 'utf-8');
+    const ui5Config = await ui5_config_1.UI5Config.newInstance(content);
+    const config = ui5Config.findCustomTask(types_1.NAME)?.configuration;
+    if (!config) {
+        throw new Error('The deployment configuration is missing.');
+    }
+    return config;
 }
 exports.getDeploymentConfig = getDeploymentConfig;
 /**
@@ -77,7 +65,7 @@ function getServiceFromEnv(targetUrl) {
             username: process.env.SERVICE_USERNAME,
             password: process.env.SERVICE_PASSWORD
         },
-        url: targetUrl !== null && targetUrl !== void 0 ? targetUrl : process.env.SERVICE_URL,
+        url: targetUrl ?? process.env.SERVICE_URL,
         systemid: process.env.SERVICE_SYSTEM_ID
     };
 }
@@ -133,17 +121,16 @@ function getServiceKey(options, targetUrl) {
  * @returns merged target object
  */
 function mergeTarget(baseTarget, options) {
-    var _a, _b, _c, _d, _e;
-    const targetUrl = (_a = options.url) !== null && _a !== void 0 ? _a : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.url;
+    const targetUrl = options.url ?? baseTarget?.url;
     return {
         url: targetUrl,
-        client: (_b = options.client) !== null && _b !== void 0 ? _b : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.client,
-        scp: options.cloud !== undefined ? options.cloud : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.cloud,
-        authenticationType: (_c = options.authenticationType) !== null && _c !== void 0 ? _c : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.authenticationType,
-        destination: (_d = options.destination) !== null && _d !== void 0 ? _d : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.destination,
+        client: options.client ?? baseTarget?.client,
+        scp: options.cloud !== undefined ? options.cloud : baseTarget?.cloud,
+        authenticationType: options.authenticationType ?? baseTarget?.authenticationType,
+        destination: options.destination ?? baseTarget?.destination,
         serviceKey: getServiceKey(options, targetUrl),
         params: options.queryParams ? parseQueryParams(options.queryParams) : undefined,
-        service: (_e = options.service) !== null && _e !== void 0 ? _e : baseTarget === null || baseTarget === void 0 ? void 0 : baseTarget.service
+        service: options.service ?? baseTarget?.service
     };
 }
 /**
@@ -154,10 +141,13 @@ function mergeTarget(baseTarget, options) {
  * @returns merged credentials
  */
 function mergeCredentials(taskConfig, options) {
-    var _a, _b;
     let credentials = taskConfig.credentials;
     if (options.username || options.password) {
-        credentials = Object.assign(Object.assign({}, (credentials !== null && credentials !== void 0 ? credentials : {})), { username: (_a = options.username) !== null && _a !== void 0 ? _a : '', password: (_b = options.password) !== null && _b !== void 0 ? _b : '' });
+        credentials = {
+            ...(credentials ?? {}),
+            username: options.username ?? '',
+            password: options.password ?? ''
+        };
     }
     return credentials;
 }
@@ -168,36 +158,33 @@ function mergeCredentials(taskConfig, options) {
  * @param options - CLI options
  * @returns the merged config
  */
-function mergeConfig(taskConfig, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    return __awaiter(this, void 0, void 0, function* () {
-        const app = {
-            name: (_a = options.name) !== null && _a !== void 0 ? _a : (_b = taskConfig.app) === null || _b === void 0 ? void 0 : _b.name,
-            description: (_c = options.description) !== null && _c !== void 0 ? _c : (_d = taskConfig.app) === null || _d === void 0 ? void 0 : _d.description,
-            package: (_e = options.package) !== null && _e !== void 0 ? _e : (_f = taskConfig.app) === null || _f === void 0 ? void 0 : _f.package,
-            transport: (_g = options.transport) !== null && _g !== void 0 ? _g : (_h = taskConfig.app) === null || _h === void 0 ? void 0 : _h.transport
-        };
-        const target = mergeTarget(taskConfig.target, options);
-        const config = { app, target, credentials: mergeCredentials(taskConfig, options) };
-        config.test = mergeFlag(options.test, taskConfig.test);
-        config.safe = mergeFlag(options.safe, taskConfig.safe);
-        config.keep = mergeFlag(options.keep, taskConfig.keep);
-        config.strictSsl = mergeFlag(options.strictSsl, taskConfig.strictSsl);
-        config.yes = mergeFlag(options.yes, taskConfig.yes);
-        config.createTransport = mergeFlag(options.createTransport, taskConfig.createTransport);
-        config.retry = process.env.NO_RETRY ? !process.env.NO_RETRY : mergeFlag(options.retry, taskConfig.retry);
-        config.lrep = options.lrep;
-        if (!options.archiveUrl && !options.archivePath && !options.archiveFolder) {
-            options.archiveFolder = 'dist';
-        }
-        if (options.config && options.archiveFolder && !(0, path_1.isAbsolute)(options.archiveFolder)) {
-            options.archiveFolder = (0, path_1.join)((0, path_1.dirname)(options.config), options.archiveFolder);
-        }
-        if (options.config && options.archivePath && !(0, path_1.isAbsolute)(options.archivePath)) {
-            options.archivePath = (0, path_1.join)((0, path_1.dirname)(options.config), options.archivePath);
-        }
-        return config;
-    });
+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
+    };
+    const target = mergeTarget(taskConfig.target, options);
+    const config = { app, target, credentials: mergeCredentials(taskConfig, options) };
+    config.test = mergeFlag(options.test, taskConfig.test);
+    config.safe = mergeFlag(options.safe, taskConfig.safe);
+    config.keep = mergeFlag(options.keep, taskConfig.keep);
+    config.strictSsl = mergeFlag(options.strictSsl, taskConfig.strictSsl);
+    config.yes = mergeFlag(options.yes, taskConfig.yes);
+    config.createTransport = mergeFlag(options.createTransport, taskConfig.createTransport);
+    config.retry = process.env.NO_RETRY ? !process.env.NO_RETRY : mergeFlag(options.retry, taskConfig.retry);
+    config.lrep = options.lrep;
+    if (!options.archiveUrl && !options.archivePath && !options.archiveFolder) {
+        options.archiveFolder = 'dist';
+    }
+    if (options.config && options.archiveFolder && !(0, path_1.isAbsolute)(options.archiveFolder)) {
+        options.archiveFolder = (0, path_1.join)((0, path_1.dirname)(options.config), options.archiveFolder);
+    }
+    if (options.config && options.archivePath && !(0, path_1.isAbsolute)(options.archivePath)) {
+        options.archivePath = (0, path_1.join)((0, path_1.dirname)(options.config), options.archivePath);
+    }
+    return config;
 }
 exports.mergeConfig = mergeConfig;
 //# sourceMappingURL=config.js.map

package/dist/cli/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runUndeploy = exports.runDeploy = exports.createCommand = void 0;
 const commander_1 = require("commander");
@@ -86,61 +77,55 @@ exports.createCommand = createCommand;
  * @param cmd - CLI command configuration to be executed
  * @returns a set of objects required for the command execution
  */
-function prepareRun(cmd) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (process.argv.length < 3) {
-            cmd.help();
-        }
-        (0, dotenv_1.config)();
-        const options = cmd.parse().opts();
-        const logLevel = options.verbose ? logger_1.LogLevel.Silly : logger_1.LogLevel.Info;
-        const logger = new logger_1.ToolsLogger({
-            transports: [new logger_1.ConsoleTransport()],
-            logLevel,
-            logPrefix: types_1.NAME
-        });
-        // Handle empty config when not passed in
-        const taskConfig = options.config ? yield (0, config_1.getDeploymentConfig)(options.config) : {};
-        const config = yield (0, config_1.mergeConfig)(taskConfig, options);
-        if (logLevel >= logger_1.LogLevel.Debug) {
-            logger.debug((0, base_1.getConfigForLogging)(config));
-        }
-        (0, base_1.validateConfig)(config);
-        (0, ui5_config_1.replaceEnvVariables)(config);
-        return { cmd, logger, config, options };
+async function prepareRun(cmd) {
+    if (process.argv.length < 3) {
+        cmd.help();
+    }
+    (0, dotenv_1.config)();
+    const options = cmd.parse().opts();
+    const logLevel = options.verbose ? logger_1.LogLevel.Silly : logger_1.LogLevel.Info;
+    const logger = new logger_1.ToolsLogger({
+        transports: [new logger_1.ConsoleTransport()],
+        logLevel,
+        logPrefix: types_1.NAME
     });
+    // 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);
+    if (logLevel >= logger_1.LogLevel.Debug) {
+        logger.debug((0, base_1.getConfigForLogging)(config));
+    }
+    (0, base_1.validateConfig)(config);
+    (0, ui5_config_1.replaceEnvVariables)(config);
+    return { cmd, logger, config, options };
 }
 /**
  * Function that is to be executed when the exposed deploy command is executed.
  */
-function runDeploy() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cmd = createCommand('deploy');
-        try {
-            const { logger, options, config } = yield prepareRun(cmd);
-            const archive = yield (0, archive_1.getArchive)(logger, options);
-            yield (0, base_1.deploy)(archive, config, logger);
-        }
-        catch (error) {
-            cmd.error(error.message);
-        }
-    });
+async function runDeploy() {
+    const cmd = createCommand('deploy');
+    try {
+        const { logger, options, config } = await prepareRun(cmd);
+        const archive = await (0, archive_1.getArchive)(logger, options);
+        await (0, base_1.deploy)(archive, config, logger);
+    }
+    catch (error) {
+        cmd.error(error.message);
+    }
 }
 exports.runDeploy = runDeploy;
 /**
  * Function that is to be executed when the exposed undeploy command is executed.
  */
-function runUndeploy() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cmd = createCommand('undeploy');
-        try {
-            const { logger, config } = yield prepareRun(cmd);
-            yield (0, base_1.undeploy)(config, logger);
-        }
-        catch (error) {
-            cmd.error(error.message);
-        }
-    });
+async function runUndeploy() {
+    const cmd = createCommand('undeploy');
+    try {
+        const { logger, config } = await prepareRun(cmd);
+        await (0, base_1.undeploy)(config, logger);
+    }
+    catch (error) {
+        cmd.error(error.message);
+    }
 }
 exports.runUndeploy = runUndeploy;
 //# sourceMappingURL=index.js.map

package/dist/ui5/archive.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,23 +14,21 @@ const adm_zip_1 = __importDefault(require("adm-zip"));
  * @param exclude - array of regex patterns used to exclude folders from archive
  * @returns {*}  {Promise<Buffer>} - archive
  */
-function createUi5Archive(logger, workspace, projectName, exclude = []) {
-    return __awaiter(this, void 0, void 0, function* () {
-        logger.info('Creating archive with UI5 build result.');
-        const prefix = `/resources/${projectName}/`;
-        const zip = new adm_zip_1.default();
-        const resources = yield workspace.byGlob(`${prefix}**/*`);
-        for (const resource of resources) {
-            if (!exclude.some((regex) => RegExp(regex, 'g').exec(resource.getPath()))) {
-                const path = resource.getPath().replace(prefix, '');
-                logger.debug(`Adding ${path}`);
-                const buffer = yield resource.getBuffer();
-                zip.addFile(path, buffer);
-            }
+async function createUi5Archive(logger, workspace, projectName, exclude = []) {
+    logger.info('Creating archive with UI5 build result.');
+    const prefix = `/resources/${projectName}/`;
+    const zip = new adm_zip_1.default();
+    const resources = await workspace.byGlob(`${prefix}**/*`);
+    for (const resource of resources) {
+        if (!exclude.some((regex) => RegExp(regex, 'g').exec(resource.getPath()))) {
+            const path = resource.getPath().replace(prefix, '');
+            logger.debug(`Adding ${path}`);
+            const buffer = await resource.getBuffer();
+            zip.addFile(path, buffer);
         }
-        logger.info('Archive created.');
-        return zip.toBuffer();
-    });
+    }
+    logger.info('Archive created.');
+    return zip.toBuffer();
 }
 exports.createUi5Archive = createUi5Archive;
 //# sourceMappingURL=archive.js.map

package/dist/ui5/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 const logger_1 = require("@sap-ux/logger");
 const types_1 = require("../types");
 const base_1 = require("../base");
@@ -21,24 +12,21 @@ const ui5_config_1 = require("@sap-ux/ui5-config");
  * @param params.workspace - reference to the UI5 tooling workspace object
  * @param params.options - project properties and configuration
  */
-function task({ workspace, options }) {
-    var _a, _b, _c, _d, _e;
-    return __awaiter(this, void 0, void 0, function* () {
-        (0, dotenv_1.config)();
-        const logLevel = (_b = (_a = options.configuration) === null || _a === void 0 ? void 0 : _a.log) !== null && _b !== void 0 ? _b : logger_1.LogLevel.Info;
-        const logger = new logger_1.ToolsLogger({
-            transports: [new logger_1.UI5ToolingTransport({ moduleName: `${types_1.NAME} ${options.projectName}` })],
-            logLevel: (_d = (_c = options.configuration) === null || _c === void 0 ? void 0 : _c.log) !== null && _d !== void 0 ? _d : logger_1.LogLevel.Info
-        });
-        if (logLevel >= logger_1.LogLevel.Debug) {
-            logger.debug(Object.assign(Object.assign({}, options.configuration), { credentials: undefined }));
-        }
-        const config = (0, base_1.validateConfig)(options.configuration);
-        (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 = yield (0, archive_1.createUi5Archive)(logger, workspace, (_e = options.projectNamespace) !== null && _e !== void 0 ? _e : options.projectName, config.exclude);
-        yield (0, base_1.deploy)(archive, config, logger);
+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
     });
+    if (logLevel >= logger_1.LogLevel.Debug) {
+        logger.debug({ ...options.configuration, credentials: undefined });
+    }
+    const config = (0, base_1.validateConfig)(options.configuration);
+    (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);
+    await (0, base_1.deploy)(archive, config, logger);
 }
 module.exports = task;
 //# sourceMappingURL=index.js.map

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.14.47",
+  "version": "0.15.2",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -32,17 +32,17 @@
     "prompts": "2.4.2",
     "adm-zip": "0.5.10",
     "chalk": "4.1.2",
-    "@sap-ux/axios-extension": "1.14.4",
-    "@sap-ux/btp-utils": "0.14.4",
-    "@sap-ux/logger": "0.5.1",
-    "@sap-ux/system-access": "0.4.7",
-    "@sap-ux/ui5-config": "0.22.10",
-    "@sap-ux/project-input-validator": "0.2.3"
+    "@sap-ux/axios-extension": "1.15.1",
+    "@sap-ux/btp-utils": "0.15.0",
+    "@sap-ux/logger": "0.6.0",
+    "@sap-ux/system-access": "0.5.1",
+    "@sap-ux/ui5-config": "0.23.1",
+    "@sap-ux/project-input-validator": "0.3.0"
   },
   "devDependencies": {
     "@types/prompts": "2.4.4",
     "@types/adm-zip": "0.5.5",
-    "@sap-ux/store": "0.6.0"
+    "@sap-ux/store": "0.7.0"
   },
   "ui5": {
     "dependencies": []