@sap-ux/ui5-application-writer 0.17.7 → 0.17.9

package/dist/data/defaults.d.ts

@@ -1,4 +1,4 @@
-import type { App, Package, UI5 } from '../types';
+import type { App, AppOptions, Package, UI5 } from '../types';
 /**
  * Returns a package instance with default properties.
  *
@@ -26,7 +26,8 @@ export declare const enum UI5_DEFAULT {
     OPENUI5_CDN = "https://openui5.hana.ondemand.com",
     TYPES_VERSION_SINCE = "1.76.0",
     TYPES_VERSION_PREVIOUS = "1.71.18",
-    TYPES_VERSION_BEST = "1.102.7",
+    TYPES_VERSION_BEST = "1.102.9",
+    ESM_TYPES_VERSION_SINCE = "1.90.0",
     MANIFEST_VERSION = "1.12.0",
     BASE_COMPONENT = "sap/ui/core/UIComponent"
 }
@@ -43,17 +44,25 @@ export declare const defaultUI5Libs: string[];
  * Coerces provided UI5 versions to valid semantic versions.
  *
  * @param {UI5} [ui5] - the UI5 instance
+ * @param options - application options
  * @returns {UI5} the updated copy of UI5 instance (does not change `ui5`)
  */
-export declare function mergeUi5(ui5: Partial<UI5>): UI5;
+export declare function mergeUi5(ui5: Partial<UI5>, options?: Partial<AppOptions>): UI5;
 /**
- * Get the best types version for the given minUI5Version.
- * For the latest versions the LTS S/4 on-premise version (1.102.x) is used, for anything before we match the versions as far back as available.
+ * Get the best types version for the given minUI5Version for https://www.npmjs.com/package/@sapui5/ts-types where specific versions are missing.
  *
- * @param minUI5Version the mininum UI5 version that needs to be supported
+ * @param minUI5Version the minimum UI5 version that needs to be supported
  * @returns semantic version representing the types version.
  */
 export declare function getTypesVersion(minUI5Version?: string): string;
+/**
+ * Get the best types version for the given minUI5Version within a selective range, starting at 1.90.0 for https://www.npmjs.com/package/@sapui5/ts-types-esm
+ * For the latest versions the LTS S/4 on-premise version (1.102.x) is used, for anything before we match the versions as far back as available.
+ *
+ * @param minUI5Version the minimum UI5 version that needs to be supported
+ * @returns semantic version representing the types version.
+ */
+export declare function getEsmTypesVersion(minUI5Version?: string): string;
 /**
  * Retrieve the tag version of the @sap/ux-specification based on the given version.
  *

package/dist/data/defaults.js

@@ -3,7 +3,7 @@ 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.mergeObjects = exports.packageDefaults = void 0;
+exports.getSpecTagVersion = exports.getEsmTypesVersion = 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"));
@@ -83,9 +83,10 @@ exports.defaultUI5Libs = ['sap.m', 'sap.ui.core'];
  * Coerces provided UI5 versions to valid semantic versions.
  *
  * @param {UI5} [ui5] - the UI5 instance
+ * @param options - application options
  * @returns {UI5} the updated copy of UI5 instance (does not change `ui5`)
  */
-function mergeUi5(ui5) {
+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 framework = (_b = ui5.framework) !== null && _b !== void 0 ? _b : 'SAPUI5';
@@ -98,26 +99,26 @@ function mergeUi5(ui5) {
         frameworkUrl: (_c = ui5.frameworkUrl) !== null && _c !== void 0 ? _c : defaultFrameworkUrl
     };
     merged.descriptorVersion = getManifestVersion(merged.minUI5Version, ui5.descriptorVersion);
-    merged.typesVersion = (_d = ui5.typesVersion) !== null && _d !== void 0 ? _d : getTypesVersion(merged.minUI5Version);
+    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);
     return Object.assign({}, ui5, merged);
 }
 exports.mergeUi5 = mergeUi5;
 /**
- * Get the best types version for the given minUI5Version.
- * For the latest versions the LTS S/4 on-premise version (1.102.x) is used, for anything before we match the versions as far back as available.
+ * Get the best types version for the given minUI5Version for https://www.npmjs.com/package/@sapui5/ts-types where specific versions are missing.
  *
- * @param minUI5Version the mininum UI5 version that needs to be supported
+ * @param minUI5Version the minimum UI5 version that needs to be supported
  * @returns semantic version representing the types version.
  */
 function getTypesVersion(minUI5Version) {
     const version = semver_1.default.coerce(minUI5Version);
     if (!version) {
-        return `~${"1.102.7" /* TYPES_VERSION_BEST */}`;
+        return `~${"1.102.9" /* TYPES_VERSION_BEST */}`;
     }
-    else if (semver_1.default.gte(version, "1.102.7" /* TYPES_VERSION_BEST */)) {
-        return `~${"1.102.7" /* TYPES_VERSION_BEST */}`;
+    else if (semver_1.default.gte(version, "1.102.9" /* TYPES_VERSION_BEST */)) {
+        return `~${"1.102.9" /* TYPES_VERSION_BEST */}`;
     }
     else {
         return semver_1.default.gte(version, "1.76.0" /* TYPES_VERSION_SINCE */)
@@ -126,6 +127,25 @@ function getTypesVersion(minUI5Version) {
     }
 }
 exports.getTypesVersion = getTypesVersion;
+/**
+ * Get the best types version for the given minUI5Version within a selective range, starting at 1.90.0 for https://www.npmjs.com/package/@sapui5/ts-types-esm
+ * For the latest versions the LTS S/4 on-premise version (1.102.x) is used, for anything before we match the versions as far back as available.
+ *
+ * @param minUI5Version the minimum UI5 version that needs to be supported
+ * @returns semantic version representing the types version.
+ */
+function getEsmTypesVersion(minUI5Version) {
+    const version = semver_1.default.coerce(minUI5Version);
+    if (!version || semver_1.default.gte(version, "1.102.9" /* TYPES_VERSION_BEST */)) {
+        return `~${"1.102.9" /* TYPES_VERSION_BEST */}`;
+    }
+    else {
+        return semver_1.default.gte(version, "1.90.0" /* ESM_TYPES_VERSION_SINCE */)
+            ? `~${semver_1.default.major(version)}.${semver_1.default.minor(version)}.0`
+            : `~${"1.90.0" /* ESM_TYPES_VERSION_SINCE */}`;
+    }
+}
+exports.getEsmTypesVersion = getEsmTypesVersion;
 /**
  * Gets the miminum UI5 version based on the specified version.
  *

package/dist/data/index.js

@@ -14,7 +14,7 @@ function mergeWithDefaults(ui5App) {
     validators_1.validate(ui5App);
     ui5App.app = defaults_1.mergeApp(ui5App.app);
     ui5App.appOptions = ui5App.appOptions || {};
-    ui5App.ui5 = defaults_1.mergeUi5(ui5App.ui5 || {});
+    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);
     if (ui5App.appOptions.sapux) {
         ui5App.package.devDependencies = ui5App.package.devDependencies || {};

package/dist/index.js

@@ -113,7 +113,7 @@ function enableTypescript(basePath, fs) {
         const ui5App = {
             app: manifest['sap.app'],
             ui5: {
-                typesVersion: defaults_1.getTypesVersion((_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.minUI5Version)
+                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)
             }
         };
         options_1.enableTypescript({ basePath, fs, ui5Configs: [ui5Config], tmplPath, ui5App }, true);

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.7",
+  "version": "0.17.9",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -20,7 +20,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@sap-ux/ui5-config": "0.15.3",
+    "@sap-ux/ui5-config": "0.15.4",
     "ejs": "3.1.7",
     "i18next": "21.6.11",
     "lodash": "4.17.21",
@@ -29,7 +29,7 @@
     "semver": "7.3.5"
   },
   "devDependencies": {
-    "@sap-ux/project-access": "1.0.0",
+    "@sap-ux/project-access": "1.0.1",
     "@types/ejs": "3.1.0",
     "@types/fs-extra": "9.0.13",
     "@types/lodash": "4.14.176",