@sap-ux/fiori-annotation-api 0.9.42 → 0.9.44

package/dist/annotation-provider.d.ts

@@ -1,4 +1,3 @@
-import type { ServiceInfo } from '@sap-ux/project-access';
 import { ODataVersionType } from '@sap-ux/odata-annotation-core-types';
 import type { ServiceArtifacts, TextFile } from './types';
 /**
@@ -12,6 +11,13 @@ import type { ServiceArtifacts, TextFile } from './types';
  * @returns Service artifacts.
  */
 export declare function getXmlServiceArtifacts(odataVersion: ODataVersionType, path: string, metadataFile: TextFile, annotationFiles: TextFile[], fileCache: Map<string, string>): ServiceArtifacts;
+/**
+ * Normalizes a URL by replacing backslashes with forward slashes and removing leading slashes.
+ *
+ * @param url - The URL to normalize.
+ * @returns The normalized URL.
+ */
+export declare function uniformUrl(url: string): string;
 /**
  *
  */
@@ -29,14 +35,6 @@ export declare class CdsAnnotationProvider {
      * @returns Service artifacts or undefined.
      */
     static getCdsServiceArtifacts(rootPath: string, servicePath: string, fileCache: Map<string, string>): ServiceArtifacts | undefined;
-    /**
-     * Get CDS services.
-     *
-     * @param rootPath - Project root path.
-     * @param fileCache - File cache.
-     * @returns Service info array.
-     */
-    static getServices(rootPath: string, fileCache: Map<string, string>): ServiceInfo[];
     /**
      * Reset CDS cache clearing compile model and service artifacts.
      *
@@ -46,10 +44,4 @@ export declare class CdsAnnotationProvider {
     static resetCache(rootPath: string, fileCache: Map<string, string>): void;
     private static getFacade;
 }
-/**
- * Normalizes a URL by replacing backslashes with forward slashes and removing leading slashes.
- *
- * @param url - The URL to normalize.
- * @returns The normalized URL.
- */
 //# sourceMappingURL=annotation-provider.d.ts.map

package/dist/annotation-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-provider.d.ts","sourceRoot":"","sources":["../src/annotation-provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAA8C,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAMnH,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI1D;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAClC,YAAY,EAAE,gBAAgB,EAC9B,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,QAAQ,EACtB,eAAe,EAAE,QAAQ,EAAE,EAC3B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,gBAAgB,CAwBlB;AAED;;GAEG;AACH,qBAAa,qBAAqB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAoC;IAC5E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAuD;IACnG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IACxE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAA+B;IAExE;;;;;;;OAOG;WACW,sBAAsB,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,gBAAgB,GAAG,SAAS;IAuD/B;;;;;;OAMG;WACW,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,EAAE;IAI1F;;;;;OAKG;WACW,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAKhF,OAAO,CAAC,MAAM,CAAC,SAAS;CAsC3B;AAwBD;;;;;GAKG"}
+{"version":3,"file":"annotation-provider.d.ts","sourceRoot":"","sources":["../src/annotation-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8C,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAWnH,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM1D;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAClC,YAAY,EAAE,gBAAgB,EAC9B,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,QAAQ,EACtB,eAAe,EAAE,QAAQ,EAAE,EAC3B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,gBAAgB,CAwBlB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAK9C;AAED;;GAEG;AACH,qBAAa,qBAAqB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAoC;IAC5E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAuD;IACnG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IACxE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAA+B;IAExE;;;;;;;OAOG;WACW,sBAAsB,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,gBAAgB,GAAG,SAAS;IAqD/B;;;;;OAKG;WACW,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAKhF,OAAO,CAAC,MAAM,CAAC,SAAS;CA2B3B"}

package/dist/annotation-provider.js

@@ -3,10 +3,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CdsAnnotationProvider = void 0;
 exports.getXmlServiceArtifacts = getXmlServiceArtifacts;
+exports.uniformUrl = uniformUrl;
+const project_access_1 = require("@sap-ux/project-access");
 const odata_vocabularies_1 = require("@sap-ux/odata-vocabularies");
+const ux_cds_compiler_facade_1 = require("@sap/ux-cds-compiler-facade");
+const odata_entity_model_1 = require("@sap-ux/odata-entity-model");
 const xml_1 = require("./xml");
 const odata_annotation_core_1 = require("@sap-ux/odata-annotation-core");
 const vocabularies_1 = require("./vocabularies");
+const node_url_1 = require("node:url");
+const cds_odata_annotation_converter_1 = require("@sap-ux/cds-odata-annotation-converter");
 /**
  * Get XML service artifacts.
  *
@@ -35,6 +41,18 @@ function getXmlServiceArtifacts(odataVersion, path, metadataFile, annotationFile
         fileSequence: adapter.getAllFiles().map((file) => file.uri)
     };
 }
+/**
+ * Normalizes a URL by replacing backslashes with forward slashes and removing leading slashes.
+ *
+ * @param url - The URL to normalize.
+ * @returns The normalized URL.
+ */
+function uniformUrl(url) {
+    return url
+        .replaceAll('\\', '/')
+        .replaceAll('//', '/')
+        .replaceAll(/(?:^\/)/g, '');
+}
 /**
  *
  */
@@ -52,7 +70,6 @@ class CdsAnnotationProvider {
      * @returns Service artifacts or undefined.
      */
     static getCdsServiceArtifacts(rootPath, servicePath, fileCache) {
-        // eslint-disable-next-line prefer-const
         let cachedArtifactsByRoot = this.serviceArtifactCache.get(rootPath);
         if (cachedArtifactsByRoot) {
             const cachedService = cachedArtifactsByRoot[servicePath];
@@ -60,60 +77,40 @@ class CdsAnnotationProvider {
                 return cachedService;
             }
         }
-        this.getFacade(rootPath, fileCache, false);
-        // NOSONAR: Commented code kept for future CDS implementation reference
-        // const services = this.serviceInfoCache.get(rootPath) ?? [];
-        // const serviceInfo = services.find((s) => uniformUrl(s.urlPath) === uniformUrl(servicePath));
-        // if (!serviceInfo) {
-        //     return undefined;
-        // }
-        // const serviceName = serviceInfo.name;
-        // const annotationFiles: Record<string, AnnotationFile> = {};
-        // const metadataElementMap = facade.getMetadata(serviceName);
-        // // We collect already full metadata from compile model, we don't need to build it based on paths.
-        // const metadataCollector = createMetadataCollector(new Map(), facade);
-        // const { propagationMap } = facade.getPropagatedTargetMap(serviceName);
-        // for (const path of facade.getAllSourceUris()) {
-        //     const uri = pathToFileURL(path).toString();
-        //     const cdsAnnotationFile = toTargetMap(facade.blitzIndex.forUri(uri), uri, this.vocabularyService, facade);
-        //     const annotationFile = toAnnotationFile(
-        //         uri,
-        //         this.vocabularyService,
-        //         cdsAnnotationFile,
-        //         metadataCollector,
-        //         undefined,
-        //         propagationMap,
-        //         true
-        //     ).file;
-        //     annotationFiles[uri] = annotationFile;
-        // }
-        // const metadataElements = getMetadataElementsFromMap(metadataElementMap);
-        // const metadataService = new MetadataService({ uriMap: facade?.getUriMap() || new Map() });
-        // metadataService.import(metadataElements, 'DummyMetadataFileUri');
-        // const aliasInformation = getAliasInfo(metadataService, XML_VOCABULARY_SERVICE, annotationFiles);
-        // const url = uniformUrl(serviceInfo.urlPath);
-        // const artifacts = {
-        //     path: url,
-        //     metadataService,
-        //     annotationFiles,
-        //     aliasInfo: aliasInformation,
-        //     fileSequence: facade.getFileSequence().map((path) => pathToFileURL(path).toString())
-        // };
-        // cachedArtifactsByRoot = {};
-        // cachedArtifactsByRoot[url] = artifacts;
-        // this.serviceArtifactCache.set(rootPath, cachedArtifactsByRoot);
-        // return artifacts;
-    }
-    /**
-     * Get CDS services.
-     *
-     * @param rootPath - Project root path.
-     * @param fileCache - File cache.
-     * @returns Service info array.
-     */
-    static getServices(rootPath, fileCache) {
-        this.getFacade(rootPath, fileCache, false);
-        return this.serviceInfoCache.get(rootPath) ?? [];
+        const facade = this.getFacade(rootPath, fileCache, false);
+        const services = this.serviceInfoCache.get(rootPath) ?? [];
+        const serviceInfo = services.find((s) => uniformUrl(s.urlPath) === uniformUrl(servicePath));
+        if (!serviceInfo) {
+            return undefined;
+        }
+        const serviceName = serviceInfo.name;
+        const annotationFiles = {};
+        const metadataElementMap = facade.getMetadata(serviceName);
+        // We collect already full metadata from compile model, we don't need to build it based on paths.
+        const metadataCollector = (0, ux_cds_compiler_facade_1.createMetadataCollector)(new Map(), facade);
+        const { propagationMap } = facade.getPropagatedTargetMap(serviceName);
+        for (const path of facade.getAllSourceUris()) {
+            const uri = (0, node_url_1.pathToFileURL)(path).toString();
+            const cdsAnnotationFile = (0, cds_odata_annotation_converter_1.toTargetMap)(facade.blitzIndex.forUri(uri), uri, this.vocabularyService, facade);
+            const annotationFile = (0, cds_odata_annotation_converter_1.toAnnotationFile)(uri, this.vocabularyService, cdsAnnotationFile, metadataCollector, undefined, propagationMap, true).file;
+            annotationFiles[uri] = annotationFile;
+        }
+        const metadataElements = (0, ux_cds_compiler_facade_1.getMetadataElementsFromMap)(metadataElementMap);
+        const metadataService = new odata_entity_model_1.MetadataService({ uriMap: facade?.getUriMap() || new Map() });
+        metadataService.import(metadataElements, 'DummyMetadataFileUri');
+        const aliasInformation = getAliasInfo(metadataService, xml_1.XML_VOCABULARY_SERVICE, annotationFiles);
+        const url = uniformUrl(serviceInfo.urlPath);
+        const artifacts = {
+            path: url,
+            metadataService,
+            annotationFiles,
+            aliasInfo: aliasInformation,
+            fileSequence: facade.getFileSequence().map((path) => (0, node_url_1.pathToFileURL)(path).toString())
+        };
+        cachedArtifactsByRoot = {};
+        cachedArtifactsByRoot[url] = artifacts;
+        this.serviceArtifactCache.set(rootPath, cachedArtifactsByRoot);
+        return artifacts;
     }
     /**
      * Reset CDS cache clearing compile model and service artifacts.
@@ -125,38 +122,28 @@ class CdsAnnotationProvider {
         this.serviceArtifactCache.delete(rootPath);
         this.getFacade(rootPath, fileCache, true);
     }
-    static getFacade(rootPath, fileCache, _ignoreCache = false) {
-        throw new Error('Not implemented yet.');
-        // NOSONAR: Commented code kept for future CDS implementation reference
-        // const cachedValue = this.cdsCache.get(rootPath);
-        // if (cachedValue && ignoreCache === false) {
-        //     return cachedValue;
-        // }
-        // console.log('compiling cds model for path:', rootPath);
-        // performance.mark('cds-compile-start');
-        // const cache = new Proxy(
-        //     {},
-        //     {
-        //         get(compilerCache: Record<string, string | undefined>, path: string) {
-        //             const cachedValue = compilerCache[path];
-        //             if (cachedValue !== undefined) {
-        //                 return cachedValue;
-        //             }
-        //             const uri = pathToFileURL(path).toString();
-        //             const value = fileCache.get(uri);
-        //             compilerCache[path] = value;
-        //             return value;
-        //         }
-        //     }
-        // );
-        // const facade = createCdsCompilerFacadeForRootSync(rootPath, [], cache);
-        // const services = processServices(facade.getServiceInfo());
-        // this.serviceInfoCache.set(rootPath, services);
-        // this.cdsCache.set(rootPath, facade);
-        // performance.mark('cds-compile-end');
-        // performance.measure('cds-compile', 'cds-compile-start', 'cds-compile-end');
-        // console.log('CDS compilation performance:', performance.getEntriesByName('cds-compile'));
-        // return facade;
+    static getFacade(rootPath, fileCache, ignoreCache = false) {
+        const cachedValue = this.cdsCache.get(rootPath);
+        if (cachedValue && ignoreCache === false) {
+            return cachedValue;
+        }
+        const cache = new Proxy({}, {
+            get(compilerCache, path) {
+                const cachedValue = compilerCache[path];
+                if (cachedValue !== undefined) {
+                    return cachedValue;
+                }
+                const uri = (0, node_url_1.pathToFileURL)(path).toString();
+                const value = fileCache.get(uri);
+                compilerCache[path] = value;
+                return value;
+            }
+        });
+        const facade = (0, ux_cds_compiler_facade_1.createCdsCompilerFacadeForRootSync)(rootPath, [], cache);
+        const services = (0, project_access_1.processServices)(facade.getServiceInfo());
+        this.serviceInfoCache.set(rootPath, services);
+        this.cdsCache.set(rootPath, facade);
+        return facade;
     }
 }
 exports.CdsAnnotationProvider = CdsAnnotationProvider;
@@ -170,17 +157,4 @@ function getAliasInfo(metadataService, vocabularyService, files) {
     }
     return aliasInformation;
 }
-/**
- * Normalizes a URL by replacing backslashes with forward slashes and removing leading slashes.
- *
- * @param url - The URL to normalize.
- * @returns The normalized URL.
- */
-// NOSONAR: Commented code kept for future CDS implementation reference
-// function uniformUrl(url: string): string {
-//     return url
-//         .replaceAll(/\\/g, '/')
-//         .replaceAll(/\/\//g, '/')
-//         .replaceAll(/(?:^\/)/g, '');
-// }
 //# sourceMappingURL=annotation-provider.js.map

package/dist/annotation-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-provider.js","sourceRoot":"","sources":["../src/annotation-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotation-provider.js","sourceRoot":"","sources":["../src/annotation-provider.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -4,5 +4,5 @@ export * from './types/change';
 export * from './external-services';
 export { ServiceArtifacts } from './types/adapter';
 export { findAnnotation, getAvtNodeFromPointer } from './avt';
-export { getXmlServiceArtifacts, CdsAnnotationProvider } from './annotation-provider';
+export { getXmlServiceArtifacts, CdsAnnotationProvider, uniformUrl } from './annotation-provider';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AACxF,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AACxF,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC"}

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.CdsAnnotationProvider = exports.getXmlServiceArtifacts = exports.getAvtNodeFromPointer = exports.findAnnotation = exports.FioriAnnotationService = void 0;
+exports.uniformUrl = exports.CdsAnnotationProvider = exports.getXmlServiceArtifacts = exports.getAvtNodeFromPointer = exports.findAnnotation = exports.FioriAnnotationService = void 0;
 var fiori_service_1 = require("./fiori-service");
 Object.defineProperty(exports, "FioriAnnotationService", { enumerable: true, get: function () { return fiori_service_1.FioriAnnotationService; } });
 __exportStar(require("./protected"), exports);
@@ -26,4 +26,5 @@ Object.defineProperty(exports, "getAvtNodeFromPointer", { enumerable: true, get:
 var annotation_provider_1 = require("./annotation-provider");
 Object.defineProperty(exports, "getXmlServiceArtifacts", { enumerable: true, get: function () { return annotation_provider_1.getXmlServiceArtifacts; } });
 Object.defineProperty(exports, "CdsAnnotationProvider", { enumerable: true, get: function () { return annotation_provider_1.CdsAnnotationProvider; } });
+Object.defineProperty(exports, "uniformUrl", { enumerable: true, get: function () { return annotation_provider_1.uniformUrl; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAAwF;AAA/E,uHAAA,sBAAsB,OAAA;AAC/B,8CAA4B;AAC5B,iDAA+B;AAC/B,sDAAoC;AAEpC,6BAA8D;AAArD,qGAAA,cAAc,OAAA;AAAE,4GAAA,qBAAqB,OAAA;AAC9C,6DAAsF;AAA7E,6HAAA,sBAAsB,OAAA;AAAE,4HAAA,qBAAqB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAAwF;AAA/E,uHAAA,sBAAsB,OAAA;AAC/B,8CAA4B;AAC5B,iDAA+B;AAC/B,sDAAoC;AAEpC,6BAA8D;AAArD,qGAAA,cAAc,OAAA;AAAE,4GAAA,qBAAqB,OAAA;AAC9C,6DAAkG;AAAzF,6HAAA,sBAAsB,OAAA;AAAE,4HAAA,qBAAqB,OAAA;AAAE,iHAAA,UAAU,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/fiori-annotation-api",
-  "version": "0.9.42",
+  "version": "0.9.44",
   "description": "Library that provides API for reading and writing annotations in SAP Fiori elements projects.",
   "publisher": "SAPSE",
   "author": "SAP SE",
@@ -27,7 +27,7 @@
     "@sap-ux/odata-entity-model": "0.3.7",
     "@sap-ux/odata-vocabularies": "0.4.30",
     "@sap-ux/logger": "0.8.5",
-    "@sap-ux/project-access": "1.35.20",
+    "@sap-ux/project-access": "1.35.21",
     "@sap-ux/xml-odata-annotation-converter": "0.4.12"
   },
   "devDependencies": {