@ui5/task-adaptation 1.1.2 → 1.2.0

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.1.2...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.2.0...HEAD).
+
+<a name="v1.2.0"></a>
+## [v1.2.0] - 2024-03-05
+
+<a name="v1.1.3"></a>
+## [v1.1.3] - 2024-02-26
 
 <a name="v1.1.2"></a>
 ## [v1.1.2] - 2024-02-23
@@ -79,6 +85,8 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2020-12-09
 
+[v1.2.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.3...v1.2.0
+[v1.1.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.2...v1.1.3
 [v1.1.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.1...v1.1.2
 [v1.1.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.0...v1.1.1
 [v1.1.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.23...v1.1.0

package/dist/annotationManager.js

@@ -24,7 +24,7 @@ class AnnotationManager {
         const i18nManager = new i18nManager_1.default(modelName, id, languages);
         const serviceRequestor = new serviceRequestor_1.default(this.configuration, this.abapRepoManager);
         const dataSourceManager = new dataSourceManager_1.default();
-        dataSourceManager.addDataSources(renamedBaseAppManifest["sap.app"]?.dataSources, this.configuration);
+        dataSourceManager.addDataSources(renamedBaseAppManifest["sap.app"]?.dataSources);
         const annotationFiles = await dataSourceManager.createAnnotationFiles(languages, i18nManager, serviceRequestor);
         const i18nFiles = i18nManager.createFiles(i18nPathName);
         if (i18nManager.hasTranslations()) {

package/dist/annotations/comparator/comparator.js

@@ -114,8 +114,11 @@ class Comparator {
         const includer_a = new Includer(a, property);
         const includer_b = new Includer(b, property);
         for (let i = 0; i < Math.max(a.length, b.length); i++) {
-            const id_a = a[i]?._attributes[idProperty];
-            const id_b = b[i]?._attributes[idProperty];
+            // There might be an exceptional case, when the object doesn't
+            // contain attributes. In this case we continue traversing, like
+            // UI5 does.
+            const id_a = a[i]?._attributes?.[idProperty];
+            const id_b = b[i]?._attributes?.[idProperty];
             if (id_a !== id_b) {
                 // We go down the array and if suddenly the ids for comparing
                 // items are not the same, we need to find the item with the

package/dist/annotations/dataSource/dataSourceManager.d.ts

@@ -1,5 +1,4 @@
 import I18nManager from "../../i18nManager";
-import { IConfiguration } from "../../model/types";
 import Language from "../../model/language";
 import ServiceRequestor from "../serviceRequestor";
 export default class DataSourceManager {
@@ -8,6 +7,6 @@ export default class DataSourceManager {
      * Parses dataSources from manifest.json.
      * @param dataSourcesJson manifest.json/sap.app/dataSources node
      */
-    addDataSources(dataSourcesJson: any, config: IConfiguration): void;
+    addDataSources(dataSourcesJson: any): void;
     createAnnotationFiles(languages: Language[], i18nManager: I18nManager, serviceRequestor: ServiceRequestor): Promise<Map<string, string>>;
 }

package/dist/annotations/dataSource/dataSourceManager.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const dataSourceOData_1 = require("./dataSourceOData");
 const dataSourceODataAnnotation_1 = require("./dataSourceODataAnnotation");
-const dataSourceODataAnnotationBeta_1 = require("./dataSourceODataAnnotationBeta");
 const path_1 = require("path");
 class DataSourceManager {
     constructor() {
@@ -12,20 +11,18 @@ class DataSourceManager {
      * Parses dataSources from manifest.json.
      * @param dataSourcesJson manifest.json/sap.app/dataSources node
      */
-    addDataSources(dataSourcesJson, config) {
+    addDataSources(dataSourcesJson) {
         if (!dataSourcesJson) {
             return;
         }
         const odataAnnotationMap = new Map();
-        if (config.enableBetaFeatures) {
-            // Loop over OData first to collect linked annotation names
-            for (const [name, dataSource] of Object.entries(dataSourcesJson)) {
-                if (dataSource.uri?.startsWith("/") && dataSource.type === "OData") {
-                    const uri = path_1.posix.normalize(dataSource.uri + "/$metadata");
-                    const odata = new dataSourceOData_1.default(name, uri, dataSource);
-                    odata.getAnnotations().forEach(annotation => odataAnnotationMap.set(annotation, uri));
-                    this.dataSources.push(odata);
-                }
+        // Loop over OData first to collect linked annotation names
+        for (const [name, dataSource] of Object.entries(dataSourcesJson)) {
+            if (dataSource.uri?.startsWith("/") && dataSource.type === "OData") {
+                const uri = path_1.posix.normalize(dataSource.uri + "/$metadata");
+                const odata = new dataSourceOData_1.default(name, uri, dataSource);
+                odata.getAnnotations().forEach(annotation => odataAnnotationMap.set(annotation, uri));
+                this.dataSources.push(odata);
             }
         }
         // If ODataAnnotation is in OData annotations, pass metadata url to it
@@ -33,12 +30,7 @@ class DataSourceManager {
             const uri = dataSource.uri;
             const metadataUrl = odataAnnotationMap.get(name);
             if (uri?.startsWith("/") && dataSource.type === "ODataAnnotation") {
-                if (config.enableBetaFeatures) {
-                    this.dataSources.push(new dataSourceODataAnnotationBeta_1.default(name, uri, dataSource, metadataUrl));
-                }
-                else {
-                    this.dataSources.push(new dataSourceODataAnnotation_1.default(name, uri, dataSource));
-                }
+                this.dataSources.push(new dataSourceODataAnnotation_1.default(name, uri, dataSource, metadataUrl));
             }
         }
         for (const dataSource of this.dataSources) {

package/dist/annotations/dataSource/dataSourceODataAnnotation.d.ts

@@ -1,6 +1,6 @@
 import DataSource from "./dataSource";
 export default class DataSourceODataAnnotation extends DataSource {
     private dataSourceJson;
-    constructor(name: string, uri: string, dataSourceJson: any);
+    constructor(name: string, uri: string, dataSourceJson: any, metadataUrl: string | undefined);
     updateManifest(): void;
 }

package/dist/annotations/dataSource/dataSourceODataAnnotation.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const dataSource_1 = require("./dataSource");
+const traverseReferences_1 = require("../transformers/traverseReferences");
 class DataSourceODataAnnotation extends dataSource_1.default {
-    constructor(name, uri, dataSourceJson) {
+    constructor(name, uri, dataSourceJson, metadataUrl) {
         super(name, uri);
         this.dataSourceJson = dataSourceJson;
+        this.jsonTransformers = [
+            new traverseReferences_1.default(metadataUrl)
+        ];
     }
     updateManifest() {
         this.dataSourceJson.uri = this.getFilename();

package/dist/annotations/transformers/traverseReferences.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const metadataJsonUtil_1 = require("../converter/metadataJsonUtil");
-const dataSourceODataAnnotationBeta_1 = require("../dataSource/dataSourceODataAnnotationBeta");
+const dataSourceODataAnnotation_1 = require("../dataSource/dataSourceODataAnnotation");
 const urlUtil_1 = require("../../util/urlUtil");
 class TraverseReferences {
     constructor(metadataUrl) {
@@ -17,7 +17,7 @@ class TraverseReferences {
                 continue;
             }
             const name = includes[0]?.namespace;
-            const dataSource = new dataSourceODataAnnotationBeta_1.default(name, absoluteUrl, {}, this.metadataUrl);
+            const dataSource = new dataSourceODataAnnotation_1.default(name, absoluteUrl, {}, this.metadataUrl);
             promises.push(dataSource.downloadAnnotation(language, serviceRequestor)
                 .then(childAnnotation => ({ name, childAnnotation })));
         }

package/dist/appVariantManager.js

@@ -63,11 +63,14 @@ class AppVariantManager {
             }
         }
         this.validateManifest(manifest);
+        // Order is important: apply manifest.json changes first, then *.change
+        // files. UI5 does the same.
+        const changes = (manifest.content ?? []).concat(manifestChanges);
         return {
             id: manifest.id,
             reference: manifest.reference,
             layer: manifest.layer,
-            changes: manifestChanges.concat(manifest.content)
+            changes
         };
     }
     static validateManifest(manifest) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {

package/dist/annotations/dataSource/dataSourceODataAnnotationBeta.d.ts

@@ -1,6 +0,0 @@
-import DataSource from "./dataSource";
-export default class DataSourceODataAnnotation extends DataSource {
-    private dataSourceJson;
-    constructor(name: string, uri: string, dataSourceJson: any, metadataUrl: string | undefined);
-    updateManifest(): void;
-}

package/dist/annotations/dataSource/dataSourceODataAnnotationBeta.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dataSource_1 = require("./dataSource");
-const traverseReferences_1 = require("../transformers/traverseReferences");
-class DataSourceODataAnnotation extends dataSource_1.default {
-    constructor(name, uri, dataSourceJson, metadataUrl) {
-        super(name, uri);
-        this.dataSourceJson = dataSourceJson;
-        this.jsonTransformers = [
-            new traverseReferences_1.default(metadataUrl)
-        ];
-    }
-    updateManifest() {
-        this.dataSourceJson.uri = this.getFilename();
-    }
-}
-exports.default = DataSourceODataAnnotation;
-//# sourceMappingURL=dataSourceODataAnnotationBeta.js.map