@sap-ux/adp-tooling 0.14.2 → 0.14.4

package/dist/preview/adp-preview.d.ts

@@ -23,6 +23,10 @@ export declare class AdpPreview {
     private readonly project;
     private readonly util;
     private readonly logger;
+    /**
+     * Instance of the ABAP provider
+     */
+    private provider;
     /**
      * Merged descriptor variant with reference app manifest
      */

package/dist/preview/adp-preview.js

@@ -16,6 +16,10 @@ class AdpPreview {
     project;
     util;
     logger;
+    /**
+     * Instance of the ABAP provider
+     */
+    provider;
     /**
      * Merged descriptor variant with reference app manifest
      */
@@ -95,13 +99,13 @@ class AdpPreview {
      */
     async init(descriptorVariant) {
         this.descriptorVariantId = descriptorVariant.id;
-        const provider = await (0, system_access_1.createAbapServiceProvider)(this.config.target, { ignoreCertErrors: this.config.ignoreCertErrors }, true, this.logger);
-        this.routesHandler = new routes_handler_1.default(this.project, this.util, provider, this.logger);
-        this.lrep = provider.getLayeredRepository();
+        this.provider = await (0, system_access_1.createAbapServiceProvider)(this.config.target, { ignoreCertErrors: this.config.ignoreCertErrors }, true, this.logger);
+        this.routesHandler = new routes_handler_1.default(this.project, this.util, this.provider, this.logger);
+        this.lrep = this.provider.getLayeredRepository();
         // fetch a merged descriptor from the backend
         await this.lrep.getCsrfToken();
         // check if the project is an ABAP cloud project
-        this.isCloud = await provider.isAbapCloud();
+        this.isCloud = await this.provider.isAbapCloud();
         await this.sync();
         return descriptorVariant.layer;
     }
@@ -212,7 +216,7 @@ class AdpPreview {
                     await (0, change_handler_1.addControllerExtension)(this.util.getProject().getRootPath(), this.util.getProject().getSourcePath(), change, fs, logger);
                 }
                 if ((0, change_handler_1.isAddAnnotationChange)(change)) {
-                    await (0, change_handler_1.addAnnotationFile)(this.util.getProject().getSourcePath(), this.util.getProject().getRootPath(), change, fs, logger);
+                    await (0, change_handler_1.addAnnotationFile)(this.util.getProject().getSourcePath(), this.util.getProject().getRootPath(), change, fs, logger, this.provider);
                 }
                 break;
             default:

package/dist/preview/change-handler.d.ts

@@ -1,6 +1,7 @@
 import type { Editor } from 'mem-fs-editor';
 import type { AddXMLChange, CommonChangeProperties, CodeExtChange, AnnotationFileChange, CommonAdditionalChangeInfoProperties } from '../types';
 import type { Logger } from '@sap-ux/logger';
+import type { AbapServiceProvider } from '@sap-ux/axios-extension';
 /**
  * A mapping object that defines how to extract change content data from changes based on their type.
  */
@@ -72,6 +73,7 @@ export declare function addControllerExtension(rootPath: string, basePath: strin
  * @param {AnnotationFileChange} change - The change data, including the fragment path.
  * @param {Editor} fs - The mem-fs-editor instance.
  * @param {Logger} logger - The logging instance.
+ *@param {AbapServiceProvider} provider - abap provider.
  */
-export declare function addAnnotationFile(basePath: string, projectRoot: string, change: AnnotationFileChange, fs: Editor, logger: Logger): Promise<void>;
+export declare function addAnnotationFile(basePath: string, projectRoot: string, change: AnnotationFileChange, fs: Editor, logger: Logger, provider: AbapServiceProvider): Promise<void>;
 //# sourceMappingURL=change-handler.d.ts.map

package/dist/preview/change-handler.js

@@ -9,14 +9,13 @@ exports.addXmlFragment = addXmlFragment;
 exports.addControllerExtension = addControllerExtension;
 exports.addAnnotationFile = addAnnotationFile;
 const path_1 = require("path");
-const project_access_1 = require("@sap-ux/project-access");
 const ejs_1 = require("ejs");
 const crypto_1 = require("crypto");
 const manifest_service_1 = require("../base/abap/manifest-service");
 const helper_1 = require("../base/helper");
-const system_access_1 = require("@sap-ux/system-access");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const editors_1 = require("../writer/editors");
+const project_access_1 = require("@sap-ux/project-access");
 const OBJECT_PAGE_CUSTOM_SECTION = 'OBJECT_PAGE_CUSTOM_SECTION';
 const CUSTOM_ACTION = 'CUSTOM_ACTION';
 const OBJECT_PAGE_HEADER_FIELD = 'OBJECT_PAGE_HEADER_FIELD';
@@ -273,15 +272,17 @@ async function addControllerExtension(rootPath, basePath, change, fs, logger) {
  * @param {AnnotationFileChange} change - The change data, including the fragment path.
  * @param {Editor} fs - The mem-fs-editor instance.
  * @param {Logger} logger - The logging instance.
+ *@param {AbapServiceProvider} provider - abap provider.
  */
-async function addAnnotationFile(basePath, projectRoot, change, fs, logger) {
+async function addAnnotationFile(basePath, projectRoot, change, fs, logger, provider) {
     const { dataSourceId, annotations, dataSource } = change.content;
     const annotationDataSourceKey = annotations[0];
     const annotationUriSegments = dataSource[annotationDataSourceKey].uri.split('/');
     annotationUriSegments.shift();
     const fullPath = (0, path_1.join)(basePath, project_access_1.DirName.Changes, ...annotationUriSegments);
     try {
-        const manifestService = await getManifestService(projectRoot, logger);
+        const variant = await (0, helper_1.getVariant)(basePath);
+        const manifestService = await manifest_service_1.ManifestService.initMergedManifest(provider, basePath, variant, logger);
         const metadata = await manifestService.getDataSourceMetadata(dataSourceId);
         const datasoruces = await manifestService.getManifestDataSources();
         const namespaces = (0, odata_service_writer_1.getAnnotationNamespaces)({ metadata });
@@ -301,17 +302,4 @@ async function addAnnotationFile(basePath, projectRoot, change, fs, logger) {
         throw new Error('Failed to create Local Annotation File' + error.message);
     }
 }
-/**
- * Returns manifest service.
- *
- * @param {string} basePath - The base path of the project.
- * @param {Logger} logger - The logging instance.
- * @returns Promise<ManifestService>
- */
-async function getManifestService(basePath, logger) {
-    const variant = await (0, helper_1.getVariant)(basePath);
-    const { target, ignoreCertErrors = false } = await (0, helper_1.getAdpConfig)(basePath, (0, path_1.join)(basePath, project_access_1.FileName.Ui5Yaml));
-    const provider = await (0, system_access_1.createAbapServiceProvider)(target, { ignoreCertErrors }, true, logger);
-    return await manifest_service_1.ManifestService.initMergedManifest(provider, basePath, variant, logger);
-}
 //# sourceMappingURL=change-handler.js.map

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.14.2",
+  "version": "0.14.4",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -32,18 +32,18 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "10.0.0",
-    "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/axios-extension": "1.21.0",
+    "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/inquirer-common": "0.7.1",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/project-access": "1.30.1",
     "@sap-ux/project-input-validator": "0.6.1",
     "@sap-ux/system-access": "0.6.0",
     "@sap-ux/ui5-config": "0.28.1",
-    "@sap-ux/odata-service-writer": "0.27.1",
+    "@sap-ux/odata-service-writer": "0.27.2",
     "@sap-ux/nodejs-utils": "0.2.0",
-    "@sap-ux/store": "1.1.0",
-    "@sap-ux/i18n": "0.3.0"
+    "@sap-ux/i18n": "0.3.0",
+    "@sap-ux/store": "1.1.0"
   },
   "devDependencies": {
     "@types/adm-zip": "0.5.5",