npm - @sap-ux/cap-config-writer - Versions diffs - 0.5.7 → 0.6.2 - Mend

@sap-ux/cap-config-writer 0.5.7 → 0.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/cap-config/index.js +34 -46
package/dist/cap-config/package-json.js +28 -49
package/dist/cap-writer/package-json.js +41 -54
package/dist/cap-writer/pom-xml.js +11 -13
package/dist/cap-writer/tsconfig-and-yaml.js +15 -26
package/dist/cap-writer/utils.js +1 -1
package/dist/i18n.js +11 -22
package/package.json +5 -5

package/dist/cap-config/index.js CHANGED Viewed

@@ -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.minCdsVersion = exports.checkCdsUi5PluginEnabled = exports.enableCdsUi5Plugin = exports.satisfiesMinCdsVersion = void 0;
 const path_1 = require("path");
@@ -25,20 +16,17 @@ const semver_1 = require("semver");
  * @param [fs] - optional: the memfs editor instance
  * @returns Promise<Editor> - memfs editor instance with updated files
  */
-function enableCdsUi5Plugin(basePath, fs) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs) {
-            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
-        }
-        const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
-        const packageJson = ((_a = fs.readJSON(packageJsonPath)) !== null && _a !== void 0 ? _a : {});
-        (0, package_json_1.ensureMinCdsVersion)(packageJson);
-        yield (0, package_json_1.enableWorkspaces)(basePath, packageJson);
-        (0, package_json_1.addCdsPluginUi5)(packageJson);
-        fs.writeJSON(packageJsonPath, packageJson);
-        return fs;
-    });
+async function enableCdsUi5Plugin(basePath, fs) {
+    if (!fs) {
+        fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+    }
+    const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
+    const packageJson = (fs.readJSON(packageJsonPath) ?? {});
+    (0, package_json_1.ensureMinCdsVersion)(packageJson);
+    await (0, package_json_1.enableWorkspaces)(basePath, packageJson);
+    (0, package_json_1.addCdsPluginUi5)(packageJson);
+    fs.writeJSON(packageJsonPath, packageJson);
+    return fs;
 }
 exports.enableCdsUi5Plugin = enableCdsUi5Plugin;
 /**
@@ -52,29 +40,29 @@ exports.enableCdsUi5Plugin = enableCdsUi5Plugin;
  * @returns false if package.json is not found at specified path or {@link CdsUi5PluginInfo} with additional info or true if
  * cds-plugin-ui5 and all prerequisites are fulfilled
  */
-function checkCdsUi5PluginEnabled(basePath, fs, moreInfo, cdsVersionInfo) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs) {
-            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
-        }
-        const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
-        if (!fs.exists(packageJsonPath)) {
-            return false;
-        }
-        const packageJson = fs.readJSON(packageJsonPath);
-        const { workspaceEnabled } = yield (0, package_json_1.getWorkspaceInfo)(basePath, packageJson);
-        const cdsInfo = {
-            // Below line checks if 'cdsVersionInfo' is available and contains version information.
-            // If it does, it uses that version information to determine if it satisfies the minimum CDS version required.
-            // If 'cdsVersionInfo' is not available or does not contain version information,it falls back to check the version specified in the package.json file.
-            hasMinCdsVersion: (cdsVersionInfo === null || cdsVersionInfo === void 0 ? void 0 : cdsVersionInfo.version) ? (0, semver_1.satisfies)(cdsVersionInfo === null || cdsVersionInfo === void 0 ? void 0 : cdsVersionInfo.version, `>=${package_json_1.minCdsVersion}`) : (0, package_json_1.satisfiesMinCdsVersion)(packageJson),
-            isWorkspaceEnabled: workspaceEnabled,
-            hasCdsUi5Plugin: (0, package_json_1.hasCdsPluginUi5)(packageJson),
-            isCdsUi5PluginEnabled: false
-        };
-        cdsInfo.isCdsUi5PluginEnabled = cdsInfo.hasMinCdsVersion && cdsInfo.isWorkspaceEnabled && cdsInfo.hasCdsUi5Plugin;
-        return moreInfo ? cdsInfo : cdsInfo.isCdsUi5PluginEnabled;
-    });
+async function checkCdsUi5PluginEnabled(basePath, fs, moreInfo, cdsVersionInfo) {
+    if (!fs) {
+        fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+    }
+    const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
+    if (!fs.exists(packageJsonPath)) {
+        return false;
+    }
+    const packageJson = fs.readJSON(packageJsonPath);
+    const { workspaceEnabled } = await (0, package_json_1.getWorkspaceInfo)(basePath, packageJson);
+    const cdsInfo = {
+        // Below line checks if 'cdsVersionInfo' is available and contains version information.
+        // If it does, it uses that version information to determine if it satisfies the minimum CDS version required.
+        // If 'cdsVersionInfo' is not available or does not contain version information,it falls back to check the version specified in the package.json file.
+        hasMinCdsVersion: cdsVersionInfo?.version
+            ? (0, semver_1.satisfies)(cdsVersionInfo?.version, `>=${package_json_1.minCdsVersion}`)
+            : (0, package_json_1.satisfiesMinCdsVersion)(packageJson),
+        isWorkspaceEnabled: workspaceEnabled,
+        hasCdsUi5Plugin: (0, package_json_1.hasCdsPluginUi5)(packageJson),
+        isCdsUi5PluginEnabled: false
+    };
+    cdsInfo.isCdsUi5PluginEnabled = cdsInfo.hasMinCdsVersion && cdsInfo.isWorkspaceEnabled && cdsInfo.hasCdsUi5Plugin;
+    return moreInfo ? cdsInfo : cdsInfo.isCdsUi5PluginEnabled;
 }
 exports.checkCdsUi5PluginEnabled = checkCdsUi5PluginEnabled;
 //# sourceMappingURL=index.js.map

package/dist/cap-config/package-json.js CHANGED Viewed

@@ -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.hasCdsPluginUi5 = exports.getWorkspaceInfo = exports.satisfiesMinCdsVersion = exports.hasMinCdsVersion = exports.addCdsPluginUi5 = exports.enableWorkspaces = exports.ensureMinCdsVersion = exports.minCdsVersion = void 0;
 const semver_1 = require("semver");
@@ -20,9 +11,8 @@ const minCdsPluginUi5Version = '0.9.3';
  * @param packageJson - the parsed package.json
  */
 function ensureMinCdsVersion(packageJson) {
-    var _a;
     if (!hasMinCdsVersion(packageJson)) {
-        (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
+        packageJson.dependencies ??= {};
         packageJson.dependencies['@sap/cds'] = `^${exports.minCdsVersion}`;
     }
 }
@@ -33,26 +23,23 @@ exports.ensureMinCdsVersion = ensureMinCdsVersion;
  * @param basePath - root path of the CAP project, where package.json is located
  * @param packageJson - the parsed package.json
  */
-function enableWorkspaces(basePath, packageJson) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { appWorkspace, workspaceEnabled } = yield getWorkspaceInfo(basePath, packageJson);
-        if (workspaceEnabled) {
-            return;
+async function enableWorkspaces(basePath, packageJson) {
+    const { appWorkspace, workspaceEnabled } = await getWorkspaceInfo(basePath, packageJson);
+    if (workspaceEnabled) {
+        return;
+    }
+    let workspacePackages = getWorkspacePackages(packageJson);
+    if (!workspacePackages) {
+        packageJson.workspaces ??= [];
+        if (Array.isArray(packageJson.workspaces)) {
+            workspacePackages = packageJson.workspaces;
         }
-        let workspacePackages = getWorkspacePackages(packageJson);
-        if (!workspacePackages) {
-            (_a = packageJson.workspaces) !== null && _a !== void 0 ? _a : (packageJson.workspaces = []);
-            if (Array.isArray(packageJson.workspaces)) {
-                workspacePackages = packageJson.workspaces;
-            }
-            else {
-                packageJson.workspaces.packages = [];
-                workspacePackages = packageJson.workspaces.packages;
-            }
+        else {
+            packageJson.workspaces.packages = [];
+            workspacePackages = packageJson.workspaces.packages;
         }
-        workspacePackages.push(appWorkspace);
-    });
+    }
+    workspacePackages.push(appWorkspace);
 }
 exports.enableWorkspaces = enableWorkspaces;
 /**
@@ -61,9 +48,8 @@ exports.enableWorkspaces = enableWorkspaces;
  * @param packageJson - the parsed package.json
  */
 function addCdsPluginUi5(packageJson) {
-    var _a;
     if (!hasCdsPluginUi5(packageJson)) {
-        (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : (packageJson.devDependencies = {});
+        packageJson.devDependencies ??= {};
         packageJson.devDependencies['cds-plugin-ui5'] = `^${minCdsPluginUi5Version}`;
     }
 }
@@ -76,8 +62,7 @@ exports.addCdsPluginUi5 = addCdsPluginUi5;
  * @returns - true: min cds version is present; false: cds version needs update
  */
 function hasMinCdsVersion(packageJson) {
-    var _a, _b;
-    return (0, semver_1.gte)((_b = (0, semver_1.coerce)((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['@sap/cds'])) !== null && _b !== void 0 ? _b : '0.0.0', exports.minCdsVersion);
+    return (0, semver_1.gte)((0, semver_1.coerce)(packageJson.dependencies?.['@sap/cds']) ?? '0.0.0', exports.minCdsVersion);
 }
 exports.hasMinCdsVersion = hasMinCdsVersion;
 /**
@@ -87,8 +72,7 @@ exports.hasMinCdsVersion = hasMinCdsVersion;
  * @returns - true: cds version satisfies the min cds version; false: cds version does not satisfy min cds version
  */
 function satisfiesMinCdsVersion(packageJson) {
-    var _a, _b;
-    return hasMinCdsVersion(packageJson) || (0, semver_1.satisfies)(exports.minCdsVersion, (_b = (_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['@sap/cds']) !== null && _b !== void 0 ? _b : '0.0.0');
+    return hasMinCdsVersion(packageJson) || (0, semver_1.satisfies)(exports.minCdsVersion, packageJson.dependencies?.['@sap/cds'] ?? '0.0.0');
 }
 exports.satisfiesMinCdsVersion = satisfiesMinCdsVersion;
 /**
@@ -98,15 +82,12 @@ exports.satisfiesMinCdsVersion = satisfiesMinCdsVersion;
  * @param packageJson - the parsed package.json
  * @returns - appWorkspace containing the path to the appWorkspace including wildcard; workspaceEnabled: boolean that states whether workspace for apps are enabled
  */
-function getWorkspaceInfo(basePath, packageJson) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const capPaths = yield (0, project_access_1.getCapCustomPaths)(basePath);
-        const appWorkspace = capPaths.app.endsWith('/') ? `${capPaths.app}*` : `${capPaths.app}/*`;
-        const workspacePackages = (_a = getWorkspacePackages(packageJson)) !== null && _a !== void 0 ? _a : [];
-        const workspaceEnabled = workspacePackages.includes(appWorkspace);
-        return { appWorkspace, workspaceEnabled };
-    });
+async function getWorkspaceInfo(basePath, packageJson) {
+    const capPaths = await (0, project_access_1.getCapCustomPaths)(basePath);
+    const appWorkspace = capPaths.app.endsWith('/') ? `${capPaths.app}*` : `${capPaths.app}/*`;
+    const workspacePackages = getWorkspacePackages(packageJson) ?? [];
+    const workspaceEnabled = workspacePackages.includes(appWorkspace);
+    return { appWorkspace, workspaceEnabled };
 }
 exports.getWorkspaceInfo = getWorkspaceInfo;
 /**
@@ -118,13 +99,12 @@ exports.getWorkspaceInfo = getWorkspaceInfo;
  * @returns ref to the packages in workspaces or undefined
  */
 function getWorkspacePackages(packageJson) {
-    var _a, _b;
     let workspacePackages;
     if (Array.isArray(packageJson.workspaces)) {
         workspacePackages = packageJson.workspaces;
     }
-    else if (Array.isArray((_a = packageJson.workspaces) === null || _a === void 0 ? void 0 : _a.packages)) {
-        workspacePackages = (_b = packageJson.workspaces) === null || _b === void 0 ? void 0 : _b.packages;
+    else if (Array.isArray(packageJson.workspaces?.packages)) {
+        workspacePackages = packageJson.workspaces?.packages;
     }
     return workspacePackages;
 }
@@ -135,8 +115,7 @@ function getWorkspacePackages(packageJson) {
  * @returns true: devDependency to cds-plugin-ui5 exists; false: devDependency to cds-plugin-ui5 does not exist
  */
 function hasCdsPluginUi5(packageJson) {
-    var _a;
-    return !!((_a = packageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['cds-plugin-ui5']);
+    return !!packageJson.devDependencies?.['cds-plugin-ui5'];
 }
 exports.hasCdsPluginUi5 = hasCdsPluginUi5;
 //# sourceMappingURL=package-json.js.map

package/dist/cap-writer/package-json.js CHANGED Viewed

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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.updateAppPackageJson = exports.updateRootPackageJson = exports.getCDSWatchScript = void 0;
 const project_access_1 = require("@sap-ux/project-access");
@@ -48,7 +39,7 @@ const i18n_1 = require("../i18n");
 function getCDSWatchScript(projectName, appId) {
     const DisableCacheParam = 'sap-ui-xx-viewCache=false';
     // projects by default are served base on the folder name in the app/ folder
-    const project = appId !== null && appId !== void 0 ? appId : projectName + '/webapp';
+    const project = appId ?? projectName + '/webapp';
     const watchScript = {
         [`watch-${projectName}`]: `cds watch --open ${project}/index.html?${DisableCacheParam}${appId ? ' --livereload false' : ''}`
     };
@@ -78,30 +69,30 @@ function updatePackageJsonWithScripts(fs, packageJsonPath, scripts) {
  * @param {Logger} [log] - The logger instance for logging warnings.
  * @returns {Promise<void>} A Promise that resolves once the scripts are updated.
  */
-function updateScripts(fs, packageJsonPath, projectName, appId, enableNPMWorkspaces, cdsUi5PluginInfo, log) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const packageJson = ((_a = fs.readJSON(packageJsonPath)) !== null && _a !== void 0 ? _a : {});
-        const hasNPMworkspaces = yield (0, cap_config_1.checkCdsUi5PluginEnabled)(packageJsonPath, fs);
-        // Determine whether to add cds watch scripts for the app based on the availability of minimum CDS version information.
-        // If 'cdsUi5PluginInfo' contains version information and it satisfies the minimum required CDS version,
-        // or if 'cdsUi5PluginInfo' is not available and the version specified in 'package.json' satisfies the minimum required version,
-        // then set 'addScripts' to true. Otherwise, set it to false.
-        const addScripts = (cdsUi5PluginInfo === null || cdsUi5PluginInfo === void 0 ? void 0 : cdsUi5PluginInfo.hasMinCdsVersion) ? cdsUi5PluginInfo.hasMinCdsVersion : (0, cap_config_1.satisfiesMinCdsVersion)(packageJson);
-        let cdsScript;
-        if (addScripts) {
-            if (enableNPMWorkspaces !== null && enableNPMWorkspaces !== void 0 ? enableNPMWorkspaces : hasNPMworkspaces) {
-                // If the project uses npm workspaces (and specifically cds-plugin-ui5 ) then the project is served using the appId
-                cdsScript = getCDSWatchScript(projectName, appId);
-            }
-            else
-                cdsScript = getCDSWatchScript(projectName);
-            updatePackageJsonWithScripts(fs, packageJsonPath, cdsScript);
+async function updateScripts(fs, packageJsonPath, projectName, appId, enableNPMWorkspaces, cdsUi5PluginInfo, log) {
+    const packageJson = (fs.readJSON(packageJsonPath) ?? {});
+    const hasNPMworkspaces = await (0, cap_config_1.checkCdsUi5PluginEnabled)(packageJsonPath, fs);
+    // Determine whether to add cds watch scripts for the app based on the availability of minimum CDS version information.
+    // If 'cdsUi5PluginInfo' contains version information and it satisfies the minimum required CDS version,
+    // or if 'cdsUi5PluginInfo' is not available and the version specified in 'package.json' satisfies the minimum required version,
+    // then set 'addScripts' to true. Otherwise, set it to false.
+    const addScripts = cdsUi5PluginInfo?.hasMinCdsVersion
+        ? cdsUi5PluginInfo.hasMinCdsVersion
+        : (0, cap_config_1.satisfiesMinCdsVersion)(packageJson);
+    let cdsScript;
+    if (addScripts) {
+        if (enableNPMWorkspaces ?? hasNPMworkspaces) {
+            // If the project uses npm workspaces (and specifically cds-plugin-ui5 ) then the project is served using the appId
+            cdsScript = getCDSWatchScript(projectName, appId);
         }
         else {
-            log === null || log === void 0 ? void 0 : log.warn((0, i18n_1.t)('warn.cdsDKNotInstalled', { minCdsVersion: cap_config_1.minCdsVersion }));
+            cdsScript = getCDSWatchScript(projectName);
         }
-    });
+        updatePackageJsonWithScripts(fs, packageJsonPath, cdsScript);
+    }
+    else {
+        log?.warn((0, i18n_1.t)('warn.cdsDKNotInstalled', { minCdsVersion: cap_config_1.minCdsVersion }));
+    }
 }
 /**
  * Updates the root package.json file of CAP projects with the following changes:
@@ -117,26 +108,23 @@ function updateScripts(fs, packageJsonPath, projectName, appId, enableNPMWorkspa
  * @param {boolean} [enableNPMWorkspaces] - Whether to enable npm workspaces.
  * @returns {Promise<void>} A Promise that resolves once the root package.json is updated.
  */
-function updateRootPackageJson(fs, projectName, sapux, capService, appId, log, enableNPMWorkspaces) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const packageJsonPath = (0, path_1.join)(capService.projectPath, 'package.json');
-        const packageJson = ((_a = fs.readJSON(packageJsonPath)) !== null && _a !== void 0 ? _a : {});
-        const capNodeType = 'Node.js';
-        if (enableNPMWorkspaces && packageJson) {
-            yield (0, cap_config_1.enableCdsUi5Plugin)(capService.projectPath, fs);
-        }
-        if ((capService === null || capService === void 0 ? void 0 : capService.capType) === capNodeType) {
-            yield updateScripts(fs, packageJsonPath, projectName, appId, enableNPMWorkspaces, capService.cdsUi5PluginInfo, log);
-        }
-        if (sapux) {
-            const dirPath = (0, path_1.join)((_b = capService.appPath) !== null && _b !== void 0 ? _b : (yield (0, project_access_1.getCapCustomPaths)(capService.projectPath)).app, projectName);
-            // Converts a directory path to a POSIX-style path.
-            const capProjectPath = path_1.default.normalize(dirPath).split(/[\\/]/g).join(path_1.default.posix.sep);
-            const sapuxExt = Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.sapux) ? [...packageJson.sapux, capProjectPath] : [capProjectPath];
-            fs.extendJSON(packageJsonPath, { sapux: sapuxExt });
-        }
-    });
+async function updateRootPackageJson(fs, projectName, sapux, capService, appId, log, enableNPMWorkspaces) {
+    const packageJsonPath = (0, path_1.join)(capService.projectPath, 'package.json');
+    const packageJson = (fs.readJSON(packageJsonPath) ?? {});
+    const capNodeType = 'Node.js';
+    if (enableNPMWorkspaces && packageJson) {
+        await (0, cap_config_1.enableCdsUi5Plugin)(capService.projectPath, fs);
+    }
+    if (capService?.capType === capNodeType) {
+        await updateScripts(fs, packageJsonPath, projectName, appId, enableNPMWorkspaces, capService.cdsUi5PluginInfo, log);
+    }
+    if (sapux) {
+        const dirPath = (0, path_1.join)(capService.appPath ?? (await (0, project_access_1.getCapCustomPaths)(capService.projectPath)).app, projectName);
+        // Converts a directory path to a POSIX-style path.
+        const capProjectPath = path_1.default.normalize(dirPath).split(/[\\/]/g).join(path_1.default.posix.sep);
+        const sapuxExt = Array.isArray(packageJson?.sapux) ? [...packageJson.sapux, capProjectPath] : [capProjectPath];
+        fs.extendJSON(packageJsonPath, { sapux: sapuxExt });
+    }
 }
 exports.updateRootPackageJson = updateRootPackageJson;
 /**
@@ -147,11 +135,10 @@ exports.updateRootPackageJson = updateRootPackageJson;
  * @param {string} appRoot The root directory of the application.
  */
 function updateAppPackageJson(fs, appRoot) {
-    var _a;
     const packageJsonPath = (0, path_1.join)(appRoot, 'package.json');
-    const packageJson = ((_a = fs.readJSON(packageJsonPath)) !== null && _a !== void 0 ? _a : {});
+    const packageJson = (fs.readJSON(packageJsonPath) ?? {});
     delete packageJson.sapux;
-    if (packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) {
+    if (packageJson?.scripts) {
         delete packageJson.scripts['int-test'];
     }
     for (const script in packageJson.scripts) {

package/dist/cap-writer/pom-xml.js CHANGED Viewed

@@ -10,7 +10,7 @@ const xml_js_1 = require("xml-js");
  * @returns {boolean} Returns true if the name exists in the array, otherwise false.
  */
 function checkIfNameExists(data, name) {
-    return data === null || data === void 0 ? void 0 : data.some((obj) => obj.name === name);
+    return data?.some((obj) => obj.name === name);
 }
 /**
  * Adds a workspace element to the provided data if it doesn't already exist.
@@ -19,7 +19,7 @@ function checkIfNameExists(data, name) {
  * @returns {boolean} Returns true if the workspace element was successfully added, otherwise false.
  */
 function addWorkspaceElement(data) {
-    if (!(data === null || data === void 0 ? void 0 : data.elements) || checkIfNameExists(data.elements, 'workingDirectory')) {
+    if (!data?.elements || checkIfNameExists(data.elements, 'workingDirectory')) {
         return false;
     }
     data.elements.push({ type: 'element', name: 'workingDirectory', elements: [{ type: 'text', text: '..' }] });
@@ -57,7 +57,6 @@ function writePomXml(fs, pomPath, pomContentsJson) {
  * @returns {void}
  */
 function updatePomXml(fs, pomPath, logger) {
-    var _a, _b, _c, _d, _e, _f, _g;
     try {
         const pomContents = readPomXml(fs, pomPath);
         const pomContentsJson = (0, xml_js_1.xml2js)(pomContents, { compact: false, ignoreComment: false });
@@ -66,22 +65,21 @@ function updatePomXml(fs, pomPath, logger) {
             return;
         }
         // find the spring-boot-maven-plugin in the pom.xml
-        const pomPlugin = (_g = (_f = (_e = (_d = (_c = (_b = (_a = pomContentsJson.elements
-            .filter((element) => element.name === 'project')) === null || _a === void 0 ? void 0 : _a[0].elements.filter((element) => element.name === 'build')) === null || _b === void 0 ? void 0 : _b[0].elements.filter((element) => element.name === 'plugins')) === null || _c === void 0 ? void 0 : _c[0].elements.filter((element) => element.name === 'plugin')) === null || _d === void 0 ? void 0 : _d.filter((obj) => {
-            var _a;
-            return (_a = obj === null || obj === void 0 ? void 0 : obj.elements) === null || _a === void 0 ? void 0 : _a.some((element) => {
-                var _a;
-                return element.name === 'artifactId' &&
-                    ((_a = element.elements) !== null && _a !== void 0 ? _a : []).some((element) => element.text === springBootMavenPlugin);
-            });
-        })) === null || _e === void 0 ? void 0 : _e[0].elements) === null || _f === void 0 ? void 0 : _f.filter((element) => element.name === 'configuration')) === null || _g === void 0 ? void 0 : _g[0];
+        const pomPlugin = pomContentsJson.elements
+            .filter((element) => element.name === 'project')?.[0]
+            .elements.filter((element) => element.name === 'build')?.[0]
+            .elements.filter((element) => element.name === 'plugins')?.[0]
+            .elements.filter((element) => element.name === 'plugin')
+            ?.filter((obj) => obj?.elements?.some((element) => element.name === 'artifactId' &&
+            (element.elements ?? []).some((element) => element.text === springBootMavenPlugin)))?.[0]
+            .elements?.filter((element) => element.name === 'configuration')?.[0];
         if (pomPlugin) {
             addWorkspaceElement(pomPlugin);
             writePomXml(fs, pomPath, pomContentsJson);
         }
     }
     catch (error) {
-        logger === null || logger === void 0 ? void 0 : logger.error(error);
+        logger?.error(error);
     }
 }
 exports.updatePomXml = updatePomXml;

package/dist/cap-writer/tsconfig-and-yaml.js CHANGED Viewed

@@ -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.updateStaticLocationsInApplicationYaml = exports.updateTsConfig = void 0;
 const project_access_1 = require("@sap-ux/project-access");
@@ -49,24 +40,22 @@ exports.updateTsConfig = updateTsConfig;
  * @param {Logger} [logger] The logger instance for logging errors.
  * @returns {void}
  */
-function updateStaticLocationsInApplicationYaml(fs, applicationYamlPath, capCustomPathsApp, logger) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const applicationYamlDocuments = fs.read(applicationYamlPath).toString();
-            const yamlDoc = yield yaml_1.YamlDocument.newInstance(applicationYamlDocuments);
-            const stringifiedYaml = JSON.stringify(yamlDoc);
-            const parsedApplicationYamlDocuments = JSON.parse(stringifiedYaml).documents;
-            if (parsedApplicationYamlDocuments.length === 1 &&
-                parsedApplicationYamlDocuments[0].spring['web.resources.static-locations'] === undefined) {
-                const applicationYamlFirstDocument = parsedApplicationYamlDocuments[0];
-                applicationYamlFirstDocument.spring['web.resources.static-locations'] = `file:./${capCustomPathsApp}`;
-                fs.write(applicationYamlPath, (0, yaml_1.yamlDocumentToYamlString)(applicationYamlFirstDocument));
-            }
+async function updateStaticLocationsInApplicationYaml(fs, applicationYamlPath, capCustomPathsApp, logger) {
+    try {
+        const applicationYamlDocuments = fs.read(applicationYamlPath).toString();
+        const yamlDoc = await yaml_1.YamlDocument.newInstance(applicationYamlDocuments);
+        const stringifiedYaml = JSON.stringify(yamlDoc);
+        const parsedApplicationYamlDocuments = JSON.parse(stringifiedYaml).documents;
+        if (parsedApplicationYamlDocuments.length === 1 &&
+            parsedApplicationYamlDocuments[0].spring['web.resources.static-locations'] === undefined) {
+            const applicationYamlFirstDocument = parsedApplicationYamlDocuments[0];
+            applicationYamlFirstDocument.spring['web.resources.static-locations'] = `file:./${capCustomPathsApp}`;
+            fs.write(applicationYamlPath, (0, yaml_1.yamlDocumentToYamlString)(applicationYamlFirstDocument));
         }
-        catch (error) {
-            logger === null || logger === void 0 ? void 0 : logger.error((0, i18n_1.t)('error.updateApplicationYaml', { error: error }));
-        }
-    });
+    }
+    catch (error) {
+        logger?.error((0, i18n_1.t)('error.updateApplicationYaml', { error: error }));
+    }
 }
 exports.updateStaticLocationsInApplicationYaml = updateStaticLocationsInApplicationYaml;
 //# sourceMappingURL=tsconfig-and-yaml.js.map

package/dist/cap-writer/utils.js CHANGED Viewed

@@ -11,7 +11,7 @@ const i18n_1 = require("../i18n");
  * @returns The URL for launching the project.
  */
 function getCapUrl(capType, projectName, appId) {
-    const projectPath = appId !== null && appId !== void 0 ? appId : projectName + '/webapp';
+    const projectPath = appId ?? projectName + '/webapp';
     if (capType === 'Java') {
         // For Java projects
         return `http://localhost:8080/${projectName}/webapp/index.html`;

package/dist/i18n.js CHANGED Viewed

@@ -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 };
 };
@@ -19,19 +10,17 @@ const NS = 'cap-config-writer';
 /**
  * Initialize i18next with the translations for this module.
  */
-function initI18n() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield i18next_1.default.init({
-            resources: {
-                en: {
-                    [NS]: cap_config_writer_i18n_json_1.default
-                }
-            },
-            lng: 'en',
-            fallbackLng: 'en',
-            defaultNS: NS,
-            ns: [NS]
-        });
+async function initI18n() {
+    await i18next_1.default.init({
+        resources: {
+            en: {
+                [NS]: cap_config_writer_i18n_json_1.default
+            }
+        },
+        lng: 'en',
+        fallbackLng: 'en',
+        defaultNS: NS,
+        ns: [NS]
     });
 }
 exports.initI18n = initI18n;

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/cap-config-writer",
   "description": "Add or update configuration for SAP CAP projects",
-  "version": "0.5.7",
+  "version": "0.6.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -24,10 +24,10 @@
     "mem-fs-editor": "9.4.0",
     "semver": "7.5.4",
     "xml-js": "1.6.11",
-    "@sap-ux/logger": "0.5.1",
-    "@sap-ux/project-access": "1.22.4",
-    "@sap-ux/odata-service-inquirer": "0.3.11",
-    "@sap-ux/yaml": "0.15.1"
+    "@sap-ux/logger": "0.6.0",
+    "@sap-ux/project-access": "1.24.0",
+    "@sap-ux/odata-service-inquirer": "0.4.2",
+    "@sap-ux/yaml": "0.16.0"
   },
   "devDependencies": {
     "@types/mem-fs": "1.1.2",