@ui5/task-adaptation 1.3.0 → 1.3.2

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.3.0...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.3.2...HEAD).
+
+<a name="v1.3.2"></a>
+## [v1.3.2] - 2024-06-04
+
+<a name="v1.3.1"></a>
+## [v1.3.1] - 2024-06-04
 
 <a name="v1.3.0"></a>
 ## [v1.3.0] - 2024-03-22
@@ -88,6 +94,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.3.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.1...v1.3.2
+[v1.3.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.0...v1.3.1
 [v1.3.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.2.0...v1.3.0
 [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

package/dist/bundle.js

@@ -2135,7 +2135,7 @@ function Version(vMajor, iMinor, iPatch, sSuffix) {
   this.getSuffix = function () {
     return sSuffix;
   };
-  this.compareTo = function () {
+  this.compareTo = function (vOtherMajor, iOtherMinor, iOtherPatch, sOtherSuffix) {
     var vOther = Version.apply(window, arguments);
     return vMajor - vOther.getMajor() || iMinor - vOther.getMinor() || iPatch - vOther.getPatch() || (sSuffix < vOther.getSuffix() ? -1 : sSuffix === vOther.getSuffix() ? 0 : 1);
   };
@@ -2146,10 +2146,41 @@ Version.prototype.inRange = function (vMin, vMax) {
 
 var SetMinUI5Version = {
   applyChange(oManifest, oChange) {
-    var vCurrentVersion = new Version(oManifest["sap.ui5"].dependencies.minUI5Version);
-    if (vCurrentVersion.compareTo(oChange.getContent().minUI5Version) <= 0) {
-      oManifest["sap.ui5"].dependencies.minUI5Version = oChange.getContent().minUI5Version;
+    var aChangeMinUI5Version = oChange.getContent().minUI5Version;
+    if (!aChangeMinUI5Version) {
+      throw new Error("No minUI5Version in change content provided");
     }
+    if (typeof aChangeMinUI5Version === "string") {
+      aChangeMinUI5Version = [aChangeMinUI5Version];
+    }
+    const mChangeMinUi5Version = {};
+    aChangeMinUI5Version.forEach(function (changeMinUI5Version) {
+      const oVersion = new Version(changeMinUI5Version);
+      if (mChangeMinUi5Version[oVersion.getMajor()]) {
+        throw new Error("Each major version can only be provided once in minUI5Version of change content");
+      }
+      mChangeMinUi5Version[oVersion.getMajor()] = [changeMinUI5Version, oVersion];
+    });
+    var {minUI5Version: aMinUI5Version} = oManifest["sap.ui5"].dependencies;
+    if (!aMinUI5Version) {
+      throw new Error("sap.ui5/dependencies/minUI5Version missing in base manifest");
+    }
+    if (typeof aMinUI5Version === "string") {
+      aMinUI5Version = [aMinUI5Version];
+    }
+    aMinUI5Version = aMinUI5Version.map(function (sCurrMinUI5Version) {
+      const oCurrMinUI5Version = new Version(sCurrMinUI5Version);
+      const aChangeVersionForMajor = mChangeMinUi5Version[oCurrMinUI5Version.getMajor()];
+      if (!aChangeVersionForMajor) {
+        return null;
+      }
+      const [sChangeMinUI5VersionForMajor, oChangeMinUI5VersionForMajor] = aChangeVersionForMajor;
+      return oCurrMinUI5Version.compareTo(oChangeMinUI5VersionForMajor) <= 0 ? sChangeMinUI5VersionForMajor : sCurrMinUI5Version;
+    }).filter(sMinVersion => sMinVersion);
+    if (aMinUI5Version.length === 0) {
+      throw new Error("Upgrade/Downgrade for different major version not possible");
+    }
+    oManifest["sap.ui5"].dependencies.minUI5Version = aMinUI5Version.length === 1 ? aMinUI5Version[0] : aMinUI5Version;
     return oManifest;
   }
 };
@@ -2862,15 +2893,13 @@ function isFunction(obj) {
 var Metadata = function (sClassName, oClassInfo) {
   fnAssert(typeof sClassName === "string" && sClassName, "Metadata: sClassName must be a non-empty string");
   fnAssert(typeof oClassInfo === "object", "Metadata: oClassInfo must be empty or an object");
-  (() => {
-    if (!oClassInfo || typeof oClassInfo.metadata !== "object") {
-      oClassInfo = {
-        metadata: oClassInfo || ({}),
-        constructor: ObjectPath.get(sClassName)
-      };
-      oClassInfo.metadata.__version = 1;
-    }
-  })();
+  if (!oClassInfo || typeof oClassInfo.metadata !== "object") {
+    oClassInfo = {
+      metadata: oClassInfo || ({}),
+      constructor: ObjectPath.get(sClassName)
+    };
+    oClassInfo.metadata.__version = 1;
+  }
   oClassInfo.metadata ??= {};
   oClassInfo.metadata.__version = oClassInfo.metadata.__version || 2;
   if (!isFunction(oClassInfo.constructor)) {
@@ -3029,6 +3058,14 @@ Metadata.prototype.addPublicMethods = function (sMethod) {
   Array.prototype.push.apply(this._aAllPublicMethods, aNames);
   this._bInterfacesUnique = false;
 };
+Metadata.prototype.getStaticProperty = function (sStaticName) {
+  let oMetadata = this;
+  while (oMetadata && !((sStaticName in oMetadata.getClass()))) {
+    oMetadata = oMetadata.getParent();
+  }
+  const oClass = oMetadata?.getClass();
+  return oClass?.[sStaticName];
+};
 Metadata.createClass = function (fnBaseClass, sClassName, oClassInfo, FNMetaImpl) {
   if (typeof fnBaseClass === "string") {
     FNMetaImpl = oClassInfo;
@@ -3787,7 +3824,7 @@ _Helper = {
     }
   },
   addToSelect: function (mQueryOptions, aSelectPaths) {
-    mQueryOptions.$select = mQueryOptions.$select || [];
+    mQueryOptions.$select ??= [];
     aSelectPaths.forEach(function (sPath) {
       if (!mQueryOptions.$select.includes(sPath)) {
         mQueryOptions.$select.push(sPath);
@@ -3822,7 +3859,7 @@ _Helper = {
       _Helper.addToSelect(mAggregatedQueryOptions, mQueryOptions.$select);
     }
     if (mQueryOptions.$expand) {
-      mAggregatedQueryOptions.$expand = mAggregatedQueryOptions.$expand || ({});
+      mAggregatedQueryOptions.$expand ??= {};
       Object.keys(mQueryOptions.$expand).forEach(function (sPath) {
         if (mAggregatedQueryOptions.$expand[sPath]) {
           _Helper.aggregateExpandSelect(mAggregatedQueryOptions.$expand[sPath], mQueryOptions.$expand[sPath]);
@@ -3882,7 +3919,7 @@ _Helper = {
         if (oSubSelect[sSegment] === true) {
           return true;
         }
-        oSubSelect = oSubSelect[sSegment] = oSubSelect[sSegment] || ({});
+        oSubSelect = oSubSelect[sSegment] ??= {};
       });
     });
     return oSelect;
@@ -3954,9 +3991,7 @@ _Helper = {
       oResult.message = "Network error";
       return oResult;
     }
-    if (sContentType) {
-      sContentType = sContentType.split(";")[0];
-    }
+    sContentType &&= sContentType.split(";")[0];
     if (jqXHR.status === 412) {
       sPreference = jqXHR.getResponseHeader("Preference-Applied");
       if (sPreference && sPreference.replace(rWhitespace, "") === "handling=strict") {
@@ -4028,9 +4063,7 @@ _Helper = {
       Object.defineProperty(oTechnicalDetails, "originalMessage", {
         enumerable: true,
         get: function () {
-          if (!oClonedMessage) {
-            oClonedMessage = _Helper.publicClone(oOriginalMessage);
-          }
+          oClonedMessage ??= _Helper.publicClone(oOriginalMessage);
           return oClonedMessage;
         }
       });
@@ -4064,11 +4097,9 @@ _Helper = {
       if (oError.strictHandlingFailed) {
         oClone.strictHandlingFailed = true;
       }
-      if (oClone.error.details) {
-        oClone.error.details = oClone.error.details.filter(function (oDetail, j) {
-          return isRelevant(oDetail, aDetailContentIDs[j]);
-        });
-      }
+      oClone.error.details &&= oClone.error.details.filter(function (oDetail, j) {
+        return isRelevant(oDetail, aDetailContentIDs[j]);
+      });
       return oClone;
     });
   },
@@ -4316,7 +4347,7 @@ _Helper = {
   },
   getKeyProperties: function (oInstance, sMetaPath, mTypeForMetaPath, aKeyProperties, bReturnAlias) {
     var bFailed, mKey2Value = {};
-    aKeyProperties = aKeyProperties || mTypeForMetaPath[sMetaPath].$Key;
+    aKeyProperties ??= mTypeForMetaPath[sMetaPath].$Key;
     bFailed = aKeyProperties.some(function (vKey) {
       var sKey, sKeyPath, oObject, sPropertyName, aSegments, oType, vValue;
       if (typeof vKey === "string") {
@@ -4381,7 +4412,7 @@ _Helper = {
     sPath = _Helper.getMetaPath(sPath);
     if (sPath) {
       sPath.split("/").some(function (sSegment) {
-        mQueryOptions = mQueryOptions && mQueryOptions.$expand && mQueryOptions.$expand[sSegment];
+        mQueryOptions &&= mQueryOptions.$expand && mQueryOptions.$expand[sSegment];
         if (!mQueryOptions || mQueryOptions === true) {
           mQueryOptions = {};
           return true;
@@ -4582,9 +4613,7 @@ _Helper = {
     var mResult;
     function set(sProperty, sValue) {
       if (sValue && (!mQueryOptions || mQueryOptions[sProperty] !== sValue)) {
-        if (!mResult) {
-          mResult = mQueryOptions ? _Helper.clone(mQueryOptions) : {};
-        }
+        mResult ??= mQueryOptions ? _Helper.clone(mQueryOptions) : {};
         mResult[sProperty] = sValue;
       }
     }
@@ -4737,9 +4766,7 @@ _Helper = {
   },
   setPrivateAnnotation: function (oObject, sAnnotation, vValue) {
     var oPrivateNamespace = oObject["@$ui5._"];
-    if (!oPrivateNamespace) {
-      oPrivateNamespace = oObject["@$ui5._"] = {};
-    }
+    oPrivateNamespace ??= oObject["@$ui5._"] = {};
     oPrivateNamespace[sAnnotation] = vValue;
   },
   stripPathPrefix: function (sPrefix, aPaths) {
@@ -4929,7 +4956,7 @@ _Helper = {
         return oTarget;
       }
       Object.keys(vSelect).forEach(function (sProperty) {
-        if (!((sProperty in oTarget)) && sProperty !== "*") {
+        if (oTarget[sProperty] === undefined && sProperty !== "*") {
           oTarget[sProperty + "@$ui5.noData"] = true;
           _Helper.fireChange(mChangeListeners, _Helper.buildPath(sPath, sProperty), undefined, true);
         }
@@ -4969,7 +4996,7 @@ _Helper = {
         mQueryOptionsForPathPrefix.$expand = {};
         if (i === aMetaPathSegments.length - 1) {
           mChildQueryOptions = Object.assign({}, mChildQueryOptions);
-          mChildQueryOptions.$select = mChildQueryOptions.$select && mChildQueryOptions.$select.slice();
+          mChildQueryOptions.$select &&= mChildQueryOptions.$select.slice();
         }
         mQueryOptionsForPathPrefix = mQueryOptionsForPathPrefix.$expand[sExpandSelectPath] = i === aMetaPathSegments.length - 1 ? mChildQueryOptions : {};
         _Helper.selectKeyProperties(mQueryOptionsForPathPrefix, fnFetchMetadata(sPropertyMetaPath + "/").getResult());
@@ -5114,16 +5141,12 @@ _MetadataConverter.prototype.getInlineAnnotationValue = function (oElement) {
 };
 _MetadataConverter.prototype.getOrCreateArray = function (oParent, sProperty) {
   var oResult = oParent[sProperty];
-  if (!oResult) {
-    oResult = oParent[sProperty] = [];
-  }
+  oResult ??= oParent[sProperty] = [];
   return oResult;
 };
 _MetadataConverter.prototype.getOrCreateObject = function (oParent, sProperty) {
   var oResult = oParent[sProperty];
-  if (!oResult) {
-    oResult = oParent[sProperty] = {};
-  }
+  oResult ??= oParent[sProperty] = {};
   return oResult;
 };
 _MetadataConverter.prototype.postProcessAnnotation = function (oElement, aResult) {
@@ -6432,7 +6455,7 @@ _V2MetadataConverter.prototype.updateNavigationPropertiesAndCreateBindings = fun
     function createNavigationPropertyBinding(oAssociationSetFrom, oAssociationSetTo) {
       var oEntitySet = oEntityContainer[oAssociationSetFrom.entitySetName], oToRole = oAssociation.roles[oAssociationSetTo.roleName];
       if (oToRole.propertyName) {
-        oEntitySet.$NavigationPropertyBinding = oEntitySet.$NavigationPropertyBinding || ({});
+        oEntitySet.$NavigationPropertyBinding ??= {};
         oEntitySet.$NavigationPropertyBinding[oToRole.propertyName] = oAssociationSetTo.entitySetName;
       }
     }

package/dist/index.js

@@ -10,7 +10,7 @@ import { determineProcessor } from "./processors/processor.js";
 export default ({ workspace, options, taskUtil }) => {
     dotenv.config();
     async function process(workspace, taskUtil) {
-        await logBuilderVersion();
+        logBuilderVersion();
         logBetaUsage();
         const processor = determineProcessor(options.configuration);
         const appVariantResources = await AppVariantManager.getAppVariantResourcesToProcess(workspace);

package/dist/util/commonUtil.d.ts

@@ -8,6 +8,6 @@ export declare function insertInArray<T>(array: T[], index: number, insert: T):
 export declare function writeTempAnnotations({ writeTempFiles }: IConfiguration, name: string, language: Language, content: string): void;
 export declare function removePropertiesExtension(filePath: string): string;
 export declare function traverse(json: any, paths: string[], callback: (json: any, key: string | number, paths: string[]) => void): void;
-export declare function logBuilderVersion(): Promise<void>;
-export declare function logBetaUsage(): Promise<void>;
+export declare function logBuilderVersion(): void;
+export declare function logBetaUsage(): void;
 export declare function getUniqueName(existingNames: string[], template: string): string;

package/dist/util/commonUtil.js

@@ -1,6 +1,8 @@
 import * as Log from "@ui5/logger";
 import * as fs from "fs";
+import { fileURLToPath } from "url";
 import { posix as path } from "path";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const log = Log.getLogger("rollup-plugin-ui5-resolve-task-adaptation");
 export function dotToUnderscore(value) {
     return value.replace(/\./g, "_");
@@ -91,17 +93,17 @@ export function traverse(json, paths, callback) {
         }
     }
 }
-export async function logBuilderVersion() {
+export function logBuilderVersion() {
     try {
-        // @ts-ignore
-        const packageJSON = await import("../../package.json");
-        log.info(`Running app-variant-bundler-build with version ${packageJSON.version}`);
+        const packageJson = fs.readFileSync(path.join(__dirname, "../../package.json"), { encoding: "utf-8" });
+        const packageJsonVersion = JSON.parse(packageJson).version;
+        log.info(`Running app-variant-bundler-build with version ${packageJsonVersion}`);
     }
     catch (e) {
         // do nothing
     }
 }
-export async function logBetaUsage() {
+export function logBetaUsage() {
     log.info("Beta features enabled");
 }
 export function getUniqueName(existingNames, template) {

package/package.json

@@ -1,15 +1,15 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.3.0",
+    "version": "1.3.2",
     "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 lint && npm run build && npm run coverage",
         "lint": "npx eslint ./src",
-        "dev": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --experimental-loader=tsx --loader=esmock 'test/**/*.spec.ts'",
-        "perf": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --experimental-loader=tsx --loader=esmock 'test/**/*.perf.ts'",
+        "dev": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/**/*.spec.ts'",
+        "perf": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/**/*.perf.ts'",
         "coverage": "npx c8 npm run dev",
-        "preversion": "npm test",
+        "preversion": "npm run build",
         "version": "git-chglog --next-tag v$npm_package_version -o CHANGELOG.md && git add CHANGELOG.md",
         "prepublishOnly": "git push --follow-tags",
         "release-note": "git-chglog -c .chglog/release-config.yml v$npm_package_version",
@@ -113,8 +113,5 @@
         "lines": 85
     },
     "types": "dist/index.d.ts",
-    "type": "module",
-    "engines": {
-        "node": "18.14.2"
-    }
+    "type": "module"
 }