refactor: isWebAppBundle as shared type guard

Author: mshanemc

src/client/metadataApiRetrieve.ts

@@ -38,6 +38,7 @@ import {
 import { extract } from './retrieveExtract';
 import { getPackageOptions } from './retrieveExtract';
 import { MetadataApiRetrieveOptions } from './types';
+import { isWebAppBundle } from './utils';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
@@ -101,28 +102,27 @@ export class RetrieveResult implements MetadataTransferResult {
 
     // construct successes
     for (const retrievedComponent of this.components.getSourceComponents()) {
-      const { fullName, type, xml, content } = retrievedComponent;
+      const { fullName, type, xml } = retrievedComponent;
       const baseResponse = {
         fullName,
         type: type.name,
         state: this.localComponents.has(retrievedComponent) ? ComponentStatus.Changed : ComponentStatus.Created,
       } as const;
 
       // Special handling for web_app bundles - they need to walk content and report individual files
-      const isWebAppBundle = type.name === 'DigitalExperienceBundle' && fullName.startsWith('web_app/') && content;
-
-      if (isWebAppBundle) {
-        const walkedPaths = retrievedComponent.walkContent();
+      if (isWebAppBundle(retrievedComponent)) {
         // Add the bundle directory itself
-        this.fileResponses.push({ ...baseResponse, filePath: content } satisfies FileResponseSuccess);
-        // Add each file with its specific path
-        for (const filePath of walkedPaths) {
-          this.fileResponses.push({ ...baseResponse, filePath } satisfies FileResponseSuccess);
-        }
+        this.fileResponses.push(
+          ...[retrievedComponent.content, ...retrievedComponent.walkContent()].map(
+            (filePath) => ({ ...baseResponse, filePath } satisfies FileResponseSuccess)
+          )
+        );
       } else if (!type.children || Object.values(type.children.types).some((t) => t.unaddressableWithoutParent)) {
-        for (const filePath of retrievedComponent.walkContent()) {
-          this.fileResponses.push({ ...baseResponse, filePath } satisfies FileResponseSuccess);
-        }
+        this.fileResponses.push(
+          ...retrievedComponent
+            .walkContent()
+            .map((filePath) => ({ ...baseResponse, filePath } satisfies FileResponseSuccess))
+        );
       }
 
       if (xml) {

src/client/utils.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025, Salesforce, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { SourceComponent } from '../resolve/sourceComponent';
+
+export const isWebAppBundle = (component: SourceComponent): component is SourceComponent & { content: string } =>
+  component.type.name === 'DigitalExperienceBundle' &&
+  component.fullName.startsWith('web_app/') &&
+  typeof component.content === 'string';