@sap-ux/ui5-application-writer 0.17.1 → 0.17.2

package/dist/data/defaults.d.ts

@@ -27,6 +27,7 @@ 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",
     MANIFEST_VERSION = "1.12.0",
     BASE_COMPONENT = "sap/ui/core/UIComponent"
 }
@@ -46,6 +47,14 @@ export declare const defaultUI5Libs: string[];
  * @returns {UI5} the updated copy of UI5 instance (does not change `ui5`)
  */
 export declare function mergeUi5(ui5: Partial<UI5>): 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.
+ *
+ * @param minUI5Version the mininum UI5 version that needs to be supported
+ * @returns semantic version representing the types version.
+ */
+export declare function getTypesVersion(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.mergeUi5 = exports.defaultUI5Libs = exports.mergeApp = exports.mergePackages = exports.packageDefaults = void 0;
+exports.getSpecTagVersion = exports.getTypesVersion = exports.mergeUi5 = exports.defaultUI5Libs = exports.mergeApp = exports.mergePackages = 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"));
@@ -101,18 +101,37 @@ function mergeUi5(ui5) {
         framework,
         frameworkUrl: (_c = ui5.frameworkUrl) !== null && _c !== void 0 ? _c : defaultFrameworkUrl
     };
-    // typesVersion must be a valid npm semantic version, we know they cannot be null as already validated
-    const localSemVer = semver_1.default.valid(semver_1.default.coerce(merged.localVersion));
-    const typesVersion = semver_1.default.gte(localSemVer, "1.76.0" /* TYPES_VERSION_SINCE */)
-        ? localSemVer
-        : "1.71.18" /* TYPES_VERSION_PREVIOUS */;
     merged.descriptorVersion = getManifestVersion(merged.minUI5Version, ui5.descriptorVersion);
-    merged.typesVersion = (_d = ui5.typesVersion) !== null && _d !== void 0 ? _d : typesVersion;
+    merged.typesVersion = (_d = ui5.typesVersion) !== null && _d !== void 0 ? _d : 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.
+ *
+ * @param minUI5Version the mininum 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 */}`;
+    }
+    else {
+        if (semver_1.default.gte(version, "1.102.7" /* TYPES_VERSION_BEST */)) {
+            return `~${"1.102.7" /* TYPES_VERSION_BEST */}`;
+        }
+        else {
+            return semver_1.default.gte(version, "1.76.0" /* TYPES_VERSION_SINCE */)
+                ? `~${semver_1.default.major(version)}.${semver_1.default.minor(version)}.${semver_1.default.patch(version)}`
+                : "1.71.18" /* TYPES_VERSION_PREVIOUS */;
+        }
+    }
+}
+exports.getTypesVersion = getTypesVersion;
 /**
  * Gets the miminum UI5 version based on the specified version.
  *

package/dist/data/ui5Libs.js

@@ -8,12 +8,13 @@ const defaults_1 = require("./defaults");
  * @param ui5Libs - The ui5 libraries to be merged with the defaults
  * @returns UI5 libs with defaults
  */
-exports.getUI5Libs = (ui5Libs) => {
+const getUI5Libs = (ui5Libs) => {
     const libs = Array.isArray(ui5Libs) ? ui5Libs : (ui5Libs === null || ui5Libs === void 0 ? void 0 : ui5Libs.split(',')) || [];
     return defaults_1.defaultUI5Libs.concat(libs).filter((value, index, self) => {
         return self.indexOf(value) === index;
     });
 };
+exports.getUI5Libs = getUI5Libs;
 /**
  * UI5 task and middleware configurations required for TypeScript projects
  */

package/dist/index.js

@@ -17,6 +17,7 @@ const ui5_config_1 = require("@sap-ux/ui5-config");
 const data_1 = require("./data");
 const ui5Libs_1 = require("./data/ui5Libs");
 const options_1 = require("./options");
+const defaults_1 = require("./data/defaults");
 /**
  * Writes the template to the memfs editor instance.
  *
@@ -93,6 +94,7 @@ exports.isTypescriptEnabled = isTypescriptEnabled;
  * @returns the updated memfs editor instance
  */
 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());
@@ -108,7 +110,13 @@ 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');
-        options_1.enableTypescript({ basePath, fs, ui5Configs: [ui5Config], tmplPath, ui5App: { app: manifest['sap.app'] } }, true);
+        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)
+            }
+        };
+        options_1.enableTypescript({ basePath, fs, ui5Configs: [ui5Config], tmplPath, ui5App }, true);
         fs.write(ui5ConfigPath, ui5Config.toString());
         return fs;
     });

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.1",
+  "version": "0.17.2",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [

package/templates/optional/codeAssist/package.json

@@ -2,6 +2,6 @@
     "devDependencies": {
         "eslint": "7.32.0",
         "@sap/eslint-plugin-ui5-jsdocs": "2.0.5",
-        "@sapui5/ts-types": "1.102.x"
+        "@sapui5/ts-types": "<%- ui5.typesVersion %>"
     }
 }

package/templates/optional/typescript/package.json

@@ -3,7 +3,7 @@
         "ts-typecheck": "tsc --noEmit"
     },
     "devDependencies": {
-        "@sapui5/ts-types-esm": "1.102.x",
+        "@sapui5/ts-types-esm": "<%- ui5.typesVersion %>",
         "ui5-tooling-transpile": "^0.2.0",
         "typescript": "^4.6.3",
         "@typescript-eslint/eslint-plugin": "^5.17.0",