@sap-ux/odata-service-writer 0.14.16 → 0.14.18

package/dist/data/annotations.js

@@ -47,7 +47,7 @@ function xmlToJson(xml) {
         return parser.parse(xml, true);
     }
     catch (error) {
-        throw new Error(i18n_1.t('error.unparseableXML', { error }));
+        throw new Error((0, i18n_1.t)('error.unparseableXML', { error }));
     }
 }
 /**

package/dist/data/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];

package/dist/index.js

@@ -32,8 +32,8 @@ Object.defineProperty(exports, "OdataVersion", { enumerable: true, get: function
  */
 function ensureExists(basePath, files, fs) {
     files.forEach((path) => {
-        if (!fs.exists(path_1.join(basePath, path))) {
-            throw new Error(i18n_1.t('error.requiredProjectFileNotFound', { path }));
+        if (!fs.exists((0, path_1.join)(basePath, path))) {
+            throw new Error((0, i18n_1.t)('error.requiredProjectFileNotFound', { path }));
         }
     });
 }
@@ -50,11 +50,11 @@ function findProjectFiles(basePath, fs) {
         const parts = basePath.split(path_1.sep);
         while (parts.length > 0 && (!files.packageJson || !files.ui5Yaml)) {
             const path = parts.join(path_1.sep);
-            if (!files.packageJson && fs.exists(path_1.join(path, 'package.json'))) {
-                files.packageJson = path_1.join(path, 'package.json');
+            if (!files.packageJson && fs.exists((0, path_1.join)(path, 'package.json'))) {
+                files.packageJson = (0, path_1.join)(path, 'package.json');
             }
-            if (!files.ui5Yaml && fs.exists(path_1.join(path, 'ui5.yaml'))) {
-                files.ui5Yaml = path_1.join(path, 'ui5.yaml');
+            if (!files.ui5Yaml && fs.exists((0, path_1.join)(path, 'ui5.yaml'))) {
+                files.ui5Yaml = (0, path_1.join)(path, 'ui5.yaml');
             }
             parts.pop();
         }
@@ -75,15 +75,15 @@ function generate(basePath, service, fs) {
     var _a;
     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 paths = yield findProjectFiles(basePath, fs);
         ensureExists(basePath, ['webapp/manifest.json'], fs);
-        data_1.enhanceData(service);
+        (0, data_1.enhanceData)(service);
         // merge content into existing files
-        const templateRoot = path_1.join(__dirname, '../templates');
+        const templateRoot = (0, path_1.join)(__dirname, '../templates');
         // manifest.json
-        updates_1.updateManifest(basePath, service, fs, templateRoot);
+        (0, updates_1.updateManifest)(basePath, service, fs, templateRoot);
         // update ui5.yaml if it exists
         let ui5Config;
         let ui5LocalConfig;
@@ -103,7 +103,7 @@ function generate(basePath, service, fs) {
             }
             fs.write(paths.ui5Yaml, ui5Config.toString());
             // ui5-local.yaml
-            ui5LocalConfigPath = path_1.join(path_1.dirname(paths.ui5Yaml), 'ui5-local.yaml');
+            ui5LocalConfigPath = (0, path_1.join)((0, path_1.dirname)(paths.ui5Yaml), 'ui5-local.yaml');
             if (fs.exists(ui5LocalConfigPath)) {
                 ui5LocalConfig = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
                 ui5LocalConfig.addFioriToolsProxydMiddleware({ backend: [service.previewSettings] });
@@ -115,29 +115,29 @@ function generate(basePath, service, fs) {
             if (paths.ui5Yaml && ui5Config) {
                 const ui5MockConfig = yield ui5_config_1.UI5Config.newInstance(ui5Config.toString());
                 ui5MockConfig.addMockServerMiddleware(service.path);
-                fs.write(path_1.join(path_1.dirname(paths.ui5Yaml), 'ui5-mock.yaml'), ui5MockConfig.toString());
+                fs.write((0, path_1.join)((0, path_1.dirname)(paths.ui5Yaml), 'ui5-mock.yaml'), ui5MockConfig.toString());
                 // also add mockserver middleware to ui5-local.yaml
                 if (ui5LocalConfig) {
                     ui5LocalConfig.addMockServerMiddleware(service.path);
                 }
             }
             // create local copy of metadata and annotations
-            fs.write(path_1.join(basePath, 'webapp', 'localService', 'metadata.xml'), prettify_xml_1.default(service.metadata, { indent: 4 }));
+            fs.write((0, path_1.join)(basePath, 'webapp', 'localService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
             // Adds local annotations to datasources section of manifest.json and writes the annotations file
             if (service.localAnnotationsName) {
-                const namespaces = data_1.getAnnotationNamespaces(service);
-                fs.copyTpl(path_1.join(templateRoot, 'add', 'annotation.xml'), path_1.join(basePath, 'webapp', 'annotations', `${service.localAnnotationsName}.xml`), Object.assign(Object.assign({}, service), { namespaces }));
+                const namespaces = (0, data_1.getAnnotationNamespaces)(service);
+                fs.copyTpl((0, path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, path_1.join)(basePath, 'webapp', 'annotations', `${service.localAnnotationsName}.xml`), Object.assign(Object.assign({}, service), { namespaces }));
             }
         }
         // update package.json if required
         if (paths.packageJson && paths.ui5Yaml) {
-            updates_1.updatePackageJson(paths.packageJson, fs, !!service.metadata);
+            (0, updates_1.updatePackageJson)(paths.packageJson, fs, !!service.metadata);
         }
         if (ui5LocalConfigPath && ui5LocalConfig) {
             fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
         }
         if ((_a = service.annotations) === null || _a === void 0 ? void 0 : _a.xml) {
-            fs.write(path_1.join(basePath, 'webapp', 'localService', `${service.annotations.technicalName}.xml`), prettify_xml_1.default(service.annotations.xml, { indent: 4 }));
+            fs.write((0, path_1.join)(basePath, 'webapp', 'localService', `${service.annotations.technicalName}.xml`), (0, prettify_xml_1.default)(service.annotations.xml, { indent: 4 }));
         }
         return fs;
     });

package/dist/updates.d.ts

@@ -17,4 +17,11 @@ export declare function updateManifest(basePath: string, service: OdataService,
  * @param addMockServer true if the mocksever middleware needs to be added as well
  */
 export declare function updatePackageJson(path: string, fs: Editor, addMockServer: boolean): void;
+/**
+ * Check if dev dependencies contains @ui5/cli version greater than 2.
+ *
+ * @param devDependencies dev dependencies from package.json
+ * @returns boolean
+ */
+export declare function hasUI5CliV3(devDependencies: any): boolean;
 //# sourceMappingURL=updates.d.ts.map

package/dist/updates.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updatePackageJson = exports.updateManifest = void 0;
+exports.hasUI5CliV3 = exports.updatePackageJson = exports.updateManifest = void 0;
 const ejs_1 = require("ejs");
 const path_1 = require("path");
 const i18n_1 = require("./i18n");
+const semver_1 = __importDefault(require("semver"));
 /**
  * Internal function that updates the manifest.json based on the given service configuration.
  *
@@ -15,19 +19,19 @@ const i18n_1 = require("./i18n");
 function updateManifest(basePath, service, fs, templateRoot) {
     var _a;
     // manifest.json
-    const manifestPath = path_1.join(basePath, 'webapp', 'manifest.json');
+    const manifestPath = (0, path_1.join)(basePath, 'webapp', 'manifest.json');
     // Get component app id
     const manifest = fs.readJSON(manifestPath);
     const appProp = 'sap.app';
     const appid = (_a = manifest === null || manifest === void 0 ? void 0 : manifest[appProp]) === null || _a === void 0 ? void 0 : _a.id;
     // Throw if required property is not found manifest.json
     if (!appid) {
-        throw new Error(i18n_1.t('error.requiredProjectPropertyNotFound', { property: `'${appProp}'.id`, path: manifestPath }));
+        throw new Error((0, i18n_1.t)('error.requiredProjectPropertyNotFound', { property: `'${appProp}'.id`, path: manifestPath }));
     }
-    const manifestJsonExt = fs.read(path_1.join(templateRoot, 'extend', `manifest.json`));
+    const manifestJsonExt = fs.read((0, path_1.join)(templateRoot, 'extend', `manifest.json`));
     // If the service object includes ejs options, for example 'client' (see: https://ejs.co/#docs),
     // resulting in unexpected behaviour and problems when webpacking. Passing an empty options object prevents this.
-    fs.extendJSON(manifestPath, JSON.parse(ejs_1.render(manifestJsonExt, service, {})));
+    fs.extendJSON(manifestPath, JSON.parse((0, ejs_1.render)(manifestJsonExt, service, {})));
 }
 exports.updateManifest = updateManifest;
 /**
@@ -41,25 +45,43 @@ function updatePackageJson(path, fs, addMockServer) {
     var _a, _b, _c;
     const packageJson = JSON.parse(fs.read(path));
     packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
-    packageJson.ui5 = (_b = packageJson.ui5) !== null && _b !== void 0 ? _b : {};
-    packageJson.ui5.dependencies = (_c = packageJson.ui5.dependencies) !== null && _c !== void 0 ? _c : [];
+    if (!hasUI5CliV3(packageJson.devDependencies)) {
+        packageJson.ui5 = (_b = packageJson.ui5) !== null && _b !== void 0 ? _b : {};
+        packageJson.ui5.dependencies = (_c = packageJson.ui5.dependencies) !== null && _c !== void 0 ? _c : [];
+        if (!packageJson.ui5.dependencies.includes('@sap/ux-ui5-tooling')) {
+            packageJson.ui5.dependencies.push('@sap/ux-ui5-tooling');
+        }
+        if (addMockServer &&
+            !packageJson.ui5.dependencies.includes('@sap/ux-ui5-fe-mockserver-middleware') &&
+            !packageJson.ui5.dependencies.includes('@sap-ux/ui5-middleware-fe-mockserver')) {
+            packageJson.ui5.dependencies.push('@sap-ux/ui5-middleware-fe-mockserver');
+        }
+    }
     if (!packageJson.devDependencies['@sap/ux-ui5-tooling']) {
         packageJson.devDependencies['@sap/ux-ui5-tooling'] = '1';
     }
-    if (!packageJson.ui5.dependencies.includes('@sap/ux-ui5-tooling')) {
-        packageJson.ui5.dependencies.push('@sap/ux-ui5-tooling');
-    }
     if (addMockServer) {
         if (!packageJson.devDependencies['@sap/ux-ui5-fe-mockserver-middleware'] &&
             !packageJson.devDependencies['@sap-ux/ui5-middleware-fe-mockserver']) {
             packageJson.devDependencies['@sap-ux/ui5-middleware-fe-mockserver'] = '2';
         }
-        if (!packageJson.ui5.dependencies.includes('@sap/ux-ui5-fe-mockserver-middleware') &&
-            !packageJson.ui5.dependencies.includes('@sap-ux/ui5-middleware-fe-mockserver')) {
-            packageJson.ui5.dependencies.push('@sap-ux/ui5-middleware-fe-mockserver');
-        }
     }
     fs.writeJSON(path, packageJson);
 }
 exports.updatePackageJson = updatePackageJson;
+/**
+ * Check if dev dependencies contains @ui5/cli version greater than 2.
+ *
+ * @param devDependencies dev dependencies from package.json
+ * @returns boolean
+ */
+function hasUI5CliV3(devDependencies) {
+    let isV3 = false;
+    const ui5CliSemver = semver_1.default.coerce(devDependencies['@ui5/cli']);
+    if (ui5CliSemver && semver_1.default.gte(ui5CliSemver, '3.0.0')) {
+        isV3 = true;
+    }
+    return isV3;
+}
+exports.hasUI5CliV3 = hasUI5CliV3;
 //# sourceMappingURL=updates.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%3Aodata-service-writer"
   },
-  "version": "0.14.16",
+  "version": "0.14.18",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -20,19 +20,22 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@sap-ux/ui5-config": "0.16.3",
+    "@sap-ux/ui5-config": "0.16.4",
     "ejs": "3.1.7",
     "fast-xml-parser": "4.0.1",
     "i18next": "20.3.2",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "prettify-xml": "1.2.0"
+    "prettify-xml": "1.2.0",
+    "semver": "7.3.5"
   },
   "devDependencies": {
+    "@sap-ux/project-access": "1.1.3",
     "@types/ejs": "3.1.0",
     "@types/fs-extra": "9.0.13",
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
+    "@types/semver": "7.3.9",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21"
   },