@sap-ux/adp-tooling 0.19.11 → 1.0.0

package/dist/cf/project/mta.js

@@ -1,52 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildVcapServicesFromResources = buildVcapServicesFromResources;
-exports.getApprouterType = getApprouterType;
-exports.getModuleNames = getModuleNames;
-exports.getServicesForFile = getServicesForFile;
-exports.hasApprouter = hasApprouter;
-exports.getMtaServices = getMtaServices;
-exports.getResources = getResources;
-exports.readMta = readMta;
-const path = __importStar(require("node:path"));
-const i18n_1 = require("../../i18n");
-const api_1 = require("../services/api");
-const cli_1 = require("../services/cli");
-const yaml_1 = require("./yaml");
-const yaml_loader_1 = require("./yaml-loader");
+import * as path from 'node:path';
+import { t } from '../../i18n.js';
+import { getServiceKeyCredentialsWithTags } from '../services/api.js';
+import { requestCfApi } from '../services/cli.js';
+import { getRouterType } from './yaml.js';
+import { getYamlContent } from './yaml-loader.js';
 const EXCLUDED_SERVICES_VCAP = new Set(['html5-apps-repo', 'portal']);
 /**
  * Builds VCAP_SERVICES by resolving MTA resources to service key credentials.
@@ -56,7 +13,7 @@ const EXCLUDED_SERVICES_VCAP = new Set(['html5-apps-repo', 'portal']);
  * @param {ToolsLogger} logger - Optional logger.
  * @returns {Promise<Record<string, unknown>>} VCAP_SERVICES keyed by service name.
  */
-async function buildVcapServicesFromResources(resources, spaceGuid, logger) {
+export async function buildVcapServicesFromResources(resources, spaceGuid, logger) {
     const vcapServices = {};
     for (const resource of resources ?? []) {
         const serviceName = resource.parameters?.service;
@@ -65,7 +22,7 @@ async function buildVcapServicesFromResources(resources, spaceGuid, logger) {
         if (!serviceName || !serviceInstanceName || EXCLUDED_SERVICES_VCAP.has(serviceName)) {
             continue;
         }
-        const data = await (0, api_1.getServiceKeyCredentialsWithTags)(spaceGuid, serviceName, serviceInstanceName, servicePlan ?? '', logger);
+        const data = await getServiceKeyCredentialsWithTags(spaceGuid, serviceName, serviceInstanceName, servicePlan ?? '', logger);
         if (!data?.credentials) {
             throw new Error(`Credentials and tags for service '${serviceName}' ('${serviceInstanceName}') not found`);
         }
@@ -79,9 +36,9 @@ async function buildVcapServicesFromResources(resources, spaceGuid, logger) {
  * @param {string} mtaProjectPath - The path to the mta project.
  * @returns {AppRouterType} The approuter type.
  */
-function getApprouterType(mtaProjectPath) {
-    const yamlContent = (0, yaml_loader_1.getYamlContent)(path.join(mtaProjectPath, 'mta.yaml'));
-    return (0, yaml_1.getRouterType)(yamlContent);
+export function getApprouterType(mtaProjectPath) {
+    const yamlContent = getYamlContent(path.join(mtaProjectPath, 'mta.yaml'));
+    return getRouterType(yamlContent);
 }
 /**
  * Get the module names.
@@ -89,8 +46,8 @@ function getApprouterType(mtaProjectPath) {
  * @param {string} mtaProjectPath - The path to the mta project.
  * @returns {string[]} The module names.
  */
-function getModuleNames(mtaProjectPath) {
-    const yamlContent = (0, yaml_loader_1.getYamlContent)(path.join(mtaProjectPath, 'mta.yaml'));
+export function getModuleNames(mtaProjectPath) {
+    const yamlContent = getYamlContent(path.join(mtaProjectPath, 'mta.yaml'));
     return yamlContent?.modules?.map((module) => module.name) ?? [];
 }
 /**
@@ -100,9 +57,9 @@ function getModuleNames(mtaProjectPath) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {BusinessServiceResource[]} The services.
  */
-function getServicesForFile(mtaFilePath, logger) {
+export function getServicesForFile(mtaFilePath, logger) {
     const serviceNames = [];
-    const parsed = (0, yaml_loader_1.getYamlContent)(mtaFilePath);
+    const parsed = getYamlContent(mtaFilePath);
     if (parsed?.resources && Array.isArray(parsed.resources)) {
         for (const resource of parsed.resources) {
             const name = resource?.parameters?.['service-name'] ?? resource.name;
@@ -123,7 +80,7 @@ function getServicesForFile(mtaFilePath, logger) {
  * @param {string[]} moduleNames - The module names.
  * @returns {boolean} Whether the project has an approuter.
  */
-function hasApprouter(moduleNames) {
+export function hasApprouter(moduleNames) {
     return moduleNames.some((name) => name.includes('destination-content') || name.includes('approuter'));
 }
 /**
@@ -136,10 +93,10 @@ function hasApprouter(moduleNames) {
 async function filterServices(businessServices, logger) {
     const serviceLabels = businessServices.map((service) => service.label).filter(Boolean);
     if (serviceLabels.length === 0) {
-        throw new Error((0, i18n_1.t)('error.noBusinessServicesFound'));
+        throw new Error(t('error.noBusinessServicesFound'));
     }
     const url = `/v3/service_offerings?names=${serviceLabels.join(',')}`;
-    const json = await (0, cli_1.requestCfApi)(url);
+    const json = await requestCfApi(url);
     logger?.log(`Filtering services. Request to: ${url}, result: ${JSON.stringify(json)}`);
     const businessServiceNames = new Set(businessServices.map((service) => service.label));
     const result = [];
@@ -155,7 +112,7 @@ async function filterServices(businessServices, logger) {
         }
     }
     if (result.length === 0) {
-        throw new Error((0, i18n_1.t)('error.noBusinessServicesFound'));
+        throw new Error(t('error.noBusinessServicesFound'));
     }
     return result;
 }
@@ -166,7 +123,7 @@ async function filterServices(businessServices, logger) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<string[]>} The services.
  */
-async function getMtaServices(projectPath, logger) {
+export async function getMtaServices(projectPath, logger) {
     const services = await readMta(projectPath, logger);
     logger?.log(`Available services defined in mta.yaml: ${JSON.stringify(services)}`);
     return services;
@@ -178,7 +135,7 @@ async function getMtaServices(projectPath, logger) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<string[]>} The resources.
  */
-async function getResources(mtaFilePath, logger) {
+export async function getResources(mtaFilePath, logger) {
     const servicesList = getServicesForFile(mtaFilePath, logger);
     const oDataFilteredServices = await filterServices(servicesList, logger);
     return oDataFilteredServices;
@@ -190,9 +147,9 @@ async function getResources(mtaFilePath, logger) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<string[]>} The resources.
  */
-async function readMta(projectPath, logger) {
+export async function readMta(projectPath, logger) {
     if (!projectPath) {
-        throw new Error((0, i18n_1.t)('error.mtaProjectPathMissing'));
+        throw new Error(t('error.mtaProjectPathMissing'));
     }
     const mtaFilePath = path.resolve(projectPath, 'mta.yaml');
     const resources = await getResources(mtaFilePath, logger);

package/dist/cf/project/yaml-loader.d.ts

@@ -1,4 +1,4 @@
-import type { MtaYaml } from '../../types';
+import type { MtaYaml } from '../../types.js';
 /**
  * Parses the MTA file.
  *

package/dist/cf/project/yaml-loader.js

@@ -1,27 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getYamlContent = getYamlContent;
-exports.getProjectName = getProjectName;
-exports.getProjectNameForXsSecurity = getProjectNameForXsSecurity;
-const node_fs_1 = __importDefault(require("node:fs"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+import fs from 'node:fs';
+import yaml from 'js-yaml';
 /**
  * Parses the MTA file.
  *
  * @param {string} filePath - The file to parse.
  * @returns {MtaYaml} The parsed YAML content.
  */
-function getYamlContent(filePath) {
-    if (!node_fs_1.default.existsSync(filePath)) {
+export function getYamlContent(filePath) {
+    if (!fs.existsSync(filePath)) {
         throw new Error(`Could not find file ${filePath}`);
     }
-    const content = node_fs_1.default.readFileSync(filePath, 'utf-8');
+    const content = fs.readFileSync(filePath, 'utf-8');
     let parsed;
     try {
-        parsed = js_yaml_1.default.load(content);
+        parsed = yaml.load(content);
         return parsed;
     }
     catch (e) {
@@ -34,7 +26,7 @@ function getYamlContent(filePath) {
  * @param {MtaYaml} yamlContent - The YAML content.
  * @returns {string | null} The project name or null if not found.
  */
-function getProjectName(yamlContent) {
+export function getProjectName(yamlContent) {
     return yamlContent?.ID || null;
 }
 /**
@@ -44,7 +36,7 @@ function getProjectName(yamlContent) {
  * @param {string} timestamp - The timestamp to append.
  * @returns {string | null} The project name for XS security or null if not available.
  */
-function getProjectNameForXsSecurity(yamlContent, timestamp) {
+export function getProjectNameForXsSecurity(yamlContent, timestamp) {
     const projectName = getProjectName(yamlContent);
     if (!projectName || !timestamp) {
         return undefined;

package/dist/cf/project/yaml.d.ts

@@ -1,7 +1,7 @@
 import type { Editor } from 'mem-fs-editor';
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { AppParamsExtended, MtaYaml, ServiceKeys } from '../../types';
-import { AppRouterType } from '../../types';
+import type { AppParamsExtended, MtaYaml, ServiceKeys } from '../../types.js';
+import { AppRouterType } from '../../types.js';
 interface AdjustMtaYamlParams {
     projectPath: string;
     adpProjectName: string;

package/dist/cf/project/yaml.js

@@ -1,54 +1,10 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMtaProject = isMtaProject;
-exports.addConnectivityServiceToMta = addConnectivityServiceToMta;
-exports.getSAPCloudService = getSAPCloudService;
-exports.getRouterType = getRouterType;
-exports.getAppParamsFromUI5Yaml = getAppParamsFromUI5Yaml;
-exports.adjustMtaYaml = adjustMtaYaml;
-const node_fs_1 = __importDefault(require("node:fs"));
-const path = __importStar(require("node:path"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const types_1 = require("../../types");
-const api_1 = require("../services/api");
-const yaml_loader_1 = require("./yaml-loader");
-const discovery_1 = require("../app/discovery");
+import fs from 'node:fs';
+import * as path from 'node:path';
+import yaml from 'js-yaml';
+import { AppRouterType } from '../../types.js';
+import { createServices, createServiceInstance, getOrCreateServiceInstanceKeys } from '../services/api.js';
+import { getProjectNameForXsSecurity, getYamlContent } from './yaml-loader.js';
+import { getServiceKeyDestinations } from '../app/discovery.js';
 const CF_MANAGED_SERVICE = 'org.cloudfoundry.managed-service';
 const HTML5_APPS_REPO = 'html5-apps-repo';
 const SAP_APPLICATION_CONTENT = 'com.sap.application.content';
@@ -58,8 +14,8 @@ const SAP_APPLICATION_CONTENT = 'com.sap.application.content';
  * @param {string} selectedPath - The selected path.
  * @returns {boolean} True if the selected path is a MTA project, false otherwise.
  */
-function isMtaProject(selectedPath) {
-    return node_fs_1.default.existsSync(path.join(selectedPath, 'mta.yaml'));
+export function isMtaProject(selectedPath) {
+    return fs.existsSync(path.join(selectedPath, 'mta.yaml'));
 }
 /**
  * Adds a connectivity service resource to the project's mta.yaml if not already present,
@@ -71,12 +27,12 @@ function isMtaProject(selectedPath) {
  * @param {Editor} memFs - The mem-fs editor instance.
  * @param {ToolsLogger} [logger] - Optional logger.
  */
-async function addConnectivityServiceToMta(projectPath, memFs, logger) {
+export async function addConnectivityServiceToMta(projectPath, memFs, logger) {
     if (!isMtaProject(projectPath)) {
         return;
     }
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
-    const yamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
+    const yamlContent = getYamlContent(mtaYamlPath);
     if (!yamlContent) {
         return;
     }
@@ -85,8 +41,8 @@ async function addConnectivityServiceToMta(projectPath, memFs, logger) {
     if (yamlContent.resources?.some((r) => r.name === connectivityResourceName)) {
         return;
     }
-    await (0, api_1.createServiceInstance)('lite', connectivityResourceName, 'connectivity', { logger });
-    await (0, api_1.getOrCreateServiceInstanceKeys)({ names: [connectivityResourceName] }, logger);
+    await createServiceInstance('lite', connectivityResourceName, 'connectivity', { logger });
+    await getOrCreateServiceInstanceKeys({ names: [connectivityResourceName] }, logger);
     yamlContent.resources = yamlContent.resources ?? [];
     yamlContent.resources.push({
         name: connectivityResourceName,
@@ -97,7 +53,7 @@ async function addConnectivityServiceToMta(projectPath, memFs, logger) {
             'service-name': connectivityResourceName
         }
     });
-    memFs.write(mtaYamlPath, js_yaml_1.default.dump(yamlContent, { lineWidth: -1 }));
+    memFs.write(mtaYamlPath, yaml.dump(yamlContent, { lineWidth: -1 }));
 }
 /**
  * Gets the SAP Cloud Service.
@@ -105,7 +61,7 @@ async function addConnectivityServiceToMta(projectPath, memFs, logger) {
  * @param {MtaYaml} yamlContent - The YAML content.
  * @returns {string} The SAP Cloud Service.
  */
-function getSAPCloudService(yamlContent) {
+export function getSAPCloudService(yamlContent) {
     const modules = yamlContent?.modules?.filter((module) => module.name.includes('destination-content'));
     const destinations = modules?.[0]?.parameters?.content?.instance?.destinations;
     const mtaDestination = destinations?.find((destination) => destination.Name.includes('html_repo_host'));
@@ -118,14 +74,14 @@ function getSAPCloudService(yamlContent) {
  * @param {MtaYaml} yamlContent - The YAML content.
  * @returns {AppRouterType} The router type.
  */
-function getRouterType(yamlContent) {
+export function getRouterType(yamlContent) {
     const filtered = yamlContent?.modules?.filter((module) => module.name.includes('destination-content') || module.name.includes('approuter'));
     const routerType = filtered?.pop();
     if (routerType?.name.includes('approuter')) {
-        return types_1.AppRouterType.STANDALONE;
+        return AppRouterType.STANDALONE;
     }
     else {
-        return types_1.AppRouterType.MANAGED;
+        return AppRouterType.MANAGED;
     }
 }
 /**
@@ -134,9 +90,9 @@ function getRouterType(yamlContent) {
  * @param {string} projectPath - The project path.
  * @returns {AppParamsExtended} The app params.
  */
-function getAppParamsFromUI5Yaml(projectPath) {
+export function getAppParamsFromUI5Yaml(projectPath) {
     const ui5YamlPath = path.join(projectPath, 'ui5.yaml');
-    const parsedYaml = (0, yaml_loader_1.getYamlContent)(ui5YamlPath);
+    const parsedYaml = getYamlContent(ui5YamlPath);
     const appConfiguration = parsedYaml?.builder?.customTasks?.[0]?.configuration;
     const appParams = {
         appHostId: appConfiguration?.appHostId || '',
@@ -191,12 +147,12 @@ function adjustMtaYamlStandaloneApprouter(yamlContent, projectName, businessServ
  * @param {ServiceKeys[]} serviceKeys - The service keys (optional).
  */
 function adjustMtaYamlManagedApprouter(yamlContent, projectName, businessSolution, businessService, timestamp, serviceKeys) {
-    const projectNameForXsSecurity = (0, yaml_loader_1.getProjectNameForXsSecurity)(yamlContent, timestamp);
+    const projectNameForXsSecurity = getProjectNameForXsSecurity(yamlContent, timestamp);
     const appRouterName = `${projectName}-destination-content`;
     let appRouter = yamlContent.modules?.find((module) => module.name === appRouterName);
     if (appRouter == null) {
         const endpointDestinations = serviceKeys
-            ? (0, discovery_1.getServiceKeyDestinations)(serviceKeys).map((endpoint) => ({
+            ? getServiceKeyDestinations(serviceKeys).map((endpoint) => ({
                 Name: endpoint.name,
                 URL: endpoint.url,
                 Authentication: 'OAuth2UserTokenExchange',
@@ -326,7 +282,7 @@ function adjustMtaYamlUDeployer(yamlContent, mtaProjectName, adpProjectName) {
  * @param {boolean} isManagedAppRouter - Whether the approuter is managed.
  */
 function adjustMtaYamlResources(yamlContent, mtaProjectName, timestamp, isManagedAppRouter) {
-    const projectNameForXsSecurity = (0, yaml_loader_1.getProjectNameForXsSecurity)(yamlContent, timestamp);
+    const projectNameForXsSecurity = getProjectNameForXsSecurity(yamlContent, timestamp);
     const resources = [
         {
             name: `${mtaProjectName}_html_repo_host`,
@@ -453,9 +409,9 @@ function adjustMtaYamlFlpModule(yamlContent, projectName, businessService) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys, spaceGuid }, memFs, timestamp, templatePathOverwrite, logger) {
+export async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys, spaceGuid }, memFs, timestamp, templatePathOverwrite, logger) {
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
-    const loadedYamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
+    const loadedYamlContent = getYamlContent(mtaYamlPath);
     const defaultYaml = {
         ID: projectPath.split(path.sep).pop() ?? '',
         version: '0.0.1',
@@ -469,7 +425,7 @@ async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, busin
     const yamlContent = Object.assign(defaultYaml, loadedYamlContent);
     const mtaProjectName = yamlContent.ID.toLowerCase();
     const initialServices = yamlContent.resources?.map((resource) => resource.parameters.service ?? '') ?? [];
-    const isStandaloneApprouter = appRouterType === types_1.AppRouterType.STANDALONE;
+    const isStandaloneApprouter = appRouterType === AppRouterType.STANDALONE;
     if (isStandaloneApprouter) {
         adjustMtaYamlStandaloneApprouter(yamlContent, mtaProjectName, businessService);
     }
@@ -481,8 +437,8 @@ async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, busin
     adjustMtaYamlOwnModule(yamlContent, adpProjectName);
     // should go last since it sorts the modules (workaround, should be removed after fixed in deployment module)
     adjustMtaYamlFlpModule(yamlContent, mtaProjectName, businessService);
-    await (0, api_1.createServices)(yamlContent, initialServices, timestamp, spaceGuid, templatePathOverwrite, logger);
-    const updatedYamlContent = js_yaml_1.default.dump(yamlContent, {
+    await createServices(yamlContent, initialServices, timestamp, spaceGuid, templatePathOverwrite, logger);
+    const updatedYamlContent = yaml.dump(yamlContent, {
         lineWidth: -1 // Disable line wrapping to keep URLs on single lines
     });
     memFs.write(mtaYamlPath, updatedYamlContent);

package/dist/cf/services/api.d.ts

@@ -1,6 +1,6 @@
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { ManifestNamespace } from '@sap-ux/project-access';
-import type { CfConfig, CFApp, RequestArguments, ServiceKeys, GetServiceInstanceParams, ServiceInstance, MtaYaml, ServiceInfo, CfUi5AppInfo, ServiceKeyCredentialsWithTags } from '../../types';
+import type { CfConfig, CFApp, RequestArguments, ServiceKeys, GetServiceInstanceParams, ServiceInstance, MtaYaml, ServiceInfo, CfUi5AppInfo, ServiceKeyCredentialsWithTags } from '../../types.js';
 interface CreateServiceOptions {
     xsSecurityProjectName?: string;
     templatePathOverwrite?: string;