@ui5/task-adaptation 1.0.11 → 1.0.13

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 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.0.11...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.0.13...HEAD).
+
+<a name="v1.0.13"></a>
+## [v1.0.13] - 2022-11-22
 
 <a name="v1.0.11"></a>
 ## [v1.0.11] - 2022-03-01
@@ -43,6 +46,7 @@ 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.0.13]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.11...v1.0.13
 [v1.0.11]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.10...v1.0.11
 [v1.0.10]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.9...v1.0.10
 [v1.0.9]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.8...v1.0.9

package/README.md

@@ -1,35 +1,11 @@
 # ui5-task-adaptation
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/ui5-task-adaptation)](https://api.reuse.software/info/github.com/SAP/ui5-task-adaptation)
-[![Build Status](https://app.travis-ci.com/SAP/ui5-task-adaptation.svg?branch=main)](https://travis-ci.org/SAP/ui5-task-adaptation)
+[![Build Status](https://app.travis-ci.com/SAP/ui5-task-adaptation.svg?branch=main)](https://app.travis-ci.com/github/SAP/ui5-task-adaptation)
 [![npm version](https://badge.fury.io/js/@ui5%2Ftask-adaptation.svg)](https://badge.fury.io/js/@ui5%2Ftask-adaptation)
 
 ## Description
 A custom task for [ui5-builder](https://github.com/SAP/ui5-builder) that allows building [UI5 Flexibility adaptation projects](https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/019b0c38a6b043d1a66b11d992eed290.html) for SAP BTP, Cloud Foundry environment.
 
-## How to specify a UI5 version
-ui5-task-adaptation is based on the UI5 implementation. In order to use a certain UI5 version, go to a module that contains the ui5.yaml and edit the ui5.yaml specifying the desired UI5 version (1.89.0 in the example below):
-
-```yaml
----
-specVersion: "2.2"
-type: application
-metadata:
-  name: example
-framework:
-  name: SAPUI5
-  version: 1.89.0
-  libraries:
-    - name: sap.ui.fl
-    - name: sap.suite.ui.generic.template
-```
-
-open a terminal and execute:
-
-```shell
-npm run build-ui5
-```
-
-
 ## How to obtain support
 In case you need any support, please create a GitHub issue.
 

package/dist/bundle.js

@@ -1,4 +1,4 @@
-//1.99.0
+//1.108.0
 var window = {};
 'use strict';
 
@@ -33,7 +33,7 @@ var Change = function (oFile) {
 };
 Change.prototype.getChangeType = function () {
   if (this._oDefinition) {
-    return this._oDefinition.changeType;
+    return this._oDefinition.flexObjectMetadata ? this._oDefinition.flexObjectMetadata.changeType : this._oDefinition.changeType;
   }
 };
 Change.prototype.getLayer = function () {
@@ -739,6 +739,13 @@ var DeleteCard = {
   }
 };
 
+var fnAssert = function (bResult, vMessage) {
+  if (!bResult) {
+    var sMessage = typeof vMessage === "function" ? vMessage() : vMessage;
+    console.assert(bResult, sMessage);
+  }
+};
+
 var fnNow = !(typeof window != "undefined" && window.performance && performance.now && performance.timing) ? Date.now : (function () {
   var iNavigationStart = performance.timing.navigationStart;
   return function perfnow() {
@@ -988,13 +995,6 @@ Log.getLogger = function (sComponent, iDefaultLogLevel) {
   return new Logger(sComponent);
 };
 
-var fnAssert = function (bResult, vMessage) {
-  if (!bResult) {
-    var sMessage = typeof vMessage === "function" ? vMessage() : vMessage;
-    console.assert(bResult, sMessage);
-  }
-};
-
 var fnUniqueSort = function (aArray) {
   fnAssert(Array.isArray(aArray), "uniqueSort: input parameter must be an Array");
   var iLength = aArray.length;
@@ -1352,7 +1352,8 @@ function getMethods(sClassName, oLog) {
       oLog.addLogListener(oListener);
     },
     getLogger: function () {
-      return oLog.getLogger(sFullClassName);
+      var oRet = oLog.getLogger(sFullClassName);
+      return oRet;
     }
   };
 }
@@ -1514,7 +1515,8 @@ function applyChange(manifest, change) {
   var targets = ((_manifest$sapUi = manifest["sap.ui5"]) === null || _manifest$sapUi === void 0 ? void 0 : (_manifest$sapUi$routi = _manifest$sapUi.routing) === null || _manifest$sapUi$routi === void 0 ? void 0 : _manifest$sapUi$routi.targets) || ({});
   var pageSettings;
   var propertyChange = changeContent === null || changeContent === void 0 ? void 0 : changeContent.entityPropertyChange;
-  if ((propertyChange === null || propertyChange === void 0 ? void 0 : propertyChange.operation) !== "UPSERT" || !(propertyChange !== null && propertyChange !== void 0 && propertyChange.propertyPath) || !(propertyChange !== null && propertyChange !== void 0 && propertyChange.propertyValue) || propertyChange !== null && propertyChange !== void 0 && propertyChange.propertyPath.startsWith("/")) {
+  if ((propertyChange === null || propertyChange === void 0 ? void 0 : propertyChange.operation) !== "UPSERT" || !(propertyChange !== null && propertyChange !== void 0 && propertyChange.propertyPath) || (propertyChange === null || propertyChange === void 0 ? void 0 : propertyChange.propertyValue) === undefined || propertyChange !== null && propertyChange !== void 0 && propertyChange.propertyPath.startsWith("/")) {
+    Log.error("Change content is not a valid");
     return manifest;
   }
   for (var p in targets) {
@@ -1528,6 +1530,7 @@ function applyChange(manifest, change) {
     }
   }
   if (!pageSettings) {
+    Log.error(("No Fiori elements page with ID ").concat(pageID, " found in routing targets."));
     return manifest;
   }
   var propertyPath = propertyChange.propertyPath.split("/");

package/package.json

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

package/scripts/rollup/overrides/sap/ui/fl/Change.js

@@ -33,7 +33,9 @@ sap.ui.define([
 	 */
 	Change.prototype.getChangeType = function () {
 		if (this._oDefinition) {
-			return this._oDefinition.changeType;
+			return this._oDefinition.flexObjectMetadata
+				? this._oDefinition.flexObjectMetadata.changeType
+				: this._oDefinition.changeType
 		}
 	};
 
@@ -43,7 +45,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	 Change.prototype.getLayer = function () {
+	Change.prototype.getLayer = function () {
 		return this._oDefinition.layer;
 	};
 

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js

@@ -0,0 +1,16 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+
+], function (
+
+) {
+	var FlexObjectFactory = function () {
+	};
+
+	return FlexObjectFactory;
+}, true);

package/scripts/rollup/project/ui5.yaml

@@ -6,7 +6,7 @@ metadata:
   allowSapInternal: true
 framework:
   name: SAPUI5
-  version: "1.91.0"
+  version: "0.0.0"
   libraries:
     - name: sap.ui.fl
     - name: sap.suite.ui.generic.template

package/scripts/rollup/ui5Resolve.ts

@@ -97,8 +97,8 @@ export default function (options: any) {
             code = code
             .replace(/sap\.ui\.define/g, "define")
             .replace(/\, \/\* bExport\= \*\/ true\)/g, ")")
-            .replace(/}, (true|false)\);$/g, "});")
-            .replace(/}, (true|false)\);(\n\/\/# sourceMappingURL=)*/g, "});\n//# sourceMappingURL=");
+            .replace(/},.*(true|false)\);$/g, "});")
+            .replace(/},.*(true|false)\);(\n\/\/# sourceMappingURL=)*/g, "});\n//# sourceMappingURL=");
             return convertAMDtoES6(code);
         }
 
@@ -108,7 +108,7 @@ export default function (options: any) {
 
 function replaceRequireAsync(code: string) {
     const requireAsyncPattern = /requireAsync((.bind\(this, ")|(\("))+(?<url>[\/\w]*)"\)/mg;
-    let match, defineUrls = [], defineVars = [], matches = new Map();
+    let match, defineUrls = new Array<string>(), defineVars = new Array<string>(), matches = new Map();
     while (match = requireAsyncPattern.exec(code)) {
         if (match.groups?.url) {
             const varaibleName = match.groups.url.split("/").pop() + crypto.randomBytes(16).toString("hex");

package/scripts/rollup.ts

@@ -14,28 +14,30 @@ const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-ada
 const projectPaths = [
     path.resolve(__dirname, "rollup", "project")
 ];
+const LATEST_VERSION_PLACEHOLDER = "0.0.0";
 
 export default class Builder {
 
     static async getProjectInfo(projectPaths: string[]) {
         for (const cwd of projectPaths) {
             try {
-                let options = {
-                    cwd,
-                    frameworkOptions: {
+                const options = <any>{
+                    cwd
+                };
+                const version = this.validateProjectSettings(cwd);
+                if (version === LATEST_VERSION_PLACEHOLDER) {
+                    options.frameworkOptions = {
                         versionOverride: "latest"
                     }
-                };
-                const project = await normalizer.generateProjectTree(options);
-                this.validateProjectSettings(cwd);
-                return project;
+                }
+                return normalizer.generateProjectTree(options);
             } catch (error: any) {
                 log.info(`${error.message}`);
             }
         }
     }
 
-    static validateProjectSettings(projectPath: string) {
+    static validateProjectSettings(projectPath: string): string {
         const FRAMEWORK_TYPES = ["OpenUI5", "SAPUI5"];
         const content = fs.readFileSync(path.join(projectPath, "ui5.yaml"), { encoding: "utf-8" });
         const yamlJson = <any>yaml.load(content);
@@ -46,6 +48,7 @@ export default class Builder {
         if (!semver.valid(framework.version)) {
             throw new Error(`UI5 framework version should correspond semantic version standard, e.g: 1.85.2`);
         }
+        return framework.version;
     }
 
     static getBundledUI5Version(destination: string) {
@@ -65,9 +68,9 @@ export default class Builder {
         }
         const isSapUiFl = (dependency: any) => dependency.id.endsWith("/sap.ui.fl");
         const sapUiFlDependency = project.dependencies.find(isSapUiFl);
-        if (bundledUI5Version == null || sapUiFlDependency && semver.lt(bundledUI5Version, sapUiFlDependency.version)) {
+        if (bundledUI5Version == null || sapUiFlDependency && semver.neq(bundledUI5Version, sapUiFlDependency.version)) {
             if (sapUiFlDependency.version) {
-                log.info(`[ROLLUP] New UI5 version ${sapUiFlDependency.version.toString()} available to bundle`);
+                log.info(`Using UI5 version ${sapUiFlDependency.version.toString()} to bundle`);
             }
             const inputOptions = <rollup.RollupOptions>{
                 input: "bundleDefinition.js",
@@ -100,7 +103,7 @@ export default class Builder {
             await bundle.write(outputOptions);
             await bundle.close();
         } else {
-            log.info(`[ROLLUP] UI5 version ${bundledUI5Version!.toString()} is already bundled`);
+            log.info(`UI5 version ${bundledUI5Version!.toString()} is already bundled`);
         }
 
     }