@sap-ux/ui5-application-writer 0.17.4 → 0.17.5

package/dist/data/defaults.d.ts

@@ -8,15 +8,14 @@ import type { App, Package, UI5 } from '../types';
  */
 export declare function packageDefaults(version?: string, description?: string): Partial<Package>;
 /**
- * Merges 2 package definitions. All properties from A and from B will be present.
- * Overlapping properties will be replaced from B. Arrays will be concatenated.
- * `ui5.dependencies` will be de-duped.
+ * Merges two objects. All properties from base and from extension will be present.
+ * Overlapping properties will be used from extension. Arrays will be concatenated and de-duped.
  *
- * @param packageA - a partial package definition
- * @param packageB - a partial package definition
+ * @param base - any object definition
+ * @param extension - another object definition
  * @returns - a merged package defintion
  */
-export declare function mergePackages(packageA: Partial<Package>, packageB: Partial<Package>): Package;
+export declare function mergeObjects<B, E>(base: B, extension: E): B & E;
 export declare const enum UI5_DEFAULT {
     DEFAULT_UI5_VERSION = "",
     DEFAULT_LOCAL_UI5_VERSION = "1.95.0",

package/dist/data/defaults.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpecTagVersion = exports.getTypesVersion = exports.mergeUi5 = exports.defaultUI5Libs = exports.mergeApp = exports.mergePackages = exports.packageDefaults = void 0;
+exports.getSpecTagVersion = exports.getTypesVersion = exports.mergeUi5 = exports.defaultUI5Libs = exports.mergeApp = exports.mergeObjects = exports.packageDefaults = void 0;
 const version_to_descriptor_mapping_json_1 = __importDefault(require("./version-to-descriptor-mapping.json")); // from https://github.com/SAP/ui5-manifest/blob/master/mapping.json
 const ui5Libs_1 = require("./ui5Libs");
 const semver_1 = __importDefault(require("semver"));
 const i18n_1 = require("../i18n");
-const json_merger_1 = require("json-merger");
+const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 /**
  * Returns a package instance with default properties.
  *
@@ -36,26 +36,25 @@ function packageDefaults(version, description) {
 }
 exports.packageDefaults = packageDefaults;
 /**
- * Merges 2 package definitions. All properties from A and from B will be present.
- * Overlapping properties will be replaced from B. Arrays will be concatenated.
- * `ui5.dependencies` will be de-duped.
+ * Merges two objects. All properties from base and from extension will be present.
+ * Overlapping properties will be used from extension. Arrays will be concatenated and de-duped.
  *
- * @param packageA - a partial package definition
- * @param packageB - a partial package definition
+ * @param base - any object definition
+ * @param extension - another object definition
  * @returns - a merged package defintion
  */
-function mergePackages(packageA, packageB) {
-    var _a;
-    const mergedPackage = json_merger_1.mergeObjects([packageA, packageB], {
-        defaultArrayMergeOperation: 'concat'
+function mergeObjects(base, extension) {
+    return mergeWith_1.default({}, base, extension, (objValue, srcValue) => {
+        // merge and de-dup arrays
+        if (objValue instanceof Array && srcValue instanceof Array) {
+            return [...new Set([...objValue, ...srcValue])];
+        }
+        else {
+            return undefined;
+        }
     });
-    // de-dup package.ui5.dependencies
-    if ((_a = mergedPackage.ui5) === null || _a === void 0 ? void 0 : _a.dependencies) {
-        mergedPackage.ui5.dependencies = Array.from(new Set(mergedPackage.ui5.dependencies));
-    }
-    return mergedPackage;
 }
-exports.mergePackages = mergePackages;
+exports.mergeObjects = mergeObjects;
 /**
  * Returns an app instance merged with default properties.
  *
@@ -64,20 +63,17 @@ exports.mergePackages = mergePackages;
  */
 function mergeApp(app) {
     var _a, _b, _c, _d, _e;
-    return json_merger_1.mergeObjects([
-        {
-            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 */,
-            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 : '',
-                toolsId: (_e = app.sourceTemplate) === null || _e === void 0 ? void 0 : _e.toolsId
-            }
-        },
-        app
-    ]);
+    return 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 */,
+        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 : '',
+            toolsId: (_e = app.sourceTemplate) === null || _e === void 0 ? void 0 : _e.toolsId
+        }
+    }, app);
 }
 exports.mergeApp = mergeApp;
 // Required default libs

package/dist/data/index.js

@@ -15,7 +15,7 @@ function mergeWithDefaults(ui5App) {
     ui5App.app = defaults_1.mergeApp(ui5App.app);
     ui5App.appOptions = ui5App.appOptions || {};
     ui5App.ui5 = defaults_1.mergeUi5(ui5App.ui5 || {});
-    ui5App.package = defaults_1.mergePackages(defaults_1.packageDefaults(ui5App.package.version, ui5App.app.description), ui5App.package);
+    ui5App.package = defaults_1.mergeObjects(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);

package/dist/options.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyOptionalFeatures = exports.enableNpmPackageConsumption = exports.enableTypescript = void 0;
 const path_1 = require("path");
 const ejs_1 = require("ejs");
-const json_merger_1 = require("json-merger");
 const files_1 = require("./files");
 const ui5Libs_1 = require("./data/ui5Libs");
+const defaults_1 = require("./data/defaults");
 /**
  * Copy all template files into the target project.
  *
@@ -23,16 +23,16 @@ function copyTemplates(name, { ui5App, fs, basePath, tmplPath }) {
         const relPath = optTmplFilePath.replace(optTmplDirPath, '');
         const outPath = path_1.join(basePath, relPath);
         // Extend or add
-        if (!(fs === null || fs === void 0 ? void 0 : fs.exists(outPath))) {
-            fs === null || fs === void 0 ? void 0 : fs.copyTpl(optTmplFilePath, outPath, ui5App, undefined, {
+        if (!fs.exists(outPath)) {
+            fs.copyTpl(optTmplFilePath, outPath, ui5App, undefined, {
                 globOptions: { dot: true }
             });
         }
         else {
-            const add = JSON.parse(ejs_1.render(fs === null || fs === void 0 ? void 0 : fs.read(optTmplFilePath), ui5App, {}));
-            const existingFile = JSON.parse(fs === null || fs === void 0 ? void 0 : fs.read(outPath));
-            const merged = json_merger_1.mergeObjects([existingFile, add], { defaultArrayMergeOperation: 'concat' });
-            fs === null || fs === void 0 ? void 0 : fs.writeJSON(outPath, merged);
+            const add = JSON.parse(ejs_1.render(fs.read(optTmplFilePath), ui5App, {}));
+            const existingFile = JSON.parse(fs.read(outPath));
+            const merged = defaults_1.mergeObjects(existingFile, add);
+            fs.writeJSON(outPath, merged);
         }
     });
 }

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.17.4",
+  "version": "0.17.5",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -22,16 +22,17 @@
   "dependencies": {
     "@sap-ux/ui5-config": "0.15.1",
     "ejs": "3.1.7",
+    "i18next": "21.6.11",
+    "lodash": "4.17.21",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "json-merger": "1.1.7",
-    "semver": "7.3.5",
-    "i18next": "21.6.11"
+    "semver": "7.3.5"
   },
   "devDependencies": {
     "@types/ejs": "3.1.0",
-    "@types/mem-fs": "1.1.2",
     "@types/fs-extra": "9.0.13",
+    "@types/lodash": "4.14.176",
+    "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.3.9",
     "fs-extra": "10.0.0"