@sap-ux/cf-deploy-config-writer 0.1.19 → 0.1.21

package/dist/cf-writer/cap-config.js

@@ -29,10 +29,11 @@ async function generateCAPConfig(config, fs, logger) {
     }
     logger?.debug(`Generate CAP configuration using: \n ${JSON.stringify(config)}`);
     await validateConfig(config);
-    const cdsOptionalParams = [constants_1.CDSXSUAAService, constants_1.CDSDestinationService, constants_1.CDSHTML5RepoService];
-    (0, mta_config_1.createCAPMTA)(config.mtaPath, cdsOptionalParams);
+    // Run `cds` add against the project, it will append whatever it needs
+    (0, mta_config_1.createCAPMTA)(config.mtaPath, [constants_1.CDSXSUAAService, constants_1.CDSDestinationService, constants_1.CDSHTML5RepoService]);
     await (0, utils_1.addRoutingConfig)(config, fs);
     await (0, utils_1.updateRootPackage)({ mtaId: config.mtaId, rootPath: config.mtaPath }, fs);
+    logger_helper_1.default.logger?.debug((0, i18n_1.t)('debug.capMtaCreated'));
     return fs;
 }
 /**

package/dist/mta-config/mta.js

@@ -125,7 +125,7 @@ class MtaConfig {
         if (!this.resources.has(constants_1.HTML5RepoHost)) {
             await this.addHtml5Host();
         }
-        // Setup the basic module template, artifacts will be added in another step
+        // Set up the basic module template, artifacts will be added in another step
         const appHostName = this.resources.get(constants_1.HTML5RepoHost)?.name;
         if (appHostName) {
             const deployer = {
@@ -411,23 +411,38 @@ class MtaConfig {
     async addApp(appModule, appPath) {
         // If an existing content module exists whether standalone/managed, append the new artifact
         const contentModule = this.modules.get('com.sap.application.content:resource');
+        let isHTML5AlreadyExisting = false; // False by default
         if (contentModule) {
             contentModule[constants_1.MTABuildParams] = contentModule[constants_1.MTABuildParams] ?? {};
             contentModule[constants_1.MTABuildParams][constants_1.MTABuildResult] =
                 contentModule[constants_1.MTABuildParams]?.[constants_1.MTABuildResult] ?? `resources`; // Default
             contentModule[constants_1.MTABuildParams].requires = contentModule[constants_1.MTABuildParams].requires ?? [];
-            if (contentModule[constants_1.MTABuildParams].requires?.findIndex((app) => app.name === appModule.slice(0, 128)) === -1) {
+            const artifactName = `${appModule.slice(0, 128)}.zip`;
+            // The name of the HTML5 app will always be the artifact name
+            if (contentModule[constants_1.MTABuildParams].requires?.findIndex((app) => app.artifacts?.includes?.(artifactName)) !== -1) {
+                isHTML5AlreadyExisting = true;
+            }
+            else {
                 contentModule[constants_1.MTABuildParams].requires.push({
                     name: appModule.slice(0, 128),
-                    artifacts: [`${appModule.slice(0, 128)}.zip`],
-                    'target-path': `${contentModule[constants_1.MTABuildParams][constants_1.MTABuildResult]}/`
+                    artifacts: [artifactName],
+                    'target-path': `${contentModule[constants_1.MTABuildParams][constants_1.MTABuildResult]}/`.replace(/\/{2,}/g, '/') // Matches two or more consecutive slashes where at least 2 repetitions of /
                 });
             }
             await this.mta.updateModule(contentModule);
+            this.dirty = true;
         }
-        // Add application module
-        const html5Module = this.apps.get(appModule);
-        if (!html5Module) {
+        // Need to handle where existing HTML5 apps are added by `cds` which follow a different naming convention when added to mta
+        const modules = await this.mta.getModules();
+        for (const module of modules) {
+            if (module.type === 'html5' && module.name.endsWith(appModule) && isHTML5AlreadyExisting) {
+                module['build-parameters'] = constants_1.HTMLAppBuildParams;
+                await this.mta.updateModule(module);
+                this.dirty = true;
+            }
+        }
+        // Add application module, if not found already
+        if (!isHTML5AlreadyExisting && !this.apps.get(appModule)) {
             const app = {
                 name: appModule.slice(0, 128),
                 type: 'html5',
@@ -436,8 +451,8 @@ class MtaConfig {
             };
             await this.mta.addModule(app);
             this.apps.set(appModule, app);
+            this.dirty = true;
         }
-        this.dirty = true;
     }
     /**
      * Append the connectivity service to the list of resources.

package/dist/utils.d.ts

@@ -117,10 +117,10 @@ export declare function setMtaDefaults(config: CFBaseConfig): void;
 /**
  * Update the root package.json with scripts to deploy the MTA.
  *
- * @param {object} Options
+ * @param {object} Options Input params
  * @param {string} Options.mtaId - MTA ID to be written to package.json
  * @param {string} Options.rootPath - MTA project path
- * @param fs
+ * @param fs - reference to a mem-fs editor
  */
 export declare function updateRootPackage({ mtaId, rootPath }: {
     mtaId: string;

package/dist/utils.js

@@ -252,10 +252,10 @@ function setMtaDefaults(config) {
 /**
  * Update the root package.json with scripts to deploy the MTA.
  *
- * @param {object} Options
+ * @param {object} Options Input params
  * @param {string} Options.mtaId - MTA ID to be written to package.json
  * @param {string} Options.rootPath - MTA project path
- * @param fs
+ * @param fs - reference to a mem-fs editor
  */
 async function updateRootPackage({ mtaId, rootPath }, fs) {
     const packageExists = fs.exists((0, path_1.join)(rootPath, project_access_1.FileName.Package));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/cf-deploy-config-writer",
   "description": "Add or amend Cloud Foundry and ABAP deployment configuration for SAP projects",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,7 +29,7 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "hasbin": "1.2.3",
-    "@sap-ux/project-access": "1.29.14",
+    "@sap-ux/project-access": "1.29.15",
     "@sap-ux/yaml": "0.16.0",
     "@sap-ux/btp-utils": "1.0.1",
     "@sap-ux/logger": "0.6.0",