@sap-ux/cf-deploy-config-writer 0.3.91 → 0.3.93

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

@@ -8,10 +8,10 @@ const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const utils_1 = require("../utils");
 const mta_config_1 = require("../mta-config");
+const wait_for_mta_1 = require("../mta-config/wait-for-mta");
 const logger_helper_1 = __importDefault(require("../logger-helper"));
 const i18n_1 = require("../i18n");
 const project_access_1 = require("@sap-ux/project-access");
-const constants_1 = require("../constants");
 /**
  * Add a standalone | managed approuter to a CAP project.
  *
@@ -30,8 +30,8 @@ async function generateCAPConfig(config, fs, logger) {
     logger?.debug(`Generate CAP configuration using: \n ${JSON.stringify(config)}`);
     await validateConfig(config);
     await (0, mta_config_1.generateCAPMTA)(config, fs);
-    // Delay to ensure MTA file write completes before subsequent read operations
-    await new Promise((resolve) => setTimeout(resolve, constants_1.MTA_FILE_OPERATION_DELAY_MS));
+    // Wait until mta.yaml is readable by mta-lib before proceeding
+    await (0, wait_for_mta_1.waitForMtaFile)(config.mtaPath);
     await (0, mta_config_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.capGenerationCompleted'));

package/dist/mta-config/index.d.ts

@@ -10,7 +10,8 @@ import { type Editor } from 'mem-fs-editor';
 export declare function getMtaId(rootPath: string): Promise<string | undefined>;
 /**
  * Get the MTA configuration from the target folder.
- * Retries up to 5 times with delays to handle file system timing issues.
+ * Waits for mta.yaml to be fully written and parseable before reading,
+ * replacing the previous retry-with-delay approach.
  *
  * @param rootPath Path to the root folder
  * @returns MtaConfig instance if found

package/dist/mta-config/index.js

@@ -32,6 +32,7 @@ const ejs_1 = require("ejs");
 const mta_1 = require("./mta");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
+const wait_for_mta_1 = require("./wait-for-mta");
 const types_1 = require("../types");
 const logger_helper_1 = __importDefault(require("../logger-helper"));
 const hasbin_1 = require("hasbin");
@@ -49,27 +50,22 @@ async function getMtaId(rootPath) {
 }
 /**
  * Get the MTA configuration from the target folder.
- * Retries up to 5 times with delays to handle file system timing issues.
+ * Waits for mta.yaml to be fully written and parseable before reading,
+ * replacing the previous retry-with-delay approach.
  *
  * @param rootPath Path to the root folder
  * @returns MtaConfig instance if found
  */
 async function getMtaConfig(rootPath) {
-    let mtaConfig;
-    const MAX_RETRIES = 5;
-    for (let retries = MAX_RETRIES; retries >= 0; retries--) {
-        try {
-            mtaConfig = await mta_1.MtaConfig.newInstance(rootPath, logger_helper_1.default.logger);
-            if (mtaConfig?.prefix) {
-                break;
-            }
-        }
-        catch (error) {
-            logger_helper_1.default.logger?.debug((0, i18n_1.t)('debug.errorReadingMta', { error: error.message }));
-            // Delay before retry to allow file system operations to complete
-            await new Promise((resolve) => setTimeout(resolve, constants_1.MTA_FILE_OPERATION_DELAY_MS));
-        }
+    try {
+        await (0, wait_for_mta_1.waitForMtaFile)(rootPath);
+    }
+    catch {
+        // File did not become ready — return undefined (same behaviour as before)
+        logger_helper_1.default.logger?.debug((0, i18n_1.t)('debug.mtaReadWithPrefix', { prefix: undefined }));
+        return undefined;
     }
+    const mtaConfig = await mta_1.MtaConfig.newInstance(rootPath, logger_helper_1.default.logger);
     logger_helper_1.default.logger?.debug((0, i18n_1.t)('debug.mtaReadWithPrefix', { prefix: mtaConfig?.prefix }));
     return mtaConfig;
 }

package/dist/mta-config/mta.js

@@ -161,8 +161,10 @@ class MtaConfig {
             name: `${this.prefix?.slice(0, constants_1.MAX_MTA_PREFIX_LENGTH)}-uaa`,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
-                'service-plan': 'application',
                 service: 'xsuaa',
+                'service-plan': 'application',
+                path: './xs-security.json',
+                'service-name': `${this.prefix?.slice(0, constants_1.MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`,
                 config: {
                     xsappname: `${this.prefix?.slice(0, constants_1.MAX_MTA_PREFIX_LENGTH)}` + '-${space-guid}',
                     'tenant-mode': 'dedicated'

package/dist/mta-config/wait-for-mta.d.ts

@@ -0,0 +1,17 @@
+export interface WaitForMtaOptions {
+    /** Maximum time to wait in milliseconds. Default: 5000 */
+    maxWaitMs?: number;
+    /** Polling interval in milliseconds. Default: 100 */
+    pollIntervalMs?: number;
+}
+/**
+ * Waits until mta.yaml exists on disk and is readable by mta-lib.
+ * Replaces hardcoded setTimeout delays used to work around mta-lib requiring
+ * files to be fully written before they can be read.
+ *
+ * @param mtaPath Directory containing (or that will contain) mta.yaml
+ * @param options Polling configuration
+ * @throws {Error} If the file is not ready within maxWaitMs
+ */
+export declare function waitForMtaFile(mtaPath: string, options?: WaitForMtaOptions): Promise<void>;
+//# sourceMappingURL=wait-for-mta.d.ts.map

package/dist/mta-config/wait-for-mta.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForMtaFile = waitForMtaFile;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const mta_lib_1 = require("@sap/mta-lib");
+const project_access_1 = require("@sap-ux/project-access");
+const i18n_1 = require("../i18n");
+/**
+ * Waits until mta.yaml exists on disk and is readable by mta-lib.
+ * Replaces hardcoded setTimeout delays used to work around mta-lib requiring
+ * files to be fully written before they can be read.
+ *
+ * @param mtaPath Directory containing (or that will contain) mta.yaml
+ * @param options Polling configuration
+ * @throws {Error} If the file is not ready within maxWaitMs
+ */
+async function waitForMtaFile(mtaPath, options = {}) {
+    const { maxWaitMs = 5000, pollIntervalMs = 100 } = options;
+    const mtaFilePath = (0, node_path_1.join)(mtaPath, project_access_1.FileName.MtaYaml);
+    const deadline = Date.now() + maxWaitMs;
+    while (Date.now() < deadline) {
+        if ((0, node_fs_1.existsSync)(mtaFilePath)) {
+            try {
+                const mta = new mta_lib_1.Mta(mtaPath, false);
+                const id = await mta.getMtaID();
+                if (id) {
+                    return;
+                }
+            }
+            catch {
+                // File exists but not yet parseable — keep polling
+            }
+        }
+        await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    }
+    throw new Error((0, i18n_1.t)('error.mtaFileNotReady', { mtaPath }));
+}
+//# sourceMappingURL=wait-for-mta.js.map

package/dist/translations/cf-deploy-config-writer.i18n.json

@@ -38,7 +38,8 @@
         "doesNotContainACapApp": "The target folder does not contain a Node.js CAP project. Please ensure the folder contains a Node.js CAP project.",
         "errorInstallingNodeModules": "An error occurred when installing node modules. Please check the logs.",
         "errorGeneratingMtaYaml": "An error occurred when creating the mta.yaml file. For more information, check the logs.",
-        "noUI5AppFound": "No SAPUI5 application found. Please ensure the manifest.json file contains a valid 'sap.app.id'."
+        "noUI5AppFound": "No SAPUI5 application found. Please ensure the manifest.json file contains a valid 'sap.app.id'.",
+        "mtaFileNotReady": "The `mta.yaml` file in '{{- mtaPath}}' was not ready within the allowed time. Please check the file system and retry."
     },
     "info": {
         "existingMTAExtensionNotFound": "Cannot find a valid existing MTA extension file. A new one will be created. Error: {{- error}}.",

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.3.91",
+  "version": "0.3.93",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,12 +29,12 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "hasbin": "1.2.3",
-    "@sap-ux/project-access": "1.35.18",
     "@sap-ux/yaml": "0.17.6",
     "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/logger": "0.8.4",
     "@sap-ux/ui5-config": "0.30.1",
-    "@sap-ux/nodejs-utils": "0.2.19"
+    "@sap-ux/nodejs-utils": "0.2.19",
+    "@sap-ux/project-access": "1.35.18"
   },
   "devDependencies": {
     "@types/ejs": "3.1.5",