@sap-ux/fiori-elements-writer 0.22.0 → 0.23.1

package/dist/data/{annotationReuseLibs.d.ts → annotationCustomUi5Libs.d.ts}

@@ -4,11 +4,10 @@ type AnnotationLibs = {
 };
 export declare const annotationLibs: AnnotationLibs[];
 /**
- * Returns the reuse libraries associated with annotation entries in the metadata
- *
+ * @description Returns the reuse libraries associated with annotation entries in the metadata.
  * @param metadata - metadata string to be checked for specific annotations
  * @returns The base component library path
  */
 export declare function getAnnotationV4Libs(metadata: string): string[];
 export {};
-//# sourceMappingURL=annotationReuseLibs.d.ts.map
+//# sourceMappingURL=annotationCustomUi5Libs.d.ts.map

package/dist/data/{annotationReuseLibs.js → annotationCustomUi5Libs.js}

@@ -8,8 +8,7 @@ exports.annotationLibs = [
     }
 ];
 /**
- * Returns the reuse libraries associated with annotation entries in the metadata
- *
+ * @description Returns the reuse libraries associated with annotation entries in the metadata.
  * @param metadata - metadata string to be checked for specific annotations
  * @returns The base component library path
  */
@@ -18,7 +17,7 @@ function getAnnotationV4Libs(metadata) {
     // Create a regular expression that matches any of the annotations
     const annotationsRegex = new RegExp(exports.annotationLibs.map((annotationLib) => annotationLib.annotation).join('|'), 'g');
     const foundAnnotations = annotationsRegex.exec(metadata);
-    foundAnnotations === null || foundAnnotations === void 0 ? void 0 : foundAnnotations.forEach((annotation) => {
+    foundAnnotations?.forEach((annotation) => {
         const rule = exports.annotationLibs.find((rule) => rule.annotation === annotation);
         if (rule) {
             libraries.push(rule.library);
@@ -27,4 +26,4 @@ function getAnnotationV4Libs(metadata) {
     return Array.from(libraries);
 }
 exports.getAnnotationV4Libs = getAnnotationV4Libs;
-//# sourceMappingURL=annotationReuseLibs.js.map
+//# sourceMappingURL=annotationCustomUi5Libs.js.map

package/dist/data/defaults.d.ts

@@ -14,10 +14,10 @@ export declare function setDefaultTemplateSettings<T extends {}>(template: Templ
  *
  * @param type - The template type of the required base component
  * @param version - The odata service version determines the appropriate base component to use
- * @param metadata - metadata string to be checked for specific annotations
+ * @param ui5Libs - ui5 libs
  * @returns The UI5 libs required by the specified template type and OData version and UI5 annotation libs
  */
-export declare function getUi5Libs(type: TemplateType, version: OdataVersion, metadata?: string, ui5Libs?: string | string[]): string[];
+export declare function getUi5Libs(type: TemplateType, version: OdataVersion, ui5Libs?: string | string[]): string[];
 /**
  * Sets defaults for the specified Fiori elements application.
  *

package/dist/data/defaults.js

@@ -8,7 +8,7 @@ const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const read_pkg_up_1 = __importDefault(require("read-pkg-up"));
 const types_1 = require("../types");
 const templateAttributes_1 = require("./templateAttributes");
-const annotationReuseLibs_1 = require("./annotationReuseLibs");
+const annotationCustomUi5Libs_1 = require("./annotationCustomUi5Libs");
 const defaultModelName = 'mainModel'; // UI5 default model name is '' but some floorplans require a named default model
 /**
  * Updates the template settings to defaults if not provided.
@@ -18,17 +18,16 @@ const defaultModelName = 'mainModel'; // UI5 default model name is '' but some f
  * @returns Updated template settings
  */
 function setDefaultTemplateSettings(template, odataVersion) {
-    var _a, _b, _c;
     const templateSettings = template.settings;
     if (template.type === types_1.TemplateType.AnalyticalListPage) {
         const alpSettings = template.settings;
         Object.assign(templateSettings, {
-            tableType: (_a = alpSettings.tableType) !== null && _a !== void 0 ? _a : types_1.TableType.ANALYTICAL // Overrides the UI5 default: ''
+            tableType: alpSettings.tableType ?? types_1.TableType.ANALYTICAL // Overrides the UI5 default: ''
         });
         if (odataVersion === odata_service_writer_1.OdataVersion.v4) {
             const alpV4Settings = template.settings;
             Object.assign(templateSettings, {
-                selectionMode: (_b = alpV4Settings.selectionMode) !== null && _b !== void 0 ? _b : types_1.TableSelectionMode.NONE
+                selectionMode: alpV4Settings.selectionMode ?? types_1.TableSelectionMode.NONE
             });
             return templateSettings;
         }
@@ -46,7 +45,7 @@ function setDefaultTemplateSettings(template, odataVersion) {
     else if (template.type === types_1.TemplateType.ListReportObjectPage || template.type === types_1.TemplateType.Worklist) {
         const tableSettings = template.settings;
         Object.assign(templateSettings, {
-            tableType: (_c = tableSettings.tableType) !== null && _c !== void 0 ? _c : types_1.TableType.RESPONSIVE // Overrides the UI5 default: ''
+            tableType: tableSettings.tableType ?? types_1.TableType.RESPONSIVE // Overrides the UI5 default: ''
         });
         if (tableSettings.tableType !== types_1.TableType.TREE) {
             delete tableSettings.hierarchyQualifier;
@@ -60,18 +59,12 @@ exports.setDefaultTemplateSettings = setDefaultTemplateSettings;
  *
  * @param type - The template type of the required base component
  * @param version - The odata service version determines the appropriate base component to use
- * @param metadata - metadata string to be checked for specific annotations
+ * @param ui5Libs - ui5 libs
  * @returns The UI5 libs required by the specified template type and OData version and UI5 annotation libs
  */
-function getUi5Libs(type, version, metadata, ui5Libs) {
+function getUi5Libs(type, version, ui5Libs) {
     const templateLibs = (0, templateAttributes_1.getTemplateUi5Libs)(type, version);
-    if (version === odata_service_writer_1.OdataVersion.v4 && metadata) {
-        let annotationLibs = (0, annotationReuseLibs_1.getAnnotationV4Libs)(metadata);
-        return [...templateLibs, ...annotationLibs].concat(ui5Libs !== null && ui5Libs !== void 0 ? ui5Libs : []);
-    }
-    else {
-        return [...templateLibs].concat(ui5Libs !== null && ui5Libs !== void 0 ? ui5Libs : []);
-    }
+    return [...templateLibs].concat(ui5Libs ?? []);
 }
 exports.getUi5Libs = getUi5Libs;
 /**
@@ -81,25 +74,31 @@ exports.getUi5Libs = getUi5Libs;
  * @returns Fiori elements app config with updated defaults for unspecified properties
  */
 function setAppDefaults(feApp) {
-    var _a, _b, _c, _d, _e, _f, _g;
     // Add template information
-    if (!((_a = feApp.app.sourceTemplate) === null || _a === void 0 ? void 0 : _a.version) || !((_b = feApp.app.sourceTemplate) === null || _b === void 0 ? void 0 : _b.id)) {
+    if (!feApp.app.sourceTemplate?.version || !feApp.app.sourceTemplate?.id) {
         const packageInfo = read_pkg_up_1.default.sync({ cwd: __dirname });
         feApp.app.sourceTemplate = {
-            id: `${packageInfo === null || packageInfo === void 0 ? void 0 : packageInfo.packageJson.name}:${feApp.template.type}`,
-            version: packageInfo === null || packageInfo === void 0 ? void 0 : packageInfo.packageJson.version,
-            toolsId: (_c = feApp.app.sourceTemplate) === null || _c === void 0 ? void 0 : _c.toolsId
+            id: `${packageInfo?.packageJson.name}:${feApp.template.type}`,
+            version: packageInfo?.packageJson.version,
+            toolsId: feApp.app.sourceTemplate?.toolsId
         };
     }
     // Generate base UI5 project
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     feApp.app.baseComponent = feApp.app.baseComponent || (0, templateAttributes_1.getBaseComponent)(feApp.template.type, feApp.service.version);
+    const customUi5Libs = feApp.service.version === odata_service_writer_1.OdataVersion.v4 && feApp.service.metadata
+        ? (0, annotationCustomUi5Libs_1.getAnnotationV4Libs)(feApp.service.metadata)
+        : [];
     // Add ui5 libs for specified template and odata version
     // Dups will be removed by call to `generateUI5Project`
-    feApp.ui5 = Object.assign(Object.assign({}, feApp.ui5), { ui5Libs: getUi5Libs(feApp.template.type, feApp.service.version, feApp.service.metadata, (_d = feApp.ui5) === null || _d === void 0 ? void 0 : _d.ui5Libs) });
+    feApp.ui5 = {
+        ...feApp.ui5,
+        ui5Libs: getUi5Libs(feApp.template.type, feApp.service.version, feApp.ui5?.ui5Libs),
+        customUi5Libs: customUi5Libs
+    };
     // Assign a default annotation name if the service type is EDMX and no local annotation name is provided
     let serviceType = feApp.service.type;
-    serviceType || (serviceType = odata_service_writer_1.ServiceType.EDMX);
+    serviceType ||= odata_service_writer_1.ServiceType.EDMX;
     if (serviceType === odata_service_writer_1.ServiceType.EDMX && !feApp.service.localAnnotationsName) {
         feApp.service.localAnnotationsName = 'annotation';
     }
@@ -108,13 +107,13 @@ function setAppDefaults(feApp) {
         feApp.service.model = defaultModelName;
     }
     // minimum UI5 version depending on the template required
-    feApp.ui5 = (_e = feApp.ui5) !== null && _e !== void 0 ? _e : {};
+    feApp.ui5 = feApp.ui5 ?? {};
     if (!feApp.ui5.minUI5Version) {
         feApp.ui5.minUI5Version =
-            (_f = feApp.ui5.version) !== null && _f !== void 0 ? _f : templateAttributes_1.TemplateTypeAttributes[feApp.template.type].minimumUi5Version[feApp.service.version];
+            feApp.ui5.version ?? templateAttributes_1.TemplateTypeAttributes[feApp.template.type].minimumUi5Version[feApp.service.version];
     }
     // if not explicitly disabled, enable the SAP Fiori tools
-    feApp.appOptions = (_g = feApp.appOptions) !== null && _g !== void 0 ? _g : {};
+    feApp.appOptions = feApp.appOptions ?? {};
     if (feApp.appOptions.sapux !== false) {
         feApp.appOptions.sapux = true;
     }

package/dist/data/manifestSettings.js

@@ -20,7 +20,6 @@ const semver_1 = __importDefault(require("semver"));
  * @param feApp - The application config to be used by the manifest templates
  */
 function extendManifestJson(fs, targetPath, rootTemplatesPath, feApp) {
-    var _a, _b;
     let templatePath = feApp.template.type;
     // FEOP and ALP v4 are variants of LROP and so we use the same template and settings
     if (feApp.service.version === odata_service_writer_1.OdataVersion.v4 &&
@@ -32,17 +31,21 @@ function extendManifestJson(fs, targetPath, rootTemplatesPath, feApp) {
         ].includes(feApp.template.type)) {
         templatePath = types_1.TemplateType.ListReportObjectPage;
         // starting with UI5 v1.94.0, contextPath should be used instead of 'entitySet' in manifest for v4 LROP based apps
-        const minVersion = semver_1.default.coerce((_a = feApp.ui5) === null || _a === void 0 ? void 0 : _a.minUI5Version);
+        const minVersion = semver_1.default.coerce(feApp.ui5?.minUI5Version);
         if (!minVersion || semver_1.default.gte(minVersion, '1.94.0')) {
             const entityConfig = feApp.template.settings.entityConfig;
             entityConfig.contextPath = `/${entityConfig.mainEntityName}`;
-            if ((_b = entityConfig.navigationEntity) === null || _b === void 0 ? void 0 : _b.EntitySet) {
+            if (entityConfig.navigationEntity?.EntitySet) {
                 entityConfig.navigationEntity.contextPath = `${entityConfig.contextPath}/${entityConfig.navigationEntity.Name}`;
             }
         }
     }
     // Enhance template settings
-    const templateSettings = Object.assign(Object.assign({}, feApp.template.settings), { defaultModel: feApp.service.model, type: feApp.template.type });
+    const templateSettings = {
+        ...feApp.template.settings,
+        defaultModel: feApp.service.model,
+        type: feApp.template.type
+    };
     // Manifest paths to be extended
     const extendTemplatePaths = [
         (0, path_1.join)(rootTemplatesPath, 'common', 'extend', 'webapp'),

package/dist/data/templateAttributes.js

@@ -79,8 +79,7 @@ const templateLibs = {
  * @returns The base component library path
  */
 function getBaseComponent(type, version) {
-    var _a;
-    return (_a = templateLibs[version][type]) === null || _a === void 0 ? void 0 : _a.baseComponent;
+    return templateLibs[version][type]?.baseComponent;
 }
 exports.getBaseComponent = getBaseComponent;
 /**
@@ -91,8 +90,7 @@ exports.getBaseComponent = getBaseComponent;
  * @returns The Ui5 libs required by the specified template type and OData version
  */
 function getTemplateUi5Libs(type, version) {
-    var _a, _b;
-    return (_b = (_a = templateLibs[version][type]) === null || _a === void 0 ? void 0 : _a.ui5Libs) !== null && _b !== void 0 ? _b : [];
+    return templateLibs[version][type]?.ui5Libs ?? [];
 }
 exports.getTemplateUi5Libs = getTemplateUi5Libs;
 exports.TemplateTypeAttributes = {

package/dist/i18n.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,19 +10,17 @@ const NS = 'fiori-freestyle-writer';
 /**
  * Initialize i18next with the translations for this module.
  */
-function initI18n() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield i18next_1.default.init({
-            resources: {
-                en: {
-                    [NS]: fiori_elements_writer_i18n_json_1.default
-                }
-            },
-            lng: 'en',
-            fallbackLng: 'en',
-            defaultNS: NS,
-            ns: [NS]
-        });
+async function initI18n() {
+    await i18next_1.default.init({
+        resources: {
+            en: {
+                [NS]: fiori_elements_writer_i18n_json_1.default
+            }
+        },
+        lng: 'en',
+        fallbackLng: 'en',
+        defaultNS: NS,
+        ns: [NS]
     });
 }
 exports.initI18n = initI18n;

package/dist/index.js

@@ -13,15 +13,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -55,10 +46,9 @@ exports.V2_FE_TYPES_AVAILABLE = '1.108.0';
  * @returns ignore pattern
  */
 function getTypeScriptIgnoreGlob(feApp, coercedUI5Version) {
-    var _a;
     let ignore = [];
     // isV2FETypesAvailable - Boolean to indicate if V2 Fiori Element types were available in the UI5 version
-    const isV2FETypesAvailable = ((_a = feApp.ui5) === null || _a === void 0 ? void 0 : _a.version) ? semver_1.default.gte(coercedUI5Version, exports.V2_FE_TYPES_AVAILABLE) : false;
+    const isV2FETypesAvailable = feApp.ui5?.version ? semver_1.default.gte(coercedUI5Version, exports.V2_FE_TYPES_AVAILABLE) : false;
     const tsIgnoreGlob = ['**/*.js'];
     ignore = tsIgnoreGlob;
     // Add local ui5.d.ts if types are missing in UI5 version for V2 Odata services
@@ -84,87 +74,89 @@ function getTypeScriptIgnoreGlob(feApp, coercedUI5Version) {
  * @param fs - an optional reference to a mem-fs editor
  * @returns Reference to a mem-fs-editor
  */
-function generate(basePath, data, fs) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    return __awaiter(this, void 0, void 0, function* () {
-        // Load i18n translations asynchronously to ensure proper initialization.
-        // This addresses occasional issues where i18n is not initialized in time, causing tests to fail.
-        yield (0, i18n_1.initI18n)();
-        // Clone rather than modifying callers refs
-        const feApp = (0, cloneDeep_1.default)(data);
-        // Ensure input data contains at least the mandatory properties required for app generation
-        (0, validate_1.validateRequiredProperties)(feApp);
-        (0, defaults_1.setAppDefaults)(feApp);
-        fs = yield (0, ui5_application_writer_1.generate)(basePath, feApp, fs);
-        feApp.template.settings = (0, defaults_1.setDefaultTemplateSettings)(feApp.template, feApp.service.version);
-        // This is done after `generateUi5Project` since defaults are set if values are not provided
-        (0, validate_1.validateApp)(feApp);
-        yield (0, odata_service_writer_1.generate)(basePath, feApp.service, fs);
-        const coercedUI5Version = semver_1.default.coerce((_a = feApp.ui5) === null || _a === void 0 ? void 0 : _a.version);
-        const templateOptions = {
-            changesPreview: ((_b = feApp.ui5) === null || _b === void 0 ? void 0 : _b.version) ? semver_1.default.lt(coercedUI5Version, templateAttributes_2.changesPreviewToVersion) : false,
-            changesLoader: feApp.service.version === odata_service_writer_1.OdataVersion.v2
-        };
-        // Add new files from templates e.g.
-        const rootTemplatesPath = (0, path_1.join)(__dirname, '..', 'templates');
-        // Add templates common to all template types
-        const jsIgnoreGlob = ['**/*.ts'];
-        let ignore = jsIgnoreGlob;
-        if (((_c = feApp.appOptions) === null || _c === void 0 ? void 0 : _c.typescript) === true) {
-            ignore = getTypeScriptIgnoreGlob(feApp, coercedUI5Version);
-        }
-        fs.copyTpl((0, path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, Object.assign(Object.assign({}, feApp), { templateOptions,
-            escapeFLPText: templateAttributes_2.escapeFLPText }), undefined, {
-            globOptions: { ignore, dot: true }
+async function generate(basePath, data, fs) {
+    // Load i18n translations asynchronously to ensure proper initialization.
+    // This addresses occasional issues where i18n is not initialized in time, causing tests to fail.
+    await (0, i18n_1.initI18n)();
+    // Clone rather than modifying callers refs
+    const feApp = (0, cloneDeep_1.default)(data);
+    // Ensure input data contains at least the mandatory properties required for app generation
+    (0, validate_1.validateRequiredProperties)(feApp);
+    (0, defaults_1.setAppDefaults)(feApp);
+    fs = await (0, ui5_application_writer_1.generate)(basePath, feApp, fs);
+    feApp.template.settings = (0, defaults_1.setDefaultTemplateSettings)(feApp.template, feApp.service.version);
+    // This is done after `generateUi5Project` since defaults are set if values are not provided
+    (0, validate_1.validateApp)(feApp);
+    await (0, odata_service_writer_1.generate)(basePath, feApp.service, fs);
+    const coercedUI5Version = semver_1.default.coerce(feApp.ui5?.version);
+    const templateOptions = {
+        changesPreview: feApp.ui5?.version ? semver_1.default.lt(coercedUI5Version, templateAttributes_2.changesPreviewToVersion) : false,
+        changesLoader: feApp.service.version === odata_service_writer_1.OdataVersion.v2
+    };
+    // Add new files from templates e.g.
+    const rootTemplatesPath = (0, path_1.join)(__dirname, '..', 'templates');
+    // Add templates common to all template types
+    const jsIgnoreGlob = ['**/*.ts'];
+    let ignore = jsIgnoreGlob;
+    if (feApp.appOptions?.typescript === true) {
+        ignore = getTypeScriptIgnoreGlob(feApp, coercedUI5Version);
+    }
+    fs.copyTpl((0, path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, {
+        ...feApp,
+        templateOptions,
+        escapeFLPText: templateAttributes_2.escapeFLPText
+    }, undefined, {
+        globOptions: { ignore, dot: true }
+    });
+    // Extend common files
+    const packagePath = (0, path_1.join)(basePath, 'package.json');
+    // Extend package.json
+    fs.extendJSON(packagePath, JSON.parse((0, ejs_1.render)(fs.read((0, path_1.join)(rootTemplatesPath, 'common', 'extend', 'package.json')), feApp, {})));
+    // Special handling for FPM because it is not based on template files but used the fpm writer
+    if (feApp.template.type === types_1.TemplateType.FlexibleProgrammingModel) {
+        const config = feApp.template.settings;
+        (0, fe_fpm_writer_1.generateCustomPage)(basePath, {
+            entity: config.entityConfig.mainEntityName,
+            name: config.pageName,
+            minUI5Version: feApp.ui5?.minUI5Version,
+            typescript: feApp.appOptions?.typescript
+        }, fs);
+    }
+    else {
+        // Copy odata version specific common templates and version specific, floorplan specific templates
+        const templateVersionPath = (0, path_1.join)(rootTemplatesPath, `v${feApp.service?.version}`);
+        [(0, path_1.join)(templateVersionPath, 'common', 'add'), (0, path_1.join)(templateVersionPath, feApp.template.type, 'add')].forEach((templatePath) => {
+            fs.copyTpl((0, path_1.join)(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true, globOptions: { ignore, dot: true } });
         });
-        // Extend common files
-        const packagePath = (0, path_1.join)(basePath, 'package.json');
-        // Extend package.json
-        fs.extendJSON(packagePath, JSON.parse((0, ejs_1.render)(fs.read((0, path_1.join)(rootTemplatesPath, 'common', 'extend', 'package.json')), feApp, {})));
-        // Special handling for FPM because it is not based on template files but used the fpm writer
-        if (feApp.template.type === types_1.TemplateType.FlexibleProgrammingModel) {
-            const config = feApp.template.settings;
-            (0, fe_fpm_writer_1.generateCustomPage)(basePath, {
-                entity: config.entityConfig.mainEntityName,
-                name: config.pageName,
-                minUI5Version: (_d = feApp.ui5) === null || _d === void 0 ? void 0 : _d.minUI5Version,
-                typescript: (_e = feApp.appOptions) === null || _e === void 0 ? void 0 : _e.typescript
-            }, fs);
-        }
-        else {
-            // Copy odata version specific common templates and version specific, floorplan specific templates
-            const templateVersionPath = (0, path_1.join)(rootTemplatesPath, `v${(_f = feApp.service) === null || _f === void 0 ? void 0 : _f.version}`);
-            [(0, path_1.join)(templateVersionPath, 'common', 'add'), (0, path_1.join)(templateVersionPath, feApp.template.type, 'add')].forEach((templatePath) => {
-                fs.copyTpl((0, path_1.join)(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true, globOptions: { ignore, dot: true } });
-            });
-        }
-        // Update manifest.json with template specific settings
-        (0, manifestSettings_1.extendManifestJson)(fs, basePath, rootTemplatesPath, feApp);
-        const packageJson = JSON.parse(fs.read(packagePath));
-        // Add tests only if v4, for now, and we have metadata (and therefore a mock server config) or has a cds service
-        const addTest = !!feApp.appOptions.addTests &&
-            ((_g = feApp.service) === null || _g === void 0 ? void 0 : _g.version) === odata_service_writer_1.OdataVersion.v4 &&
-            (!!((_h = feApp.service) === null || _h === void 0 ? void 0 : _h.metadata) || feApp.service.type === odata_service_writer_1.ServiceType.CDS);
-        packageJson.scripts = Object.assign((_j = packageJson.scripts) !== null && _j !== void 0 ? _j : {}, Object.assign({}, (0, packageConfig_1.getPackageJsonTasks)({
-            localOnly: !((_k = feApp.service) === null || _k === void 0 ? void 0 : _k.url),
-            addMock: !!((_l = feApp.service) === null || _l === void 0 ? void 0 : _l.metadata),
+    }
+    // Update manifest.json with template specific settings
+    (0, manifestSettings_1.extendManifestJson)(fs, basePath, rootTemplatesPath, feApp);
+    const packageJson = JSON.parse(fs.read(packagePath));
+    // Add tests only if v4, for now, and we have metadata (and therefore a mock server config) or has a cds service
+    const addTest = !!feApp.appOptions.addTests &&
+        feApp.service?.version === odata_service_writer_1.OdataVersion.v4 &&
+        (!!feApp.service?.metadata || feApp.service.type === odata_service_writer_1.ServiceType.CDS);
+    packageJson.scripts = Object.assign(packageJson.scripts ?? {}, {
+        ...(0, packageConfig_1.getPackageJsonTasks)({
+            localOnly: !feApp.service?.url,
+            addMock: !!feApp.service?.metadata,
             addTest,
-            sapClient: (_m = feApp.service) === null || _m === void 0 ? void 0 : _m.client,
+            sapClient: feApp.service?.client,
             flpAppId: feApp.app.flpAppId,
-            startFile: (_o = data === null || data === void 0 ? void 0 : data.app) === null || _o === void 0 ? void 0 : _o.startFile,
-            localStartFile: (_p = data === null || data === void 0 ? void 0 : data.app) === null || _p === void 0 ? void 0 : _p.localStartFile,
-            generateIndex: (_q = feApp.appOptions) === null || _q === void 0 ? void 0 : _q.generateIndex
-        })));
-        fs.writeJSON(packagePath, packageJson);
-        if (addTest) {
-            (0, ui5_test_writer_1.generateOPAFiles)(basePath, {
-                htmlTarget: ((_r = feApp.appOptions) === null || _r === void 0 ? void 0 : _r.generateIndex)
-                    ? 'index.html'
-                    : `test/flpSandbox.html?sap-ui-xx-viewCache=false#${feApp.app.flpAppId}`
-            }, fs);
-        }
-        return fs;
+            startFile: data?.app?.startFile,
+            localStartFile: data?.app?.localStartFile,
+            generateIndex: feApp.appOptions?.generateIndex
+        })
     });
+    fs.writeJSON(packagePath, packageJson);
+    if (addTest) {
+        (0, ui5_test_writer_1.generateOPAFiles)(basePath, {
+            htmlTarget: feApp.appOptions?.generateIndex
+                ? 'index.html'
+                : `test/flpSandbox.html?sap-ui-xx-viewCache=false#${feApp.app.flpAppId}`
+        }, fs);
+    }
+    return fs;
 }
 exports.generate = generate;
 __exportStar(require("./types"), exports);

package/dist/validate.js

@@ -14,7 +14,6 @@ const types_1 = require("./types");
  * @param feApp - Fiori elements application configuration
  */
 function validateApp(feApp) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     // Validate odata version
     if (feApp.service.version &&
         !templateAttributes_1.TemplateTypeAttributes[feApp.template.type].supportedODataVersions.includes(feApp.service.version)) {
@@ -25,18 +24,18 @@ function validateApp(feApp) {
     }
     // Validate ui5 versions if present (defaults will apply otherwise)
     let ui5Version = null;
-    if ((_a = feApp.ui5) === null || _a === void 0 ? void 0 : _a.version) {
-        ui5Version = semver_1.default.coerce((_b = feApp.ui5) === null || _b === void 0 ? void 0 : _b.version);
+    if (feApp.ui5?.version) {
+        ui5Version = semver_1.default.coerce(feApp.ui5?.version);
         if (!ui5Version) {
-            throw new types_1.ValidationError((0, i18n_1.t)('error.invalidUI5Version', { versionProperty: 'version', ui5Version: (_c = feApp.ui5) === null || _c === void 0 ? void 0 : _c.version }));
+            throw new types_1.ValidationError((0, i18n_1.t)('error.invalidUI5Version', { versionProperty: 'version', ui5Version: feApp.ui5?.version }));
         }
     }
     let minUI5Version;
     const minRequiredUI5Version = templateAttributes_1.TemplateTypeAttributes[feApp.template.type].minimumUi5Version[feApp.service.version];
-    if ((_d = feApp.ui5) === null || _d === void 0 ? void 0 : _d.minUI5Version) {
-        minUI5Version = semver_1.default.coerce((_e = feApp.ui5) === null || _e === void 0 ? void 0 : _e.minUI5Version);
+    if (feApp.ui5?.minUI5Version) {
+        minUI5Version = semver_1.default.coerce(feApp.ui5?.minUI5Version);
         if (!minUI5Version) {
-            throw new types_1.ValidationError((0, i18n_1.t)('error.invalidUI5Version', { versionProperty: 'minUI5Version', ui5Version: (_f = feApp.ui5) === null || _f === void 0 ? void 0 : _f.minUI5Version }));
+            throw new types_1.ValidationError((0, i18n_1.t)('error.invalidUI5Version', { versionProperty: 'minUI5Version', ui5Version: feApp.ui5?.minUI5Version }));
         }
     }
     else {
@@ -45,7 +44,7 @@ function validateApp(feApp) {
     if (ui5Version && semver_1.default.lt(ui5Version, minRequiredUI5Version)) {
         throw new types_1.ValidationError((0, i18n_1.t)('error.unsupportedUI5Version', {
             versionProperty: 'version',
-            ui5Version: (_g = feApp.ui5) === null || _g === void 0 ? void 0 : _g.version,
+            ui5Version: feApp.ui5?.version,
             templateType: feApp.template.type,
             minRequiredUI5Version
         }));
@@ -53,7 +52,7 @@ function validateApp(feApp) {
     if (semver_1.default.lt(minUI5Version, minRequiredUI5Version)) {
         throw new types_1.ValidationError((0, i18n_1.t)('error.unsupportedUI5Version', {
             versionProperty: 'minUI5Version',
-            ui5Version: (_h = feApp.ui5) === null || _h === void 0 ? void 0 : _h.minUI5Version,
+            ui5Version: feApp.ui5?.minUI5Version,
             templateType: feApp.template.type,
             minRequiredUI5Version
         }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "0.22.0",
+  "version": "0.23.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,11 +27,11 @@
     "mem-fs-editor": "9.4.0",
     "read-pkg-up": "7.0.1",
     "semver": "7.5.4",
-    "@sap-ux/ui5-application-writer": "0.26.18",
-    "@sap-ux/fe-fpm-writer": "0.24.16",
-    "@sap-ux/ui5-config": "0.22.10",
-    "@sap-ux/odata-service-writer": "0.20.5",
-    "@sap-ux/ui5-test-writer": "0.3.3"
+    "@sap-ux/odata-service-writer": "0.21.0",
+    "@sap-ux/ui5-application-writer": "0.27.1",
+    "@sap-ux/fe-fpm-writer": "0.25.0",
+    "@sap-ux/ui5-config": "0.23.0",
+    "@sap-ux/ui5-test-writer": "0.4.0"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -41,7 +41,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
-    "@sap-ux/eslint-plugin-fiori-tools": "0.4.2"
+    "@sap-ux/eslint-plugin-fiori-tools": "0.5.0"
   },
   "engines": {
     "node": ">=18.x"