@sap-ux/project-access 1.10.0 → 1.10.2

package/dist/project/cap.js

@@ -107,7 +107,15 @@ function getCapModelAndServices(projectRoot) {
             (0, path_1.join)(projectRoot, capProjectPaths.db)
         ];
         const model = yield cds.load(modelPaths);
-        const services = cds.compile.to['serviceinfo'](model, { root: projectRoot });
+        let services = cds.compile.to['serviceinfo'](model, { root: projectRoot });
+        if (services === null || services === void 0 ? void 0 : services.map) {
+            services = services === null || services === void 0 ? void 0 : services.map((value) => {
+                return {
+                    name: value.name,
+                    urlPath: uniformUrl(value.urlPath)
+                };
+            });
+        }
         return {
             model,
             services
@@ -115,6 +123,15 @@ function getCapModelAndServices(projectRoot) {
     });
 }
 exports.getCapModelAndServices = getCapModelAndServices;
+/**
+ * Remove rogue '\\' - cds windows if needed.
+ *
+ * @param url - url to uniform
+ * @returns - uniform url
+ */
+function uniformUrl(url) {
+    return url.replace(/\\/g, '/').replace(/\/\//g, '/');
+}
 /**
  * Return the EDMX string of a CAP service.
  *
@@ -142,15 +159,15 @@ function readCapServiceMetadataEdmx(root, uri, version = 'v4') {
 }
 exports.readCapServiceMetadataEdmx = readCapServiceMetadataEdmx;
 /**
- * Find a service in a list of services.
+ * Find a service in a list of services ignoring leading and trailing slashes.
  *
  * @param services - list of services from cds.compile.to['serviceinfo'](model)
  * @param uri - search uri (usually from data source in manifest.json)
  * @returns - name and uri of the service, undefined if service not found
  */
 function findServiceByUri(services, uri) {
-    const searchUri = uri.replace(/[\\/]/g, '/'); // replace all \ and / in service uri due to issues on Windows with backslashes
-    return services.find((srv) => srv.urlPath.replace(/[\\/]/g, '/') === searchUri);
+    const searchUri = uniformUrl(uri).replace(/(?:^\/)|(?:\/$)/g, '');
+    return services.find((srv) => srv.urlPath.replace(/(?:^\/)|(?:\/$)/g, '') === searchUri);
 }
 /**
  * Get CAP CDS project environment config for project root.

package/dist/project/search.d.ts

@@ -23,7 +23,7 @@ export declare function getAppRootFromWebappPath(webappPath: string): Promise<st
  * @param wsFolders - list of roots, either as vscode WorkspaceFolder[] or array of paths
  * @returns - results as path to apps plus files already parsed, e.g. manifest.json
  */
-export declare function findAllApps(wsFolders: WorkspaceFolder[] | string[] | undefined): Promise<AllAppResults[]>;
+export declare function findAllApps(wsFolders: readonly WorkspaceFolder[] | string[] | undefined): Promise<AllAppResults[]>;
 /**
  * Find all requested Fiori artifacts like apps, adaptations, extensions, that are supported by Fiori tools, for a given list of roots (workspace folders).
  *
@@ -33,7 +33,7 @@ export declare function findAllApps(wsFolders: WorkspaceFolder[] | string[] | un
  * @returns - data structure containing the search results, for app e.g. as path to app plus files already parsed, e.g. manifest.json
  */
 export declare function findFioriArtifacts(options: {
-    wsFolders?: WorkspaceFolder[] | string[];
+    wsFolders?: readonly WorkspaceFolder[] | string[];
     artifacts: FioriArtifactTypes[];
 }): Promise<FoundFioriArtifacts>;
 //# sourceMappingURL=search.d.ts.map

package/dist/project/search.js

@@ -59,7 +59,7 @@ function wsFoldersToRootPaths(wsFolders) {
         });
     }
     else {
-        wsRoots = wsFolders || [];
+        wsRoots = (wsFolders !== null && wsFolders !== void 0 ? wsFolders : []);
     }
     return wsRoots;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",