fix: turns bundle parts of SourceMembers into real MDtypes

Author: mshanemc

src/shared/remoteSourceTrackingService.ts

@@ -15,29 +15,9 @@ import { ComponentStatus } from '@salesforce/source-deploy-retrieve';
 import { Dictionary, Optional } from '@salesforce/ts-types';
 import { env, toNumber } from '@salesforce/kit';
 import { RemoteSyncInput } from '../shared/types';
+import { ChangeResult, RemoteChangeElement, MemberRevision, SourceMember } from './types';
 import { getMetadataKeyFromFileResponse } from './metadataKeys';
 
-export type MemberRevision = {
-  serverRevisionCounter: number;
-  lastRetrievedFromServer: number | null;
-  memberType: string;
-  isNameObsolete: boolean;
-};
-
-export type SourceMember = {
-  MemberType: string;
-  MemberName: string;
-  IsNameObsolete: boolean;
-  RevisionCounter: number;
-};
-
-export type RemoteChangeElement = {
-  name: string;
-  type: string;
-  deleted?: boolean;
-  modified?: boolean;
-};
-
 // represents the contents of the config file stored in 'maxRevision.json'
 interface Contents {
   serverMaxRevisionCounter: number;
@@ -574,3 +554,25 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
     }
   }
 }
+
+/**
+ * pass in an RCE, and this will return a pullable ChangeResult.
+ * Useful for correcing bundle types where the files show change results with types but aren't resolvable
+ */
+export const remoteChangeElementToChangeResult = (rce: RemoteChangeElement): ChangeResult => {
+  return {
+    ...rce,
+    ...(mappingsForSourceMemberTypesToMetadataType.has(rce.type)
+      ? {
+          name: rce.name.split('/')[0],
+          type: mappingsForSourceMemberTypesToMetadataType.get(rce.type),
+        }
+      : {}),
+    origin: 'remote', // we know they're remote
+  };
+};
+
+const mappingsForSourceMemberTypesToMetadataType = new Map<string, string>([
+  ['AuraDefinition', 'AuraDefinitionBundle'],
+  ['LightningComponentResource', 'LightningComponentBundle'],
+]);

src/sourceTracking.ts

@@ -16,10 +16,14 @@ import {
   FileResponse,
 } from '@salesforce/source-deploy-retrieve';
 
-import { RemoteSourceTrackingService, RemoteChangeElement, getMetadataKey } from './shared/remoteSourceTrackingService';
+import {
+  RemoteSourceTrackingService,
+  getMetadataKey,
+  remoteChangeElementToChangeResult,
+} from './shared/remoteSourceTrackingService';
 import { ShadowRepo } from './shared/localShadowRepo';
 import { filenamesToVirtualTree } from './shared/filenamesToVirtualTree';
-import { RemoteSyncInput } from './shared/types';
+import { RemoteSyncInput, ChangeResult, RemoteChangeElement } from './shared/types';
 
 export const getKeyFromObject = (element: RemoteChangeElement | ChangeResult): string => {
   if (element.type && element.name) {
@@ -44,20 +48,6 @@ export interface LocalUpdateOptions {
   deletedFiles?: string[];
 }
 
-/**
- * Summary type that supports both local and remote change types
- */
-export type ChangeResult = Partial<RemoteChangeElement> & {
-  origin: 'local' | 'remote';
-  filenames?: string[];
-};
-
-export interface ConflictError {
-  message: string;
-  name: 'conflict';
-  conflicts: ChangeResult[];
-}
-
 export interface SourceTrackingOptions {
   org: Org;
   project: SfdxProject;
@@ -183,10 +173,12 @@ export class SourceTracking extends AsyncCreatable {
         filteredChanges = remoteChanges.filter((change) => !change.deleted);
       }
       if (options.format === 'ChangeResult') {
-        return filteredChanges.map((change) => ({ ...change, origin: 'remote' })) as T[];
+        return filteredChanges.map((change) => remoteChangeElementToChangeResult(change)) as T[];
       }
       if (options.format === 'ChangeResultWithPaths') {
-        return this.populateFilePaths(filteredChanges.map((change) => ({ ...change, origin: 'remote' }))) as T[];
+        return this.populateFilePaths(
+          filteredChanges.map((change) => remoteChangeElementToChangeResult(change))
+        ) as T[];
       }
       // turn it into a componentSet to resolve filenames
       const remoteChangesAsComponentLike = filteredChanges.map((element) => ({