@sap-ux/adp-tooling 0.12.134 → 0.12.136

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

@@ -25,12 +25,11 @@ export declare function writeAnnotationChange(projectPath: string, timestamp: nu
  *
  * @param {string} projectPath - The root path of the project.
  * @param {ManifestChangeProperties} change - The change data to be written to the file.
- * @param {string} fileName - The name of the file to write the change data to.
  * @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}
  */
-export declare function writeChangeToFolder(projectPath: string, change: ManifestChangeProperties, fileName: string, fs: Editor, dir?: string): void;
+export declare function writeChangeToFolder(projectPath: string, change: ManifestChangeProperties, fs: Editor, dir?: string): 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.

package/dist/base/change-utils.js

@@ -14,6 +14,7 @@ exports.getChange = getChange;
 const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const project_access_1 = require("@sap-ux/project-access");
+const types_1 = require("../types");
 const ejs_1 = require("ejs");
 /**
  * Writes annotation changes to the specified project path using the provided `mem-fs-editor` instance.
@@ -30,9 +31,8 @@ function writeAnnotationChange(projectPath, timestamp, annotation, change, fs) {
         const changesFolderPath = path_1.default.join(projectPath, project_access_1.DirName.Webapp, project_access_1.DirName.Changes);
         const annotationsFolderPath = path_1.default.join(changesFolderPath, project_access_1.DirName.Annotations);
         if (change) {
-            const changeFileName = `id_${timestamp}_addAnnotationsToOData.change`;
+            const changeFileName = `${change.fileName}.change`;
             const changeFilePath = path_1.default.join(changesFolderPath, changeFileName);
-            change.fileName = `${change.fileName}_addAnnotationsToOData`;
             writeChangeToFile(changeFilePath, change, fs);
         }
         if (!annotation.filePath) {
@@ -63,17 +63,17 @@ function writeAnnotationChange(projectPath, timestamp, annotation, change, fs) {
  *
  * @param {string} projectPath - The root path of the project.
  * @param {ManifestChangeProperties} change - The change data to be written to the file.
- * @param {string} fileName - The name of the file to write the change data to.
  * @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}
  */
-function writeChangeToFolder(projectPath, change, fileName, fs, dir = '') {
+function writeChangeToFolder(projectPath, change, fs, dir = '') {
     try {
         let targetFolderPath = path_1.default.join(projectPath, project_access_1.DirName.Webapp, project_access_1.DirName.Changes);
         if (dir) {
             targetFolderPath = path_1.default.join(targetFolderPath, dir);
         }
+        const fileName = `${change.fileName}.change`;
         const filePath = path_1.default.join(targetFolderPath, fileName);
         writeChangeToFile(filePath, change, fs);
     }
@@ -219,8 +219,13 @@ function findChangeWithInboundId(projectPath, inboundId) {
  * @returns - An object representing the change
  */
 function getChange({ id, layer, namespace }, timestamp, content, changeType) {
+    const changeName = types_1.ChangeTypeMap[changeType];
+    if (!changeName) {
+        throw new Error(`Could not extract the change name from the change type: ${changeType}`);
+    }
+    const fileName = `id_${timestamp}_${changeName}`;
     return {
-        fileName: `id_${timestamp}`,
+        fileName,
         namespace: path_1.default.posix.join(namespace, project_access_1.DirName.Changes),
         layer,
         fileType: 'change',

package/dist/types.d.ts

@@ -317,6 +317,10 @@ export declare const enum ChangeType {
     ADD_LIBRARY_REFERENCE = "appdescr_ui5_addLibraries",
     CHANGE_INBOUND = "appdescr_app_changeInbound"
 }
+/**
+ * A mapping of ChangeType values to their respective change names.
+ */
+export declare const ChangeTypeMap: Record<ChangeType, string>;
 /**
  * Maps a ChangeType to the corresponding data structure needed for that type of change.
  * This conditional type ensures type safety by linking each change type with its relevant data model.

package/dist/types.js

@@ -1,3 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChangeTypeMap = void 0;
+/**
+ * A mapping of ChangeType values to their respective change names.
+ */
+exports.ChangeTypeMap = {
+    ["appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */]: 'addNewModel',
+    ["appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */]: 'addAnnotationsToOData',
+    ["appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */]: 'changeDataSource',
+    ["appdescr_ui5_addComponentUsages" /* ChangeType.ADD_COMPONENT_USAGES */]: 'addComponentUsages',
+    ["appdescr_ui5_addLibraries" /* ChangeType.ADD_LIBRARY_REFERENCE */]: 'addLibraries',
+    ["appdescr_app_changeInbound" /* ChangeType.CHANGE_INBOUND */]: 'changeInbound'
+};
 //# sourceMappingURL=types.js.map

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, `id_${timestamp}_addComponentUsages.change`, this.fs);
+        (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, `id_${libTimestamp}_addLibraries.change`, this.fs);
+        (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, `id_${timestamp}_changeDataSource.change`, this.fs);
+        (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, `id_${annotationTs}_changeDataSource.change`, this.fs);
+            (0, change_utils_1.writeChangeToFolder)(this.projectPath, annotationChange, this.fs);
         }
     }
 }

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

@@ -73,7 +73,7 @@ class InboundWriter {
         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, `id_${timestamp}_changeInbound.change`, this.fs);
+            (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, `id_${timestamp}_addNewModel.change`, this.fs);
+        (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.12.134",
+  "version": "0.12.136",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -40,7 +40,7 @@
     "@sap-ux/project-input-validator": "0.3.4",
     "@sap-ux/system-access": "0.5.31",
     "@sap-ux/ui5-config": "0.26.2",
-    "@sap-ux/odata-service-writer": "0.26.2",
+    "@sap-ux/odata-service-writer": "0.26.3",
     "@sap-ux/i18n": "0.2.1"
   },
   "devDependencies": {