@sap-ux/adp-tooling 1.0.53 → 1.0.55

package/dist/ui5/fetch.d.ts

@@ -12,7 +12,8 @@ export declare function fetchPublicVersions(logger?: ToolsLogger): Promise<UI5Ve
  * Fetches internal UI5 versions from the Neo CDN and maps them to formatted version strings.
  *
  * @param {string} latestVersion - The latest public UI5 version.
+ * @param {ToolsLogger} logger - Optional logger instance.
  * @returns {Promise<string[]>} A promise that resolves to an array of formatted internal version strings.
  */
-export declare function fetchInternalVersions(latestVersion: string): Promise<string[]>;
+export declare function fetchInternalVersions(latestVersion: string, logger?: ToolsLogger): Promise<string[]>;
 //# sourceMappingURL=fetch.d.ts.map

package/dist/ui5/fetch.js

@@ -1,3 +1,5 @@
+import axios from 'axios';
+import { getProxyAgentConfig, isAxiosError } from '@sap-ux/axios-extension';
 import { buildFallbackMap } from './format.js';
 import { UI5_VERSIONS_CDN_URL, UI5_VERSIONS_NEO_CDN_URL, LATEST_VERSION } from '../base/constants/index.js';
 /**
@@ -9,11 +11,8 @@ import { UI5_VERSIONS_CDN_URL, UI5_VERSIONS_NEO_CDN_URL, LATEST_VERSION } from '
  */
 export async function fetchPublicVersions(logger) {
     try {
-        const response = await fetch(UI5_VERSIONS_CDN_URL);
-        if (!response.ok) {
-            throw new Error(`Failed to fetch public UI5 versions. Status: ${response.status}`);
-        }
-        return (await response.json());
+        const { data } = await axios.get(UI5_VERSIONS_CDN_URL, getProxyAgentConfig(UI5_VERSIONS_CDN_URL));
+        return data;
     }
     catch (e) {
         logger?.warn('[ui5-info] Falling back to built-in UI5 version list: ' + (e instanceof Error ? e.message : String(e)));
@@ -24,15 +23,25 @@ export async function fetchPublicVersions(logger) {
  * Fetches internal UI5 versions from the Neo CDN and maps them to formatted version strings.
  *
  * @param {string} latestVersion - The latest public UI5 version.
+ * @param {ToolsLogger} logger - Optional logger instance.
  * @returns {Promise<string[]>} A promise that resolves to an array of formatted internal version strings.
  */
-export async function fetchInternalVersions(latestVersion) {
-    const response = await fetch(UI5_VERSIONS_NEO_CDN_URL);
-    const data = await response.json();
-    return data?.routes?.map((route) => {
+export async function fetchInternalVersions(latestVersion, logger) {
+    let data;
+    try {
+        ({ data } = await axios.get(UI5_VERSIONS_NEO_CDN_URL, getProxyAgentConfig(UI5_VERSIONS_NEO_CDN_URL)));
+    }
+    catch (e) {
+        if (isAxiosError(e) && e.response) {
+            logger?.warn('[ui5-info] Could not fetch internal UI5 versions: ' + (e instanceof Error ? e.message : String(e)));
+            return [];
+        }
+        throw e;
+    }
+    return (data?.routes?.map((route) => {
         return route.target.version === latestVersion
             ? `${route.target.version} ${LATEST_VERSION}`
             : route.target.version;
-    });
+    }) ?? []);
 }
 //# sourceMappingURL=fetch.js.map

package/dist/ui5/validator.js

@@ -1,5 +1,6 @@
 import { validateEmptyString } from '@sap-ux/project-input-validator';
 import axios from 'axios';
+import { getProxyAgentConfig } from '@sap-ux/axios-extension';
 import { t } from '../i18n.js';
 import { getOfficialBaseUI5VersionUrl, getFormattedVersion } from './format.js';
 import { isOfflineError } from './network.js';
@@ -17,7 +18,8 @@ export async function validateUI5VersionExists(version) {
     const selectedVersionURL = getOfficialBaseUI5VersionUrl(version);
     const resource = version.includes('snapshot') ? 'neo-app.json' : getFormattedVersion(version);
     try {
-        await axios.get(`${selectedVersionURL}/${resource}`);
+        const url = `${selectedVersionURL}/${resource}`;
+        await axios.get(url, getProxyAgentConfig(url));
         return true;
     }
     catch (e) {

package/dist/ui5/version-info.d.ts

@@ -1,3 +1,4 @@
+import type { ToolsLogger } from '@sap-ux/logger';
 import type { UI5Version } from '../types.js';
 export interface VersionLabels {
     formattedVersion: string;
@@ -64,9 +65,10 @@ export declare function checkSystemVersionPattern(version: string | undefined):
  * and then filters them based on a minimum supported version (in this case '1.71.0').
  *
  * @param {string} latestVersion - The latest public version string.
+ * @param {ToolsLogger} logger - Optional logger instance.
  * @returns {Promise<string[]>} A promise that resolves to an array of internal version strings.
  */
-export declare function getInternalVersions(latestVersion: string): Promise<string[]>;
+export declare function getInternalVersions(latestVersion: string, logger?: ToolsLogger): Promise<string[]>;
 /**
  * Fetches versions that are higher than the specified version.
  *
@@ -86,7 +88,8 @@ export declare function getHigherVersions(version: string, publicVersions: UI5Ve
  * @param {string | undefined} systemVersion - The current system version (can be undefined).
  * @param {boolean} isCustomerBase - Indicates if the project is customer based.
  * @param {UI5Version} publicVersions - The public UI5 version data.
+ * @param {ToolsLogger} logger - Optional logger instance.
  * @returns {Promise<string[]>} A promise that resolves to an array of relevant version strings.
  */
-export declare function getRelevantVersions(systemVersion: string | undefined, isCustomerBase: boolean, publicVersions: UI5Version): Promise<string[]>;
+export declare function getRelevantVersions(systemVersion: string | undefined, isCustomerBase: boolean, publicVersions: UI5Version, logger?: ToolsLogger): Promise<string[]>;
 //# sourceMappingURL=version-info.d.ts.map

package/dist/ui5/version-info.js

@@ -97,10 +97,11 @@ export function checkSystemVersionPattern(version) {
  * and then filters them based on a minimum supported version (in this case '1.71.0').
  *
  * @param {string} latestVersion - The latest public version string.
+ * @param {ToolsLogger} logger - Optional logger instance.
  * @returns {Promise<string[]>} A promise that resolves to an array of internal version strings.
  */
-export async function getInternalVersions(latestVersion) {
-    const releasedVersions = await fetchInternalVersions(latestVersion);
+export async function getInternalVersions(latestVersion, logger) {
+    const releasedVersions = await fetchInternalVersions(latestVersion, logger);
     return releasedVersions.filter((version) => isFeatureSupportedVersion('1.71.0', version));
 }
 /**
@@ -135,9 +136,10 @@ export async function getHigherVersions(version, publicVersions) {
  * @param {string | undefined} systemVersion - The current system version (can be undefined).
  * @param {boolean} isCustomerBase - Indicates if the project is customer based.
  * @param {UI5Version} publicVersions - The public UI5 version data.
+ * @param {ToolsLogger} logger - Optional logger instance.
  * @returns {Promise<string[]>} A promise that resolves to an array of relevant version strings.
  */
-export async function getRelevantVersions(systemVersion, isCustomerBase, publicVersions) {
+export async function getRelevantVersions(systemVersion, isCustomerBase, publicVersions, logger) {
     let formattedVersion = '', systemSnapshotLabel = '', systemLatestLabel = '';
     const latestPublicVersion = publicVersions?.latest?.version;
     let versions = [];
@@ -145,7 +147,7 @@ export async function getRelevantVersions(systemVersion, isCustomerBase, publicV
         ({ formattedVersion, systemSnapshotLabel, systemLatestLabel } = getVersionLabels(systemVersion, publicVersions));
     }
     if (!isCustomerBase) {
-        versions = await getInternalVersions(latestPublicVersion);
+        versions = await getInternalVersions(latestPublicVersion, logger);
         if (formattedVersion) {
             const regex = new RegExp(`${formattedVersion} `, 'g');
             versions = versions.map((v) => v.replace(regex, `${formattedVersion}${systemSnapshotLabel} ${CURRENT_SYSTEM_VERSION}`));

package/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "1.0.53",
+  "version": "1.0.55",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -37,17 +37,17 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.4",
     "uuid": "11.1.1",
-    "@sap-ux/axios-extension": "2.0.10",
+    "@sap-ux/axios-extension": "2.1.0",
     "@sap-ux/btp-utils": "2.0.6",
     "@sap-ux/i18n": "1.0.3",
-    "@sap-ux/inquirer-common": "1.0.40",
+    "@sap-ux/inquirer-common": "1.0.42",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/nodejs-utils": "1.0.10",
     "@sap-ux/odata-service-writer": "1.0.22",
     "@sap-ux/project-access": "2.2.0",
     "@sap-ux/project-input-validator": "1.0.19",
     "@sap-ux/store": "2.0.7",
-    "@sap-ux/system-access": "1.0.13",
+    "@sap-ux/system-access": "1.0.14",
     "@sap-ux/ui5-config": "1.0.9",
     "@sap-ux/ui5-info": "1.0.6"
   },