@ui5/task-adaptation 1.0.10 → 1.0.12

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.0.10...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.0.12...HEAD).
+
+<a name="v1.0.12"></a>
+## [v1.0.12] - 2022-11-16
+
+<a name="v1.0.11"></a>
+## [v1.0.11] - 2022-03-01
 
 <a name="v1.0.10"></a>
 ## [v1.0.10] - 2021-06-04
@@ -40,6 +46,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.0.12]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.11...v1.0.12
+[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
 [v1.0.8]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.7...v1.0.8

package/README.md

@@ -1,8 +1,10 @@
 # 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://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 for the SAP BTP, Cloud Foundry environment. Note: This feature is still in development and not available yet.
+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 obtain support
 In case you need any support, please create a GitHub issue.

package/dist/bundle.js

@@ -1,4 +1,6 @@
-var window = {};'use strict';
+//1.108.0
+var window = {};
+'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
@@ -31,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 () {
@@ -157,13 +159,13 @@ function setPropValueByPath(oEntityProp, oRoot) {
   }
   ObjectPath.set(aPath, oEntityProp.propertyValue, oRoot);
 }
-function changePropertyValueByPath (oChanges, oRootPath) {
-  if (Array.isArray(oChanges)) {
-    oChanges.forEach(function (oEntityProp) {
+function changePropertyValueByPath (vChanges, oRootPath) {
+  if (Array.isArray(vChanges)) {
+    vChanges.forEach(function (oEntityProp) {
       setPropValueByPath(oEntityProp, oRootPath);
     });
   } else {
-    setPropValueByPath(oChanges, oRootPath);
+    setPropValueByPath(vChanges, oRootPath);
   }
 }
 
@@ -253,10 +255,8 @@ function checkIdNamespaceCompliance(sId, oChange) {
         throw new Error("Id " + sId + " must not start with reserved " + layer_prefixes[sKey]);
       }
     });
-  } else {
-    if (!sId.startsWith(sPrefix)) {
-      throw new Error("Id " + sId + " must start with " + sPrefix);
-    }
+  } else if (!sId.startsWith(sPrefix)) {
+    throw new Error("Id " + sId + " must start with " + sPrefix);
   }
 }
 function getNamespacePrefixForLayer(sLayer) {
@@ -643,6 +643,19 @@ var ChangeInbound = {
   }
 };
 
+var SetAbstract = {
+  applyChange: function (oManifest, oChange) {
+    if (!oChange.getContent().hasOwnProperty("abstract")) {
+      throw new Error("No abstract in change content provided");
+    }
+    if (oChange.getContent().abstract !== false) {
+      throw new Error("The current change value of property abstract is '" + oChange.getContent().abstract + "'. Only allowed value for property abstract is boolean 'false'");
+    }
+    ObjectPath.set(["sap.fiori", "abstract"], oChange.getContent().abstract, oManifest);
+    return oManifest;
+  }
+};
+
 function _mergeExistingLibrary(oManifestLib, oChangeLib) {
   var oUpdatedLibrary = {};
   if (oChangeLib.minVersion) {
@@ -726,31 +739,10 @@ var DeleteCard = {
   }
 };
 
-var BaseObject$1;
-var Interface = function (oObject, aMethods, _bReturnFacade) {
-  if (!oObject) {
-    return oObject;
-  }
-  BaseObject$1 = BaseObject$1 || sap.ui.requireSync("sap/ui/base/Object");
-  function fCreateDelegator(oObject, sMethodName) {
-    return function () {
-      var tmp = oObject[sMethodName].apply(oObject, arguments);
-      if (_bReturnFacade) {
-        return this;
-      } else {
-        return tmp instanceof BaseObject$1 ? tmp.getInterface() : tmp;
-      }
-    };
-  }
-  if (!aMethods) {
-    return {};
-  }
-  var sMethodName;
-  for (var i = 0, ml = aMethods.length; i < ml; i++) {
-    sMethodName = aMethods[i];
-    if (!oObject[sMethodName] || typeof oObject[sMethodName] === "function") {
-      this[sMethodName] = fCreateDelegator(oObject, sMethodName);
-    }
+var fnAssert = function (bResult, vMessage) {
+  if (!bResult) {
+    var sMessage = typeof vMessage === "function" ? vMessage() : vMessage;
+    console.assert(bResult, sMessage);
   }
 };
 
@@ -1003,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;
@@ -1251,7 +1236,7 @@ var BaseObject = Metadata.createClass("sap.ui.base.Object", {
 });
 BaseObject.prototype.destroy = function () {};
 BaseObject.prototype.getInterface = function () {
-  var oInterface = new Interface(this, this.getMetadata().getAllPublicMethods());
+  var oInterface = new BaseObject._Interface(this, this.getMetadata().getAllPublicMethods());
   this.getInterface = function () {
     return oInterface;
   };
@@ -1277,6 +1262,31 @@ BaseObject.prototype.isA = function (vTypeName) {
 BaseObject.isA = function (oObject, vTypeName) {
   return oObject instanceof BaseObject && oObject.isA(vTypeName);
 };
+BaseObject._Interface = function (oObject, aMethods, _bReturnFacade) {
+  if (!oObject) {
+    return oObject;
+  }
+  function fCreateDelegator(oObject, sMethodName) {
+    return function () {
+      var tmp = oObject[sMethodName].apply(oObject, arguments);
+      if (_bReturnFacade) {
+        return this;
+      } else {
+        return tmp instanceof BaseObject ? tmp.getInterface() : tmp;
+      }
+    };
+  }
+  if (!aMethods) {
+    return {};
+  }
+  var sMethodName;
+  for (var i = 0, ml = aMethods.length; i < ml; i++) {
+    sMethodName = aMethods[i];
+    if (!oObject[sMethodName] || typeof oObject[sMethodName] === "function") {
+      this[sMethodName] = fCreateDelegator(oObject, sMethodName);
+    }
+  }
+};
 
 var class2type = {};
 var hasOwn = class2type.hasOwnProperty;
@@ -1342,7 +1352,8 @@ function getMethods(sClassName, oLog) {
       oLog.addLogListener(oListener);
     },
     getLogger: function () {
-      return oLog.getLogger(sFullClassName);
+      var oRet = oLog.getLogger(sFullClassName);
+      return oRet;
     }
   };
 }
@@ -1354,7 +1365,7 @@ var FeLogger = BaseObject.extend("sap.suite.ui.generic.template.genericUtilities
 
 var oLogger$2 = new FeLogger("manifestMerger.MergerUil").getLogger();
 var mergerUtil = {
-  iterateAndFind: function iterateFind(oPages, sEntityKey, sPageComponent, sChildPageId) {
+  iterateAndFind: function iterateFind(oPages, sEntityKey, sPageComponent, sChildPageId, sParentKey) {
     var oPageStructure;
     if (Array.isArray(oPages)) {
       throw new Error("Manifest should have sap.ui.generic.app.pages as Object structure and not array ");
@@ -1373,7 +1384,9 @@ var mergerUtil = {
         if (oPageStructure) {
           break;
         }
-        oPageStructure = iterateFind(oPages[sKey], sEntityKey, sPageComponent, sChildPageId);
+        if (sKey === "pages" || sParentKey === "pages") {
+          oPageStructure = iterateFind(oPages[sKey], sEntityKey, sPageComponent, sChildPageId, sKey);
+        }
       } else if (sKey === "pages" && Array.isArray(oPages[sKey])) {
         throw new Error("Manifest should have sap.ui.generic.app.pages as Object structure and not array ");
       }
@@ -1455,6 +1468,9 @@ var addNewObjectPage = {
       "name": "sap.suite.ui.generic.template.ObjectPage"
     };
     if (oPageStructure) {
+      if (oPageStructure.pages && Array.isArray(oPageStructure.pages)) {
+        throw Error("Manifest should have sap.ui.generic.app.pages as Object structure and not array");
+      }
       ObjectPath.create(["pages", sChildPageId], oPageStructure);
       ObjectPath.set(["pages", sChildPageId], oChangeContent.childPage.definition, oPageStructure);
       ObjectPath.set(["pages", sChildPageId, "component"], oComponentContent, oPageStructure);
@@ -1491,6 +1507,48 @@ var changePageConfiguration = {
   }
 };
 
+var _exports = {};
+function applyChange(manifest, change) {
+  var _manifest$sapUi, _manifest$sapUi$routi;
+  var changeContent = change.getContent();
+  var pageID = changeContent === null || changeContent === void 0 ? void 0 : changeContent.page;
+  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 ? 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) {
+    if (targets[p].id === pageID) {
+      var _targets$p$name;
+      if ((_targets$p$name = targets[p].name) !== null && _targets$p$name !== void 0 && _targets$p$name.startsWith("sap.fe.templates.")) {
+        var _targets$p, _targets$p$options;
+        pageSettings = ((_targets$p = targets[p]) === null || _targets$p === void 0 ? void 0 : (_targets$p$options = _targets$p.options) === null || _targets$p$options === void 0 ? void 0 : _targets$p$options.settings) || ({});
+        break;
+      }
+    }
+  }
+  if (!pageSettings) {
+    Log.error(("No Fiori elements page with ID ").concat(pageID, " found in routing targets."));
+    return manifest;
+  }
+  var propertyPath = propertyChange.propertyPath.split("/");
+  if (propertyPath[0] === "controlConfiguration") {
+    var annotationPath = "";
+    for (var i = 1; i < propertyPath.length; i++) {
+      annotationPath += (i > 1 ? "/" : "") + propertyPath[i];
+      if (annotationPath.indexOf("@") > -1) {
+        propertyPath = ["controlConfiguration", annotationPath].concat(propertyPath.slice(i + 1));
+        break;
+      }
+    }
+  }
+  ObjectPath.set(propertyPath, propertyChange.propertyValue, pageSettings);
+  return manifest;
+}
+_exports.applyChange = applyChange;
+
 var Registration = {
   appdescr_ui5_addLibraries: () => Promise.resolve(AddLibrary),
   appdescr_app_setTitle: () => Promise.resolve(SetTitle),
@@ -1498,7 +1556,8 @@ var Registration = {
   appdescr_ovp_addNewCard: () => Promise.resolve(AddNewCard),
   appdescr_ovp_removeCard: () => Promise.resolve(DeleteCard),
   appdescr_ui_generic_app_addNewObjectPage: () => Promise.resolve(addNewObjectPage),
-  appdescr_ui_generic_app_changePageConfiguration: () => Promise.resolve(changePageConfiguration)
+  appdescr_ui_generic_app_changePageConfiguration: () => Promise.resolve(changePageConfiguration),
+  appdescr_fe_changePageConfiguration: () => Promise.resolve(_exports)
 };
 
 var RegistrationBuild = {
@@ -1510,7 +1569,8 @@ var RegistrationBuild = {
   appdescr_ui5_setFlexExtensionPointEnabled: () => Promise.resolve(SetFlexExtensionPointEnabled),
   appdescr_ui5_addNewModel: () => Promise.resolve(AddNewModel),
   appdescr_app_addAnnotationsToOData: () => Promise.resolve(AddAnnotationsToOData),
-  appdescr_app_changeInbound: () => Promise.resolve(ChangeInbound)
+  appdescr_app_changeInbound: () => Promise.resolve(ChangeInbound),
+  appdescr_fiori_setAbstract: () => Promise.resolve(SetAbstract)
 };
 var RegistrationCopy = Object.assign({}, Registration);
 var RegistrationBuild$1 = Object.assign(RegistrationCopy, RegistrationBuild);

package/dist/index.js

@@ -11,39 +11,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const appVariantManager_1 = require("./appVariantManager");
 const baseAppManager_1 = require("./baseAppManager");
-const html5RepoManager_1 = require("./html5RepoManager");
-const resourceUtil_1 = require("./util/resourceUtil");
+const updateCache_1 = require("./updateCache");
 /**
  * Creates an appVariant bundle from the provided resources.
  */
 module.exports = ({ workspace, options, taskUtil }) => {
     function process(workspace, taskUtil) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseAppFiles = getBaseAppFiles(options.configuration);
+            const baseAppFiles = updateCache_1.default(options.configuration);
             const appVariantResources = yield appVariantManager_1.default.getAppVariantResources(workspace);
             const appVariantInfo = appVariantManager_1.default.process(appVariantResources, options.projectNamespace, taskUtil);
             const baseAppResources = yield baseAppManager_1.default.process(yield baseAppFiles, yield appVariantInfo, options);
             yield Promise.all(appVariantResources.concat(baseAppResources).map(resource => workspace.write(resource)));
         });
     }
-    function getBaseAppFiles(configuration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = new Map();
-            if (!configuration.ignoreCache) {
-                result = yield resourceUtil_1.default.readTemp(configuration);
-            }
-            if (result.size === 0) {
-                const [metadata, baseAppFiles] = yield Promise.all([
-                    html5RepoManager_1.default.getMetadata(configuration),
-                    html5RepoManager_1.default.getBaseAppFiles(configuration)
-                ]);
-                const metadataMap = new Map([[resourceUtil_1.default.METADATA_FILENAME, JSON.stringify(metadata)]]);
-                yield resourceUtil_1.default.writeTemp(configuration, new Map([...baseAppFiles, ...metadataMap]));
-                return baseAppFiles;
-            }
-            return result;
-        });
-    }
     return process(workspace, taskUtil);
 };
 //# sourceMappingURL=index.js.map

package/dist/model/types.d.ts

@@ -6,7 +6,6 @@ export interface IConfiguration {
     spaceGuid?: string;
     orgGuid?: string;
     sapCloudService?: string;
-    ignoreCache?: boolean;
 }
 export interface IProjectOptions {
     configuration: IConfiguration;

package/dist/updateCache.d.ts

@@ -2,4 +2,4 @@ import { IConfiguration } from "./model/types";
 /**
  * Updates temporary stored original app files
  */
-export default function (configuration: IConfiguration): Promise<boolean>;
+export default function (configuration: IConfiguration): Promise<Map<string, string>>;

package/dist/updateCache.js

@@ -23,11 +23,13 @@ function default_1(configuration) {
         const metadata = yield metadataPromise;
         if (metadata.changedOn !== (tempMetadata === null || tempMetadata === void 0 ? void 0 : tempMetadata.changedOn)) {
             const baseAppFiles = yield html5RepoManager_1.default.getBaseAppFiles(configuration);
-            baseAppFiles.set(resourceUtil_1.default.METADATA_FILENAME, JSON.stringify(metadata));
-            yield resourceUtil_1.default.writeTemp(configuration, baseAppFiles);
-            return true;
+            const metadataMap = new Map([[resourceUtil_1.default.METADATA_FILENAME, JSON.stringify(metadata)]]);
+            yield resourceUtil_1.default.writeTemp(configuration, new Map([...baseAppFiles, ...metadataMap]));
+            return baseAppFiles;
+        }
+        else {
+            return resourceUtil_1.default.readTemp(configuration);
         }
-        return false;
     });
 }
 exports.default = default_1;

package/dist/util/requestUtil.js

@@ -9,29 +9,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_fetch_1 = require("node-fetch");
+const axios_1 = require("axios");
 class RequestUtil {
     static get(uri, options) {
-        return node_fetch_1.default(uri, options).then(res => res.json());
+        return axios_1.default.get(uri, options).then(response => response.data);
     }
     static download(token, appHostId, uri) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!token) {
                 throw new Error("HTML5 token is undefined");
             }
-            const response = yield node_fetch_1.default(uri, {
+            return axios_1.default.get(uri, {
+                responseType: "arraybuffer",
                 headers: {
                     "Content-Type": "application/json",
                     "Authorization": "Bearer " + token,
                     "x-app-host-id": appHostId
                 }
-            });
-            return new Promise((resolve, reject) => {
-                const data = [];
-                response.body.on("error", err => reject(err));
-                response.body.on("data", block => data.push(block));
-                response.body.on("end", () => resolve(Buffer.concat(data)));
-            });
+            }).then(response => response.data);
         });
     }
 }

package/package.json

@@ -1,19 +1,20 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.0.10",
+    "version": "1.0.12",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
         "test": "npm run build && npm run coverage",
         "dev": "mocha --no-timeouts -r ts-node/register 'test/**/*.spec.ts'",
-        "coverage": "nyc node_modules/.bin/mocha -r ts-node/register 'test/**/*.spec.ts'",
-        "coverage-verbose": "nyc --reporter=html --reporter=text node_modules/.bin/mocha -r ts-node/register 'test/**/*.spec.ts'",
+        "perf": "mocha --no-timeouts -r ts-node/register 'test/**/*.perf.ts'",
+        "coverage": "nyc mocha -r ts-node/register 'test/**/*.spec.ts'",
+        "coverage-verbose": "nyc --reporter=html --reporter=text mocha -r ts-node/register 'test/**/*.spec.ts'",
         "preversion": "npm test",
         "version": "git-chglog --next-tag v$npm_package_version -o CHANGELOG.md && git add CHANGELOG.md",
         "postversion": "git push --follow-tags",
         "release-note": "git-chglog -c .chglog/release-config.yml v$npm_package_version",
-        "rollup": "rollup -c rollup.config.js",
-        "build": "npm run rollup && tsc -p ."
+        "rollup": "ts-node scripts/rollup.ts ./dist/bundle.js",
+        "build": "npm run rollup && tsc -p ./"
     },
     "repository": {
         "type": "git",
@@ -31,39 +32,42 @@
     "author": "SAP SE",
     "license": "Apache-2.0",
     "dependencies": {
-        "@buxlabs/amd-to-es6": "^0.16.0",
-        "@rollup/plugin-node-resolve": "^13.0.0",
-        "@sap/cf-tools": "^1.1.1",
+        "@buxlabs/amd-to-es6": "^0.16.1",
+        "@rollup/plugin-node-resolve": "^13.0.4",
+        "@sap/cf-tools": "^2.0.1",
         "@ui5/fs": "^2.0.6",
         "@ui5/logger": "^2.0.1",
-        "@ui5/project": "^2.3.1",
+        "@ui5/project": "^2.6.0",
         "adm-zip": "^0.5.5",
         "amdextract": "^3.0.0",
+        "axios": "^0.25.0",
         "builtin-modules": "^3.2.0",
         "js-yaml": "^4.1.0",
-        "node-fetch": "^2.6.1",
         "rimraf": "^3.0.2",
-        "rollup": "^2.50.0",
+        "rollup": "^2.56.3",
         "semver": "^7.3.5",
         "temp-dir": "^2.0.0"
     },
     "devDependencies": {
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
         "@types/adm-zip": "^0.4.34",
-        "@types/chai": "^4.2.18",
-        "@types/mocha": "^8.2.2",
-        "@types/node-fetch": "^2.5.10",
-        "@types/request": "^2.48.5",
-        "@types/rimraf": "^3.0.0",
-        "@types/sinon": "^10.0.0",
+        "@types/chai": "^4.2.21",
+        "@types/chai-as-promised": "^7.1.4",
+        "@types/js-yaml": "^4.0.3",
+        "@types/mocha": "^9.1.0",
+        "@types/rimraf": "^3.0.2",
+        "@types/semver": "^7.3.8",
+        "@types/sinon": "^10.0.2",
         "chai": "^4.3.4",
-        "mocha": "^8.4.0",
+        "chai-as-promised": "^7.1.1",
+        "chalk": "^4.1.2",
+        "mocha": "^9.2.0",
         "mock-require": "^3.0.3",
         "nyc": "^15.1.0",
-        "sinon": "^11.1.0",
+        "sinon": "^11.1.2",
         "source-map-support": "^0.5.19",
-        "ts-node": "^10.0.0",
-        "typescript": "^4.2.4"
+        "ts-node": "^10.4.0",
+        "typescript": "^4.3.5"
     },
     "nyc": {
         "reporter": [
@@ -79,10 +83,10 @@
             "test/**",
             "lib/processors/jsdoc/lib/**",
             "dist/**",
-            "rollup.config.js",
-            "rollup/**",
             "src/model/types.ts",
-            "src/util/requestUtil.ts"
+            "src/util/requestUtil.ts",
+            "scripts/**/*.js",
+            "scripts/git/octokitUtil.ts"
         ],
         "check-coverage": true,
         "statements": 85,

package/{rollup → 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/{rollup → scripts/rollup}/project/ui5.yaml

@@ -3,9 +3,11 @@ specVersion: "2.2"
 type: application
 metadata:
   name: rollup
+  allowSapInternal: true
 framework:
   name: SAPUI5
-  version: 1.89.0
+  version: "0.0.0"
   libraries:
     - name: sap.ui.fl
     - name: sap.suite.ui.generic.template
+    - name: sap.fe.core

package/scripts/rollup/ui5Resolve.ts

@@ -0,0 +1,134 @@
+import * as crypto from "crypto";
+import * as fs from "fs";
+import * as path from "path";
+import * as stream from "stream";
+
+import { promisify } from "util";
+
+const convertAMDtoES6 = require("@buxlabs/amd-to-es6");
+const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
+const { resourceFactory } = require("@ui5/fs");
+
+
+export default function (options: any) {
+
+    let dependencies: any;
+
+    const skipTransformation = (id: string) => !options.skipTransformation?.includes(id);
+
+    return {
+
+        name: "ui5-resolve",
+
+        buildStart: async (_: any) => {
+
+            dependencies = resourceFactory.createCollectionsForTree(options.project, {}).dependencies;
+
+            const pipe = promisify(stream.pipeline);
+            const resources: any[] = await Promise.all(options.assets.map((asset: string) => dependencies.byGlob(asset)));
+            const writePromises = [].concat(...resources).map((resource: any) => {
+                const file = `./dist${resource.getPath()}`;
+                const folder = path.dirname(file);
+                if (!fs.existsSync(folder)) {
+                    fs.mkdirSync(folder, { recursive: true });
+                }
+                if (fs.existsSync(file)) {
+                    fs.unlinkSync(file);
+                }
+                return pipe(resource.getStream(), fs.createWriteStream(file));
+            });
+            await Promise.all(writePromises);
+        },
+
+
+        /*
+         * Right before writing result to dist
+         */
+        renderChunk: (code: string) => {
+            return `//${options.ui5version}\nvar window = {};\n${code}`;
+        },
+
+
+        resolveId: (source: string, importer: string) => {
+            log.verbose(`resolveId: ${source} from ${importer}`);
+            if (importer && source.startsWith(".")) {
+                source = path.posix.join(path.dirname(importer), source);
+            }
+            log.verbose(" --> resolve to: " + source);
+            return source;
+        },
+
+
+        load: async (id: string) => {
+            log.verbose(`load: ${id}`);
+
+            if (!dependencies) {
+                dependencies = resourceFactory.createCollectionsForTree(options.project, {}).dependencies;
+            }
+
+            const localFile = path.join(__dirname, id);
+            if (fs.existsSync(localFile)) {
+                log.info(`Using local file "${id}"`);
+                return fs.readFileSync(localFile, {
+                    encoding: "utf8"
+                });
+            }
+
+            const localOverride = path.resolve(__dirname, "overrides", id + ".js");
+            if (fs.existsSync(localOverride)) {
+                log.info(`Using local override for "${id}"`);
+                return fs.readFileSync(localOverride, { encoding: "utf8" });
+            }
+
+            const resource = await dependencies.byPath(`/resources/${id}.js`);
+            return resource.getString();
+        },
+
+
+        transform: (code: string, id: string): string | undefined => {
+            const skipped = !skipTransformation(id);
+            log.verbose(`transform: ${id} ${skipped ? "skipped" : ""}`);
+            if (skipped) {
+                return;
+            }
+
+            code = replaceRequireAsync(code);
+
+            code = code
+            .replace(/sap\.ui\.define/g, "define")
+            .replace(/\, \/\* bExport\= \*\/ true\)/g, ")")
+            .replace(/},.*(true|false)\);$/g, "});")
+            .replace(/},.*(true|false)\);(\n\/\/# sourceMappingURL=)*/g, "});\n//# sourceMappingURL=");
+            return convertAMDtoES6(code);
+        }
+
+    };
+};
+
+
+function replaceRequireAsync(code: string) {
+    const requireAsyncPattern = /requireAsync((.bind\(this, ")|(\("))+(?<url>[\/\w]*)"\)/mg;
+    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");
+            defineUrls.push(`"${match.groups.url}"`);
+            defineVars.push(varaibleName);
+            const value = match[0].includes("requireAsync.bind")
+                ? `() => Promise.resolve(${varaibleName})`
+                : varaibleName;
+            matches.set(match[0], value);
+        }
+    }
+    if (defineUrls.length > 0 && defineVars.length > 0) {
+        matches.forEach((value, key) => code = code.replace(key, value));
+        code = replaceRequireAsyncWith(code, `"sap/ui/fl/requireAsync"`, defineUrls);
+        code = replaceRequireAsyncWith(code, "requireAsync", defineVars);
+    }
+    return code;
+}
+
+
+function replaceRequireAsyncWith(code: string, requireAsyncSearchKeyword: string, inserts: string[]) {
+    return code.replace(requireAsyncSearchKeyword, inserts.join(",\n\t"));
+}

package/scripts/rollup.ts

@@ -0,0 +1,114 @@
+import * as fs from "fs";
+import * as path from "path";
+
+import * as builtins from "builtin-modules";
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import * as rollup from "rollup";
+import * as semver from "semver";
+import * as yaml from "js-yaml";
+import ui5 from "./rollup/ui5Resolve";
+
+const { normalizer } = require("@ui5/project");
+const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
+
+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 {
+                const options = <any>{
+                    cwd
+                };
+                const version = this.validateProjectSettings(cwd);
+                if (version === LATEST_VERSION_PLACEHOLDER) {
+                    options.frameworkOptions = {
+                        versionOverride: "latest"
+                    }
+                }
+                return normalizer.generateProjectTree(options);
+            } catch (error: any) {
+                log.info(`${error.message}`);
+            }
+        }
+    }
+
+    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);
+        const framework = yamlJson["framework"];
+        if (!FRAMEWORK_TYPES.includes(framework.name)) {
+            throw new Error(`UI5 framework name is incorrect, possible values: ${FRAMEWORK_TYPES.join(" or ")}`);
+        }
+        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) {
+        const bundleFilePath = path.join(process.cwd(), destination);
+        if (fs.existsSync(bundleFilePath)) {
+            const bundle = fs.readFileSync(bundleFilePath, { encoding: "utf-8" });
+            const version = bundle.substring(2, bundle.indexOf("\n"));
+            return semver.coerce(version);
+        }
+    }
+
+    static async run(destination: string): Promise<void> {
+        const bundledUI5Version = this.getBundledUI5Version(destination);
+        const project = await this.getProjectInfo(projectPaths);
+        if (!project) {
+            throw new Error("ui5.yaml is not found or incorrect");
+        }
+        const isSapUiFl = (dependency: any) => dependency.id.endsWith("/sap.ui.fl");
+        const sapUiFlDependency = project.dependencies.find(isSapUiFl);
+        if (bundledUI5Version == null || sapUiFlDependency && semver.neq(bundledUI5Version, sapUiFlDependency.version)) {
+            if (sapUiFlDependency.version) {
+                log.info(`Using UI5 version ${sapUiFlDependency.version.toString()} to bundle`);
+            }
+            const inputOptions = <rollup.RollupOptions>{
+                input: "bundleDefinition.js",
+                plugins: [
+                    ui5({
+                        assets: [
+                            "/resources/sap/ui/fl/**",
+                            "/resources/sap/suite/ui/generic/template/**"
+                        ],
+                        skipTransformation: [
+                            "bundleDefinition.js",
+                            "sap/ui/thirdparty/URI"
+                        ],
+                        output: destination,
+                        project: project,
+                        ui5version: sapUiFlDependency.version
+                    }),
+                    nodeResolve({
+                        preferBuiltins: true
+                    })
+                ],
+                external: builtins
+            }
+            const bundle = await rollup.rollup(inputOptions);
+
+            const outputOptions = <rollup.RollupOptions>{
+                file: destination,
+                format: "commonjs"
+            }
+            await bundle.write(outputOptions);
+            await bundle.close();
+        } else {
+            log.info(`UI5 version ${bundledUI5Version!.toString()} is already bundled`);
+        }
+
+    }
+}
+
+if (process.argv.length === 3) {
+    Builder.run(process.argv[2]);
+}

package/rollup/ui5-resolve.js

@@ -1,164 +0,0 @@
-//@ts-check
-const path = require("path");
-const fs = require("fs");
-const stream = require("stream");
-const { promisify } = require("util");
-const pipe = promisify(stream.pipeline);
-const yaml = require("js-yaml");
-const semver = require("semver");
-const crypto = require("crypto");
-
-const convertAMDtoES6 = require("@buxlabs/amd-to-es6");
-
-const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
-//@ts-ignore
-const { normalizer } = require("@ui5/project");
-const { resourceFactory } = require("@ui5/fs");
-
-
-module.exports = (options) => {
-
-    const skipTransformation = (id) => !options.skipTransformation.includes(id);
-
-    async function getProject(projectPaths) {
-        for (const { cwd, useLatestVersion } of projectPaths) {
-            try {
-                let options = { cwd };
-                if (useLatestVersion) {
-                    options.frameworkOptions = {
-                        versionOverride: "latest"
-                    }
-                }
-                const project = await normalizer.generateProjectTree(options);
-                validateProjectSettings(cwd);
-                return project;
-            } catch (error) {
-                log.info(`${error.message}`);
-            }
-        }
-    }
-
-    function validateProjectSettings(projectPath) {
-        const FRAMEWORK_TYPES = ["OpenUI5", "SAPUI5"];
-        const content = fs.readFileSync(path.join(projectPath, "ui5.yaml"), { encoding: "utf-8" });
-        const framework = yaml.load(content)["framework"];
-        if (!FRAMEWORK_TYPES.includes(framework.name)) {
-            throw new Error(`UI5 framework name is incorrect, possible values: ${FRAMEWORK_TYPES.join(" or ")}`);
-        }
-        if (!semver.valid(framework.version)) {
-            throw new Error(`UI5 framework version should correspond semantic version standard, e.g: 1.85.2`);
-        }
-    }
-
-
-    return {
-
-        name: "ui5-resolve",
-
-        buildStart: async (buildOptions) => {
-
-            const project = await getProject(options.projectPaths);
-            this.dependencies = resourceFactory.createCollectionsForTree(project, {}).dependencies;
-
-            const resources = await Promise.all(options.assets.map(asset => this.dependencies.byGlob(asset)));
-            const writePromises = [].concat(...resources).map(resource => {
-                const file = `./dist${resource.getPath()}`;
-                const folder = path.dirname(file);
-                if (!fs.existsSync(folder)) {
-                    fs.mkdirSync(folder, { recursive: true });
-                }
-                if (fs.existsSync(file)) {
-                    fs.unlinkSync(file);
-                }
-                return pipe(resource.getStream(), fs.createWriteStream(file));
-            });
-            await Promise.all(writePromises);
-        },
-
-
-        /*
-         * Right before writing result to dist
-         */
-        renderChunk: async (code) => {
-            return "var window = {};" + code;
-        },
-
-
-        resolveId: (source, importer) => {
-            log.verbose(`resolveId: ${source} from ${importer}`);
-            if (importer && source.startsWith(".")) {
-                source = path.posix.join(path.dirname(importer), source);
-            }
-            log.verbose(" --> resolve to: " + source);
-            return source;
-        },
-
-
-        load: async (id) => {
-            log.verbose(`load: ${id}`);
-
-            const localFile = path.join(process.cwd(), id);
-            if (fs.existsSync(localFile)) {
-                log.info(`Using local file "${localFile}"`);
-                return fs.readFileSync(localFile, {
-                    encoding: "utf8"
-                });
-            }
-
-            const localOverride = path.resolve(__dirname, "overrides", id + ".js");
-            if (fs.existsSync(localOverride)) {
-                log.info(`Using local override for "${id}"`);
-                return fs.readFileSync(localOverride, {
-                    encoding: "utf8"
-                });
-            }
-
-            const resource = await this.dependencies.byPath(`/resources/${id}.js`);
-            return resource.getString();
-        },
-
-
-        transform: (code, id) => {
-            const skipped = !skipTransformation(id);
-            log.verbose(`transform: ${id} ${skipped ? "skipped" : ""}`);
-            if (skipped) {
-                return;
-            }
-
-            code = replaceRequireAsync(code);
-
-            code = code
-                .replace(/sap\.ui\.define/g, "define")
-                .replace(/\, \/\* bExport\= \*\/ true\)/g, ")")
-                .replace(/}, true\);$/g, "});");
-            return convertAMDtoES6(code);
-        }
-
-    };
-};
-
-
-function replaceRequireAsync(code) {
-    const requireAsyncPattern = /requireAsync((.bind\(this, ")|(\("))+(?<url>[\/\w]*)"\)/mg;
-    let match, defineUrls = [], defineVars = [], matches = new Map();
-    while (match = requireAsyncPattern.exec(code)) {
-        const varaibleName = match.groups.url.split("/").pop() + crypto.randomBytes(16).toString("hex");
-        defineUrls.push(`"${match.groups.url}"`);
-        defineVars.push(varaibleName);
-        const value = match[0].includes("requireAsync.bind")
-            ? `() => Promise.resolve(${varaibleName})`
-            : varaibleName;
-        matches.set(match[0], value);
-    }
-    if (defineUrls.length > 0 && defineVars.length > 0) {
-        matches.forEach((value, key) => code = code.replace(key, value));
-        code = replaceRequireAsyncWith(code, `"sap/ui/fl/requireAsync"`, defineUrls);
-        code = replaceRequireAsyncWith(code, "requireAsync", defineVars);
-    }
-    return code;
-}
-
-
-function replaceRequireAsyncWith(code, requireAsyncSearchKeyword, inserts) {
-    return code.replace(requireAsyncSearchKeyword, inserts.join(",\n\t"));
-}

package/rollup.config.js

@@ -1,40 +0,0 @@
-//@ts-check
-const path = require("path");
-const ui5 = require("./rollup/ui5-resolve");
-const builtins = require("builtin-modules");
-const { nodeResolve } = require("@rollup/plugin-node-resolve");
-
-module.exports = {
-    input: "./rollup/bundle-def.js",
-    plugins: [
-        ui5({
-            assets: [
-                "/resources/sap/ui/fl/**",
-                "/resources/sap/suite/ui/generic/template/**"
-            ],
-            skipTransformation: [
-                "./rollup/bundle-def.js",
-                "sap/ui/thirdparty/URI"
-            ],
-            projectPaths: [
-                {
-                    cwd: path.resolve(__dirname, "..", "..", ".."),
-                },
-                {
-                    cwd: path.resolve(__dirname, "rollup", "project"),
-                    useLatestVersion: true
-                }
-            ]
-        }),
-        nodeResolve({
-            preferBuiltins: true
-        })
-    ],
-    external: builtins,
-    output: [
-        {
-            file: "./dist/bundle.js",
-            format: "commonjs"
-        }
-    ]
-};