@salesforce/source-tracking 8.1.4 → 8.1.6

package/lib/shared/functions.d.ts

@@ -41,6 +41,7 @@ export declare const getAllFiles: (sc: SourceComponent) => string[];
 export declare const remoteChangeToMetadataMember: (cr: ChangeResult) => MetadataMember;
 export declare const FileResponseSuccessToRemoteSyncInput: (fr: FileResponseSuccess) => RemoteSyncInput;
 export declare const changeResultToMetadataComponent: (registry: RegistryAccess) => (cr: ChangeResultWithNameAndType) => MetadataComponent;
+export declare const TYPES_WITH_SOURCEMEMBER_NAME_MISMATCH: Set<string>;
 export declare const uniqueArrayConcat: <T>(arr1: T[] | Set<T>, arr2: T[] | Set<T>) => T[];
 /** for web, where cwd does not existconstruct a TreeContainer with the projectPath to keep SDR MetadataResolver from trying to use cwd  */
 export declare const maybeGetTreeContainer: (projectPath: string) => TreeContainer | undefined;

package/lib/shared/functions.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeGetTreeContainer = exports.uniqueArrayConcat = exports.changeResultToMetadataComponent = exports.FileResponseSuccessToRemoteSyncInput = exports.remoteChangeToMetadataMember = exports.getAllFiles = exports.sourceComponentHasFullNameAndType = exports.sourceComponentIsCustomLabel = exports.forceIgnoreDenies = exports.deleteCustomLabels = exports.ensureRelative = exports.chunkArray = exports.folderContainsPath = exports.pathIsInFolder = exports.excludeLwcLocalOnlyTest = exports.supportsPartialDelete = exports.getKeyFromObject = exports.getMetadataNameFromLegacyKey = exports.getMetadataTypeFromLegacyKey = exports.getMetadataNameFromKey = exports.getMetadataTypeFromKey = exports.getLegacyMetadataKey = exports.getMetadataKey = void 0;
+exports.maybeGetTreeContainer = exports.uniqueArrayConcat = exports.TYPES_WITH_SOURCEMEMBER_NAME_MISMATCH = exports.changeResultToMetadataComponent = exports.FileResponseSuccessToRemoteSyncInput = exports.remoteChangeToMetadataMember = exports.getAllFiles = exports.sourceComponentHasFullNameAndType = exports.sourceComponentIsCustomLabel = exports.forceIgnoreDenies = exports.deleteCustomLabels = exports.ensureRelative = exports.chunkArray = exports.folderContainsPath = exports.pathIsInFolder = exports.excludeLwcLocalOnlyTest = exports.supportsPartialDelete = exports.getKeyFromObject = exports.getMetadataNameFromLegacyKey = exports.getMetadataTypeFromLegacyKey = exports.getMetadataNameFromKey = exports.getMetadataTypeFromKey = exports.getLegacyMetadataKey = exports.getMetadataKey = void 0;
 const node_path_1 = require("node:path");
 const node_fs_1 = __importDefault(require("node:fs"));
 const ts_types_1 = require("@salesforce/ts-types");
@@ -159,6 +159,7 @@ const changeResultToMetadataComponent = (registry) => (cr) => ({
     type: registry.getTypeByName(cr.type),
 });
 exports.changeResultToMetadataComponent = changeResultToMetadataComponent;
+exports.TYPES_WITH_SOURCEMEMBER_NAME_MISMATCH = new Set(['NavigationMenu', 'Audience']);
 // TODO: use set.union when node 22 is everywhere
 const uniqueArrayConcat = (arr1, arr2) => Array.from(new Set([...arr1, ...arr2]));
 exports.uniqueArrayConcat = uniqueArrayConcat;

package/lib/shared/remote/remoteSourceTrackingService.d.ts

@@ -80,6 +80,12 @@ export declare class RemoteSourceTrackingService {
     /** Return a tracked element as MemberRevision data.*/
     private getSourceMember;
     private setMemberRevision;
+    /**
+     * SourceMember can use a different name than Metadata API for some types
+     * (e.g. NavigationMenu, Audience). When the MDAPI fullName doesn't match
+     * any tracked SourceMember, search for a pending member of the same type.
+     */
+    private findSourceMemberFallback;
     /** O(1) decoded-key lookup via lazily-built reverse index */
     private resolveDecodedKey;
 }

package/lib/shared/remote/remoteSourceTrackingService.js

@@ -142,15 +142,17 @@ class RemoteSourceTrackingService {
         // any item in an aura/LWC bundle needs to represent the top (bundle) level and the file itself
         // so we de-dupe via a set
         Array.from(new Set(elements.flatMap((element) => (0, metadataKeys_1.getMetadataKeyFromFileResponse)(registry)(element)))).map((metadataKey) => {
-            const revision = this.getSourceMember(metadataKey);
-            if (!revision) {
+            const match = this.getSourceMember(metadataKey)
+                ? { key: metadataKey, member: this.getSourceMember(metadataKey) }
+                : this.findSourceMemberFallback(metadataKey);
+            if (!match) {
                 this.logger.warn(`found no matching revision for ${metadataKey}`);
             }
-            else if (doesNotMatchServer(revision)) {
-                quietLogger(`Syncing ${metadataKey} revision from ${revision.lastRetrievedFromServer ?? 'null'} to ${revision.RevisionCounter}`);
-                this.setMemberRevision(metadataKey, {
-                    ...revision,
-                    lastRetrievedFromServer: revision.RevisionCounter,
+            else if (doesNotMatchServer(match.member)) {
+                quietLogger(`Syncing ${match.key} revision from ${match.member.lastRetrievedFromServer ?? 'null'} to ${match.member.RevisionCounter}`);
+                this.setMemberRevision(match.key, {
+                    ...match.member,
+                    lastRetrievedFromServer: match.member.RevisionCounter,
                 });
             }
         });
@@ -416,6 +418,31 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`),
             this.decodedKeyIndex.set(decodeURIComponent(matchingKey), matchingKey);
         }
     }
+    /**
+     * SourceMember can use a different name than Metadata API for some types
+     * (e.g. NavigationMenu, Audience). When the MDAPI fullName doesn't match
+     * any tracked SourceMember, search for a pending member of the same type.
+     */
+    findSourceMemberFallback(metadataKey) {
+        const metadataType = (0, functions_1.getMetadataTypeFromKey)(metadataKey);
+        if (!functions_1.TYPES_WITH_SOURCEMEMBER_NAME_MISMATCH.has(metadataType))
+            return undefined;
+        const mdApiName = (0, functions_1.getMetadataNameFromKey)(metadataKey);
+        const matches = [];
+        for (const [key, member] of this.sourceMembers) {
+            if (member.MemberType === metadataType &&
+                doesNotMatchServer(member) &&
+                member.MemberName &&
+                mdApiName.includes(member.MemberName)) {
+                matches.push({ key, member });
+            }
+        }
+        if (matches.length === 1) {
+            this.logger.debug(`SourceMember name fallback: matched ${metadataKey} to ${matches[0].key}`);
+            return matches[0];
+        }
+        return undefined;
+    }
     /** O(1) decoded-key lookup via lazily-built reverse index */
     resolveDecodedKey(key) {
         this.decodedKeyIndex ??= buildDecodedKeyIndex(this.sourceMembers);

package/lib/sourceTracking.d.ts

@@ -1,7 +1,7 @@
 import { Org, SfProject } from '@salesforce/core';
 import { AsyncCreatable } from '@salesforce/kit';
 import { ComponentSet, SourceComponent, FileResponse, DeployResult, RetrieveResult, RegistryAccess } from '@salesforce/source-deploy-retrieve';
-import { RemoteSyncInput, StatusOutputRow, ChangeOptions, ChangeResult, LocalUpdateOptions } from './shared/types';
+import { RemoteSyncInput, StatusOutputRow, ChangeOptions, ChangeResult, LocalUpdateOptions, RemoteChangeElement } from './shared/types';
 export type SourceTrackingOptions = {
     org: Org;
     project: SfProject;
@@ -195,4 +195,6 @@ export declare class SourceTracking extends AsyncCreatable {
     private getLocalStatusRows;
     private remoteChangesToOutputRows;
 }
+/** Correct SourceMember names that don't match the Metadata API fullName by matching against local files. */
+export declare const correctSourceMemberNames: (changes: RemoteChangeElement[], packageDirPaths: string[], registry: RegistryAccess) => RemoteChangeElement[];
 export {};

package/lib/sourceTracking.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SourceTracking = void 0;
+exports.correctSourceMemberNames = exports.SourceTracking = void 0;
 /*
  * Copyright 2026, Salesforce, Inc.
  *
@@ -229,10 +229,10 @@ class SourceTracking extends kit_1.AsyncCreatable {
             await this.ensureRemoteTracking();
             const remoteChanges = await this.remoteSourceTrackingService.retrieveUpdates();
             this.logger.debug('remoteChanges', remoteChanges);
-            const filteredChanges = remoteChanges
+            const filteredChanges = (0, exports.correctSourceMemberNames)(remoteChanges
                 .filter(remoteFilterByState[options.state])
                 // skip any remote types not in the registry.  Will emit warnings
-                .filter((rce) => (0, metadataKeys_1.registrySupportsType)(this.registry)(rce.type));
+                .filter((rce) => (0, metadataKeys_1.registrySupportsType)(this.registry)(rce.type)), this.project.getPackageDirectories().map((pkgDir) => pkgDir.fullPath), this.registry);
             if (options.format === 'ChangeResult') {
                 return filteredChanges.map((0, remoteSourceTrackingService_1.remoteChangeElementToChangeResult)(this.registry));
             }
@@ -660,4 +660,31 @@ const localChangesToOutputRow = (logger) => (forceIgnore) => (localType) => (inp
     }
     throw new Error('no filenames found for local ChangeResult');
 };
+/** Correct SourceMember names that don't match the Metadata API fullName by matching against local files. */
+const correctSourceMemberNames = (changes, packageDirPaths, registry) => {
+    const localNamesByType = new Map();
+    for (const component of source_deploy_retrieve_1.ComponentSet.fromSource({ fsPaths: packageDirPaths, registry }).getSourceComponents()) {
+        const typeName = component.type.name;
+        const existing = localNamesByType.get(typeName);
+        if (existing) {
+            existing.push(component.fullName);
+        }
+        else {
+            localNamesByType.set(typeName, [component.fullName]);
+        }
+    }
+    return changes.map((change) => {
+        if (!functions_3.TYPES_WITH_SOURCEMEMBER_NAME_MISMATCH.has(change.type))
+            return change;
+        const localNames = localNamesByType.get(change.type);
+        if (!localNames || localNames.includes(change.name))
+            return change;
+        const matches = localNames.filter((localName) => localName.includes(change.name));
+        if (matches.length === 1) {
+            return { ...change, name: matches[0] };
+        }
+        return change;
+    });
+};
+exports.correctSourceMemberNames = correctSourceMemberNames;
 //# sourceMappingURL=sourceTracking.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "8.1.4",
+  "version": "8.1.6",
   "author": "Salesforce",
   "license": "Apache-2.0",
   "main": "lib/index.js",
@@ -50,13 +50,13 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@salesforce/core": "^9.1.10",
+    "@salesforce/core": "^9.3.6",
     "@salesforce/kit": "^4.0.0",
-    "@salesforce/source-deploy-retrieve": "^13.3.1",
+    "@salesforce/source-deploy-retrieve": "^13.4.6",
     "@salesforce/ts-types": "^3.2.0",
-    "fast-xml-parser": "^5.5.7",
+    "fast-xml-parser": "^5.11.2",
     "graceful-fs": "^4.2.11",
-    "isomorphic-git": "^1.34.2",
+    "isomorphic-git": "^1.44.2",
     "ts-retry-promise": "^0.8.1"
   },
   "devDependencies": {
@@ -68,7 +68,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^18",
     "@types/sinon": "^10.0.20",
-    "esbuild": "^0.25.11",
+    "esbuild": "^0.28.2",
     "eslint": "^10.4.0",
     "eslint-config-salesforce-typescript": "^7.0.0",
     "eslint-plugin-sf-plugin": "^3.0.0",