@sap-ux/adp-tooling 0.18.4 → 0.18.6

package/dist/types.d.ts

@@ -389,6 +389,11 @@ export declare const enum HttpStatusCodes {
     NOT_IMPLEMETED = 501,
     SERVICE_UNAVAILABLE = 503
 }
+export type NetworkError = {
+    message?: string;
+    name?: string;
+    code?: string;
+};
 export type OperationType = 'read' | 'write' | 'delete';
 /**
  * Represents a constructor type that creates an instance of IWriter.

package/dist/ui5/format.d.ts

@@ -40,28 +40,20 @@ export declare function removeBracketsFromVersion(version: string): string;
  */
 export declare function removeMicroPart(version: string): string;
 /**
- * Removes the timestamp part from a version string, typically used to clean up snapshot versions that include a timestamp.
- * Converts a version string like '1.95.0.34566363464' to '1.95.0'.
+ * Removes the timestamp and '-snapshot' suffix from a version string.
+ * Converts a version string like '1.95.0.123456789' or '1.95.0-snapshot' to '1.95.0'.
  *
- * @param {string} version - The version string that may include a timestamp as part of a snapshot version.
- * @returns {string} The version string without the timestamp, including only the major, minor, and micro version numbers.
- */
-export declare function removeTimestampFromVersion(version: string): string;
-/**
- * Removes the '-snapshot' suffix from a version string's patch number.
- * Converts version strings like '1.96.0-snapshot' to '1.96.0' by cleaning
- * the patch part of any snapshot designation.
- *
- * @param {string} version - The version string that may include '-snapshot' in the patch number.
- * @returns {string} The version string with the snapshot suffix removed from the patch number.
+ * @param {string} version - The version string that may include a timestamp and '-snapshot' suffix.
+ * @returns {string} The cleaned version string without the timestamp and snapshot designation.
  * @example
  * ```typescript
- * removeSnapshotFromVersion('1.96.0-snapshot'); // Returns '1.96.0'
- * removeSnapshotFromVersion('1.87.3-SNAPSHOT'); // Returns '1.87.3' (case-insensitive)
- * removeSnapshotFromVersion('1.120.1');         // Returns '1.120.1' (no change)
+ * formatUi5Version('1.95.0.123456789'); // returns '1.95.0'
+ * formatUi5Version('1.95.0-snapshot');   // returns '1.95.0'
+ * formatUi5Version('1.95.0-SNAPSHOT');   // returns '1.95.0'
+ * formatUi5Version('1.95.0');            // returns '1.95.0'
  * ```
  */
-export declare function removeSnapshotFromVersion(version: string): string;
+export declare function formatUi5Version(version: string): string;
 /**
  * Conditionally appends a '-snapshot' suffix to a version string if certain criteria are met.
  * The suffix is added only if the version string includes an unreleased snapshot version.

package/dist/ui5/format.js

@@ -5,8 +5,7 @@ exports.getFormattedVersion = getFormattedVersion;
 exports.buildSystemVersionLabel = buildSystemVersionLabel;
 exports.removeBracketsFromVersion = removeBracketsFromVersion;
 exports.removeMicroPart = removeMicroPart;
-exports.removeTimestampFromVersion = removeTimestampFromVersion;
-exports.removeSnapshotFromVersion = removeSnapshotFromVersion;
+exports.formatUi5Version = formatUi5Version;
 exports.addSnapshot = addSnapshot;
 exports.parseUI5Version = parseUI5Version;
 exports.isFeatureSupportedVersion = isFeatureSupportedVersion;
@@ -73,34 +72,22 @@ function removeMicroPart(version) {
     return `${versionParts[0]}.${versionParts[1]}`;
 }
 /**
- * Removes the timestamp part from a version string, typically used to clean up snapshot versions that include a timestamp.
- * Converts a version string like '1.95.0.34566363464' to '1.95.0'.
+ * Removes the timestamp and '-snapshot' suffix from a version string.
+ * Converts a version string like '1.95.0.123456789' or '1.95.0-snapshot' to '1.95.0'.
  *
- * @param {string} version - The version string that may include a timestamp as part of a snapshot version.
- * @returns {string} The version string without the timestamp, including only the major, minor, and micro version numbers.
- */
-function removeTimestampFromVersion(version) {
-    const versionParts = version.split('.');
-    return `${versionParts[0]}.${versionParts[1]}.${versionParts[2]}`;
-}
-/**
- * Removes the '-snapshot' suffix from a version string's patch number.
- * Converts version strings like '1.96.0-snapshot' to '1.96.0' by cleaning
- * the patch part of any snapshot designation.
- *
- * @param {string} version - The version string that may include '-snapshot' in the patch number.
- * @returns {string} The version string with the snapshot suffix removed from the patch number.
+ * @param {string} version - The version string that may include a timestamp and '-snapshot' suffix.
+ * @returns {string} The cleaned version string without the timestamp and snapshot designation.
  * @example
  * ```typescript
- * removeSnapshotFromVersion('1.96.0-snapshot'); // Returns '1.96.0'
- * removeSnapshotFromVersion('1.87.3-SNAPSHOT'); // Returns '1.87.3' (case-insensitive)
- * removeSnapshotFromVersion('1.120.1');         // Returns '1.120.1' (no change)
+ * formatUi5Version('1.95.0.123456789'); // returns '1.95.0'
+ * formatUi5Version('1.95.0-snapshot');   // returns '1.95.0'
+ * formatUi5Version('1.95.0-SNAPSHOT');   // returns '1.95.0'
+ * formatUi5Version('1.95.0');            // returns '1.95.0'
  * ```
  */
-function removeSnapshotFromVersion(version) {
+function formatUi5Version(version) {
     const versionParts = version.split('.');
-    const patchNumber = versionParts[2].toLowerCase().replace('-snapshot', '');
-    return `${versionParts[0]}.${versionParts[1]}.${patchNumber}`;
+    return `${versionParts[0]}.${versionParts[1]}.${versionParts[2].toLowerCase().replace('-snapshot', '')}`;
 }
 /**
  * Conditionally appends a '-snapshot' suffix to a version string if certain criteria are met.
@@ -113,7 +100,10 @@ function removeSnapshotFromVersion(version) {
  */
 function addSnapshot(version, latestVersion) {
     const versionParts = version.split('.');
-    return versionParts[2] && removeTimestampFromVersion(version) != latestVersion ? '-snapshot' : '';
+    return (versionParts[3] || version.toLowerCase().includes('-snapshot')) &&
+        formatUi5Version(version) !== latestVersion
+        ? '-snapshot'
+        : '';
 }
 /**
  * Function that parse the UI5 version. Returns NaN for snapshot or snapshot-untested. eturns x.xx for snapshot-x.xx.xx.

package/dist/ui5/network.d.ts

@@ -1,10 +1,14 @@
+import type { NetworkError } from '../types';
 /**
  * Checks if the current environment is offline or has network connectivity issues.
  * This function is designed for VS Code's Yeoman UI environment where network
  * errors may differ from browser environments.
  *
- * @param {Error} error - The error object from a failed fetch request.
+ * @param {object} error - The error object from a failed fetch request.
+ * @param {string} [error.message] - The error message string.
+ * @param {string} [error.name] - The error name string.
+ * @param {string} [error.code] - The error code string.
  * @returns {boolean} True if the error indicates offline/network issues.
  */
-export declare function isOfflineError(error: Error): boolean;
+export declare function isOfflineError(error: NetworkError): boolean;
 //# sourceMappingURL=network.d.ts.map

package/dist/ui5/network.js

@@ -22,10 +22,13 @@ const networkErrorMessages = [
  * This function is designed for VS Code's Yeoman UI environment where network
  * errors may differ from browser environments.
  *
- * @param {Error} error - The error object from a failed fetch request.
+ * @param {object} error - The error object from a failed fetch request.
+ * @param {string} [error.message] - The error message string.
+ * @param {string} [error.name] - The error name string.
+ * @param {string} [error.code] - The error code string.
  * @returns {boolean} True if the error indicates offline/network issues.
  */
 function isOfflineError(error) {
-    return networkErrorMessages.some((msg) => error.message?.includes(msg) || error.name?.includes(msg));
+    return networkErrorMessages.some((msg) => error.message?.includes(msg) || error.name?.includes(msg) || error.code?.includes(msg));
 }
 //# sourceMappingURL=network.js.map

package/dist/ui5/validator.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateUI5VersionExists = validateUI5VersionExists;
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
+const axios_1 = __importDefault(require("axios"));
 const i18n_1 = require("../i18n");
 const format_1 = require("./format");
 const network_1 = require("./network");
@@ -19,7 +23,7 @@ async function validateUI5VersionExists(version) {
     const selectedVersionURL = (0, format_1.getOfficialBaseUI5VersionUrl)(version);
     const resource = version.includes('snapshot') ? 'neo-app.json' : (0, format_1.getFormattedVersion)(version);
     try {
-        await fetch(`${selectedVersionURL}/${resource}`);
+        await axios_1.default.get(`${selectedVersionURL}/${resource}`);
         return true;
     }
     catch (e) {

package/dist/ui5/version-info.js

@@ -82,7 +82,7 @@ function getVersionLabels(version, publicVersions) {
     let systemLatestLabel = '';
     if (version) {
         const latestVersion = getLatestVersion(publicVersions);
-        formattedVersion = (0, format_1.removeTimestampFromVersion)(version);
+        formattedVersion = (0, format_1.formatUi5Version)(version);
         systemSnapshotLabel = (0, format_1.addSnapshot)(version, latestVersion);
         systemLatestLabel = formattedVersion === latestVersion ? constants_1.LATEST_VERSION : '';
     }
@@ -99,9 +99,7 @@ function checkSystemVersionPattern(version) {
     if (!version || !pattern.test(version)) {
         return undefined;
     }
-    let normalizedVersion = (0, format_1.removeTimestampFromVersion)(version);
-    normalizedVersion = (0, format_1.removeSnapshotFromVersion)(normalizedVersion);
-    return normalizedVersion;
+    return (0, format_1.formatUi5Version)(version);
 }
 /**
  * Retrieves and filters internal UI5 versions.
@@ -151,21 +149,27 @@ async function getHigherVersions(version, publicVersions) {
  * @returns {Promise<string[]>} A promise that resolves to an array of relevant version strings.
  */
 async function getRelevantVersions(systemVersion, isCustomerBase, publicVersions) {
-    const version = checkSystemVersionPattern(systemVersion);
+    let formattedVersion = '', systemSnapshotLabel = '', systemLatestLabel = '';
     const latestPublicVersion = publicVersions?.latest?.version;
     let versions = [];
-    const { formattedVersion, systemSnapshotLabel, systemLatestLabel } = getVersionLabels(version, publicVersions);
+    if (systemVersion) {
+        ({ formattedVersion, systemSnapshotLabel, systemLatestLabel } = getVersionLabels(systemVersion, publicVersions));
+    }
     if (!isCustomerBase) {
         versions = await getInternalVersions(latestPublicVersion);
-        if (version) {
+        if (formattedVersion) {
             const regex = new RegExp(`${formattedVersion} `, 'g');
             versions = versions.map((v) => v.replace(regex, `${formattedVersion}${systemSnapshotLabel} ${constants_1.CURRENT_SYSTEM_VERSION}`));
             versions.unshift((0, format_1.buildSystemVersionLabel)(formattedVersion, systemSnapshotLabel, systemLatestLabel));
         }
         versions.unshift(constants_1.SNAPSHOT_VERSION, constants_1.SNAPSHOT_UNTESTED_VERSION);
     }
-    else if (version && systemSnapshotLabel === '') {
+    else if (formattedVersion && systemSnapshotLabel === '') {
         versions = await getHigherVersions(formattedVersion, publicVersions);
+        if (!versions.length && formattedVersion !== latestPublicVersion) {
+            versions = [`${formattedVersion} ${constants_1.CURRENT_SYSTEM_VERSION}`, `${latestPublicVersion} ${constants_1.LATEST_VERSION}`];
+            return [...new Set(versions)];
+        }
         versions.unshift((0, format_1.buildSystemVersionLabel)(formattedVersion, systemSnapshotLabel, systemLatestLabel));
     }
     else {

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%3Aadp-tooling"
   },
-  "version": "0.18.4",
+  "version": "0.18.6",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "ejs": "3.1.10",
     "i18next": "25.3.0",
     "inquirer": "8.2.7",
-    "js-yaml": "4.1.0",
+    "js-yaml": "4.1.1",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "prompts": "2.4.2",
@@ -39,12 +39,12 @@
     "@sap-ux/axios-extension": "1.24.2",
     "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/i18n": "0.3.5",
-    "@sap-ux/inquirer-common": "0.9.3",
+    "@sap-ux/inquirer-common": "0.9.4",
     "@sap-ux/logger": "0.7.1",
     "@sap-ux/nodejs-utils": "0.2.8",
-    "@sap-ux/odata-service-writer": "0.27.29",
-    "@sap-ux/project-access": "1.32.8",
-    "@sap-ux/project-input-validator": "0.6.30",
+    "@sap-ux/odata-service-writer": "0.27.30",
+    "@sap-ux/project-access": "1.32.9",
+    "@sap-ux/project-input-validator": "0.6.31",
     "@sap-ux/store": "1.3.3",
     "@sap-ux/system-access": "0.6.28",
     "@sap-ux/ui5-config": "0.29.9",