@sap-ux/adp-tooling 0.13.22 → 0.13.25

package/dist/writer/project-utils.d.ts

@@ -1,12 +1,13 @@
 import type { Editor } from 'mem-fs-editor';
-import type { AdpWriterConfig, CustomConfig, PackageJson } from '../types';
+import type { AdpWriterConfig, CustomConfig } from '../types';
+import type { Package } from '@sap-ux/project-access';
 import type { OperationsType } from '@sap-ux/axios-extension';
 /**
  * Retrieves the package name and version from the package.json file located two levels up the directory tree.
  *
- * @returns {PackageJson} An object containing the `name` and `version` of the package.
+ * @returns {Package} An object containing the `name` and `version` of the package.
  */
-export declare function getPackageJSONInfo(): PackageJson;
+export declare function getPackageJSONInfo(): Package;
 /**
  * Constructs a custom configuration object for the Adaptation Project (ADP).
  *
@@ -16,7 +17,7 @@ export declare function getPackageJSONInfo(): PackageJson;
  * @param {string} pkg.version - The version of the tool generating the config.
  * @returns {CustomConfig} The generated ADP custom configuration object.
  */
-export declare function getCustomConfig(environment: OperationsType, { name: id, version }: PackageJson): CustomConfig;
+export declare function getCustomConfig(environment: OperationsType, { name: id, version }: Package): CustomConfig;
 /**
  * Writes a given project template files within a specified folder in the project directory.
  *

package/dist/writer/project-utils.js

@@ -13,7 +13,7 @@ const ui5_config_1 = require("@sap-ux/ui5-config");
 /**
  * Retrieves the package name and version from the package.json file located two levels up the directory tree.
  *
- * @returns {PackageJson} An object containing the `name` and `version` of the package.
+ * @returns {Package} An object containing the `name` and `version` of the package.
  */
 function getPackageJSONInfo() {
     const defaultPackage = {
@@ -41,8 +41,8 @@ function getCustomConfig(environment, { name: id, version }) {
         adp: {
             environment,
             support: {
-                id,
-                version,
+                id: id ?? '',
+                version: version ?? '',
                 toolsId: (0, uuid_1.v4)()
             }
         }

package/dist/writer/writer-config.d.ts

@@ -1,6 +1,8 @@
 import type { ToolsLogger } from '@sap-ux/logger';
+import type { Package } from '@sap-ux/project-access';
 import type { AbapServiceProvider } from '@sap-ux/axios-extension';
-import type { AdpWriterConfig, ConfigAnswers, FlexLayer, PackageJson } from '../types';
+import { FlexLayer } from '../types';
+import type { AdpWriterConfig, ConfigAnswers } from '../types';
 interface ConfigOptions {
     /**
      * The ABAP service provider instance used to retrieve system-specific information.
@@ -26,7 +28,7 @@ interface ConfigOptions {
     /**
      * The package.json information used to generate custom configuration.
      */
-    packageJson: PackageJson;
+    packageJson: Package;
     /**
      * Logger instance for debugging and error reporting.
      */
@@ -41,7 +43,7 @@ interface ConfigOptions {
  * @param {FlexLayer} options.layer - The FlexLayer indicating the deployment layer.
  * @param {object} options.defaults - Default project parameters.
  * @param {string} options.defaults.namespace - The default namespace to be used.
- * @param {PackageJson} options.packageJson - The package.json information for generating custom configuration.
+ * @param {Package} options.packageJson - The package.json information for generating custom configuration.
  * @param {ToolsLogger} options.logger - The logger for debugging and error logging.
  * @returns {Promise<AdpWriterConfig>} A promise that resolves to the generated ADP writer configuration.
  */

package/dist/writer/writer-config.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfig = getConfig;
-const client_1 = require("../client");
+const abap_1 = require("../abap");
 const project_utils_1 = require("./project-utils");
 const descriptor_content_1 = require("./descriptor-content");
+const ui5_1 = require("../ui5");
 /**
  * Generates the configuration object for the Adaptation Project.
  *
@@ -13,7 +14,7 @@ const descriptor_content_1 = require("./descriptor-content");
  * @param {FlexLayer} options.layer - The FlexLayer indicating the deployment layer.
  * @param {object} options.defaults - Default project parameters.
  * @param {string} options.defaults.namespace - The default namespace to be used.
- * @param {PackageJson} options.packageJson - The package.json information for generating custom configuration.
+ * @param {Package} options.packageJson - The package.json information for generating custom configuration.
  * @param {ToolsLogger} options.logger - The logger for debugging and error logging.
  * @returns {Promise<AdpWriterConfig>} A promise that resolves to the generated ADP writer configuration.
  */
@@ -21,8 +22,12 @@ async function getConfig(options) {
     const { configAnswers, defaults, layer, logger, packageJson, provider } = options;
     const ato = await provider.getAtoInfo();
     const operationsType = ato.operationsType ?? 'P';
-    const target = await (0, client_1.getAbapTarget)(configAnswers.system, logger);
+    const target = await (0, abap_1.getProviderConfig)(configAnswers.system, logger);
     const customConfig = (0, project_utils_1.getCustomConfig)(operationsType, packageJson);
+    const isCloudProject = await provider.isAbapCloud();
+    const isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
+    const ui5Info = ui5_1.UI5VersionInfo.getInstance(layer);
+    const ui5Version = isCloudProject ? ui5Info.getLatestVersion() : ui5Info.getVersionToBeUsed('', isCustomerBase);
     return {
         app: {
             id: defaults.namespace,
@@ -31,6 +36,11 @@ async function getConfig(options) {
             title: '',
             content: [(0, descriptor_content_1.getNewModelEnhanceWithChange)()]
         },
+        ui5: {
+            minVersion: ui5Version?.split(' ')[0],
+            version: (0, ui5_1.getFormattedVersion)(ui5Version),
+            frameworkUrl: (0, ui5_1.getOfficialBaseUI5VersionUrl)(ui5Version)
+        },
         customConfig,
         target,
         options: {

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.13.22",
+  "version": "0.13.25",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -34,7 +34,7 @@
     "uuid": "10.0.0",
     "@sap-ux/axios-extension": "1.19.2",
     "@sap-ux/btp-utils": "1.0.2",
-    "@sap-ux/inquirer-common": "0.6.32",
+    "@sap-ux/inquirer-common": "0.6.33",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.29.18",
     "@sap-ux/project-input-validator": "0.5.0",

package/dist/client/abap-provider.d.ts

@@ -1,38 +0,0 @@
-import type { ToolsLogger } from '@sap-ux/logger';
-import type { AbapTarget } from '@sap-ux/ui5-config';
-import type { AbapServiceProvider, AxiosRequestConfig, ProviderConfiguration } from '@sap-ux/axios-extension';
-export type RequestOptions = AxiosRequestConfig & Partial<ProviderConfiguration>;
-interface ProviderOptions {
-    system: string;
-    client?: string;
-    username?: string;
-    password?: string;
-}
-/**
- * Retrieves a fully configured ABAP service provider for the specified system.
- *
- * This function uses the provided system identifier (and optional client and credentials)
- * to build an ABAP target configuration, which is then passed to createAbapServiceProvider.
- *
- * @param {ProviderOptions} options - Options for configuring the provider.
- * @param {ToolsLogger} logger - The logger for logging errors and debug messages.
- * @returns {Promise<AbapServiceProvider>} A promise that resolves to the configured ABAP service provider.
- * @throws {Error} If provider instantiation fails.
- */
-export declare function getConfiguredProvider({ system, client, password, username }: ProviderOptions, logger: ToolsLogger): Promise<AbapServiceProvider>;
-/**
- * Determines the ABAP target configuration based on the running environment and system details.
- *
- * For an App Studio environment, the target is constructed with a destination property.
- * For non-AppStudio environments, the function retrieves system details from the TargetSystems service,
- * maps these details to an AbapTarget, and attaches authentication credentials to the request options if available.
- *
- * @param {string} system - The system identifier (URL or system name).
- * @param {ToolsLogger} logger - The logger for logging errors.
- * @param {RequestOptions} [requestOptions] - Optional request options which will be updated with auth information if available.
- * @param {string} [client] - Optional client number for systems with multiple clients.
- * @returns {Promise<AbapTarget>} A promise that resolves to the configured ABAP target.
- */
-export declare function getAbapTarget(system: string, logger: ToolsLogger, requestOptions?: RequestOptions, client?: string): Promise<AbapTarget>;
-export {};
-//# sourceMappingURL=abap-provider.d.ts.map

package/dist/client/abap-provider.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfiguredProvider = getConfiguredProvider;
-exports.getAbapTarget = getAbapTarget;
-const btp_utils_1 = require("@sap-ux/btp-utils");
-const system_access_1 = require("@sap-ux/system-access");
-const target_systems_1 = require("./target-systems");
-/**
- * Retrieves a fully configured ABAP service provider for the specified system.
- *
- * This function uses the provided system identifier (and optional client and credentials)
- * to build an ABAP target configuration, which is then passed to createAbapServiceProvider.
- *
- * @param {ProviderOptions} options - Options for configuring the provider.
- * @param {ToolsLogger} logger - The logger for logging errors and debug messages.
- * @returns {Promise<AbapServiceProvider>} A promise that resolves to the configured ABAP service provider.
- * @throws {Error} If provider instantiation fails.
- */
-async function getConfiguredProvider({ system, client, password, username }, logger) {
-    try {
-        const requestOptions = {
-            ignoreCertErrors: false
-        };
-        const target = await getAbapTarget(system, logger, requestOptions, client);
-        if (username && password) {
-            requestOptions.auth = { username, password };
-        }
-        return await (0, system_access_1.createAbapServiceProvider)(target, requestOptions, false, logger);
-    }
-    catch (e) {
-        logger?.error(`Failed to instantiate provider for system: ${system}. Reason: ${e.message}`);
-        throw new Error(e.message);
-    }
-}
-/**
- * Determines the ABAP target configuration based on the running environment and system details.
- *
- * For an App Studio environment, the target is constructed with a destination property.
- * For non-AppStudio environments, the function retrieves system details from the TargetSystems service,
- * maps these details to an AbapTarget, and attaches authentication credentials to the request options if available.
- *
- * @param {string} system - The system identifier (URL or system name).
- * @param {ToolsLogger} logger - The logger for logging errors.
- * @param {RequestOptions} [requestOptions] - Optional request options which will be updated with auth information if available.
- * @param {string} [client] - Optional client number for systems with multiple clients.
- * @returns {Promise<AbapTarget>} A promise that resolves to the configured ABAP target.
- */
-async function getAbapTarget(system, logger, requestOptions, client) {
-    let target;
-    const targetSystems = new target_systems_1.TargetSystems(logger);
-    if ((0, btp_utils_1.isAppStudio)()) {
-        target = {
-            destination: system
-        };
-    }
-    else {
-        const details = await targetSystems.getSystemByName(system);
-        if (!details) {
-            throw new Error(`No system details found for system: ${system}`);
-        }
-        target = {
-            client: details?.Client ?? client,
-            url: details?.Url
-        };
-        if (details?.Authentication) {
-            target.authenticationType = details?.Authentication;
-        }
-        const username = details?.Credentials?.username;
-        const password = details?.Credentials?.password;
-        if (requestOptions && username && password) {
-            requestOptions.auth = {
-                username,
-                password
-            };
-        }
-    }
-    return target;
-}
-//# sourceMappingURL=abap-provider.js.map

package/dist/client/index.d.ts

@@ -1,4 +0,0 @@
-export * from './target-applications';
-export * from './target-systems';
-export * from './abap-provider';
-//# sourceMappingURL=index.d.ts.map