@sap-ux/adp-tooling 0.18.9 → 0.18.11

package/dist/base/change-utils.d.ts

@@ -17,9 +17,9 @@ interface InboundChange extends ManifestChangeProperties {
  * @param {ManifestChangeProperties} change - The annotation data change that will be written.
  * @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
  * @param {string} templatesPath - The path to the templates used for generating changes.
- * @returns {void}
+ * @returns {Promise<void>}
  */
-export declare function writeAnnotationChange(projectPath: string, timestamp: number, annotation: AnnotationsData['annotation'], change: ManifestChangeProperties | undefined, fs: Editor, templatesPath?: string): void;
+export declare function writeAnnotationChange(projectPath: string, timestamp: number, annotation: AnnotationsData['annotation'], change: ManifestChangeProperties | undefined, fs: Editor, templatesPath?: string): Promise<void>;
 /**
  * Writes a given change object to a file within a specified folder in the project's 'changes' directory.
  * If an additional subdirectory is specified, the change file is written there.
@@ -28,9 +28,9 @@ export declare function writeAnnotationChange(projectPath: string, timestamp: nu
  * @param {ManifestChangeProperties} change - The change data to be written to the file.
  * @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
  * @param {string} [dir] - An optional subdirectory within the 'changes' directory where the file will be written.
- * @returns {void}
+ * @returns {Promise<void>}
  */
-export declare function writeChangeToFolder(projectPath: string, change: ManifestChangeProperties, fs: Editor, dir?: string): void;
+export declare function writeChangeToFolder(projectPath: string, change: ManifestChangeProperties, fs: Editor, dir?: string): Promise<void>;
 /**
  * Writes a given change object to a specific file path. The change data is stringified to JSON format before
  * writing. This function is used to directly write changes to a file, without specifying a directory.
@@ -80,10 +80,11 @@ export declare function getChangesByType(projectPath: string, changeType: Change
  *
  * @param {string} projectPath - The root path of the project.
  * @param {string} inboundId - The inbound ID to search for within change files.
+ * @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
  * @returns {InboundChangeData} An object containing the file path and the change object with the matching inbound ID.
  * @throws {Error} Throws an error if the change file cannot be read or if there's an issue accessing the directory.
  */
-export declare function findChangeWithInboundId(projectPath: string, inboundId: string): InboundChangeData;
+export declare function findChangeWithInboundId(projectPath: string, inboundId: string, fs: Editor): Promise<InboundChangeData>;
 /**
  * Constructs a generic change object based on provided parameters.
  *

package/dist/base/change-utils.js

@@ -25,11 +25,12 @@ const ejs_1 = require("ejs");
  * @param {ManifestChangeProperties} change - The annotation data change that will be written.
  * @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
  * @param {string} templatesPath - The path to the templates used for generating changes.
- * @returns {void}
+ * @returns {Promise<void>}
  */
-function writeAnnotationChange(projectPath, timestamp, annotation, change, fs, templatesPath) {
+async function writeAnnotationChange(projectPath, timestamp, annotation, change, fs, templatesPath) {
     try {
-        const changesFolderPath = node_path_1.default.join(projectPath, project_access_1.DirName.Webapp, project_access_1.DirName.Changes);
+        const webappPath = await (0, project_access_1.getWebappPath)(projectPath, fs);
+        const changesFolderPath = node_path_1.default.join(webappPath, project_access_1.DirName.Changes);
         const annotationsFolderPath = node_path_1.default.join(changesFolderPath, project_access_1.DirName.Annotations);
         if (change) {
             const changeFileName = `${change.fileName}.change`;
@@ -68,11 +69,12 @@ function writeAnnotationChange(projectPath, timestamp, annotation, change, fs, t
  * @param {ManifestChangeProperties} change - The change data to be written to the file.
  * @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
  * @param {string} [dir] - An optional subdirectory within the 'changes' directory where the file will be written.
- * @returns {void}
+ * @returns {Promise<void>}
  */
-function writeChangeToFolder(projectPath, change, fs, dir = '') {
+async function writeChangeToFolder(projectPath, change, fs, dir = '') {
     try {
-        let targetFolderPath = node_path_1.default.join(projectPath, project_access_1.DirName.Webapp, project_access_1.DirName.Changes);
+        const webappPath = await (0, project_access_1.getWebappPath)(projectPath, fs);
+        let targetFolderPath = node_path_1.default.join(webappPath, project_access_1.DirName.Changes);
         if (dir) {
             targetFolderPath = node_path_1.default.join(targetFolderPath, dir);
         }
@@ -179,13 +181,15 @@ function getChangesByType(projectPath, changeType, subDir) {
  *
  * @param {string} projectPath - The root path of the project.
  * @param {string} inboundId - The inbound ID to search for within change files.
+ * @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
  * @returns {InboundChangeData} An object containing the file path and the change object with the matching inbound ID.
  * @throws {Error} Throws an error if the change file cannot be read or if there's an issue accessing the directory.
  */
-function findChangeWithInboundId(projectPath, inboundId) {
+async function findChangeWithInboundId(projectPath, inboundId, fs) {
     let changeObj;
     let filePath = '';
-    const pathToInboundChangeFiles = node_path_1.default.join(projectPath, project_access_1.DirName.Webapp, project_access_1.DirName.Changes);
+    const webappPath = await (0, project_access_1.getWebappPath)(projectPath, fs);
+    const pathToInboundChangeFiles = node_path_1.default.join(webappPath, project_access_1.DirName.Changes);
     if (!(0, node_fs_1.existsSync)(pathToInboundChangeFiles)) {
         return {
             filePath,

package/dist/writer/changes/writers/annotations-writer.js

@@ -107,7 +107,7 @@ class AnnotationsWriter {
         if (data.isCommand) {
             change = (0, change_utils_1.getChange)(variant, timestamp, content, "appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */);
         }
-        (0, change_utils_1.writeAnnotationChange)(this.projectPath, timestamp, data.annotation, change, this.fs, this.templatesPath);
+        await (0, change_utils_1.writeAnnotationChange)(this.projectPath, timestamp, data.annotation, change, this.fs, this.templatesPath);
     }
 }
 exports.AnnotationsWriter = AnnotationsWriter;

package/dist/writer/changes/writers/component-usages-writer.js

@@ -62,14 +62,14 @@ class ComponentUsagesWriter {
         const componentUsagesContent = this.constructContent(data);
         const timestamp = Date.now();
         const compUsagesChange = (0, change_utils_1.getChange)(data.variant, timestamp, componentUsagesContent, "appdescr_ui5_addComponentUsages" /* ChangeType.ADD_COMPONENT_USAGES */);
-        (0, change_utils_1.writeChangeToFolder)(this.projectPath, compUsagesChange, this.fs);
+        await (0, change_utils_1.writeChangeToFolder)(this.projectPath, compUsagesChange, this.fs);
         if (!('library' in data)) {
             return;
         }
         const libRefContent = this.constructLibContent(data);
         const libTimestamp = timestamp + 1;
         const refLibChange = (0, change_utils_1.getChange)(data.variant, libTimestamp, libRefContent, "appdescr_ui5_addLibraries" /* ChangeType.ADD_LIBRARY_REFERENCE */);
-        (0, change_utils_1.writeChangeToFolder)(this.projectPath, refLibChange, this.fs);
+        await (0, change_utils_1.writeChangeToFolder)(this.projectPath, refLibChange, this.fs);
     }
 }
 exports.ComponentUsagesWriter = ComponentUsagesWriter;

package/dist/writer/changes/writers/data-source-writer.js

@@ -57,12 +57,12 @@ class DataSourceWriter {
         const timestamp = Date.now();
         const content = this.constructContent(id, uri, maxAge);
         const change = (0, change_utils_1.getChange)(variant, timestamp, content, "appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */);
-        (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
+        await (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
         if (annotationId && annotationUri) {
             const annotationContent = this.constructContent(annotationId, annotationUri);
             const annotationTs = timestamp + 1;
             const annotationChange = (0, change_utils_1.getChange)(variant, annotationTs, annotationContent, "appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */);
-            (0, change_utils_1.writeChangeToFolder)(this.projectPath, annotationChange, this.fs);
+            await (0, change_utils_1.writeChangeToFolder)(this.projectPath, annotationChange, this.fs);
         }
     }
 }

package/dist/writer/changes/writers/inbound-writer.js

@@ -68,12 +68,12 @@ class InboundWriter {
      * @returns {Promise<void>} A promise that resolves when the change writing process is completed.
      */
     async write(data) {
-        const { changeWithInboundId, filePath } = (0, change_utils_1.findChangeWithInboundId)(this.projectPath, data.inboundId);
+        const { changeWithInboundId, filePath } = await (0, change_utils_1.findChangeWithInboundId)(this.projectPath, data.inboundId, this.fs);
         const timestamp = Date.now();
         if (!changeWithInboundId) {
             const content = this.constructContent(data);
             const change = (0, change_utils_1.getChange)(data.variant, timestamp, content, "appdescr_app_changeInbound" /* ChangeType.CHANGE_INBOUND */);
-            (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
+            await (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
         }
         else {
             if (changeWithInboundId.content) {

package/dist/writer/changes/writers/new-model-writer.js

@@ -66,7 +66,7 @@ class NewModelWriter {
         const timestamp = Date.now();
         const content = this.constructContent(data);
         const change = (0, change_utils_1.getChange)(data.variant, timestamp, content, "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */);
-        (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
+        await (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
     }
 }
 exports.NewModelWriter = NewModelWriter;

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%3Aadp-tooling"
   },
-  "version": "0.18.9",
+  "version": "0.18.11",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -39,12 +39,12 @@
     "@sap-ux/axios-extension": "1.24.3",
     "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/i18n": "0.3.5",
-    "@sap-ux/inquirer-common": "0.9.7",
+    "@sap-ux/inquirer-common": "0.9.8",
     "@sap-ux/logger": "0.7.1",
     "@sap-ux/nodejs-utils": "0.2.8",
-    "@sap-ux/odata-service-writer": "0.27.31",
-    "@sap-ux/project-access": "1.32.10",
-    "@sap-ux/project-input-validator": "0.6.32",
+    "@sap-ux/odata-service-writer": "0.27.32",
+    "@sap-ux/project-access": "1.32.11",
+    "@sap-ux/project-input-validator": "0.6.33",
     "@sap-ux/store": "1.3.3",
     "@sap-ux/system-access": "0.6.29",
     "@sap-ux/ui5-config": "0.29.10",