refactor: addressed review comments

Author: pyelchurisf

src/client/deployMessages.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { basename, dirname, extname, join, posix, sep } from 'node:path/posix';
+import { basename, dirname, extname, join, posix, relative, sep } from 'node:path/posix';
 import { SfError } from '@salesforce/core/sfError';
 import { ensureArray } from '@salesforce/kit';
 import { ComponentLike, SourceComponent } from '../resolve';
@@ -87,10 +87,11 @@ export const createResponses = (component: SourceComponent, responseMessages: De
     if (state === ComponentStatus.Failed) {
       return [{ ...base, state, ...parseDeployDiagnostic(component, message) } satisfies FileResponseFailure];
     } else {
-      const isWebAppBundle = component.type.name === 'DigitalExperienceBundle' && 
-                             component.fullName.startsWith('web_app/') &&
-                             component.content;
-      
+      const isWebAppBundle =
+        component.type.name === 'DigitalExperienceBundle' &&
+        component.fullName.startsWith('web_app/') &&
+        component.content;
+
       if (isWebAppBundle) {
         const walkedPaths = component.walkContent();
         const bundleResponse: FileResponseSuccess = {
@@ -100,17 +101,17 @@ export const createResponses = (component: SourceComponent, responseMessages: De
           filePath: component.content!,
         };
         const fileResponses: FileResponseSuccess[] = walkedPaths.map((filePath) => {
-          const relPath = filePath.replace(component.content! + '/', '');
+          const relPath = relative(component.content!, filePath);
           return {
-            fullName: `${component.fullName}/${relPath}`,
+            fullName: join(component.fullName, relPath).split(sep).join(posix.sep),
             type: 'DigitalExperience',
             state,
             filePath,
           };
         });
         return [bundleResponse, ...fileResponses];
       }
-      
+
       return [
         ...(shouldWalkContent(component)
           ? component.walkContent().map((filePath): FileResponseSuccess => ({ ...base, state, filePath }))

src/resolve/adapters/digitalExperienceSourceAdapter.ts

@@ -201,10 +201,10 @@ export class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
     const pathParts = trigger.split(sep);
     const digitalExperiencesIndex = pathParts.indexOf('digitalExperiences');
 
-    // Extract bundle name: web_app/WebApp3
+    // Extract bundle name: web_app/WebApp3 (always use posix separator for metadata names)
     const baseType = pathParts[digitalExperiencesIndex + 1];
     const spaceApiName = pathParts[digitalExperiencesIndex + 2];
-    const bundleName = `${baseType}/${spaceApiName}`;
+    const bundleName = [baseType, spaceApiName].join('/');
 
     // Extract bundle directory: /path/to/digitalExperiences/web_app/WebApp3
     const bundleDir = pathParts.slice(0, digitalExperiencesIndex + 3).join(sep);
@@ -232,10 +232,10 @@ export class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
       const digitalExperiencesIndex = getDigitalExperiencesIndex(contentPath);
       const baseType = pathParts[digitalExperiencesIndex + 1];
       const spaceApiName = pathParts[digitalExperiencesIndex + 2];
-      return `${baseType}/${spaceApiName}`;
+      return [baseType, spaceApiName].join('/');
     }
     const bundlePath = this.getBundleMetadataXmlPath(contentPath);
-    return `${parentName(dirname(bundlePath))}/${parentName(bundlePath)}`;
+    return [parentName(dirname(bundlePath)), parentName(bundlePath)].join('/');
   }
 
   private getBundleMetadataXmlPath(path: string): string {
@@ -275,15 +275,10 @@ const contentParts = digitalExperienceStructure.split(sep);
  * web_app base type has a simpler structure without ContentType folders.
  * Structure: digitalExperiences/web_app/spaceApiName/...files...
  */
-const isWebAppBaseType = (path: string): boolean => {
+export const isWebAppBaseType = (path: string): boolean => {
   const pathParts = path.split(sep);
   const digitalExperiencesIndex = pathParts.indexOf('digitalExperiences');
-  // Check if the base type (folder after digitalExperiences) is WEB_APP_BASE_TYPE
-  return (
-    digitalExperiencesIndex > -1 &&
-    pathParts.length > digitalExperiencesIndex + 1 &&
-    pathParts[digitalExperiencesIndex + 1] === WEB_APP_BASE_TYPE
-  );
+  return pathParts[digitalExperiencesIndex + 1] === WEB_APP_BASE_TYPE;
 };
 
 /**

src/resolve/metadataResolver.ts

@@ -27,24 +27,11 @@ import { SourceAdapterFactory } from './adapters/sourceAdapterFactory';
 import { ForceIgnore } from './forceIgnore';
 import { SourceComponent } from './sourceComponent';
 import { NodeFSTreeContainer, TreeContainer } from './treeContainers';
+import { isWebAppBaseType } from './adapters/digitalExperienceSourceAdapter';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
 
-/**
- * Checks if the given path is a web_app bundle directory.
- * web_app bundles don't have metadata XML files and are identified by directory structure.
- */
-const isWebAppBundlePath = (path: string): boolean => {
-  const pathParts = path.split(sep);
-  const digitalExperiencesIndex = pathParts.indexOf('digitalExperiences');
-  return (
-    digitalExperiencesIndex > -1 &&
-    pathParts.length > digitalExperiencesIndex + 2 &&
-    pathParts[digitalExperiencesIndex + 1] === 'web_app'
-  );
-};
-
 /**
  * Resolver for metadata type and component objects.
  *
@@ -238,7 +225,7 @@ const resolveDirectoryAsComponent =
   (registry: RegistryAccess) =>
   (tree: TreeContainer) =>
   (dirPath: string): boolean => {
-    if (isWebAppBundlePath(dirPath)) {
+    if (isWebAppBaseType(dirPath)) {
       return true;
     }
 
@@ -353,7 +340,7 @@ const resolveType =
   (registry: RegistryAccess) =>
   (tree: TreeContainer) =>
   (fsPath: string): MetadataType | undefined => {
-    if (isWebAppBundlePath(fsPath)) {
+    if (isWebAppBaseType(fsPath)) {
       return registry.getTypeByName('DigitalExperienceBundle');
     }