@sap-ux/fiori-elements-writer 0.8.16 → 0.8.18

package/dist/data/defaults.d.ts

@@ -7,7 +7,7 @@ import type { FioriElementsApp, Template } from '../types';
  * @param odataVersion - may be used to determine the default properties set
  * @returns Updated template settings
  */
-export declare function setDefaultTemplateSettings<T>(template: Template<T>, odataVersion?: OdataVersion): T;
+export declare function setDefaultTemplateSettings<T extends {}>(template: Template<T>, odataVersion?: OdataVersion): T;
 /**
  * Sets defaults for the specified Fiori elements application.
  *

package/dist/data/defaults.js

@@ -62,10 +62,10 @@ function setAppDefaults(feApp) {
         };
     }
     // Generate base UI5 project
-    feApp.app.baseComponent = feApp.app.baseComponent || templateAttributes_1.getBaseComponent(feApp.template.type, feApp.service.version);
+    feApp.app.baseComponent = feApp.app.baseComponent || (0, templateAttributes_1.getBaseComponent)(feApp.template.type, feApp.service.version);
     // 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: (_d = templateAttributes_1.getUi5Libs(feApp.template.type, feApp.service.version)) === null || _d === void 0 ? void 0 : _d.concat((_f = (_e = feApp.ui5) === null || _e === void 0 ? void 0 : _e.ui5Libs) !== null && _f !== void 0 ? _f : []) });
+    feApp.ui5 = Object.assign(Object.assign({}, feApp.ui5), { ui5Libs: (_d = (0, templateAttributes_1.getUi5Libs)(feApp.template.type, feApp.service.version)) === null || _d === void 0 ? void 0 : _d.concat((_f = (_e = feApp.ui5) === null || _e === void 0 ? void 0 : _e.ui5Libs) !== null && _f !== void 0 ? _f : []) });
     if (!feApp.service.localAnnotationsName) {
         feApp.service.localAnnotationsName = 'annotation';
     }

package/dist/data/manifestSettings.js

@@ -31,16 +31,16 @@ function extendManifestJson(fs, targetPath, rootTemplatesPath, feApp) {
     const templateSettings = Object.assign(Object.assign({}, feApp.template.settings), { defaultModel: feApp.service.model, type: feApp.template.type });
     // Manifest paths to be extended
     const extendTemplatePaths = [
-        path_1.join(rootTemplatesPath, 'common', 'extend', 'webapp'),
-        path_1.join(rootTemplatesPath, templatePath, 'extend', 'webapp'),
-        path_1.join(rootTemplatesPath, `v${feApp.service.version}`, templatePath, 'extend', 'webapp'),
-        path_1.join(rootTemplatesPath, `v${feApp.service.version}`, 'common', 'extend', 'webapp')
+        (0, path_1.join)(rootTemplatesPath, 'common', 'extend', 'webapp'),
+        (0, path_1.join)(rootTemplatesPath, templatePath, 'extend', 'webapp'),
+        (0, path_1.join)(rootTemplatesPath, `v${feApp.service.version}`, templatePath, 'extend', 'webapp'),
+        (0, path_1.join)(rootTemplatesPath, `v${feApp.service.version}`, 'common', 'extend', 'webapp')
     ];
-    const manifestPath = path_1.join(targetPath, 'webapp', 'manifest.json');
+    const manifestPath = (0, path_1.join)(targetPath, 'webapp', 'manifest.json');
     extendTemplatePaths.forEach((extendTemplatePath) => {
-        const manifestTemplatePath = path_1.join(extendTemplatePath, 'manifest.json');
+        const manifestTemplatePath = (0, path_1.join)(extendTemplatePath, 'manifest.json');
         if (fs.exists(manifestTemplatePath)) {
-            fs.extendJSON(manifestPath, JSON.parse(ejs_1.render(fs.read(manifestTemplatePath), templateSettings, {})));
+            fs.extendJSON(manifestPath, JSON.parse((0, ejs_1.render)(fs.read(manifestTemplatePath), templateSettings, {})));
         }
     });
 }

package/dist/data/templateAttributes.d.ts

@@ -1,7 +1,7 @@
 import { OdataVersion, TemplateType } from '../types';
 export declare const oldestSupportedUI5Version = "1.65.0";
 export declare const changesPreviewToVersion = "1.78.0";
-export declare type TemplateOptions = {
+export type TemplateOptions = {
     changesPreview?: boolean;
     changesLoader?: boolean;
 };
@@ -22,7 +22,7 @@ export declare function getBaseComponent(type: TemplateType, version: OdataVersi
  * @returns The Ui5 libs required by the specified template type and OData version
  */
 export declare function getUi5Libs(type: TemplateType, version: OdataVersion): string[] | undefined;
-declare type TemplateAttributes = {
+type TemplateAttributes = {
     [K in TemplateType]: {
         supportedODataVersions: OdataVersion[];
         minimumUi5Version: {

package/dist/index.d.ts

@@ -9,7 +9,7 @@ import type { FioriElementsApp } from './types';
  * @param fs - an optional reference to a mem-fs editor
  * @returns Reference to a mem-fs-editor
  */
-declare function generate<T>(basePath: string, data: FioriElementsApp<T>, fs?: Editor): Promise<Editor>;
+declare function generate<T extends {}>(basePath: string, data: FioriElementsApp<T>, fs?: Editor): Promise<Editor>;
 export { generate, FioriElementsApp, App };
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -49,15 +53,15 @@ function generate(basePath, data, fs) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     return __awaiter(this, void 0, void 0, function* () {
         // Clone rather than modifying callers refs
-        const feApp = cloneDeep_1.default(data);
+        const feApp = (0, cloneDeep_1.default)(data);
         // Ensure input data contains at least the manadatory properties required for app genertation
-        validate_1.validateRequiredProperties(feApp);
-        defaults_1.setAppDefaults(feApp);
-        fs = yield ui5_application_writer_1.generate(basePath, feApp, fs);
-        feApp.template.settings = defaults_1.setDefaultTemplateSettings(feApp.template, feApp.service.version);
+        (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
-        validate_1.validateApp(feApp);
-        yield odata_service_writer_1.generate(basePath, feApp.service, fs);
+        (0, validate_1.validateApp)(feApp);
+        yield (0, odata_service_writer_1.generate)(basePath, feApp.service, fs);
         const templateOptions = {
             changesPreview: ((_a = feApp.ui5) === null || _a === void 0 ? void 0 : _a.version)
                 ? semver_1.default.lt(semver_1.default.coerce((_b = feApp.ui5) === null || _b === void 0 ? void 0 : _b.version), templateAttributes_1.changesPreviewToVersion)
@@ -65,22 +69,22 @@ function generate(basePath, data, fs) {
             changesLoader: feApp.service.version === odata_service_writer_1.OdataVersion.v2
         };
         // Add new files from templates e.g.
-        const rootTemplatesPath = path_1.join(__dirname, '..', 'templates');
+        const rootTemplatesPath = (0, path_1.join)(__dirname, '..', 'templates');
         // Add templates common to all template types
         // Common files
         const ignore = [((_c = feApp.appOptions) === null || _c === void 0 ? void 0 : _c.typescript) ? '**/*.js' : '**/*.ts'];
-        fs.copyTpl(path_1.join(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, Object.assign(Object.assign({}, feApp), { templateOptions,
+        fs.copyTpl((0, path_1.join)(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, Object.assign(Object.assign({}, feApp), { templateOptions,
             escapeFLPText: templateAttributes_1.escapeFLPText }), undefined, {
             globOptions: { ignore, dot: true }
         });
         // Extend common files
-        const packagePath = path_1.join(basePath, 'package.json');
+        const packagePath = (0, path_1.join)(basePath, 'package.json');
         // Extend package.json
-        fs.extendJSON(packagePath, JSON.parse(ejs_1.render(fs.read(path_1.join(rootTemplatesPath, 'common', 'extend', 'package.json')), feApp, {})));
+        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;
-            fe_fpm_writer_1.generateCustomPage(basePath, {
+            (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,
@@ -89,17 +93,17 @@ function generate(basePath, data, fs) {
         }
         else {
             // Copy version specific common templates and version specific, floorplan specific templates
-            const templateVersionPath = path_1.join(rootTemplatesPath, `v${(_f = feApp.service) === null || _f === void 0 ? void 0 : _f.version}`);
-            [path_1.join(templateVersionPath, 'common', 'add'), path_1.join(templateVersionPath, feApp.template.type, 'add')].forEach((templatePath) => {
-                fs.copyTpl(path_1.join(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true, globOptions: { ignore, dot: true } });
+            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
-        manifestSettings_1.extendManifestJson(fs, basePath, rootTemplatesPath, feApp);
+        (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)
         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);
-        packageJson.scripts = Object.assign(packageJson.scripts, Object.assign({}, packageConfig_1.getPackageJsonTasks({
+        packageJson.scripts = Object.assign(packageJson.scripts || {}, Object.assign({}, (0, packageConfig_1.getPackageJsonTasks)({
             localOnly: !((_j = feApp.service) === null || _j === void 0 ? void 0 : _j.url),
             addMock: !!((_k = feApp.service) === null || _k === void 0 ? void 0 : _k.metadata),
             addTest,
@@ -110,7 +114,7 @@ function generate(basePath, data, fs) {
         })));
         fs.writeJSON(packagePath, packageJson);
         if (addTest) {
-            ui5_test_writer_1.generateOPAFiles(basePath, {}, fs);
+            (0, ui5_test_writer_1.generateOPAFiles)(basePath, {}, fs);
         }
         return fs;
     });

package/dist/packageConfig.js

@@ -30,11 +30,11 @@ function getPackageJsonTasks({ localOnly, addMock = true, addTest = false, sapCl
     // Full parameter section composed by search param and fragment identifier
     const params = `${searchParam}${hashFragment}`;
     const startCommand = localOnly
-        ? `echo \\"${i18n_1.t('info.mockOnlyWarning')}\\"`
+        ? `echo \\"${(0, i18n_1.t)('info.mockOnlyWarning')}\\"`
         : `fiori run --open "${startFile || 'test/flpSandbox.html'}${params}"`;
     const startLocalCommand = `fiori run --config ./ui5-local.yaml --open "${localStartFile || 'test/flpSandbox.html'}${params}"`;
     const startNoFlpCommand = localOnly
-        ? `echo \\"${i18n_1.t('info.mockOnlyWarning')}\\"`
+        ? `echo \\"${(0, i18n_1.t)('info.mockOnlyWarning')}\\"`
         : `fiori run --open "${'index.html'}${searchParam}"`;
     const mockTask = `fiori run --config ./ui5-mock.yaml --open "test/flpSandbox.html${params}"`;
     const testTask = 'fiori run --config ./ui5-mock.yaml --open "test/integration/opaTests.qunit.html"';

package/dist/validate.js

@@ -18,7 +18,7 @@ function validateApp(feApp) {
     // Validate odata version
     if (feApp.service.version &&
         !templateAttributes_1.TemplateTypeAttributes[feApp.template.type].supportedODataVersions.includes(feApp.service.version)) {
-        throw new types_1.ValidationError(i18n_1.t('error.unsupportedOdataVersion', {
+        throw new types_1.ValidationError((0, i18n_1.t)('error.unsupportedOdataVersion', {
             serviceVersion: feApp.service.version,
             templateType: feApp.template.type
         }));
@@ -28,7 +28,7 @@ function validateApp(feApp) {
     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 (!ui5Version) {
-            throw new types_1.ValidationError(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: (_c = feApp.ui5) === null || _c === void 0 ? void 0 : _c.version }));
         }
     }
     let minUI5Version;
@@ -36,14 +36,14 @@ function validateApp(feApp) {
     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 (!minUI5Version) {
-            throw new types_1.ValidationError(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: (_f = feApp.ui5) === null || _f === void 0 ? void 0 : _f.minUI5Version }));
         }
     }
     else {
         minUI5Version = semver_1.default.coerce(minRequiredUI5Version);
     }
     if (ui5Version && semver_1.default.lt(ui5Version, minRequiredUI5Version)) {
-        throw new types_1.ValidationError(i18n_1.t('error.unsupportedUI5Version', {
+        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,
             templateType: feApp.template.type,
@@ -51,7 +51,7 @@ function validateApp(feApp) {
         }));
     }
     if (semver_1.default.lt(minUI5Version, minRequiredUI5Version)) {
-        throw new types_1.ValidationError(i18n_1.t('error.unsupportedUI5Version', {
+        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,
             templateType: feApp.template.type,
@@ -68,7 +68,7 @@ exports.validateApp = validateApp;
 function validateRequiredProperties(feApp) {
     // Service is mandatory for generation of Fiori Elements apps
     if (!feApp.service) {
-        throw new types_1.ValidationError(i18n_1.t('error.missingRequiredProperty', {
+        throw new types_1.ValidationError((0, i18n_1.t)('error.missingRequiredProperty', {
             propertyName: 'FioriElementsApp.service'
         }));
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "0.8.16",
+  "version": "0.8.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -20,11 +20,11 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@sap-ux/odata-service-writer": "0.14.16",
-    "@sap-ux/ui5-application-writer": "0.18.6",
-    "@sap-ux/fe-fpm-writer": "0.18.5",
-    "@sap-ux/ui5-config": "0.16.3",
-    "@sap-ux/ui5-test-writer": "0.1.6",
+    "@sap-ux/odata-service-writer": "0.14.17",
+    "@sap-ux/ui5-application-writer": "0.18.8",
+    "@sap-ux/fe-fpm-writer": "0.18.7",
+    "@sap-ux/ui5-config": "0.16.4",
+    "@sap-ux/ui5-test-writer": "0.1.7",
     "ejs": "3.1.7",
     "i18next": "20.3.2",
     "lodash": "4.17.21",