@sap-ux/project-access 1.34.0 → 1.34.2

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { FileName, DirName, FioriToolsSettings, MinCdsPluginUi5Version, MinCdsVersion, fioriToolsDirectory } from './constants';
 export { getFilePaths } from './file';
 export { normalizePath } from './path';
-export { addPackageDevDependency, clearCdsModuleCache, createApplicationAccess, createProjectAccess, deleteCapApp, filterDataSourcesByType, findAllApps, findCapProjectRoot, findCapProjects, findFioriArtifacts, findProjectRoot, findRootsForPath, getAllUi5YamlFileNames, getAppRootFromWebappPath, getAppProgrammingLanguage, getAppType, getCapCustomPaths, getCapEnvironment, getCapModelAndServices, getCapServiceName, getCapProjectType, getCdsFiles, getCdsRoots, getCdsServices, getCapI18nFolderNames, getSpecification, getSpecificationModuleFromCache, getSpecificationPath, getI18nPropertiesPaths, getI18nBundles, getMinUI5VersionFromManifest, getMinUI5VersionAsArray, getMinimumUI5Version, getMtaPath, getMockServerConfig, getMockDataPath, getNodeModulesPath, getPathMappings, getProject, getProjectType, getWebappPath, hasUI5CliV3, isCapProject, isCapJavaProject, isCapNodeJsProject, loadModuleFromProject, readCapServiceMetadataEdmx, readUi5Yaml, refreshSpecificationDistTags, toReferenceUri, updatePackageScript, getWorkspaceInfo, hasMinCdsVersion, checkCdsUi5PluginEnabled, readFlexChanges, processServices, getMainService } from './project';
+export { addPackageDevDependency, clearCdsModuleCache, createApplicationAccess, createProjectAccess, deleteCapApp, filterDataSourcesByType, findAllApps, findCapProjectRoot, findCapProjects, findFioriArtifacts, findProjectRoot, findRootsForPath, getAllUi5YamlFileNames, getAppRootFromWebappPath, getAppProgrammingLanguage, getAppType, getCapCustomPaths, getCapEnvironment, getCapModelAndServices, getCapServiceName, getCapProjectType, getCdsFiles, getCdsRoots, getCdsServices, getCapI18nFolderNames, getSpecification, getSpecificationModuleFromCache, getSpecificationPath, getI18nPropertiesPaths, getI18nBundles, getMinUI5VersionFromManifest, getMinUI5VersionAsArray, getMinimumUI5Version, getMtaPath, getMockServerConfig, getMockDataPath, getNodeModulesPath, getPathMappings, type PathMappings, getProject, getProjectType, getWebappPath, hasUI5CliV3, isCapProject, isCapJavaProject, isCapNodeJsProject, loadModuleFromProject, readCapServiceMetadataEdmx, readUi5Yaml, refreshSpecificationDistTags, toReferenceUri, updatePackageScript, getWorkspaceInfo, hasMinCdsVersion, checkCdsUi5PluginEnabled, readFlexChanges, processServices, getMainService } from './project';
 export { execNpmCommand } from './command/npm-command';
 export * from './types';
 export * from './library';

package/dist/project/index.d.ts

@@ -5,7 +5,7 @@ export { getCapI18nFolderNames, getI18nPropertiesPaths, getI18nBundles } from '.
 export { getAppProgrammingLanguage, getAppType, getMinUI5VersionFromManifest, getMinUI5VersionAsArray, getMinimumUI5Version, getProject, getProjectType } from './info';
 export { loadModuleFromProject } from './module-loader';
 export { findAllApps, findCapProjects, findFioriArtifacts, findProjectRoot, getAppRootFromWebappPath, findCapProjectRoot, findRootsForPath } from './search';
-export { getWebappPath, readUi5Yaml, getAllUi5YamlFileNames, getMockServerConfig, getMockDataPath, getPathMappings } from './ui5-config';
+export { getWebappPath, readUi5Yaml, getAllUi5YamlFileNames, getMockServerConfig, getMockDataPath, getPathMappings, type PathMappings } from './ui5-config';
 export { getMtaPath } from './mta';
 export { createApplicationAccess, createProjectAccess } from './access';
 export { updatePackageScript, hasUI5CliV3 } from './script';

package/dist/project/ui5-config.d.ts

@@ -1,8 +1,33 @@
 import type { Editor } from 'mem-fs-editor';
-import type { MockserverConfig } from '@sap-ux/ui5-config';
+import type { MockserverConfig, Ui5Document } from '@sap-ux/ui5-config';
 import { UI5Config } from '@sap-ux/ui5-config';
-type PathMappings = {
-    [key: string]: string | undefined;
+/**
+ * Type representing the possible path mappings defined in the UI5 configuration for the different project types.
+ *
+ */
+export type PathMappings = {
+    [K in keyof typeof PATH_MAPPING_DEFAULTS]: {
+        [P in keyof (typeof PATH_MAPPING_DEFAULTS)[K]]: string;
+    };
+}[keyof typeof PATH_MAPPING_DEFAULTS];
+/**
+ * Extracts the paths configuration type for a given UI5 project type.
+ *
+ * @template T - The UI5 project type.
+ */
+type PathsFor<T extends Ui5Document['type']> = Extract<Ui5Document, {
+    type: T;
+}> extends {
+    configuration?: {
+        paths?: infer P;
+    };
+} ? P : never;
+/**
+ * Default path mappings for each UI5 project type.
+ *
+ */
+declare const PATH_MAPPING_DEFAULTS: {
+    [K in Ui5Document['type']]: Required<PathsFor<K>>;
 };
 /**
  * Get path to webapp.

package/dist/project/ui5-config.js

@@ -10,6 +10,10 @@ const node_path_1 = require("node:path");
 const ui5_config_1 = require("@sap-ux/ui5-config");
 const constants_1 = require("../constants");
 const file_1 = require("../file");
+/**
+ * Default path mappings for each UI5 project type.
+ *
+ */
 const PATH_MAPPING_DEFAULTS = {
     application: { webapp: constants_1.DirName.Webapp },
     library: { src: 'src', test: 'test' },
@@ -35,14 +39,15 @@ async function getBaseDir(appRoot, memFs) {
  * @returns - path to webapp folder
  */
 async function getWebappPath(appRoot, memFs) {
-    let pathMappings = {};
+    let pathMappings;
     try {
         pathMappings = await getPathMappings(appRoot, memFs);
     }
     catch {
         // For backward compatibility ignore errors and use default
+        pathMappings = {};
     }
-    return pathMappings?.webapp ?? (0, node_path_1.join)(appRoot, constants_1.DirName.Webapp);
+    return 'webapp' in pathMappings ? pathMappings.webapp : (0, node_path_1.join)(appRoot, constants_1.DirName.Webapp);
 }
 /**
  * Get path mappings defined in 'ui5.yaml' depending on the project type defined in 'ui5.yaml'.
@@ -70,17 +75,16 @@ async function getPathMappings(appRoot, memFs, fileName = constants_1.FileName.U
         throw new Error(`Unsupported project type for path mappings: ${type}`);
     }
     const baseDir = await getBaseDir(appRoot, memFs);
-    const pathMappings = {};
-    for (const [key, value] of Object.entries(configuration?.paths || {})) {
-        pathMappings[key] = (0, node_path_1.join)(baseDir, value ?? PATH_MAPPING_DEFAULTS[type][key]);
-    }
-    //Add defaults if no specific value exists
-    for (const [key, defaultValue] of Object.entries(PATH_MAPPING_DEFAULTS[type] ?? {})) {
-        if (!pathMappings[key]) {
-            pathMappings[key] = (0, node_path_1.join)(baseDir, defaultValue);
-        }
+    // Use Record<string, string> to permit index access during the merge loop
+    const result = {};
+    const configPaths = (configuration?.paths || {});
+    const defaults = PATH_MAPPING_DEFAULTS[type];
+    for (const key in defaults) {
+        const value = configPaths[key] ?? defaults[key];
+        result[key] = (0, node_path_1.join)(baseDir, value);
     }
-    return pathMappings;
+    // Cast the merged result to PathMappings to re-enforce strict union keys for the caller
+    return result;
 }
 /**
  * Checks if UI5 config yaml file exists and returns its content.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.34.0",
+  "version": "1.34.2",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "mem-fs-editor": "9.4.0",
     "semver": "7.5.4",
     "@sap-ux/i18n": "0.3.7",
-    "@sap-ux/ui5-config": "0.29.12"
+    "@sap-ux/ui5-config": "0.29.13"
   },
   "devDependencies": {
     "@types/mem-fs": "1.1.2",