@sap-ux/adp-tooling 0.13.44 → 0.13.45

package/dist/base/constants/index.d.ts

@@ -8,6 +8,7 @@ export declare const SNAPSHOT_VERSION = "snapshot";
 export declare const SNAPSHOT_UNTESTED_VERSION = "snapshot-untested";
 export declare const RESOURCE_BUNDLE_TEXT = "\n\n# This is the resource bundle for ";
 export declare const TRANSLATION_UUID_TEXT = "\n#__ldi.translation.uuid=";
+export declare const MAIN_I18N_PATH = "i18n/i18n.properties";
 export declare const BASE_I18N_DESCRIPTION = "#Make sure you provide a unique prefix to the newly added keys in this file, to avoid overriding of SAP Fiori application keys.";
 export declare const S4HANA_APPS_PARAMS: {
     'sap.app/type': string;

package/dist/base/constants/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ABAP_VARIANT_APPS_PARAMS = exports.ABAP_APPS_PARAMS = exports.S4HANA_APPS_PARAMS = exports.BASE_I18N_DESCRIPTION = exports.TRANSLATION_UUID_TEXT = exports.RESOURCE_BUNDLE_TEXT = exports.SNAPSHOT_UNTESTED_VERSION = exports.SNAPSHOT_VERSION = exports.LATEST_VERSION = exports.CURRENT_SYSTEM_VERSION = exports.SNAPSHOT_CDN_URL = exports.UI5_VERSIONS_NEO_CDN_URL = exports.UI5_VERSIONS_CDN_URL = exports.UI5_CDN_URL = void 0;
+exports.ABAP_VARIANT_APPS_PARAMS = exports.ABAP_APPS_PARAMS = exports.S4HANA_APPS_PARAMS = exports.BASE_I18N_DESCRIPTION = exports.MAIN_I18N_PATH = exports.TRANSLATION_UUID_TEXT = exports.RESOURCE_BUNDLE_TEXT = exports.SNAPSHOT_UNTESTED_VERSION = exports.SNAPSHOT_VERSION = exports.LATEST_VERSION = exports.CURRENT_SYSTEM_VERSION = exports.SNAPSHOT_CDN_URL = exports.UI5_VERSIONS_NEO_CDN_URL = exports.UI5_VERSIONS_CDN_URL = exports.UI5_CDN_URL = void 0;
 exports.UI5_CDN_URL = 'https://ui5.sap.com';
 exports.UI5_VERSIONS_CDN_URL = 'https://sapui5.hana.ondemand.com/version.json';
 exports.UI5_VERSIONS_NEO_CDN_URL = 'https://ui5.sap.com/neo-app.json';
@@ -11,6 +11,7 @@ exports.SNAPSHOT_VERSION = 'snapshot';
 exports.SNAPSHOT_UNTESTED_VERSION = 'snapshot-untested';
 exports.RESOURCE_BUNDLE_TEXT = '\n\n# This is the resource bundle for ';
 exports.TRANSLATION_UUID_TEXT = '\n#__ldi.translation.uuid=';
+exports.MAIN_I18N_PATH = 'i18n/i18n.properties';
 exports.BASE_I18N_DESCRIPTION = '#Make sure you provide a unique prefix to the newly added keys in this file, to avoid overriding of SAP Fiori application keys.';
 exports.S4HANA_APPS_PARAMS = {
     'sap.app/type': 'application',

package/dist/base/prompt.d.ts

@@ -1,8 +1,7 @@
-import type { CustomConfig, AdpWriterConfig } from '../types';
-import type { AbapTarget } from '@sap-ux/system-access';
 import type { Logger } from '@sap-ux/logger';
-import type { UI5FlexLayer } from '@sap-ux/project-access';
+import type { AbapTarget } from '@sap-ux/system-access';
 import type { AppIndex } from '@sap-ux/axios-extension';
+import { type CustomConfig, type AdpWriterConfig, FlexLayer } from '../types';
 export type PromptDefaults = {
     id?: string;
     reference?: string;
@@ -31,7 +30,7 @@ export declare function promptGeneratorInput(defaults: PromptDefaults | undefine
  */
 export declare function promptTarget(defaults: PromptDefaults, logger: Logger): Promise<{
     apps: AppIndex;
-    layer: UI5FlexLayer;
+    layer: FlexLayer;
     target: AbapTarget;
     customConfig: CustomConfig;
 }>;

package/dist/base/prompt.js

@@ -167,7 +167,7 @@ async function fetchSystemInformation(target, ignoreCertErrors, logger) {
     }, true, logger);
     logger.info('Fetching system information...');
     const ato = await provider.getAtoInfo();
-    const layer = ato.tenantType === 'SAP' ? 'VENDOR' : 'CUSTOMER_BASE';
+    const layer = ato.tenantType === 'SAP' ? "VENDOR" /* FlexLayer.VENDOR */ : "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
     const packageJson = (0, project_utils_1.getPackageJSONInfo)();
     const customConfig = {
         adp: {

package/dist/index.d.ts

@@ -1,20 +1,20 @@
 export * from './types';
 export * from './prompts';
 export * from './common';
+export * from './abap';
+export * from './source';
+export * from './ui5';
 export * from './base/cf';
+export * from './base/helper';
 export * from './base/constants';
 export * from './base/project-builder';
 export * from './base/abap/manifest-service';
-export * from './base/helper';
-export * from './abap';
-export * from './source';
+export { promptGeneratorInput, PromptDefaults } from './base/prompt';
 export * from './preview/adp-preview';
+export * from './writer/manifest';
 export * from './writer/writer-config';
-export * from './writer/descriptor-content';
-export * from './ui5';
-export { getCustomConfig } from './writer/project-utils';
 export { generate, migrate } from './writer';
 export { generateChange } from './writer/editors';
+export { getCustomConfig } from './writer/project-utils';
 export { generateInboundConfig } from './writer/inbound-navigation';
-export { promptGeneratorInput, PromptDefaults } from './base/prompt';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,30 +14,30 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptGeneratorInput = exports.generateInboundConfig = exports.generateChange = exports.migrate = exports.generate = exports.getCustomConfig = void 0;
+exports.generateInboundConfig = exports.getCustomConfig = exports.generateChange = exports.migrate = exports.generate = exports.promptGeneratorInput = void 0;
 __exportStar(require("./types"), exports);
 __exportStar(require("./prompts"), exports);
 __exportStar(require("./common"), exports);
+__exportStar(require("./abap"), exports);
+__exportStar(require("./source"), exports);
+__exportStar(require("./ui5"), exports);
 __exportStar(require("./base/cf"), exports);
+__exportStar(require("./base/helper"), exports);
 __exportStar(require("./base/constants"), exports);
 __exportStar(require("./base/project-builder"), exports);
 __exportStar(require("./base/abap/manifest-service"), exports);
-__exportStar(require("./base/helper"), exports);
-__exportStar(require("./abap"), exports);
-__exportStar(require("./source"), exports);
+var prompt_1 = require("./base/prompt");
+Object.defineProperty(exports, "promptGeneratorInput", { enumerable: true, get: function () { return prompt_1.promptGeneratorInput; } });
 __exportStar(require("./preview/adp-preview"), exports);
+__exportStar(require("./writer/manifest"), exports);
 __exportStar(require("./writer/writer-config"), exports);
-__exportStar(require("./writer/descriptor-content"), exports);
-__exportStar(require("./ui5"), exports);
-var project_utils_1 = require("./writer/project-utils");
-Object.defineProperty(exports, "getCustomConfig", { enumerable: true, get: function () { return project_utils_1.getCustomConfig; } });
 var writer_1 = require("./writer");
 Object.defineProperty(exports, "generate", { enumerable: true, get: function () { return writer_1.generate; } });
 Object.defineProperty(exports, "migrate", { enumerable: true, get: function () { return writer_1.migrate; } });
 var editors_1 = require("./writer/editors");
 Object.defineProperty(exports, "generateChange", { enumerable: true, get: function () { return editors_1.generateChange; } });
+var project_utils_1 = require("./writer/project-utils");
+Object.defineProperty(exports, "getCustomConfig", { enumerable: true, get: function () { return project_utils_1.getCustomConfig; } });
 var inbound_navigation_1 = require("./writer/inbound-navigation");
 Object.defineProperty(exports, "generateInboundConfig", { enumerable: true, get: function () { return inbound_navigation_1.generateInboundConfig; } });
-var prompt_1 = require("./base/prompt");
-Object.defineProperty(exports, "promptGeneratorInput", { enumerable: true, get: function () { return prompt_1.promptGeneratorInput; } });
 //# sourceMappingURL=index.js.map

package/dist/source/manifest.d.ts

@@ -1,6 +1,7 @@
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { Manifest } from '@sap-ux/project-access';
 import type { AbapServiceProvider } from '@sap-ux/axios-extension';
+import { ApplicationType } from '../types';
 /**
  * Evaluates whether the application described by the manifest is a SAP Fiori Elements version 4 application.
  *
@@ -22,6 +23,21 @@ export declare function getFioriId(manifest: Manifest | undefined): string;
  * @returns {Promise<string>} The ACH code as a string if available, otherwise an empty string.
  */
 export declare function getAch(manifest: Manifest | undefined): string;
+/**
+ * Determines the type of UI5 application based on the content of its manifest file.
+ * This function checks various properties within the manifest to classify the application
+ * into predefined types such as Fiori Elements, Fiori Elements OVP, Free Style, or None.
+ *
+ * @param {Manifest} manifest - The manifest configuration object of the application.
+ * @returns {ApplicationType} The type of the application as defined by the ApplicationType enum.
+ *
+ * The classification is done based on the presence and values of specific keys in the manifest:
+ * - 'sap.ovp' indicates a Fiori Elements Overview Page (OVP).
+ * - 'sap.ui.generic.app' or 'sap.app' with a specific sourceTemplate id indicates a Fiori Elements application.
+ * - If none of these conditions are met, the function defaults to categorizing the application as Free Style.
+ * - If the manifest is empty, it returns None.
+ */
+export declare function getApplicationType(manifest?: Manifest): ApplicationType;
 /**
  * Checks if views are loaded synchronously or asynchronously in the UI5 settings of the manifest.
  * Sets the isAppSync property based on the loading method.

package/dist/source/manifest.js

@@ -4,8 +4,10 @@ exports.SourceManifest = void 0;
 exports.isV4Application = isV4Application;
 exports.getFioriId = getFioriId;
 exports.getAch = getAch;
+exports.getApplicationType = getApplicationType;
 exports.isSyncLoadedView = isSyncLoadedView;
 const i18n_1 = require("../i18n");
+const types_1 = require("../types");
 /**
  * Evaluates whether the application described by the manifest is a SAP Fiori Elements version 4 application.
  *
@@ -33,6 +35,34 @@ function getFioriId(manifest) {
 function getAch(manifest) {
     return manifest?.['sap.app']?.ach?.toString() ?? '';
 }
+/**
+ * Determines the type of UI5 application based on the content of its manifest file.
+ * This function checks various properties within the manifest to classify the application
+ * into predefined types such as Fiori Elements, Fiori Elements OVP, Free Style, or None.
+ *
+ * @param {Manifest} manifest - The manifest configuration object of the application.
+ * @returns {ApplicationType} The type of the application as defined by the ApplicationType enum.
+ *
+ * The classification is done based on the presence and values of specific keys in the manifest:
+ * - 'sap.ovp' indicates a Fiori Elements Overview Page (OVP).
+ * - 'sap.ui.generic.app' or 'sap.app' with a specific sourceTemplate id indicates a Fiori Elements application.
+ * - If none of these conditions are met, the function defaults to categorizing the application as Free Style.
+ * - If the manifest is empty, it returns None.
+ */
+function getApplicationType(manifest) {
+    if (!manifest || Object.keys(manifest).length === 0) {
+        return types_1.ApplicationType.NONE;
+    }
+    if (manifest['sap.ovp']) {
+        return types_1.ApplicationType.FIORI_ELEMENTS_OVP;
+    }
+    const isSmartTemplate = !!manifest['sap.ui.generic.app'];
+    const hasSmartTemplateId = manifest['sap.app']?.sourceTemplate?.id?.toLowerCase() === 'ui5template.smarttemplate';
+    if (hasSmartTemplateId || isSmartTemplate) {
+        return types_1.ApplicationType.FIORI_ELEMENTS;
+    }
+    return types_1.ApplicationType.FREE_STYLE;
+}
 /**
  * Checks if views are loaded synchronously or asynchronously in the UI5 settings of the manifest.
  * Sets the isAppSync property based on the loading method.

package/dist/translations/adp-tooling.i18n.json

@@ -68,7 +68,7 @@
         "errorInputInvalidValuePrefix": "{{value}} should start with '{{prefix}}'",
         "errorCustomerEmptyValue": "{{value}} should contain at least one character in addition to '{{prefix}}'",
         "errorInvalidDataSourceURI": "Invalid URI. The URI must start and end with '/' and contain no spaces.",
-        "appDoesNotSupportManifest": "The selected application is not supported by the adaptation project. Please select a different application. For more information, see SAPUI5 Adaptation Project documentation.",
+        "appDoesNotSupportManifest": "The selected application is not supported by SAPUI5 Adaptation Project as it does not have a manifest.json file. Please select a different application.",
         "ui5VersionNotReachableError": "The URL of the SAPUI5 version you have selected is not reachable. The URL <URL> should be made accessible through cloud connector and the destination configuration so it can be consumed within the SAPUI5 adaptation project and its SAPUI5 Adaptation Editor.",
         "ui5VersionOutdatedError": "The SAPUI5 version you have selected is not compatible with the SAPUI5 Adaptation Editor. Please select a different version.",
         "ui5VersionDoesNotExistGeneric": "An error occurred when validating the SAPUI5 version: {{error}}. Please select a different version.",

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { UI5FlexLayer, ManifestNamespace } from '@sap-ux/project-access';
+import type { UI5FlexLayer, ManifestNamespace, Manifest } from '@sap-ux/project-access';
 import type { DestinationAbapTarget, UrlAbapTarget } from '@sap-ux/system-access';
 import type { Adp, BspApp } from '@sap-ux/ui5-config';
 import type { OperationsType } from '@sap-ux/axios-extension';
@@ -39,7 +39,7 @@ export interface OnpremApp {
     id: string;
     /** Reference associated with the ID of the base application. */
     reference: string;
-    layer?: UI5FlexLayer;
+    layer?: FlexLayer;
     fioriId?: string;
     ach?: string;
     title?: string;
@@ -47,6 +47,12 @@ export interface OnpremApp {
     content?: Content[];
     /** Optional: Description about i18n.properties. */
     i18nDescription?: string;
+    /** Optional: I18n resource models derived from the manifest. */
+    i18nModels?: ResourceModel[];
+    /** Optional: Application type derived from the manifest. */
+    appType?: ApplicationType;
+    /** The manifest of the application */
+    manifest?: Manifest;
 }
 export interface CloudApp extends OnpremApp {
     /** bspName associated with the ABAP Cloud repository name of the base application. */
@@ -63,6 +69,7 @@ export interface AdpWriterConfig {
         minVersion?: string;
         version?: string;
         frameworkUrl?: string;
+        shouldSetMinVersion?: boolean;
     };
     package?: {
         name?: string;
@@ -127,6 +134,18 @@ export interface VersionDetail {
     support: string;
     lts: boolean;
 }
+export interface ResourceModel {
+    key: string;
+    path: string;
+    content?: string;
+}
+export interface SapModel {
+    type?: string;
+    uri?: string;
+    settings?: {
+        bundleName?: string;
+    };
+}
 export interface Endpoint extends Partial<Destination> {
     Name: string;
     Url?: string;
@@ -313,6 +332,12 @@ export type ParameterRules = {
      */
     isReference(param: string): ParamCheck;
 };
+export declare enum ApplicationType {
+    FIORI_ELEMENTS = "FioriElements",
+    FIORI_ELEMENTS_OVP = "FioriElementsOVP",
+    FREE_STYLE = "FreeStyle",
+    NONE = ""
+}
 export declare const enum TemplateFileName {
     Fragment = "fragment.xml",
     Controller = "controller.ejs",

package/dist/types.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeTypeMap = void 0;
+exports.ChangeTypeMap = exports.ApplicationType = void 0;
+var ApplicationType;
+(function (ApplicationType) {
+    ApplicationType["FIORI_ELEMENTS"] = "FioriElements";
+    ApplicationType["FIORI_ELEMENTS_OVP"] = "FioriElementsOVP";
+    ApplicationType["FREE_STYLE"] = "FreeStyle";
+    ApplicationType["NONE"] = "";
+})(ApplicationType || (exports.ApplicationType = ApplicationType = {}));
 /**
  * A mapping of ChangeType values to their respective change names.
  */

package/dist/writer/i18n/index.d.ts

@@ -1,4 +1,6 @@
-import { FlexLayer } from '../../types';
+import type { Editor } from 'mem-fs-editor';
+import type { Manifest } from '@sap-ux/project-access';
+import { FlexLayer, type ResourceModel, type SapModel } from '../../types';
 /**
  * Generates an internationalization description string for a specific layer within an application.
  *
@@ -7,4 +9,39 @@ import { FlexLayer } from '../../types';
  * @returns {string} The internationalization description string.
  */
 export declare function getI18nDescription(layer: FlexLayer, appTitle?: string): string;
+/**
+ * Writes internationalization (i18n) model files to the specified paths within the project structure.
+ *
+ * @param {string} basePath - The base path of the project where i18n files are located, typically the root.
+ * @param {ResourceModel[]} [i18nModels] - An optional array of i18n models to be written. Each model contains
+ *                                         the key, path, and content for an i18n file.
+ * @param {Editor} fs - The file system editor interface used for writing files.
+ 
+ *
+ * This function ensures that:
+ * - Only i18n models that are not the main i18n file (`i18n/i18n.properties`) are processed.
+ * - Models are written only if they have content and do not match the main i18n path.
+ * - The file path for each model is constructed using the provided base path and model's specified path.
+ */
+export declare function writeI18nModels(basePath: string, i18nModels: ResourceModel[] | undefined, fs: Editor): void;
+/**
+ * Extracts the resource model path from a given UI5 model.
+ *
+ * @param {SapModel} ui5Model - The UI5 model object.
+ * @param {string} modelObjectKey - The key of the model object.
+ * @param {string} appId - Application ID.
+ * @returns {string} The calculated resource model path.
+ */
+export declare function extractResourceModelPath(ui5Model: SapModel, modelObjectKey: string, appId: string): string;
+/**
+ * Extracts and constructs resource models from the application manifest based on the specified layer and application information.
+ * This function filters out resource models and attaches a generated i18n description, along with the path derived from the model.
+ *
+ * @param {Manifest| undefined} manifest - The application manifest containing model configurations.
+ * @param {FlexLayer} layer - The UI5 Flex layer.
+ * @param {string} id - The application identifier.
+ * @param {string} [title] - The application title.
+ * @returns {ResourceModel[] | undefined} An array of resource models or undefined if no models meet the criteria.
+ */
+export declare function getI18nModels(manifest: Manifest | undefined, layer: FlexLayer, id: string, title?: string): ResourceModel[] | undefined;
 //# sourceMappingURL=index.d.ts.map

package/dist/writer/i18n/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getI18nDescription = getI18nDescription;
+exports.writeI18nModels = writeI18nModels;
+exports.extractResourceModelPath = extractResourceModelPath;
+exports.getI18nModels = getI18nModels;
 const uuid_1 = require("uuid");
 const __1 = require("../..");
 /**
@@ -15,4 +18,79 @@ function getI18nDescription(layer, appTitle) {
         ? __1.BASE_I18N_DESCRIPTION
         : __1.BASE_I18N_DESCRIPTION + __1.RESOURCE_BUNDLE_TEXT + appTitle + __1.TRANSLATION_UUID_TEXT + (0, uuid_1.v4)();
 }
+/**
+ * Writes internationalization (i18n) model files to the specified paths within the project structure.
+ *
+ * @param {string} basePath - The base path of the project where i18n files are located, typically the root.
+ * @param {ResourceModel[]} [i18nModels] - An optional array of i18n models to be written. Each model contains
+ *                                         the key, path, and content for an i18n file.
+ * @param {Editor} fs - The file system editor interface used for writing files.
+ 
+ *
+ * This function ensures that:
+ * - Only i18n models that are not the main i18n file (`i18n/i18n.properties`) are processed.
+ * - Models are written only if they have content and do not match the main i18n path.
+ * - The file path for each model is constructed using the provided base path and model's specified path.
+ */
+function writeI18nModels(basePath, i18nModels, fs) {
+    if (!i18nModels?.length) {
+        return;
+    }
+    for (const { key, path, content } of i18nModels) {
+        const isMainFile = key === 'i18n' || path === __1.MAIN_I18N_PATH;
+        if (!isMainFile && content) {
+            const i18nPath = `${basePath}/webapp/${path}`;
+            fs.write(i18nPath, content);
+        }
+    }
+}
+/**
+ * Extracts the resource model path from a given UI5 model.
+ *
+ * @param {SapModel} ui5Model - The UI5 model object.
+ * @param {string} modelObjectKey - The key of the model object.
+ * @param {string} appId - Application ID.
+ * @returns {string} The calculated resource model path.
+ */
+function extractResourceModelPath(ui5Model, modelObjectKey, appId) {
+    let resourceModelPath = '';
+    if (ui5Model?.uri) {
+        resourceModelPath = ui5Model.uri;
+    }
+    else if (ui5Model?.settings) {
+        const bundleName = ui5Model.settings?.bundleName;
+        if (bundleName?.indexOf(appId) === 0) {
+            const fileLocation = bundleName.slice(appId.length, bundleName.length);
+            resourceModelPath = fileLocation.replace(/\./g, '/').substring(1, fileLocation.length) + '.properties';
+        }
+        else {
+            resourceModelPath = `i18n/${modelObjectKey}.properties`;
+        }
+    }
+    return resourceModelPath;
+}
+/**
+ * Extracts and constructs resource models from the application manifest based on the specified layer and application information.
+ * This function filters out resource models and attaches a generated i18n description, along with the path derived from the model.
+ *
+ * @param {Manifest| undefined} manifest - The application manifest containing model configurations.
+ * @param {FlexLayer} layer - The UI5 Flex layer.
+ * @param {string} id - The application identifier.
+ * @param {string} [title] - The application title.
+ * @returns {ResourceModel[] | undefined} An array of resource models or undefined if no models meet the criteria.
+ */
+function getI18nModels(manifest, layer, id, title) {
+    if (!manifest) {
+        return undefined;
+    }
+    const models = manifest['sap.ui5']?.models ?? {};
+    return Object.entries(models).reduce((acc, [key, ui5Model]) => {
+        if (ui5Model?.type === 'sap.ui.model.resource.ResourceModel') {
+            const content = getI18nDescription(layer, title);
+            const path = extractResourceModelPath(ui5Model, key, id);
+            acc.push({ key, path, content });
+        }
+        return acc;
+    }, []);
+}
 //# sourceMappingURL=index.js.map

package/dist/writer/index.d.ts

@@ -1,5 +1,5 @@
 import { type Editor } from 'mem-fs-editor';
-import type { AdpWriterConfig } from '../types';
+import { type AdpWriterConfig } from '../types';
 /**
  * Writes the adp-project template to the mem-fs-editor instance.
  *

package/dist/writer/index.js

@@ -5,8 +5,11 @@ exports.migrate = migrate;
 const path_1 = require("path");
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
+const manifest_1 = require("./manifest");
 const options_1 = require("./options");
+const i18n_1 = require("./i18n");
 const project_utils_1 = require("./project-utils");
+const source_1 = require("../source");
 const baseTmplPath = (0, path_1.join)(__dirname, '../../templates');
 /**
  * Set default values for optional properties.
@@ -25,14 +28,21 @@ function setDefaults(config) {
         customConfig: config.customConfig ? { ...config.customConfig } : undefined
     };
     configWithDefaults.app.title ??= `Adaptation of ${config.app.reference}`;
-    configWithDefaults.app.layer ??= 'CUSTOMER_BASE';
+    configWithDefaults.app.layer ??= "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
     configWithDefaults.package ??= config.package ? { ...config.package } : {};
     configWithDefaults.package.name ??= config.app.id.toLowerCase().replace(/\./g, '-');
     configWithDefaults.package.description ??= configWithDefaults.app.title;
+    configWithDefaults.app.i18nModels ??= (0, i18n_1.getI18nModels)(configWithDefaults.app.manifest, configWithDefaults.app.layer, configWithDefaults.app.reference, configWithDefaults.app.title);
+    configWithDefaults.app.i18nDescription ??= (0, i18n_1.getI18nDescription)(configWithDefaults.app.layer, configWithDefaults.app.title);
+    configWithDefaults.app.appType ??= (0, source_1.getApplicationType)(configWithDefaults.app.manifest);
+    configWithDefaults.app.content ??= (0, manifest_1.getManifestContent)(configWithDefaults);
     if (configWithDefaults.flp && !configWithDefaults.flp.inboundId) {
         configWithDefaults.flp.addInboundId = true;
         configWithDefaults.flp.inboundId = `${configWithDefaults.app.id}.InboundID`;
     }
+    if (configWithDefaults.customConfig?.adp.environment === 'C' && configWithDefaults.flp) {
+        (0, options_1.enhanceManifestChangeContentWithFlpConfig)(configWithDefaults.flp, configWithDefaults.app.id, configWithDefaults.app.content);
+    }
     return configWithDefaults;
 }
 /**
@@ -48,9 +58,7 @@ async function generate(basePath, config, fs) {
         fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
     }
     const fullConfig = setDefaults(config);
-    if (fullConfig.customConfig?.adp.environment === 'C' && fullConfig.flp) {
-        (0, options_1.enhanceManifestChangeContentWithFlpConfig)(fullConfig.flp, fullConfig.app.id, fullConfig.app.content);
-    }
+    (0, i18n_1.writeI18nModels)(basePath, fullConfig.app.i18nModels, fs);
     (0, project_utils_1.writeTemplateToFolder)(baseTmplPath, (0, path_1.join)(basePath), fullConfig, fs);
     await (0, project_utils_1.writeUI5DeployYaml)(basePath, fullConfig, fs);
     await (0, project_utils_1.writeUI5Yaml)(basePath, fullConfig, fs);

package/dist/writer/manifest/descriptor-content.d.ts

@@ -0,0 +1,50 @@
+import { ApplicationType } from '../../types';
+import type { Content, AdpWriterConfig, ResourceModel } from '../../types';
+/**
+ * Creates a descriptor change object for a resource model.
+ *
+ * @param {string} modelId - The identifier for the model.
+ * @param {string} path - The path to the resource bundle or i18n properties file.
+ * @param {ApplicationType} type - The type of the application (e.g., FREE_STYLE, FIORI_ELEMENTS, etc.).
+ * @param {string} ui5Version - The UI5 version to check for feature support.
+ * @returns {Content} The descriptor change content object structured according to the UI5 enhancement specifications.
+ *
+ * This function checks if the 'fallbackLocale' feature is supported from UI5 version 1.84.0 onwards.
+ * If supported and the application type is FREE_STYLE, it includes specific properties for localization.
+ * Otherwise, it prepares a standard model enhancement structure.
+ */
+export declare function createDescriptorChangeForResourceModel(modelId: string, path: string, type?: ApplicationType, ui5Version?: string): Content;
+/**
+ * Populates a content array with descriptor changes for each resource model provided.
+ *
+ * @param {Content[]} content - The array to be filled with descriptor change objects.
+ * @param {ApplicationType} type - The type of the application (e.g., FREE_STYLE, FIORI_ELEMENTS, etc.).
+ * @param {string} systemVersion - The UI5 system version used to determine feature support.
+ * @param {ResourceModel[]} [i18nModels] - Optional array of resource models from which to create descriptor changes.
+ *
+ * Each descriptor change is generated based on the provided system version and application type,
+ * taking into account whether certain UI5 features are supported.
+ */
+export declare function fillDescriptorContent(content: Content[], type?: ApplicationType, systemVersion?: string, i18nModels?: ResourceModel[]): void;
+/**
+ * Adds support data entries for Fiori registration IDs and application component hierarchy (ACH) to a content array.
+ *
+ * @param {Content[]} content - The array to which support data entries will be added.
+ * @param {string} [fioriId] - The Fiori ID to set in the registration.
+ * @param {string} [ach] - The application component hierarchy code, which will be converted to uppercase.
+ */
+export declare function fillSupportData(content: Content[], fioriId?: string, ach?: string): void;
+/**
+ * Generates an array of content objects for a `manifest.appdescr_variant` file based on the application configuration.
+ * This function populates descriptor content and, depending on the application layer, may include additional
+ * support data. It also handles setting the minimum UI5 version if specified in the configuration.
+ *
+ * @param {AdpWriterConfig} config - Configuration object containing application and UI5 specific settings.
+ *      `app` contains properties like application type, layer, and identifiers.
+ *      `ui5` may include version details and flags for setting minimum UI5 version.
+ * @returns {Content[]} An array of content objects for the application manifest. Each object describes a specific
+ *      change or setting necessary for the application configuration, such as setting minimum UI5 version,
+ *      updating title, or adding support data.
+ */
+export declare function getManifestContent(config: AdpWriterConfig): Content[];
+//# sourceMappingURL=descriptor-content.d.ts.map

package/dist/writer/manifest/descriptor-content.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDescriptorChangeForResourceModel = createDescriptorChangeForResourceModel;
+exports.fillDescriptorContent = fillDescriptorContent;
+exports.fillSupportData = fillSupportData;
+exports.getManifestContent = getManifestContent;
+const ui5_1 = require("../../ui5");
+const types_1 = require("../../types");
+/**
+ * Creates a descriptor change object for a resource model.
+ *
+ * @param {string} modelId - The identifier for the model.
+ * @param {string} path - The path to the resource bundle or i18n properties file.
+ * @param {ApplicationType} type - The type of the application (e.g., FREE_STYLE, FIORI_ELEMENTS, etc.).
+ * @param {string} ui5Version - The UI5 version to check for feature support.
+ * @returns {Content} The descriptor change content object structured according to the UI5 enhancement specifications.
+ *
+ * This function checks if the 'fallbackLocale' feature is supported from UI5 version 1.84.0 onwards.
+ * If supported and the application type is FREE_STYLE, it includes specific properties for localization.
+ * Otherwise, it prepares a standard model enhancement structure.
+ */
+function createDescriptorChangeForResourceModel(modelId, path, type, ui5Version) {
+    const fallbackLocaleSupported = (0, ui5_1.isFeatureSupportedVersion)('1.84.0', ui5Version);
+    if (type === types_1.ApplicationType.FREE_STYLE && fallbackLocaleSupported) {
+        return {
+            changeType: 'appdescr_ui5_addNewModelEnhanceWith',
+            content: {
+                modelId,
+                bundleUrl: path,
+                supportedLocales: [''],
+                fallbackLocale: ''
+            }
+        };
+    }
+    return {
+        changeType: 'appdescr_ui5_addNewModelEnhanceWith',
+        content: {
+            modelId
+        },
+        texts: {
+            'i18n': path
+        }
+    };
+}
+/**
+ * Populates a content array with descriptor changes for each resource model provided.
+ *
+ * @param {Content[]} content - The array to be filled with descriptor change objects.
+ * @param {ApplicationType} type - The type of the application (e.g., FREE_STYLE, FIORI_ELEMENTS, etc.).
+ * @param {string} systemVersion - The UI5 system version used to determine feature support.
+ * @param {ResourceModel[]} [i18nModels] - Optional array of resource models from which to create descriptor changes.
+ *
+ * Each descriptor change is generated based on the provided system version and application type,
+ * taking into account whether certain UI5 features are supported.
+ */
+function fillDescriptorContent(content, type, systemVersion, i18nModels) {
+    if (i18nModels) {
+        i18nModels.forEach((i18nModel) => {
+            content.push(createDescriptorChangeForResourceModel(i18nModel.key, i18nModel.path, type, systemVersion));
+        });
+    }
+}
+/**
+ * Adds support data entries for Fiori registration IDs and application component hierarchy (ACH) to a content array.
+ *
+ * @param {Content[]} content - The array to which support data entries will be added.
+ * @param {string} [fioriId] - The Fiori ID to set in the registration.
+ * @param {string} [ach] - The application component hierarchy code, which will be converted to uppercase.
+ */
+function fillSupportData(content, fioriId, ach) {
+    if (fioriId) {
+        content.push({
+            changeType: 'appdescr_fiori_setRegistrationIds',
+            content: {
+                registrationIds: [fioriId]
+            }
+        });
+    }
+    if (ach) {
+        content.push({
+            changeType: 'appdescr_app_setAch',
+            content: {
+                ach: ach?.toUpperCase()
+            }
+        });
+    }
+}
+/**
+ * Generates an array of content objects for a `manifest.appdescr_variant` file based on the application configuration.
+ * This function populates descriptor content and, depending on the application layer, may include additional
+ * support data. It also handles setting the minimum UI5 version if specified in the configuration.
+ *
+ * @param {AdpWriterConfig} config - Configuration object containing application and UI5 specific settings.
+ *      `app` contains properties like application type, layer, and identifiers.
+ *      `ui5` may include version details and flags for setting minimum UI5 version.
+ * @returns {Content[]} An array of content objects for the application manifest. Each object describes a specific
+ *      change or setting necessary for the application configuration, such as setting minimum UI5 version,
+ *      updating title, or adding support data.
+ */
+function getManifestContent(config) {
+    const { app, ui5 } = config;
+    const { ach, fioriId, appType, layer, i18nModels } = app;
+    const isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
+    const content = [];
+    fillDescriptorContent(content, appType, ui5?.version, i18nModels);
+    if (!isCustomerBase) {
+        fillSupportData(content, fioriId, ach);
+    }
+    if (ui5?.shouldSetMinVersion) {
+        content.push({
+            changeType: 'appdescr_ui5_setMinUI5Version',
+            content: {
+                minUI5Version: ui5?.minVersion
+            }
+        });
+    }
+    content.push({
+        changeType: 'appdescr_app_setTitle',
+        content: {},
+        texts: {
+            i18n: 'i18n/i18n.properties'
+        }
+    });
+    return content;
+}
+//# sourceMappingURL=descriptor-content.js.map

package/dist/writer/manifest/index.d.ts

@@ -0,0 +1,2 @@
+export * from './descriptor-content';
+//# sourceMappingURL=index.d.ts.map

package/dist/writer/manifest/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./descriptor-content"), exports);
+//# sourceMappingURL=index.js.map

package/dist/writer/options.js

@@ -115,6 +115,13 @@ function addFioriToolsMiddlewares(ui5Config, config) {
     const backendConfig = { ...config.target };
     backendConfig.url ??= VSCODE_URL;
     backendConfig.path = '/sap';
+    const ui5ConfigOptions = {
+        url: config?.ui5?.frameworkUrl
+    };
+    const version = config?.ui5?.version;
+    if (version) {
+        ui5ConfigOptions.version = version;
+    }
     ui5Config.addFioriToolsAppReloadMiddleware();
     ui5Config.addCustomMiddleware([
         {
@@ -129,10 +136,7 @@ function addFioriToolsMiddlewares(ui5Config, config) {
         }
     ]);
     ui5Config.addFioriToolsProxydMiddleware({
-        ui5: {
-            url: config?.ui5?.frameworkUrl,
-            version: config?.ui5?.minVersion ?? '' //default to latest if version is not set
-        },
+        ui5: ui5ConfigOptions,
         backend: [backendConfig]
     }, 'fiori-tools-preview');
 }

package/dist/writer/writer-config.d.ts

@@ -1,9 +1,9 @@
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { Package } from '@sap-ux/project-access';
+import type { Manifest, Package } from '@sap-ux/project-access';
 import type { AbapServiceProvider } from '@sap-ux/axios-extension';
 import { FlexLayer } from '../types';
 import type { AdpWriterConfig, AttributesAnswers, ConfigAnswers, UI5Version } from '../types';
-interface ConfigOptions {
+export interface ConfigOptions {
     /**
      * The ABAP service provider instance used to retrieve system-specific information.
      */
@@ -32,6 +32,10 @@ interface ConfigOptions {
      * System UI5 Version.
      */
     systemVersion: string | undefined;
+    /**
+     * The application manifest.
+     */
+    manifest: Manifest | undefined;
     /**
      * Logger instance for debugging and error reporting.
      */
@@ -51,5 +55,13 @@ interface ConfigOptions {
  * @returns {Promise<AdpWriterConfig>} A promise that resolves to the generated ADP writer configuration.
  */
 export declare function getConfig(options: ConfigOptions): Promise<AdpWriterConfig>;
-export {};
+/**
+ * Generates the configuration details required for a SAPUI5 application based on system and selected UI5 versions.
+ *
+ * @param {string} ui5Version - The selected UI5 version.
+ * @param {UI5Version} publicVersions - The publicly available UI5 versions.
+ * @param {string | undefined} systemVersion - The SAPUI5 version detected on the target system.
+ * @returns {AdpWriterConfig['ui5']} An object containing the required UI5 configuration for the writer config.
+ */
+export declare function getUi5Config(ui5Version: string, publicVersions: UI5Version, systemVersion: string | undefined): AdpWriterConfig['ui5'];
 //# sourceMappingURL=writer-config.d.ts.map

package/dist/writer/writer-config.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfig = getConfig;
+exports.getUi5Config = getUi5Config;
+const ui5_1 = require("../ui5");
 const abap_1 = require("../abap");
-const i18n_1 = require("./i18n");
 const project_utils_1 = require("./project-utils");
-const descriptor_content_1 = require("./descriptor-content");
-const ui5_1 = require("../ui5");
 /**
  * Generates the configuration object for the Adaptation Project.
  *
@@ -20,7 +19,7 @@ const ui5_1 = require("../ui5");
  * @returns {Promise<AdpWriterConfig>} A promise that resolves to the generated ADP writer configuration.
  */
 async function getConfig(options) {
-    const { configAnswers, attributeAnswers, layer, logger, packageJson, provider, publicVersions, systemVersion } = options;
+    const { configAnswers, attributeAnswers, layer, logger, packageJson, provider, publicVersions, systemVersion, manifest } = options;
     const ato = await provider.getAtoInfo();
     const operationsType = ato.operationsType ?? 'P';
     const target = await (0, abap_1.getProviderConfig)(configAnswers.system, logger);
@@ -37,8 +36,9 @@ async function getConfig(options) {
         reference: id,
         layer,
         title,
-        content: (0, descriptor_content_1.getManifestContent)(layer, systemVersion, publicVersions, fioriId, ach),
-        i18nDescription: (0, i18n_1.getI18nDescription)(layer, title)
+        manifest,
+        ach,
+        fioriId
     };
     if (isCloudProject) {
         const lrep = provider.getLayeredRepository();
@@ -48,13 +48,10 @@ async function getConfig(options) {
             languages
         });
     }
+    const ui5 = getUi5Config(ui5Version, publicVersions, systemVersion);
     return {
         app,
-        ui5: {
-            minVersion: ui5Version?.split(' ')?.[0],
-            version: (0, ui5_1.getFormattedVersion)(ui5Version),
-            frameworkUrl: (0, ui5_1.getOfficialBaseUI5VersionUrl)(ui5Version)
-        },
+        ui5,
         customConfig,
         target,
         options: {
@@ -63,4 +60,20 @@ async function getConfig(options) {
         }
     };
 }
+/**
+ * Generates the configuration details required for a SAPUI5 application based on system and selected UI5 versions.
+ *
+ * @param {string} ui5Version - The selected UI5 version.
+ * @param {UI5Version} publicVersions - The publicly available UI5 versions.
+ * @param {string | undefined} systemVersion - The SAPUI5 version detected on the target system.
+ * @returns {AdpWriterConfig['ui5']} An object containing the required UI5 configuration for the writer config.
+ */
+function getUi5Config(ui5Version, publicVersions, systemVersion) {
+    return {
+        minVersion: (0, ui5_1.getMinUI5VersionForManifest)(publicVersions, systemVersion),
+        version: (0, ui5_1.getFormattedVersion)(ui5Version),
+        frameworkUrl: (0, ui5_1.getOfficialBaseUI5VersionUrl)(ui5Version),
+        shouldSetMinVersion: (0, ui5_1.shouldSetMinUI5Version)(systemVersion)
+    };
+}
 //# sourceMappingURL=writer-config.js.map

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.13.44",
+  "version": "0.13.45",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",

package/templates/project/webapp/manifest.appdescr_variant

@@ -6,16 +6,5 @@
   "id": "<%- app.id %>",
   "namespace": "apps/<%- app.reference %>/appVariants/<%- app.id %>/",
   "version": "0.1.0",
-  "content": [
-<%if(app.content){-%><% for(let change of app.content){-%>
-    <%- JSON.stringify(change, undefined, 4) %><%-","%>
-<%}-%><%}-%>
-    {
-      "changeType": "appdescr_app_setTitle",
-      "content": {},
-      "texts": {
-        "i18n": "i18n/i18n.properties"
-      }
-    }
-  ]
+  "content": <%- JSON.stringify(app.content || [], null, 2).split('\n').map((line, index) => index === 0 ? line : '  ' + line).join('\n') %>
 }

package/dist/writer/descriptor-content.d.ts

@@ -1,27 +0,0 @@
-import { FlexLayer, type Content, type UI5Version } from '../types';
-/**
- * Returns a model enhancement change configuration.
- *
- * @returns {Content} The model change configuration.
- */
-export declare function getNewModelEnhanceWithChange(): Content;
-/**
- * Adds support data entries for Fiori registration IDs and application component hierarchy (ACH) to a content array.
- *
- * @param {Content[]} content - The array to which support data entries will be added.
- * @param {string} [fioriId] - The Fiori ID to set in the registration.
- * @param {string} [ach] - The application component hierarchy code, which will be converted to uppercase.
- */
-export declare function fillSupportData(content: Content[], fioriId?: string, ach?: string): void;
-/**
- * Generates an array of content objects for a `manifest.appdescr_variant` file based on the application configuration.
- *
- * @param {FlexLayer} layer - The deployment layer of the application (e.g., CUSTOMER_BASE or VENDOR).
- * @param {string | undefined} systemVersion - The minimum required SAPUI5 version for the application.
- * @param {UI5Version} publicVersions - Publicly available SAPUI5 versions.
- * @param {string} [fioriId] - Optional Fiori ID to be added to support information.
- * @param {string} [ach] - Optional ACH ID used for support analytics.
- * @returns {Content[]} An array of content objects describing descriptor variant changes to be applied to the manifest.
- */
-export declare function getManifestContent(layer: FlexLayer, systemVersion: string | undefined, publicVersions: UI5Version, fioriId?: string, ach?: string): Content[];
-//# sourceMappingURL=descriptor-content.d.ts.map

package/dist/writer/descriptor-content.js

@@ -1,75 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewModelEnhanceWithChange = getNewModelEnhanceWithChange;
-exports.fillSupportData = fillSupportData;
-exports.getManifestContent = getManifestContent;
-const ui5_1 = require("../ui5");
-/**
- * Returns a model enhancement change configuration.
- *
- * @returns {Content} The model change configuration.
- */
-function getNewModelEnhanceWithChange() {
-    return {
-        changeType: 'appdescr_ui5_addNewModelEnhanceWith',
-        content: {
-            modelId: 'i18n',
-            bundleUrl: 'i18n/i18n.properties',
-            supportedLocales: [''],
-            fallbackLocale: ''
-        }
-    };
-}
-/**
- * Adds support data entries for Fiori registration IDs and application component hierarchy (ACH) to a content array.
- *
- * @param {Content[]} content - The array to which support data entries will be added.
- * @param {string} [fioriId] - The Fiori ID to set in the registration.
- * @param {string} [ach] - The application component hierarchy code, which will be converted to uppercase.
- */
-function fillSupportData(content, fioriId, ach) {
-    if (fioriId) {
-        content.push({
-            changeType: 'appdescr_fiori_setRegistrationIds',
-            content: {
-                registrationIds: [fioriId]
-            }
-        });
-    }
-    if (ach) {
-        content.push({
-            changeType: 'appdescr_app_setAch',
-            content: {
-                ach: ach?.toUpperCase()
-            }
-        });
-    }
-}
-/**
- * Generates an array of content objects for a `manifest.appdescr_variant` file based on the application configuration.
- *
- * @param {FlexLayer} layer - The deployment layer of the application (e.g., CUSTOMER_BASE or VENDOR).
- * @param {string | undefined} systemVersion - The minimum required SAPUI5 version for the application.
- * @param {UI5Version} publicVersions - Publicly available SAPUI5 versions.
- * @param {string} [fioriId] - Optional Fiori ID to be added to support information.
- * @param {string} [ach] - Optional ACH ID used for support analytics.
- * @returns {Content[]} An array of content objects describing descriptor variant changes to be applied to the manifest.
- */
-function getManifestContent(layer, systemVersion, publicVersions, fioriId, ach) {
-    const isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
-    const content = [];
-    if (!isCustomerBase) {
-        fillSupportData(content, fioriId, ach);
-    }
-    if ((0, ui5_1.shouldSetMinUI5Version)(systemVersion)) {
-        content.push({
-            changeType: 'appdescr_ui5_setMinUI5Version',
-            content: {
-                minUI5Version: (0, ui5_1.getMinUI5VersionForManifest)(publicVersions, systemVersion)
-            }
-        });
-    }
-    content.push(getNewModelEnhanceWithChange());
-    return content;
-}
-//# sourceMappingURL=descriptor-content.js.map