@sap-ux/ui5-application-writer 0.18.5 → 0.18.7

package/dist/data/defaults.js

@@ -44,7 +44,7 @@ exports.packageDefaults = packageDefaults;
  * @returns - a merged package defintion
  */
 function mergeObjects(base, extension) {
-    return mergeWith_1.default({}, base, extension, (objValue, srcValue) => {
+    return (0, mergeWith_1.default)({}, base, extension, (objValue, srcValue) => {
         // merge and de-dup arrays
         if (objValue instanceof Array && srcValue instanceof Array) {
             return [...new Set([...objValue, ...srcValue])];
@@ -63,11 +63,11 @@ exports.mergeObjects = mergeObjects;
  */
 function mergeApp(app) {
     var _a, _b, _c, _d, _e;
-    return mergeWith_1.default({
+    return (0, mergeWith_1.default)({
         version: '0.0.1',
-        title: i18n_1.t('text.defaultAppTitle', { id: app.id }),
-        description: i18n_1.t('text.defaultAppDescription', { id: app.id }),
-        baseComponent: "sap/ui/core/UIComponent" /* BASE_COMPONENT */,
+        title: (0, i18n_1.t)('text.defaultAppTitle', { id: app.id }),
+        description: (0, i18n_1.t)('text.defaultAppDescription', { id: app.id }),
+        baseComponent: "sap/ui/core/UIComponent" /* UI5_DEFAULT.BASE_COMPONENT */,
         sourceTemplate: {
             id: (_b = (_a = app.sourceTemplate) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '',
             version: (_d = (_c = app.sourceTemplate) === null || _c === void 0 ? void 0 : _c.version) !== null && _d !== void 0 ? _d : '',
@@ -88,9 +88,9 @@ exports.defaultUI5Libs = ['sap.m', 'sap.ui.core'];
  */
 function mergeUi5(ui5, options) {
     var _a, _b, _c, _d, _e;
-    const version = (_a = ui5.version) !== null && _a !== void 0 ? _a : "" /* DEFAULT_UI5_VERSION */; // Undefined or null indicates the latest available should be used
+    const version = (_a = ui5.version) !== null && _a !== void 0 ? _a : "" /* UI5_DEFAULT.DEFAULT_UI5_VERSION */; // Undefined or null indicates the latest available should be used
     const framework = (_b = ui5.framework) !== null && _b !== void 0 ? _b : 'SAPUI5';
-    const defaultFrameworkUrl = framework === 'SAPUI5' ? "https://ui5.sap.com" /* SAPUI5_CDN */ : "https://openui5.hana.ondemand.com" /* OPENUI5_CDN */;
+    const defaultFrameworkUrl = framework === 'SAPUI5' ? "https://ui5.sap.com" /* UI5_DEFAULT.SAPUI5_CDN */ : "https://openui5.hana.ondemand.com" /* UI5_DEFAULT.OPENUI5_CDN */;
     const merged = {
         minUI5Version: getMinUI5Version(version, ui5.minUI5Version),
         localVersion: getLocalVersion({ framework, version, localVersion: ui5.localVersion }),
@@ -102,7 +102,7 @@ function mergeUi5(ui5, options) {
     merged.typesVersion =
         (_d = ui5.typesVersion) !== null && _d !== void 0 ? _d : ((options === null || options === void 0 ? void 0 : options.typescript) ? getEsmTypesVersion : getTypesVersion)(merged.minUI5Version);
     merged.ui5Theme = (_e = ui5.ui5Theme) !== null && _e !== void 0 ? _e : 'sap_fiori_3';
-    merged.ui5Libs = ui5Libs_1.getUI5Libs(ui5.ui5Libs);
+    merged.ui5Libs = (0, ui5Libs_1.getUI5Libs)(ui5.ui5Libs);
     return Object.assign({}, ui5, merged);
 }
 exports.mergeUi5 = mergeUi5;
@@ -115,15 +115,15 @@ exports.mergeUi5 = mergeUi5;
 function getTypesVersion(minUI5Version) {
     const version = semver_1.default.coerce(minUI5Version);
     if (!version) {
-        return `~${"1.108.0" /* TYPES_VERSION_BEST */}`;
+        return `~${"1.108.0" /* UI5_DEFAULT.TYPES_VERSION_BEST */}`;
     }
-    else if (semver_1.default.gte(version, "1.108.0" /* TYPES_VERSION_BEST */)) {
-        return `~${"1.108.0" /* TYPES_VERSION_BEST */}`;
+    else if (semver_1.default.gte(version, "1.108.0" /* UI5_DEFAULT.TYPES_VERSION_BEST */)) {
+        return `~${"1.108.0" /* UI5_DEFAULT.TYPES_VERSION_BEST */}`;
     }
     else {
-        return semver_1.default.gte(version, "1.76.0" /* TYPES_VERSION_SINCE */)
+        return semver_1.default.gte(version, "1.76.0" /* UI5_DEFAULT.TYPES_VERSION_SINCE */)
             ? `~${semver_1.default.major(version)}.${semver_1.default.minor(version)}.${semver_1.default.patch(version)}`
-            : "1.71.15" /* TYPES_VERSION_PREVIOUS */;
+            : "1.71.15" /* UI5_DEFAULT.TYPES_VERSION_PREVIOUS */;
     }
 }
 exports.getTypesVersion = getTypesVersion;
@@ -136,13 +136,13 @@ exports.getTypesVersion = getTypesVersion;
  */
 function getEsmTypesVersion(minUI5Version) {
     const version = semver_1.default.coerce(minUI5Version);
-    if (!version || semver_1.default.gte(version, "1.108.0" /* TYPES_VERSION_BEST */)) {
-        return `~${"1.108.0" /* TYPES_VERSION_BEST */}`;
+    if (!version || semver_1.default.gte(version, "1.108.0" /* UI5_DEFAULT.TYPES_VERSION_BEST */)) {
+        return `~${"1.108.0" /* UI5_DEFAULT.TYPES_VERSION_BEST */}`;
     }
     else {
-        return semver_1.default.gte(version, "1.94.0" /* ESM_TYPES_VERSION_SINCE */)
+        return semver_1.default.gte(version, "1.94.0" /* UI5_DEFAULT.ESM_TYPES_VERSION_SINCE */)
             ? `~${semver_1.default.major(version)}.${semver_1.default.minor(version)}.0`
-            : `~${"1.94.0" /* ESM_TYPES_VERSION_SINCE */}`;
+            : `~${"1.94.0" /* UI5_DEFAULT.ESM_TYPES_VERSION_SINCE */}`;
     }
 }
 exports.getEsmTypesVersion = getEsmTypesVersion;
@@ -154,7 +154,7 @@ exports.getEsmTypesVersion = getEsmTypesVersion;
  * @returns minimum UI5 version for manifest
  */
 function getMinUI5Version(ui5Version, minUI5Version) {
-    return minUI5Version !== null && minUI5Version !== void 0 ? minUI5Version : (ui5Version ? ui5Version : "1.60.0" /* MIN_UI5_VERSION */);
+    return minUI5Version !== null && minUI5Version !== void 0 ? minUI5Version : (ui5Version ? ui5Version : "1.60.0" /* UI5_DEFAULT.MIN_UI5_VERSION */);
 }
 /**
  * Get the manifest descriptor version from the specified UI5 version.
@@ -208,7 +208,7 @@ function getManifestVersion(ui5Version, manifestVersion) {
         }
         return matchVersion;
     };
-    return (_a = manifestVersion !== null && manifestVersion !== void 0 ? manifestVersion : (ui5SemVer && getClosestManifestVersion(ui5SemVer))) !== null && _a !== void 0 ? _a : "1.12.0" /* MANIFEST_VERSION */;
+    return (_a = manifestVersion !== null && manifestVersion !== void 0 ? manifestVersion : (ui5SemVer && getClosestManifestVersion(ui5SemVer))) !== null && _a !== void 0 ? _a : "1.12.0" /* UI5_DEFAULT.MANIFEST_VERSION */;
 }
 /**
  * If a specific local version is provided, use it, otherwise, sync with version but keep minimum versions in mind.
@@ -224,11 +224,11 @@ function getLocalVersion({ framework, version, localVersion }) {
     if (localVersion) {
         return localVersion;
     }
-    else if (version === "" /* DEFAULT_UI5_VERSION */) {
-        return "1.95.0" /* DEFAULT_LOCAL_UI5_VERSION */;
+    else if (version === "" /* UI5_DEFAULT.DEFAULT_UI5_VERSION */) {
+        return "1.95.0" /* UI5_DEFAULT.DEFAULT_LOCAL_UI5_VERSION */;
     }
     // minimum version available as local libs
-    const minVersion = framework === 'SAPUI5' ? "1.76.0" /* MIN_LOCAL_SAPUI5_VERSION */ : "1.52.5" /* MIN_LOCAL_OPENUI5_VERSION */;
+    const minVersion = framework === 'SAPUI5' ? "1.76.0" /* UI5_DEFAULT.MIN_LOCAL_SAPUI5_VERSION */ : "1.52.5" /* UI5_DEFAULT.MIN_LOCAL_OPENUI5_VERSION */;
     // If the ui5 `version` is higher than the min framework version 'result' then use that as the local version instead
     // Update to a valid coerced version string e.g. snapshot-1.80 -> 1.80.0. Cannot be null as previously validated.
     const versionSemVer = semver_1.default.coerce(version);

package/dist/data/index.js

@@ -11,18 +11,18 @@ const validators_1 = require("./validators");
  * @returns {Ui5App} - a new Ui5App instance with all required defaults set
  */
 function mergeWithDefaults(ui5App) {
-    validators_1.validate(ui5App);
-    ui5App.app = defaults_1.mergeApp(ui5App.app);
+    (0, validators_1.validate)(ui5App);
+    ui5App.app = (0, defaults_1.mergeApp)(ui5App.app);
     ui5App.appOptions = ui5App.appOptions || {};
     // if typescript and codeAssist is enabled disable codeAssist
     if (ui5App.appOptions.typescript && ui5App.appOptions.codeAssist) {
         ui5App.appOptions.codeAssist = false;
     }
-    ui5App.ui5 = defaults_1.mergeUi5(ui5App.ui5 || {}, ui5App.appOptions);
-    ui5App.package = defaults_1.mergeObjects(defaults_1.packageDefaults(ui5App.package.version, ui5App.app.description), ui5App.package);
+    ui5App.ui5 = (0, defaults_1.mergeUi5)(ui5App.ui5 || {}, ui5App.appOptions);
+    ui5App.package = (0, defaults_1.mergeObjects)((0, defaults_1.packageDefaults)(ui5App.package.version, ui5App.app.description), ui5App.package);
     if (ui5App.appOptions.sapux) {
         ui5App.package.devDependencies = ui5App.package.devDependencies || {};
-        ui5App.package.devDependencies['@sap/ux-specification'] = defaults_1.getSpecTagVersion(ui5App.ui5.version);
+        ui5App.package.devDependencies['@sap/ux-specification'] = (0, defaults_1.getSpecTagVersion)(ui5App.ui5.version);
     }
     return ui5App;
 }

package/dist/data/ui5Libs.d.ts

@@ -4,7 +4,7 @@
  * @param ui5Libs - The ui5 libraries to be merged with the defaults
  * @returns UI5 libs with defaults
  */
-export declare const getUI5Libs: (ui5Libs?: string | string[] | undefined) => string[];
+export declare const getUI5Libs: (ui5Libs?: string | string[]) => string[];
 /**
  * UI5 task and middleware configurations required for TypeScript projects
  */

package/dist/data/validators.js

@@ -15,11 +15,11 @@ const i18n_1 = require("../i18n");
  */
 function validateAppId(appId) {
     if (!appId) {
-        throw new Error(i18n_1.t('error.missingRequiredProperty', { propertyName: 'app.id' }));
+        throw new Error((0, i18n_1.t)('error.missingRequiredProperty', { propertyName: 'app.id' }));
     }
     const match = appId.match(/["]/);
     if (match) {
-        throw new Error(i18n_1.t('error.disallowedCharacters', { propertyName: 'app.id', disallowedChars: `${match === null || match === void 0 ? void 0 : match.join()}` }));
+        throw new Error((0, i18n_1.t)('error.disallowedCharacters', { propertyName: 'app.id', disallowedChars: `${match === null || match === void 0 ? void 0 : match.join()}` }));
     }
     return true;
 }
@@ -34,7 +34,7 @@ exports.validateAppId = validateAppId;
  */
 function validateUI5Version(version) {
     if (version && semver_1.default.coerce(version) === null) {
-        throw new Error(i18n_1.t('error.invalidUI5Version', { version }));
+        throw new Error((0, i18n_1.t)('error.invalidUI5Version', { version }));
     }
     return true;
 }

package/dist/files.js

@@ -11,9 +11,9 @@ const path_1 = require("path");
  * @throws if an error occurs reading a file path
  */
 function getFilePaths(dir) {
-    return fs_1.readdirSync(dir).reduce((files, entry) => {
-        const entryPath = path_1.join(dir, entry);
-        const isDirectory = fs_1.statSync(entryPath).isDirectory();
+    return (0, fs_1.readdirSync)(dir).reduce((files, entry) => {
+        const entryPath = (0, path_1.join)(dir, entry);
+        const isDirectory = (0, fs_1.statSync)(entryPath).isDirectory();
         return isDirectory ? [...files, ...getFilePaths(entryPath)] : [...files, entryPath];
     }, []);
 }

package/dist/index.js

@@ -30,17 +30,17 @@ function generate(basePath, ui5AppConfig, fs) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if (!fs) {
-            fs = mem_fs_editor_1.create(mem_fs_1.create());
+            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
         }
-        const ui5App = data_1.mergeWithDefaults(ui5AppConfig);
-        const tmplPath = path_1.join(__dirname, '..', 'templates');
+        const ui5App = (0, data_1.mergeWithDefaults)(ui5AppConfig);
+        const tmplPath = (0, path_1.join)(__dirname, '..', 'templates');
         const ignore = [((_a = ui5AppConfig.appOptions) === null || _a === void 0 ? void 0 : _a.typescript) ? '**/*.js' : '**/*.ts'];
-        fs.copyTpl(path_1.join(tmplPath, 'core', '**/*.*'), path_1.join(basePath), ui5App, undefined, {
+        fs.copyTpl((0, path_1.join)(tmplPath, 'core', '**/*.*'), (0, path_1.join)(basePath), ui5App, undefined, {
             globOptions: { dot: true, ignore },
             processDestinationPath: (filePath) => filePath.replace(/gitignore.tmpl/g, '.gitignore')
         });
         // ui5.yaml
-        const ui5ConfigPath = path_1.join(basePath, 'ui5.yaml');
+        const ui5ConfigPath = (0, path_1.join)(basePath, 'ui5.yaml');
         const ui5Config = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5ConfigPath));
         ui5Config.addFioriToolsProxydMiddleware({
             ui5: {
@@ -49,12 +49,12 @@ function generate(basePath, ui5AppConfig, fs) {
         });
         ui5Config.addFioriToolsAppReloadMiddleware();
         // ui5-local.yaml
-        const ui5LocalConfigPath = path_1.join(basePath, 'ui5-local.yaml');
+        const ui5LocalConfigPath = (0, path_1.join)(basePath, 'ui5-local.yaml');
         const ui5LocalConfig = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
         ui5LocalConfig.addUI5Framework(ui5App.ui5.framework, ui5App.ui5.localVersion, ui5App.ui5.ui5Libs, ui5App.ui5.ui5Theme);
         ui5LocalConfig.addFioriToolsAppReloadMiddleware();
         // Add optional features
-        options_1.applyOptionalFeatures(ui5App, fs, basePath, tmplPath, [ui5Config, ui5LocalConfig]);
+        (0, options_1.applyOptionalFeatures)(ui5App, fs, basePath, tmplPath, [ui5Config, ui5LocalConfig]);
         // write ui5 yamls
         fs.write(ui5ConfigPath, ui5Config.toString());
         fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
@@ -72,10 +72,10 @@ exports.generate = generate;
 function isTypescriptEnabled(basePath, fs) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!fs) {
-            fs = mem_fs_editor_1.create(mem_fs_1.create());
+            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
         }
         // check middlewares and tasks
-        const ui5Config = yield ui5_config_1.UI5Config.newInstance(fs.read(path_1.join(basePath, 'ui5.yaml')));
+        const ui5Config = yield ui5_config_1.UI5Config.newInstance(fs.read((0, path_1.join)(basePath, 'ui5.yaml')));
         if (!ui5Config.findCustomMiddleware(ui5Libs_1.ui5TSSupport.middleware.name)) {
             return false;
         }
@@ -97,10 +97,10 @@ function enableTypescript(basePath, fs) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if (!fs) {
-            fs = mem_fs_editor_1.create(mem_fs_1.create());
+            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
         }
-        const manifestPath = path_1.join(basePath, 'webapp/manifest.json');
-        const ui5ConfigPath = path_1.join(basePath, 'ui5.yaml');
+        const manifestPath = (0, path_1.join)(basePath, 'webapp/manifest.json');
+        const ui5ConfigPath = (0, path_1.join)(basePath, 'ui5.yaml');
         if (!fs.exists(manifestPath)) {
             throw new Error(`Invalid project folder. Cannot find required file ${manifestPath}`);
         }
@@ -109,14 +109,14 @@ function enableTypescript(basePath, fs) {
         }
         const manifest = fs.readJSON(manifestPath);
         const ui5Config = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5ConfigPath));
-        const tmplPath = path_1.join(__dirname, '..', 'templates');
+        const tmplPath = (0, path_1.join)(__dirname, '..', 'templates');
         const ui5App = {
             app: manifest['sap.app'],
             ui5: {
-                typesVersion: defaults_1.getEsmTypesVersion((_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version)
+                typesVersion: (0, defaults_1.getEsmTypesVersion)((_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version)
             }
         };
-        options_1.enableTypescript({ basePath, fs, ui5Configs: [ui5Config], tmplPath, ui5App }, true);
+        (0, options_1.enableTypescript)({ basePath, fs, ui5Configs: [ui5Config], tmplPath, ui5App }, true);
         fs.write(ui5ConfigPath, ui5Config.toString());
         return fs;
     });

package/dist/options.js

@@ -17,11 +17,11 @@ const defaults_1 = require("./data/defaults");
  * @param input.tmplPath template basepath
  */
 function copyTemplates(name, { ui5App, fs, basePath, tmplPath }) {
-    const optTmplDirPath = path_1.join(tmplPath, 'optional', `${name}`);
-    const optTmplFilePaths = files_1.getFilePaths(optTmplDirPath);
+    const optTmplDirPath = (0, path_1.join)(tmplPath, 'optional', `${name}`);
+    const optTmplFilePaths = (0, files_1.getFilePaths)(optTmplDirPath);
     optTmplFilePaths.forEach((optTmplFilePath) => {
         const relPath = optTmplFilePath.replace(optTmplDirPath, '');
-        const outPath = path_1.join(basePath, relPath);
+        const outPath = (0, path_1.join)(basePath, relPath);
         // Extend or add
         if (!fs.exists(outPath)) {
             fs.copyTpl(optTmplFilePath, outPath, ui5App, undefined, {
@@ -29,9 +29,9 @@ function copyTemplates(name, { ui5App, fs, basePath, tmplPath }) {
             });
         }
         else {
-            const add = JSON.parse(ejs_1.render(fs.read(optTmplFilePath), ui5App, {}));
+            const add = JSON.parse((0, ejs_1.render)(fs.read(optTmplFilePath), ui5App, {}));
             const existingFile = JSON.parse(fs.read(outPath));
-            const merged = defaults_1.mergeObjects(existingFile, add);
+            const merged = (0, defaults_1.mergeObjects)(existingFile, add);
             fs.writeJSON(outPath, merged);
         }
     });
@@ -55,13 +55,13 @@ const factories = {
  */
 function enableTypescript(input, keepOldComponent = false) {
     var _a;
-    input.ui5App.app.baseComponent = (_a = input.ui5App.app.baseComponent) !== null && _a !== void 0 ? _a : "sap/ui/core/UIComponent" /* BASE_COMPONENT */;
+    input.ui5App.app.baseComponent = (_a = input.ui5App.app.baseComponent) !== null && _a !== void 0 ? _a : "sap/ui/core/UIComponent" /* UI5_DEFAULT.BASE_COMPONENT */;
     copyTemplates('typescript', input);
     input.ui5Configs.forEach((ui5Config) => {
         ui5Config.addCustomMiddleware([ui5Libs_1.ui5TSSupport.middleware]);
         ui5Config.addCustomTasks([ui5Libs_1.ui5TSSupport.task]);
     });
-    const compPath = path_1.join(input.basePath, 'webapp/Component.js');
+    const compPath = (0, path_1.join)(input.basePath, 'webapp/Component.js');
     if (keepOldComponent) {
         input.fs.move(compPath, `${compPath}.old`);
     }

package/dist/types.d.ts

@@ -35,7 +35,7 @@ export interface App {
         toolsId?: string;
     };
 }
-export declare type UI5Framework = 'SAPUI5' | 'OpenUI5';
+export type UI5Framework = 'SAPUI5' | 'OpenUI5';
 export interface UI5 {
     framework: UI5Framework;
     frameworkUrl: string;

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%3Aui5-application-writer"
   },
-  "version": "0.18.5",
+  "version": "0.18.7",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -20,7 +20,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@sap-ux/ui5-config": "0.16.2",
+    "@sap-ux/ui5-config": "0.16.4",
     "@ui5/manifest": "1.49.2",
     "ejs": "3.1.7",
     "i18next": "21.6.11",
@@ -30,7 +30,7 @@
     "semver": "7.3.5"
   },
   "devDependencies": {
-    "@sap-ux/project-access": "1.1.0",
+    "@sap-ux/project-access": "1.1.3",
     "@types/ejs": "3.1.0",
     "@types/fs-extra": "9.0.13",
     "@types/lodash": "4.14.176",