@sap-ux/adp-tooling 0.18.21 → 0.18.24

package/dist/index.d.ts

@@ -17,6 +17,5 @@ export * from './writer/manifest';
 export * from './writer/writer-config';
 export { generate, migrate } from './writer';
 export { generateChange } from './writer/editors';
-export { getCustomConfig } from './writer/project-utils';
 export { generateInboundConfig } from './writer/inbound-navigation';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateInboundConfig = exports.getCustomConfig = exports.generateChange = exports.migrate = exports.generate = exports.promptGeneratorInput = void 0;
+exports.generateInboundConfig = exports.generateChange = exports.migrate = exports.generate = exports.promptGeneratorInput = void 0;
 __exportStar(require("./types"), exports);
 __exportStar(require("./prompts"), exports);
 __exportStar(require("./common"), exports);
@@ -38,8 +38,6 @@ Object.defineProperty(exports, "generate", { enumerable: true, get: function ()
 Object.defineProperty(exports, "migrate", { enumerable: true, get: function () { return writer_1.migrate; } });
 var editors_1 = require("./writer/editors");
 Object.defineProperty(exports, "generateChange", { enumerable: true, get: function () { return editors_1.generateChange; } });
-var project_utils_1 = require("./writer/project-utils");
-Object.defineProperty(exports, "getCustomConfig", { enumerable: true, get: function () { return project_utils_1.getCustomConfig; } });
 var inbound_navigation_1 = require("./writer/inbound-navigation");
 Object.defineProperty(exports, "generateInboundConfig", { enumerable: true, get: function () { return inbound_navigation_1.generateInboundConfig; } });
 //# sourceMappingURL=index.js.map

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { UI5FlexLayer, ManifestNamespace, Manifest } from '@sap-ux/project-access';
+import type { UI5FlexLayer, ManifestNamespace, Manifest, Package } from '@sap-ux/project-access';
 import type { DestinationAbapTarget, UrlAbapTarget } from '@sap-ux/system-access';
 import type { Adp, BspApp } from '@sap-ux/ui5-config';
 import type { AxiosRequestConfig, OperationsType } from '@sap-ux/axios-extension';
@@ -946,6 +946,7 @@ export interface CfAdpWriterConfig {
         path: string;
         folder: string;
     };
+    customConfig?: CustomConfig;
     ui5: {
         version: string;
     };
@@ -974,6 +975,8 @@ export interface CreateCfConfigParams {
     projectPath: string;
     addStandaloneApprouter?: boolean;
     publicVersions: UI5Version;
+    packageJson: Package;
+    toolsId: string;
 }
 export declare const AppRouterType: {
     readonly MANAGED: "Managed HTML5 Application Runtime";

package/dist/writer/options.d.ts

@@ -1,5 +1,5 @@
 import type { UI5Config } from '@sap-ux/ui5-config';
-import type { AdpWriterConfig, Content, CloudApp, InternalInboundNavigation, CfAdpWriterConfig } from '../types';
+import type { AdpWriterConfig, Content, CloudApp, InternalInboundNavigation, CfAdpWriterConfig, CustomConfig } from '../types';
 /**
  * Generate the configuration for the middlewares required for the ui5.yaml.
  *
@@ -22,9 +22,9 @@ export declare function enhanceUI5YamlWithCustomTask(ui5Config: UI5Config, confi
  * Generate custom configuration required for the ui5.yaml.
  *
  * @param ui5Config configuration representing the ui5.yaml
- * @param config full project configuration
+ * @param customConfig custom configuration
  */
-export declare function enhanceUI5YamlWithCustomConfig(ui5Config: UI5Config, config: AdpWriterConfig): void;
+export declare function enhanceUI5YamlWithCustomConfig(ui5Config: UI5Config, customConfig?: CustomConfig): void;
 /**
  * Enhances a UI5 YAML configuration with the transpile middleware for TypeScript support.
  *

package/dist/writer/options.js

@@ -59,10 +59,10 @@ function enhanceUI5YamlWithCustomTask(ui5Config, config) {
  * Generate custom configuration required for the ui5.yaml.
  *
  * @param ui5Config configuration representing the ui5.yaml
- * @param config full project configuration
+ * @param customConfig custom configuration
  */
-function enhanceUI5YamlWithCustomConfig(ui5Config, config) {
-    const adp = config.customConfig?.adp;
+function enhanceUI5YamlWithCustomConfig(ui5Config, customConfig) {
+    const adp = customConfig?.adp;
     if (adp) {
         const { support } = adp;
         ui5Config.addCustomConfiguration('adp', { support });

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

@@ -1,7 +1,6 @@
 import type { Editor } from 'mem-fs-editor';
-import { type AdpWriterConfig, type CustomConfig, type TypesConfig, type CfAdpWriterConfig, type DescriptorVariant } from '../types';
+import { type AdpWriterConfig, type TypesConfig, type CfAdpWriterConfig, type DescriptorVariant } 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.
  *
@@ -19,16 +18,6 @@ export declare function getPackageJSONInfo(): Package;
  * @returns {TypesConfig} - The package name and version string for the UI5 types.
  */
 export declare function getTypes(ui5Version?: string): TypesConfig;
-/**
- * Constructs a custom configuration object for the Adaptation Project (ADP).
- *
- * @param {OperationsType} environment - The operations type ('P' for on-premise or 'C' for cloud ready).
- * @param {object} pkg - The parsed contents of `package.json`.
- * @param {string} pkg.name - The name of the tool or package generating the config.
- * @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 }: Package): CustomConfig;
 /**
  * Get the variant for the CF project.
  *

package/dist/writer/project-utils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageJSONInfo = getPackageJSONInfo;
 exports.getTypes = getTypes;
-exports.getCustomConfig = getCustomConfig;
 exports.getCfVariant = getCfVariant;
 exports.writeTemplateToFolder = writeTemplateToFolder;
 exports.writeUI5Yaml = writeUI5Yaml;
@@ -11,7 +10,6 @@ exports.writeUI5DeployYaml = writeUI5DeployYaml;
 exports.writeCfTemplates = writeCfTemplates;
 const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
-const uuid_1 = require("uuid");
 const options_1 = require("./options");
 const ui5_config_1 = require("@sap-ux/ui5-config");
 /**
@@ -56,27 +54,6 @@ function getTypes(ui5Version) {
         typesVersion
     };
 }
-/**
- * Constructs a custom configuration object for the Adaptation Project (ADP).
- *
- * @param {OperationsType} environment - The operations type ('P' for on-premise or 'C' for cloud ready).
- * @param {object} pkg - The parsed contents of `package.json`.
- * @param {string} pkg.name - The name of the tool or package generating the config.
- * @param {string} pkg.version - The version of the tool generating the config.
- * @returns {CustomConfig} The generated ADP custom configuration object.
- */
-function getCustomConfig(environment, { name: id, version }) {
-    return {
-        adp: {
-            environment,
-            support: {
-                id: id ?? '',
-                version: version ?? '',
-                toolsId: (0, uuid_1.v4)()
-            }
-        }
-    };
-}
 /**
  * Get the variant for the CF project.
  *
@@ -152,7 +129,7 @@ async function writeUI5Yaml(projectPath, data, fs) {
         const baseUi5ConfigContent = fs.read(ui5ConfigPath);
         const ui5Config = await ui5_config_1.UI5Config.newInstance(baseUi5ConfigContent);
         ui5Config.setConfiguration({ propertiesFileSourceEncoding: 'UTF-8' });
-        (0, options_1.enhanceUI5YamlWithCustomConfig)(ui5Config, data);
+        (0, options_1.enhanceUI5YamlWithCustomConfig)(ui5Config, data.customConfig);
         (0, options_1.enhanceUI5YamlWithTranspileMiddleware)(ui5Config, data);
         (0, options_1.enhanceUI5Yaml)(ui5Config, data);
         (0, options_1.enhanceUI5YamlWithCustomTask)(ui5Config, data);
@@ -176,6 +153,7 @@ async function writeCfUI5Yaml(projectPath, data, fs) {
         const baseUi5ConfigContent = fs.read(ui5ConfigPath);
         const ui5Config = await ui5_config_1.UI5Config.newInstance(baseUi5ConfigContent);
         ui5Config.setConfiguration({ propertiesFileSourceEncoding: 'UTF-8' });
+        (0, options_1.enhanceUI5YamlWithCustomConfig)(ui5Config, data.customConfig);
         /** Builder task */
         (0, options_1.enhanceUI5YamlWithCfCustomTask)(ui5Config, data);
         /** Middlewares */

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

@@ -40,6 +40,10 @@ export interface ConfigOptions {
      * Logger instance for debugging and error reporting.
      */
     logger: ToolsLogger;
+    /**
+     * The tools ID.
+     */
+    toolsId: string;
 }
 /**
  * Generates the configuration object for the Adaptation Project.

package/dist/writer/writer-config.js

@@ -6,7 +6,6 @@ exports.getCfConfig = getCfConfig;
 const node_path_1 = require("node:path");
 const ui5_1 = require("../ui5");
 const abap_1 = require("../abap");
-const project_utils_1 = require("./project-utils");
 const types_1 = require("../types");
 const i18n_1 = require("../i18n");
 /**
@@ -23,11 +22,10 @@ const i18n_1 = require("../i18n");
  * @returns {Promise<AdpWriterConfig>} A promise that resolves to the generated ADP writer configuration.
  */
 async function getConfig(options) {
-    const { configAnswers, attributeAnswers, layer, logger, packageJson, provider, publicVersions, systemVersion, manifest } = options;
+    const { configAnswers, attributeAnswers, layer, logger, packageJson, provider, publicVersions, systemVersion, manifest, toolsId } = options;
     const ato = await provider.getAtoInfo();
     const operationsType = ato.operationsType ?? 'P';
     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 ui5Version = isCloudProject
@@ -56,7 +54,16 @@ async function getConfig(options) {
     return {
         app,
         ui5,
-        customConfig,
+        customConfig: {
+            adp: {
+                environment: operationsType,
+                support: {
+                    id: packageJson.name ?? '',
+                    version: packageJson.version ?? '',
+                    toolsId
+                }
+            }
+        },
         target,
         options: {
             fioriTools: true,
@@ -118,6 +125,15 @@ function getCfConfig(params) {
             path: params.projectPath,
             folder: (0, node_path_1.join)(params.projectPath, params.attributeAnswers.projectName)
         },
+        customConfig: {
+            adp: {
+                support: {
+                    id: params.packageJson?.name ?? '',
+                    version: params.packageJson?.version ?? '',
+                    toolsId: params.toolsId ?? ''
+                }
+            }
+        },
         ui5: {
             version: ui5Version
         },

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.21",
+  "version": "0.18.24",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -36,17 +36,17 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "10.0.0",
-    "@sap-ux/axios-extension": "1.24.6",
+    "@sap-ux/axios-extension": "1.25.0",
     "@sap-ux/btp-utils": "1.1.6",
     "@sap-ux/i18n": "0.3.6",
-    "@sap-ux/inquirer-common": "0.9.16",
+    "@sap-ux/inquirer-common": "0.10.0",
     "@sap-ux/logger": "0.7.2",
     "@sap-ux/nodejs-utils": "0.2.10",
-    "@sap-ux/odata-service-writer": "0.27.38",
+    "@sap-ux/odata-service-writer": "0.28.0",
     "@sap-ux/project-access": "1.32.16",
     "@sap-ux/project-input-validator": "0.6.38",
-    "@sap-ux/store": "1.3.5",
-    "@sap-ux/system-access": "0.6.32",
+    "@sap-ux/store": "1.4.0",
+    "@sap-ux/system-access": "0.6.34",
     "@sap-ux/ui5-config": "0.29.11",
     "@sap-ux/ui5-info": "0.13.4"
   },
@@ -68,7 +68,7 @@
     "nock": "13.4.0",
     "rimraf": "6.0.1",
     "supertest": "7.1.4",
-    "@sap-ux/store": "1.3.5"
+    "@sap-ux/store": "1.4.0"
   },
   "engines": {
     "node": ">=20.x"