@ui5/task-adaptation 1.6.5-rc.1 → 1.6.5-rc.2

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.6.5-rc.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.6.5-rc.2...HEAD).
+
+<a name="v1.6.5-rc.2"></a>
+## [v1.6.5-rc.2] - 2026-04-14
 
 <a name="v1.6.5-rc.1"></a>
 ## [v1.6.5-rc.1] - 2026-04-13
@@ -185,6 +188,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.6.5-rc.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.5-rc.1...v1.6.5-rc.2
 [v1.6.5-rc.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.3...v1.6.5-rc.1
 [v1.6.4-rc.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.2...v1.6.4-rc.3
 [v1.6.4-rc.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.1...v1.6.4-rc.2

package/dist/appVariantManager.js

@@ -62,18 +62,21 @@ export default class AppVariant {
     }
     ;
     getProcessedManifestChanges() {
-        // Order: manifest changes first, then *.change files
+        // Order: manifest changes first, then *.change files sorted by creation ASC
         const manifestChanges = structuredClone(this.content) ?? [];
+        const changeFileChanges = [];
         this.files.forEach((content, filename) => {
             if (filename.endsWith(CHANGES_EXT)) {
                 const change = JSON.parse(content);
                 if (isManifestChange(filename, content)) {
                     const { newFilename } = moveFile(filename, content, this.prefix, this.id);
                     this.updateRelativePaths(change, newFilename);
-                    manifestChanges.push(change);
+                    changeFileChanges.push(change);
                 }
             }
         });
+        changeFileChanges.sort(FilesUtil.sortByTimeStamp);
+        manifestChanges.push(...changeFileChanges);
         if (this.layer) {
             manifestChanges.forEach(change => change.layer = this.layer ?? change.layer);
         }

package/dist/landscapeConfiguration.js

@@ -5,19 +5,47 @@ import AbapRepository from "./repositories/abapRepository.js";
 import HTML5Repository from "./repositories/html5Repository.js";
 import LocalRepository from "./repositories/localRepository.js";
 import AbapAnnotationManager from "./annotations/abapAnnotationManager.js";
-import LocalAnnotationManager from "./annotations/localAnnotationManager.js";
-import { validateObject } from "./util/commonUtil.js";
 import CFAnnotationManager from "./annotations/cfAnnotationManager.js";
+import CFValidator from "./util/validator/cfValidator.js";
+import AbapValidator from "./util/validator/abapValidator.js";
+import { isOneOf } from "./util/validator/validator.js";
+import { LANDSCAPE_TYPES } from "./model/configuration.js";
+import { getLogger } from "@ui5/logger";
+import LocalAnnotationManager from "./annotations/localAnnotationManager.js";
+const log = getLogger("@ui5/task-adaptation::LandscapeConfiguration");
 export function initialize(configuration) {
-    validateObject(configuration, ["type"], "should be specified in ui5.yaml configuration: 'cf' or 'abap'");
-    const repository = getRepository(configuration);
-    const annotationManager = getAnnotationManager(configuration, repository);
+    const type = getTypeByConfiguration(configuration);
+    const enhancedConfig = { ...configuration, type };
+    const repository = getRepository(enhancedConfig);
+    const annotationManager = getAnnotationManager(enhancedConfig, repository);
     return {
-        adapter: getAdapter(configuration, annotationManager),
+        adapter: getAdapter(enhancedConfig, annotationManager),
         repository,
         annotationManager
     };
 }
+function getTypeByConfiguration(configuration) {
+    const validators = [
+        new CFValidator(),
+        new AbapValidator(),
+    ];
+    if (isOneOf(LANDSCAPE_TYPES, configuration.type)) {
+        return configuration.type;
+    }
+    else {
+        log.warn("Deprecated behavior: type is not specified or invalid. Should be either 'cf' or 'abap'. Trying to detect the type based on provided configuration");
+        for (const validator of validators) {
+            try {
+                validator.validateConfiguration(configuration);
+                return validator.type;
+            }
+            catch (_error) {
+                // Continue to the next validator if validation fails
+            }
+        }
+        throw new Error("'type' should be specified in ui5.yaml configuration: 'cf' or 'abap'");
+    }
+}
 function getAdapter(configuration, annotationManager) {
     if (isPreview(configuration)) {
         return new PreviewAdapter(configuration);

package/dist/model/configuration.d.ts

@@ -8,8 +8,8 @@ export interface IConfiguration {
     org?: string;
     sapCloudService?: string;
     destination?: string;
-    type?: "cf" | "abap";
-    mode?: "preview" | "local" | "default";
+    type?: LandscapeType;
+    mode?: LandscapeMode;
     languages?: any[] | undefined;
     enableAnnotationCache?: boolean;
     enableBetaFeatures?: boolean;
@@ -18,6 +18,10 @@ export interface IConfiguration {
     serviceInstanceName?: string;
     adpDir?: string;
 }
+export declare const LANDSCAPE_TYPES: readonly ["cf", "abap"];
+export type LandscapeType = typeof LANDSCAPE_TYPES[number];
+export declare const LANDSCAPE_MODES: readonly ["preview", "local", "default"];
+export type LandscapeMode = typeof LANDSCAPE_MODES[number];
 export interface IAbapTargetMeta {
     name?: string;
     ignoreCertErrors?: boolean;

package/dist/model/configuration.js

@@ -1,2 +1,3 @@
-export {};
+export const LANDSCAPE_TYPES = ["cf", "abap"];
+export const LANDSCAPE_MODES = ["preview", "local", "default"];
 //# sourceMappingURL=configuration.js.map

package/dist/model/types.d.ts

@@ -61,6 +61,7 @@ export interface IChange {
     layer?: string;
     content?: IChangeContent;
     filename: string;
+    creation: string;
 }
 export interface IChangeText {
     i18n: string;

package/dist/repositories/abapProvider.d.ts

@@ -2,6 +2,6 @@ import type { AbapServiceProvider } from "@sap-ux/axios-extension";
 import { IConfiguration } from "../model/types.js";
 export default class AbapProvider {
     private provider;
+    private abapValidator;
     get({ target, destination }: IConfiguration): Promise<AbapServiceProvider>;
-    private static validateAndGetAbapTarget;
 }

package/dist/repositories/abapProvider.js

@@ -1,14 +1,14 @@
 import { createAbapServiceProvider } from "@sap-ux/system-access";
-import BtpUtils from "@sap-ux/btp-utils";
 import { getLogger } from "@ui5/logger";
-import { validateObject } from "../util/commonUtil.js";
+import AbapValidator from "../util/validator/abapValidator.js";
 const log = getLogger("@ui5/task-adaptation::AbapProvider");
 log.debug = (message) => log.verbose(message);
 export default class AbapProvider {
     provider = null;
+    abapValidator = new AbapValidator();
     async get({ target, destination }) {
         if (!this.provider) {
-            const abapTarget = AbapProvider.validateAndGetAbapTarget(target, destination);
+            const abapTarget = this.abapValidator.validateAndGetAbapTarget(target, destination);
             if (abapTarget) {
                 this.provider = await createAbapServiceProvider(abapTarget, { ignoreCertErrors: abapTarget.ignoreCertErrors }, true, log);
             }
@@ -18,20 +18,5 @@ export default class AbapProvider {
         }
         return this.provider;
     }
-    static validateAndGetAbapTarget(target, destination) {
-        if (target) {
-            // if target configuration appears, we validate that it should be
-            // either target/destination for BAS or target/url for IDE we're
-            // trying to detect is it destination for BAS or url for IDE
-            const abapTargetProperties = BtpUtils.isAppStudio() ? ["destination"] : ["url"];
-            validateObject(target, abapTargetProperties, "should be specified in ui5.yaml configuration/target");
-            return target;
-        }
-        else if (destination) {
-            log.warn("Destination is deprecated, use target/destination configuration instead");
-            return { destination };
-        }
-        throw new Error("Target should be specified in ui5.yaml configuration to connect the ABAP system");
-    }
 }
 //# sourceMappingURL=abapProvider.js.map

package/dist/repositories/html5Repository.d.ts

@@ -3,6 +3,7 @@ import IRepository from "./repository.js";
 import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
 export default class HTML5Repository implements IRepository {
     private configuration;
+    private validator;
     constructor(configuration: IConfiguration);
     getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
     fetch(_repoName: string, _cachebusterToken: string): Promise<Map<string, string>>;

package/dist/repositories/html5Repository.js

@@ -9,13 +9,14 @@ import RequestUtil from "../util/requestUtil.js";
 import { getLogger } from "@ui5/logger";
 import { unzipZipEntries } from "../util/zipUtil.js";
 import { cached } from "../cache/cacheHolder.js";
-import { validateConfiguration } from "../util/commonUtil.js";
+import CFValidator from "../util/validator/cfValidator.js";
 const log = getLogger("@ui5/task-adaptation::HTML5Repository");
 export default class HTML5Repository {
     configuration;
+    validator = new CFValidator();
     constructor(configuration) {
         this.configuration = configuration;
-        validateConfiguration(configuration, ["appHostId", "appName", "appVersion"]);
+        this.validator.validateConfiguration(configuration);
     }
     async getAppVariantIdHierarchy(appId) {
         const metadata = await this.getMetadata();

package/dist/util/filesUtil.d.ts

@@ -1,5 +1,7 @@
+import { IChange } from "../model/types.js";
 export default class FilesUtil {
     static filter(files: ReadonlyMap<string, string>): ReadonlyMap<string, string>;
+    static sortByTimeStamp(a: IChange, b: IChange): number;
     /**
      * 1p. i18n.properties are not renamed and property keys are ignored during
      * the renaming across the files.

package/dist/util/filesUtil.js

@@ -23,6 +23,13 @@ export default class FilesUtil {
         });
         return result;
     }
+    static sortByTimeStamp(a, b) {
+        if (a.creation < b.creation)
+            return -1;
+        if (a.creation > b.creation)
+            return 1;
+        return 0;
+    }
     /**
      * 1p. i18n.properties are not renamed and property keys are ignored during
      * the renaming across the files.

package/dist/util/validator/abapValidator.d.ts

@@ -0,0 +1,8 @@
+import { AbapTarget } from "@sap-ux/system-access";
+import { IAbapTargetMeta, IConfiguration, LandscapeType } from "../../model/configuration.js";
+import IValidator from "./validator.js";
+export default class AbapValidator implements IValidator {
+    type: LandscapeType;
+    validateAndGetAbapTarget(target: AbapTarget & IAbapTargetMeta | undefined, destination: string | undefined): AbapTarget & IAbapTargetMeta;
+    validateConfiguration({ target, destination }: IConfiguration): void;
+}

package/dist/util/validator/abapValidator.js

@@ -0,0 +1,26 @@
+import { validateObject } from "../commonUtil.js";
+import BtpUtils from "@sap-ux/btp-utils";
+import { getLogger } from "@ui5/logger";
+const log = getLogger("@ui5/task-adaptation::AbapValidator");
+export default class AbapValidator {
+    type = "abap";
+    validateAndGetAbapTarget(target, destination) {
+        if (target) {
+            // if target configuration appears, we validate that it should be
+            // either target/destination for BAS or target/url for IDE we're
+            // trying to detect is it destination for BAS or url for IDE
+            const abapTargetProperties = BtpUtils.isAppStudio() ? ["destination"] : ["url"];
+            validateObject(target, abapTargetProperties, "should be specified in ui5.yaml configuration/target");
+            return target;
+        }
+        else if (destination) {
+            log.warn("Destination is deprecated, use target/destination configuration instead");
+            return { destination };
+        }
+        throw new Error("Target should be specified in ui5.yaml configuration to connect the ABAP system");
+    }
+    validateConfiguration({ target, destination }) {
+        this.validateAndGetAbapTarget(target, destination);
+    }
+}
+//# sourceMappingURL=abapValidator.js.map

package/dist/util/validator/cfValidator.d.ts

@@ -0,0 +1,6 @@
+import { IConfiguration, LandscapeType } from "../../model/configuration.js";
+import IValidator from "./validator.js";
+export default class CFValidator implements IValidator {
+    type: LandscapeType;
+    validateConfiguration(configuration: IConfiguration): void;
+}

package/dist/util/validator/cfValidator.js

@@ -0,0 +1,8 @@
+import { validateConfiguration } from "../commonUtil.js";
+export default class CFValidator {
+    type = "cf";
+    validateConfiguration(configuration) {
+        validateConfiguration(configuration, ["appHostId", "appName", "appVersion"]);
+    }
+}
+//# sourceMappingURL=cfValidator.js.map

package/dist/util/validator/validator.d.ts

@@ -0,0 +1,6 @@
+import { IConfiguration, LandscapeType } from "../../model/configuration.js";
+export default interface IValidator {
+    type: LandscapeType;
+    validateConfiguration(configuration: IConfiguration): void;
+}
+export declare function isOneOf<T extends readonly unknown[]>(values: T, value: unknown): value is T[number];

package/dist/util/validator/validator.js

@@ -0,0 +1,4 @@
+export function isOneOf(values, value) {
+    return values.includes(value);
+}
+//# sourceMappingURL=validator.js.map

package/package.json

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