refactor: webappbundle also relative to project path if provided

Author: mshanemc

src/client/deployMessages.ts

@@ -17,7 +17,8 @@
 import { basename, dirname, extname, join, posix, sep } from 'node:path';
 import { SfError } from '@salesforce/core/sfError';
 import { ensureArray } from '@salesforce/kit';
-import { ComponentLike, SourceComponent } from '../resolve';
+import { SourceComponentWithContent, SourceComponent } from '../resolve/sourceComponent';
+import { ComponentLike } from '../resolve';
 import { registry } from '../registry/registry';
 import {
   BooleanString,
@@ -91,47 +92,45 @@ export const createResponses =
         return [{ ...base, state, ...parseDeployDiagnostic(component, message) } satisfies FileResponseFailure];
       }
 
-      if (isWebAppBundle(component)) {
-        const walkedPaths = component.walkContent();
-        const bundleResponse: FileResponseSuccess = {
-          fullName: component.fullName,
-          type: component.type.name,
-          state,
-          filePath: component.content,
-        };
-        const fileResponses: FileResponseSuccess[] = walkedPaths.map((filePath) => {
-          // Normalize paths to ensure relative() works correctly on Windows
-          const normalizedContent = component.content.split(sep).join(posix.sep);
-          const normalizedFilePath = filePath.split(sep).join(posix.sep);
-          const relPath = posix.relative(normalizedContent, normalizedFilePath);
-          return {
-            fullName: posix.join(component.fullName, relPath),
-            type: 'DigitalExperience',
-            state,
-            filePath,
-          };
-        });
-        return [bundleResponse, ...fileResponses];
-      }
-
       return (
-        [
-          ...(shouldWalkContent(component)
-            ? component.walkContent().map((filePath): FileResponseSuccess => ({ ...base, state, filePath }))
-            : []),
-          ...(component.xml ? [{ ...base, state, filePath: component.xml } satisfies FileResponseSuccess] : []),
-        ]
+        isWebAppBundle(component)
+          ? [
+              {
+                ...base,
+                state,
+                filePath: component.content,
+              },
+              ...component.walkContent().map((filePath) => ({
+                fullName: getWebAppBundleContentFullName(component)(filePath),
+                type: 'DigitalExperience',
+                state,
+                filePath,
+              })),
+            ]
+          : [
+              ...(shouldWalkContent(component)
+                ? component.walkContent().map((filePath): FileResponseSuccess => ({ ...base, state, filePath }))
+                : []),
+              ...(component.xml ? [{ ...base, state, filePath: component.xml }] : []),
+            ]
+      ).map((response) => ({
+        ...response,
+        filePath:
           // deployResults will produce filePaths relative to cwd, which might not be set in all environments
           // if our CS had a projectDir set, we'll make the results relative to that path
-          .map((response) => ({
-            ...response,
-            filePath:
-              projectPath && process.cwd() === projectPath
-                ? response.filePath
-                : join(projectPath ?? '', response.filePath),
-          }))
-      );
+          projectPath && process.cwd() === projectPath ? response.filePath : join(projectPath ?? '', response.filePath),
+      })) satisfies FileResponseSuccess[];
     });
+
+const getWebAppBundleContentFullName =
+  (component: SourceComponentWithContent) =>
+  (filePath: string): string => {
+    // Normalize paths to ensure relative() works correctly on Windows
+    const normalizedContent = component.content.split(sep).join(posix.sep);
+    const normalizedFilePath = filePath.split(sep).join(posix.sep);
+    return posix.relative(normalizedContent, normalizedFilePath);
+  };
+
 /**
  * Groups messages from the deploy result by component fullName and type
  */
@@ -152,8 +151,6 @@ export const getDeployMessages = (result: MetadataApiDeployStatus): Map<string,
     if (!messageMap.has(key)) {
       messageMap.set(key, []);
     }
-    messageMap.get(key)?.push(sanitized);
-    failedComponentKeys.add(key);
   }
 
   for (const success of successMessages) {

src/client/retrieveExtract.ts

@@ -21,7 +21,7 @@ import { ConvertOutputConfig } from '../convert/types';
 import { MetadataConverter } from '../convert/metadataConverter';
 import { ComponentSet } from '../collections/componentSet';
 import { ZipTreeContainer } from '../resolve/treeContainers';
-import { SourceComponent } from '../resolve/sourceComponent';
+import { SourceComponent, SourceComponentWithContent } from '../resolve/sourceComponent';
 import { fnJoin } from '../utils/path';
 import { ComponentStatus, FileResponse, FileResponseSuccess, PackageOption, PackageOptions } from './types';
 import { MetadataApiRetrieveOptions } from './types';
@@ -147,12 +147,12 @@ const handlePartialDeleteMerges = ({
         });
 };
 
-const supportsPartialDeleteAndHasContent = (comp: SourceComponent): comp is SourceComponent & { content: string } =>
+const supportsPartialDeleteAndHasContent = (comp: SourceComponent): comp is SourceComponentWithContent =>
   supportsPartialDelete(comp) && typeof comp.content === 'string' && fs.statSync(comp.content).isDirectory();
 
 const supportsPartialDeleteAndHasZipContent =
   (tree: ZipTreeContainer) =>
-  (comp: SourceComponent): comp is SourceComponent & { content: string } =>
+  (comp: SourceComponent): comp is SourceComponentWithContent =>
     supportsPartialDelete(comp) && typeof comp.content === 'string' && tree.isDirectory(comp.content);
 
 const supportsPartialDeleteAndIsInMap =

src/client/utils.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SourceComponent } from '../resolve/sourceComponent';
+import { SourceComponent, SourceComponentWithContent } from '../resolve/sourceComponent';
 
-export const isWebAppBundle = (component: SourceComponent): component is SourceComponent & { content: string } =>
+export const isWebAppBundle = (component: SourceComponent): component is SourceComponentWithContent =>
   component.type.name === 'DigitalExperienceBundle' &&
   component.fullName.startsWith('web_app/') &&
   typeof component.content === 'string';

src/resolve/sourceComponent.ts

@@ -47,6 +47,8 @@ export type ComponentProperties = {
   parentType?: MetadataType;
 };
 
+export type SourceComponentWithContent = SourceComponent & { content: string };
+
 /**
  * Representation of a MetadataComponent in a file tree.
  */