@salesforce/source-tracking 7.4.10 → 7.5.1

package/lib/shared/functions.d.ts

@@ -18,7 +18,7 @@ export declare const pathIsInFolder: (folder: string) => (filePath: string) => b
 export declare const folderContainsPath: (filePath: string) => (folder: string) => boolean;
 export declare const chunkArray: <T>(arr: T[], size: number) => T[][];
 export declare const ensureRelative: (projectPath: string) => (filePath: string) => string;
-export type ParsedCustomLabels = {
+type ParsedCustomLabels = {
     CustomLabels: {
         labels: Array<{
             fullName: string;
@@ -40,5 +40,6 @@ export declare const sourceComponentHasFullNameAndType: (input: SourceComponent)
 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 changeResultToMetadataComponent: (registry: RegistryAccess) => (cr: ChangeResultWithNameAndType) => MetadataComponent;
 export declare const uniqueArrayConcat: <T>(arr1: T[] | Set<T>, arr2: T[] | Set<T>) => T[];
+export {};

package/lib/shared/functions.js

@@ -22,7 +22,6 @@ exports.uniqueArrayConcat = exports.changeResultToMetadataComponent = exports.Fi
 const node_path_1 = require("node:path");
 const node_fs_1 = __importDefault(require("node:fs"));
 const ts_types_1 = require("@salesforce/ts-types");
-const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const kit_1 = require("@salesforce/kit");
 const remoteChangeIgnoring_1 = require("./remoteChangeIgnoring");
@@ -145,7 +144,7 @@ exports.remoteChangeToMetadataMember = remoteChangeToMetadataMember;
 // weird, right?  This is for oclif.table which allows types but not interfaces.  In this case, they are equivalent
 const FileResponseSuccessToRemoteSyncInput = (fr) => fr;
 exports.FileResponseSuccessToRemoteSyncInput = FileResponseSuccessToRemoteSyncInput;
-const changeResultToMetadataComponent = (registry = new source_deploy_retrieve_1.RegistryAccess()) => (cr) => ({
+const changeResultToMetadataComponent = (registry) => (cr) => ({
     fullName: cr.name,
     type: registry.getTypeByName(cr.type),
 });

package/lib/shared/guards.d.ts

@@ -1,8 +1,6 @@
-import { MetadataMember, FileResponse, FileResponseFailure, FileResponseSuccess } from '@salesforce/source-deploy-retrieve';
+import { FileResponse, FileResponseSuccess } from '@salesforce/source-deploy-retrieve';
 import { ChangeResult } from './types';
 import { ChangeResultWithNameAndType } from './types';
-export declare const metadataMemberGuard: (input: MetadataMember | undefined | Partial<MetadataMember>) => input is MetadataMember;
-export declare const isSdrFailure: (fileResponse: FileResponse) => fileResponse is FileResponseFailure;
 export declare const isSdrSuccess: (fileResponse: FileResponse) => fileResponse is FileResponseSuccess;
 export declare const FileResponseIsDeleted: (fileResponse: FileResponse) => boolean;
 export declare const FileResponseIsNotDeleted: (fileResponse: FileResponse) => boolean;

package/lib/shared/guards.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDefined = exports.isChangeResultWithNameAndType = exports.FileResponseHasPath = exports.FileResponseIsNotDeleted = exports.FileResponseIsDeleted = exports.isSdrSuccess = exports.isSdrFailure = exports.metadataMemberGuard = void 0;
+exports.isDefined = exports.isChangeResultWithNameAndType = exports.FileResponseHasPath = exports.FileResponseIsNotDeleted = exports.FileResponseIsDeleted = exports.isSdrSuccess = void 0;
 /*
  * Copyright 2025, Salesforce, Inc.
  *
@@ -17,10 +17,6 @@ exports.isDefined = exports.isChangeResultWithNameAndType = exports.FileResponse
  * limitations under the License.
  */
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
-const metadataMemberGuard = (input) => input !== undefined && typeof input.fullName === 'string' && typeof input.type === 'string';
-exports.metadataMemberGuard = metadataMemberGuard;
-const isSdrFailure = (fileResponse) => fileResponse.state === source_deploy_retrieve_1.ComponentStatus.Failed;
-exports.isSdrFailure = isSdrFailure;
 const isSdrSuccess = (fileResponse) => fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Failed;
 exports.isSdrSuccess = isSdrSuccess;
 const FileResponseIsDeleted = (fileResponse) => fileResponse.state === source_deploy_retrieve_1.ComponentStatus.Deleted;

package/lib/shared/local/functions.d.ts

@@ -3,7 +3,6 @@ export declare const IS_WINDOWS: boolean;
 export declare const toFilenames: (rows: StatusRow[]) => string[];
 export declare const isDeleted: (status: StatusRow) => boolean;
 export declare const isAdded: (status: StatusRow) => boolean;
-export declare const ensureWindows: (filepath: string) => string;
 export declare const ensurePosix: (filepath: string) => string;
 export declare const FILE = 0;
 export declare const HEAD = 1;

package/lib/shared/local/functions.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WORKDIR = exports.HEAD = exports.FILE = exports.ensurePosix = exports.ensureWindows = exports.isAdded = exports.isDeleted = exports.toFilenames = exports.IS_WINDOWS = void 0;
+exports.WORKDIR = exports.HEAD = exports.FILE = exports.ensurePosix = exports.isAdded = exports.isDeleted = exports.toFilenames = exports.IS_WINDOWS = void 0;
 /*
  * Copyright 2025, Salesforce, Inc.
  *
@@ -49,8 +49,8 @@ exports.WORKDIR = exports.HEAD = exports.FILE = exports.ensurePosix = exports.en
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
+const os = __importStar(require("node:os"));
 exports.IS_WINDOWS = os.type() === 'Windows_NT'; // array members for status results
 // filenames were normalized when read from isogit
 const toFilenames = (rows) => rows.map((row) => row[exports.FILE]);
@@ -59,8 +59,6 @@ const isDeleted = (status) => status[exports.WORKDIR] === 0;
 exports.isDeleted = isDeleted;
 const isAdded = (status) => status[exports.HEAD] === 0 && status[exports.WORKDIR] === 2;
 exports.isAdded = isAdded;
-const ensureWindows = (filepath) => path.win32.normalize(filepath);
-exports.ensureWindows = ensureWindows;
 const ensurePosix = (filepath) => filepath.split(path.sep).join(path.posix.sep);
 exports.ensurePosix = ensurePosix;
 // We don't use STAGE (StatusRow[3]). Changes are added and committed in one step

package/lib/shared/local/localShadowRepo.js

@@ -57,9 +57,7 @@ const os = __importStar(require("node:os"));
 const fs = __importStar(require("graceful-fs"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
-// @ts-expect-error isogit has both ESM and CJS exports but node16 module/resolution identifies it as ESM
 const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
-const performance_1 = require("@oclif/core/performance");
 const functions_1 = require("../functions");
 const moveDetection_1 = require("./moveDetection");
 const functions_2 = require("./functions");
@@ -74,7 +72,7 @@ const redirectToCliRepoError = (e) => {
     }
     throw e;
 };
-/** do not try to add more than this many files at a time through isogit.  You'll hit EMFILE: too many open files even with graceful-fs */
+/** do not try to add more than this many files at a time through isogit.  You'll hit EMFILE: too many open files */
 const MAX_FILE_ADD = kit_1.env.getNumber('SF_SOURCE_TRACKING_BATCH_SIZE', kit_1.env.getNumber('SFDX_SOURCE_TRACKING_BATCH_SIZE', functions_2.IS_WINDOWS ? 8000 : 15_000));
 class ShadowRepo {
     static instanceMap = new Map();
@@ -133,12 +131,7 @@ class ShadowRepo {
      * @returns the deleted directory
      */
     async delete() {
-        if (typeof fs.promises.rm === 'function') {
-            await fs.promises.rm(this.gitDir, { recursive: true, force: true });
-        }
-        else {
-            await fs.promises.rm(this.gitDir, { recursive: true });
-        }
+        await fs.promises.rm(this.gitDir, { recursive: true, force: true });
         return this.gitDir;
     }
     /**
@@ -152,7 +145,6 @@ class ShadowRepo {
     async getStatus(noCache = false) {
         this.logger.trace(`start: getStatus (noCache = ${noCache})`);
         if (!this.status || noCache) {
-            const marker = performance_1.Performance.mark('@salesforce/source-tracking', 'localShadowRepo.getStatus#withoutCache');
             try {
                 // status hasn't been initialized yet
                 this.status = await isomorphic_git_1.default.statusMatrix({
@@ -179,7 +171,6 @@ class ShadowRepo {
             catch (e) {
                 redirectToCliRepoError(e);
             }
-            marker?.stop();
         }
         this.logger.trace(`done: getStatus (noCache = ${noCache})`);
         return this.status;
@@ -243,10 +234,6 @@ class ShadowRepo {
             // this is valid, might not be an error
             return 'no files to commit';
         }
-        const marker = performance_1.Performance.mark('@salesforce/source-tracking', 'localShadowRepo.commitChanges', {
-            deployedFiles: deployedFiles.length,
-            deletedFiles: deletedFiles.length,
-        });
         if (deployedFiles.length) {
             const chunks = (0, functions_1.chunkArray)(
             // these are stored in posix/style/path format.  We have to convert inbound stuff from windows
@@ -284,9 +271,6 @@ class ShadowRepo {
         if (deletedFiles.length) {
             // Using a cache here speeds up the performance by ~24.4%
             let cache = {};
-            const deleteMarker = performance_1.Performance.mark('@salesforce/source-tracking', 'localShadowRepo.commitChanges#delete', {
-                deletedFiles: deletedFiles.length,
-            });
             for (const filepath of [...new Set(functions_2.IS_WINDOWS ? deletedFiles.map(normalize).map(functions_2.ensurePosix) : deletedFiles)]) {
                 try {
                     // these need to be done sequentially because isogit manages file locking.  Isogit remove does not support multiple files at once
@@ -299,7 +283,6 @@ class ShadowRepo {
             }
             // clear cache
             cache = {};
-            deleteMarker?.stop();
         }
         try {
             this.logger.trace('start: commitChanges git.commit');
@@ -320,29 +303,22 @@ class ShadowRepo {
         catch (e) {
             redirectToCliRepoError(e);
         }
-        marker?.stop();
     }
     async detectMovedFiles() {
         // get status will return os-specific paths
         const matchingFiles = (0, moveDetection_1.getMatches)(await this.getStatus());
         if (!matchingFiles.added.size || !matchingFiles.deleted.size)
             return;
-        const movedFilesMarker = performance_1.Performance.mark('@salesforce/source-tracking', 'localShadowRepo.detectMovedFiles');
         const matches = await (0, moveDetection_1.filenameMatchesToMap)(this.registry)(this.projectPath)(this.gitDir)(matchingFiles);
         if (matches.deleteOnly.size === 0 && matches.fullMatches.size === 0)
-            return movedFilesMarker?.stop();
+            return;
         this.logger.debug((0, moveDetection_1.getLogMessage)(matches));
-        movedFilesMarker?.addDetails({
-            filesMoved: matches.fullMatches.size,
-            filesMovedAndEdited: matches.deleteOnly.size,
-        });
         // Commit the moved files and refresh the status
         await this.commitChanges({
             deletedFiles: [...matches.fullMatches.values(), ...matches.deleteOnly.values()],
             deployedFiles: [...matches.fullMatches.keys()],
             message: 'Committing moved files',
         });
-        movedFilesMarker?.stop();
     }
 }
 exports.ShadowRepo = ShadowRepo;

package/lib/shared/local/moveDetection.d.ts

@@ -1,5 +1,5 @@
 import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
-import { DetectionFileInfoWithType, StatusRow, StringMap } from './types';
+import { StatusRow, StringMap } from './types';
 type AddedAndDeletedFilenames = {
     added: Set<string>;
     deleted: Set<string>;
@@ -15,7 +15,4 @@ export declare const filenameMatchesToMap: (registry: RegistryAccess) => (projec
 /** compare delete and adds from git.status, matching basenames of the files.  returns early when there's nothing to match */
 export declare const getMatches: (status: StatusRow[]) => AddedAndDeletedFilenames;
 export declare const getLogMessage: (matches: StringMapsForMatches) => string;
-/** returns a map of <hash+basename, filepath>.  If two items result in the same hash+basename, return that in the ignore bucket */
-export declare const buildMap: (info: DetectionFileInfoWithType[]) => StringMap[];
-export declare const toKey: (input: DetectionFileInfoWithType) => string;
 export {};

package/lib/shared/local/moveDetection.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toKey = exports.buildMap = exports.getLogMessage = exports.getMatches = exports.filenameMatchesToMap = void 0;
+exports.getLogMessage = exports.getMatches = exports.filenameMatchesToMap = void 0;
 /*
  * Copyright 2025, Salesforce, Inc.
  *
@@ -54,12 +54,10 @@ exports.toKey = exports.buildMap = exports.getLogMessage = exports.getMatches =
  */
 const node_path_1 = __importDefault(require("node:path"));
 const node_os_1 = require("node:os");
+const fs = __importStar(require("graceful-fs"));
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
-// @ts-expect-error isogit has both ESM and CJS exports but node16 module/resolution identifies it as ESM
 const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
-const fs = __importStar(require("graceful-fs"));
-const performance_1 = require("@oclif/core/performance");
 const guards_1 = require("../guards");
 const functions_1 = require("../functions");
 const functions_2 = require("./functions");
@@ -111,8 +109,8 @@ const getLogMessage = (matches) => [
 exports.getLogMessage = getLogMessage;
 /** build maps of the add/deletes with filenames, returning the matches  Logs if we can't make a match because buildMap puts them in the ignored bucket */
 const buildMaps = async ({ addedInfo, deletedInfo }) => {
-    const [addedMap, addedIgnoredMap] = (0, exports.buildMap)(addedInfo);
-    const [deletedMap, deletedIgnoredMap] = (0, exports.buildMap)(deletedInfo);
+    const [addedMap, addedIgnoredMap] = buildMap(addedInfo);
+    const [deletedMap, deletedIgnoredMap] = buildMap(deletedInfo);
     // If we detected any files that have the same basename and hash, emit a warning and send telemetry
     // These files will still show up as expected in the `sf project deploy preview` output
     // We could add more logic to determine and display filepaths that we ignored...
@@ -161,16 +159,11 @@ const compareHashes = ({ addedMap, deletedMap }) => {
 /** enrich the filenames with basename and oid (hash)  */
 const toFileInfo = async ({ projectPath, gitDir, added, deleted, }) => {
     // Track how long it takes to gather the oid information from the git trees
-    const getInfoMarker = performance_1.Performance.mark('@salesforce/source-tracking', 'localShadowRepo.detectMovedFiles#toFileInfo', {
-        addedFiles: added.size,
-        deletedFiles: deleted.size,
-    });
     const headRef = await isomorphic_git_1.default.resolveRef({ fs, dir: projectPath, gitdir: gitDir, ref: 'HEAD' });
     const [addedInfo, deletedInfo] = await Promise.all([
         await Promise.all(Array.from(added).map(getHashForAddedFile(projectPath))),
         await Promise.all(Array.from(deleted).map(getHashFromActualFileContents(gitDir)(projectPath)(headRef))),
     ]);
-    getInfoMarker?.stop();
     return { addedInfo, deletedInfo };
 };
 /** returns a map of <hash+basename, filepath>.  If two items result in the same hash+basename, return that in the ignore bucket */
@@ -178,7 +171,7 @@ const buildMap = (info) => {
     const map = new Map();
     const ignore = new Map();
     info.map((i) => {
-        const key = (0, exports.toKey)(i);
+        const key = toKey(i);
         // If we find a duplicate key, we need to remove it and ignore it in the future.
         // Finding duplicate hash#basename means that we cannot accurately determine where it was moved to or from
         if (map.has(key) || ignore.has(key)) {
@@ -191,7 +184,6 @@ const buildMap = (info) => {
     });
     return [map, ignore];
 };
-exports.buildMap = buildMap;
 const getHashForAddedFile = (projectPath) => async (filepath) => ({
     filename: filepath,
     basename: node_path_1.default.basename(filepath),
@@ -218,7 +210,6 @@ const getHashFromActualFileContents = (gitdir) => (projectPath) => (oid) => asyn
     hash: (await isomorphic_git_1.default.readBlob({ fs, dir: projectPath, gitdir, filepath: functions_2.IS_WINDOWS ? (0, functions_2.ensurePosix)(filepath) : filepath, oid })).oid,
 });
 const toKey = (input) => [input.hash, input.basename, input.type, input.type, input.parentType ?? '', input.parentFullName ?? ''].join(JOIN_CHAR);
-exports.toKey = toKey;
 const removeHashFromEntry = ([k, v]) => [removeHashFromKey(k), v];
 const removeHashFromKey = (hash) => hash.split(JOIN_CHAR).splice(1).join(JOIN_CHAR);
 /** resolve the metadata types (and possibly parent components) */

package/lib/shared/localComponentSetArray.js

@@ -62,7 +62,7 @@ const getNonSequential = ({ packageDirs, nonDeletes: nonDeletes, deletes: delete
         path: packageDirs.map((dir) => dir.name).join(';'),
     },
 ];
-const getComponentSets = ({ groupings, sourceApiVersion, registry = new source_deploy_retrieve_1.RegistryAccess(), }) => {
+const getComponentSets = ({ groupings, sourceApiVersion, registry, }) => {
     const logger = core_1.Logger.childFromRoot('localComponentSetArray');
     // optimistic resolution...some files may not be possible to resolve
     const resolverForNonDeletes = new source_deploy_retrieve_1.MetadataResolver(registry);

package/lib/shared/metadataKeys.d.ts

@@ -1,5 +1,5 @@
 import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
 import { RemoteSyncInput } from './types';
-export declare const getMetadataKeyFromFileResponse: (fileResponse: RemoteSyncInput) => string[];
-export declare const mappingsForSourceMemberTypesToMetadataType: Map<string, string>;
-export declare const registrySupportsType: (registry?: RegistryAccess) => (type: string) => boolean;
+export declare const getMetadataKeyFromFileResponse: (registry: RegistryAccess) => (fileResponse: RemoteSyncInput) => string[];
+export declare const getMappingsForSourceMemberTypesToMetadataType: (registry: RegistryAccess) => Map<string, string>;
+export declare const registrySupportsType: (registry: RegistryAccess) => (type: string) => boolean;

package/lib/shared/metadataKeys.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registrySupportsType = exports.mappingsForSourceMemberTypesToMetadataType = exports.getMetadataKeyFromFileResponse = void 0;
+exports.registrySupportsType = exports.getMappingsForSourceMemberTypesToMetadataType = exports.getMetadataKeyFromFileResponse = void 0;
 /*
  * Copyright 2025, Salesforce, Inc.
  *
@@ -25,16 +25,11 @@ const functions_1 = require("./functions");
 const pathAfterFullName = (fileResponse) => fileResponse?.filePath
     ? (0, node_path_1.join)((0, node_path_1.dirname)(fileResponse.filePath).substring((0, node_path_1.dirname)(fileResponse.filePath).lastIndexOf(fileResponse.fullName)), (0, node_path_1.basename)(fileResponse.filePath)).replace(/\\/gi, '/')
     : '';
-const registryAccess = new source_deploy_retrieve_1.RegistryAccess();
-// only compute once
-const aliasTypes = registryAccess
-    .getAliasTypes()
-    // allow assertion because aliasTypes are defined as having that property
-    .map((aliasType) => [aliasType.name, registryAccess.getTypeByName(aliasType.aliasFor).name]);
-const reverseAliasTypes = new Map(aliasTypes.map(([alias, type]) => [type, alias]));
+const getAliasTypes = (registry) => registry.getAliasTypes().map((aliasType) => [aliasType.name, registry.getTypeByName(aliasType.aliasFor).name]);
+const reverseStringMap = (original) => new Map(original.map(([k, v]) => [v, k]));
 // handle all "weird" type/name translation between SourceMember and SDR FileResponse
 // These get de-duplicated in a set later, so it's ok to have one per file
-const getMetadataKeyFromFileResponse = (fileResponse) => {
+const getMetadataKeyFromFileResponse = (registry) => (fileResponse) => {
     // also create an element for the parent object
     if (fileResponse.type === 'CustomField' && fileResponse.filePath) {
         const splits = (0, node_path_1.normalize)(fileResponse.filePath).split(node_path_1.sep);
@@ -64,24 +59,26 @@ const getMetadataKeyFromFileResponse = (fileResponse) => {
             .toArray()
             .flatMap((component) => component.getChildren().map((child) => (0, functions_1.getMetadataKey)('CustomLabel', child.fullName)));
     }
+    const reverseAliasTypesResult = reverseStringMap(getAliasTypes(registry));
     // if we've aliased a type, we'll have to possibly sync both types--you can't tell from the sourceComponent retrieved which way it was stored on the server
-    if (reverseAliasTypes.has(fileResponse.type)) {
+    if (reverseAliasTypesResult.has(fileResponse.type)) {
         return [
             (0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName),
-            (0, functions_1.getMetadataKey)(reverseAliasTypes.get(fileResponse.type), fileResponse.fullName),
+            (0, functions_1.getMetadataKey)(reverseAliasTypesResult.get(fileResponse.type), fileResponse.fullName),
         ];
     }
     // standard key for everything else
     return [(0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName)];
 };
 exports.getMetadataKeyFromFileResponse = getMetadataKeyFromFileResponse;
-exports.mappingsForSourceMemberTypesToMetadataType = new Map([
-    ...aliasTypes,
+const getMappingsForSourceMemberTypesToMetadataType = (registry) => new Map([
+    ...getAliasTypes(registry),
     ['AuraDefinition', 'AuraDefinitionBundle'],
     ['LightningComponentResource', 'LightningComponentBundle'],
 ]);
-const registrySupportsType = (registry = new source_deploy_retrieve_1.RegistryAccess()) => (type) => {
-    if (exports.mappingsForSourceMemberTypesToMetadataType.has(type)) {
+exports.getMappingsForSourceMemberTypesToMetadataType = getMappingsForSourceMemberTypesToMetadataType;
+const registrySupportsType = (registry) => (type) => {
+    if ((0, exports.getMappingsForSourceMemberTypesToMetadataType)(registry).has(type)) {
         return true;
     }
     if (type === 'PicklistValue') {

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

@@ -1,2 +1,3 @@
-import { RemoteSyncInput } from '../types';
-export declare const calculateExpectedSourceMembers: (expectedMembers: RemoteSyncInput[]) => Map<string, RemoteSyncInput>;
+import { type RegistryAccess } from '@salesforce/source-deploy-retrieve';
+import { type RemoteSyncInput } from '../types';
+export declare const calculateExpectedSourceMembers: (registry: RegistryAccess, expectedMembers: RemoteSyncInput[]) => Map<string, RemoteSyncInput>;

package/lib/shared/remote/expectedSourceMembers.js

@@ -58,8 +58,9 @@ const excludedKeys = [
     'CustomTab###standard-mailapp',
     'ApexEmailNotifications###apexEmailNotifications',
 ];
-const calculateExpectedSourceMembers = (expectedMembers) => {
+const calculateExpectedSourceMembers = (registry, expectedMembers) => {
     const outstandingSourceMembers = new Map();
+    const getKeys = (0, metadataKeys_1.getMetadataKeyFromFileResponse)(registry);
     expectedMembers
         .filter((fileResponse) => 
     // unchanged files will never be in the sourceMembers.  Not really sure why SDR returns them.
@@ -84,7 +85,7 @@ const calculateExpectedSourceMembers = (expectedMembers) => {
         !fileResponse.type.startsWith('Workflow') &&
         !isSpecialAuraXml(fileResponse.filePath))
         .map((member) => {
-        (0, metadataKeys_1.getMetadataKeyFromFileResponse)(member)
+        getKeys(member)
             // remove some individual members known to not work with tracking even when their type does
             .filter((key) => 
         // CustomObject could have been re-added by the key generator from one of its fields

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

@@ -1,5 +1,5 @@
 import { RemoteChangeElement } from '../types';
-import { ContentsV0, ContentsV1, MemberRevision, MemberRevisionLegacy } from './types';
+import { ContentsV0, ContentsV1, MemberRevision } from './types';
 export declare const FILENAME = "maxRevision.json";
 export declare const getFilePath: (orgId: string) => string;
 export declare const readFileContents: (filePath: string) => Promise<ContentsV1 | Record<string, never>>;
@@ -10,4 +10,3 @@ export declare const writeTrackingFile: ({ filePath, maxCounter, members, }: {
     maxCounter: number;
     members: Map<string, MemberRevision>;
 }) => Promise<void>;
-export declare const toLegacyMemberRevision: ([, member]: [string, MemberRevision]) => [key: string, MemberRevisionLegacy];

package/lib/shared/remote/fileOperations.js

@@ -1,9 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLegacyMemberRevision = exports.writeTrackingFile = exports.upgradeFileContents = exports.revisionToRemoteChangeElement = exports.readFileContents = exports.getFilePath = exports.FILENAME = void 0;
+exports.writeTrackingFile = exports.upgradeFileContents = exports.revisionToRemoteChangeElement = exports.readFileContents = exports.getFilePath = exports.FILENAME = void 0;
 /*
  * Copyright 2025, Salesforce, Inc.
  *
@@ -19,8 +52,8 @@ exports.toLegacyMemberRevision = exports.writeTrackingFile = exports.upgradeFile
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const fs = __importStar(require("graceful-fs"));
 const kit_1 = require("@salesforce/kit");
 const core_1 = require("@salesforce/core");
 const functions_1 = require("../functions");
@@ -29,7 +62,7 @@ const getFilePath = (orgId) => node_path_1.default.join('.sf', 'orgs', orgId, ex
 exports.getFilePath = getFilePath;
 const readFileContents = async (filePath) => {
     try {
-        const contents = await node_fs_1.default.promises.readFile(filePath, 'utf8');
+        const contents = await fs.promises.readFile(filePath, 'utf8');
         const parsedContents = (0, kit_1.parseJsonMap)(contents, filePath);
         if (parsedContents.fileVersion === 1) {
             return parsedContents;
@@ -87,7 +120,7 @@ const writeTrackingFile = async ({ filePath, maxCounter, members, }) => {
         : {
             fileVersion: 0,
             serverMaxRevisionCounter: maxCounter,
-            sourceMembers: Object.fromEntries(Array.from(members.entries()).map(exports.toLegacyMemberRevision)),
+            sourceMembers: Object.fromEntries(Array.from(members.entries()).map(toLegacyMemberRevision)),
         };
     await lockResult.writeAndUnlock(JSON.stringify(contents, null, 4));
 };
@@ -101,5 +134,4 @@ const toLegacyMemberRevision = ([, member]) => [
         isNameObsolete: member.IsNameObsolete,
     },
 ];
-exports.toLegacyMemberRevision = toLegacyMemberRevision;
 //# sourceMappingURL=fileOperations.js.map

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

@@ -15,4 +15,3 @@ export declare const querySourceMembersFrom: ({ conn, fromRevision, queryCache,
     /** if you don't pass in a logger, you get no log output */
     logger?: PinoLogger;
 }) => Promise<SourceMember[]>;
-export declare const queryFn: (conn: Connection, query: string) => Promise<SourceMember[]>;

package/lib/shared/remote/orgQueries.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryFn = exports.querySourceMembersFrom = exports.querySourceMembersTo = exports.calculateTimeout = void 0;
+exports.querySourceMembersFrom = exports.querySourceMembersTo = exports.calculateTimeout = void 0;
 /*
  * Copyright 2025, Salesforce, Inc.
  *
@@ -36,7 +36,7 @@ exports.calculateTimeout = calculateTimeout;
 /** exported only for spy/mock  */
 const querySourceMembersTo = async (conn, toRevision) => {
     const query = `SELECT ${types_1.SOURCE_MEMBER_FIELDS.join(', ')} FROM SourceMember WHERE RevisionCounter <= ${toRevision}`;
-    return (0, exports.queryFn)(conn, query);
+    return queryFn(conn, query);
 };
 exports.querySourceMembersTo = querySourceMembersTo;
 const querySourceMembersFrom = async ({ conn, fromRevision, queryCache, userQueryCache, logger, }) => {
@@ -51,7 +51,7 @@ const querySourceMembersFrom = async ({ conn, fromRevision, queryCache, userQuer
     // because `serverMaxRevisionCounter` is always updated, we need to select > to catch the most recent change
     const query = `SELECT ${types_1.SOURCE_MEMBER_FIELDS.join(', ')} FROM SourceMember WHERE RevisionCounter > ${fromRevision}`;
     logger?.debug(`Query: ${query}`);
-    const queryResult = await (0, exports.queryFn)(conn, query);
+    const queryResult = await queryFn(conn, query);
     if (userQueryCache) {
         await updateCacheWithUnknownUsers(conn, queryResult, userQueryCache);
     }
@@ -71,7 +71,6 @@ const queryFn = async (conn, query) => {
         throw core_1.SfError.wrap(error);
     }
 };
-exports.queryFn = queryFn;
 /** A series of workarounds for server-side bugs.  Each bug should be filed against a team, with a WI, so we know when these are fixed and can be removed */
 const sourceMemberCorrections = (sourceMember) => {
     if (sourceMember.MemberType === 'QuickActionDefinition') {

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

@@ -1,8 +1,9 @@
 import { Logger, Org } from '@salesforce/core';
+import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
 import { ChangeResult, RemoteChangeElement, RemoteSyncInput } from '../types';
 export type PinoLogger = ReturnType<(typeof Logger)['getRawRootLogger']>;
 /** Options for RemoteSourceTrackingService.getInstance */
-export type RemoteSourceTrackingServiceOptions = {
+type RemoteSourceTrackingServiceOptions = {
     org: Org;
     projectPath: string;
 };
@@ -39,7 +40,7 @@ export declare class RemoteSourceTrackingService {
      * pass in a series of SDR FilResponses .\
      * it sets their last retrieved revision to the current revision counter from the server.
      */
-    syncSpecifiedElements(elements: RemoteSyncInput[]): Promise<void>;
+    syncSpecifiedElements(registry: RegistryAccess, elements: RemoteSyncInput[]): Promise<void>;
     /**
      * Resets source tracking state by first clearing all tracked data, then
      * queries and synchronizes SourceMembers from the associated org.
@@ -66,7 +67,7 @@ export declare class RemoteSourceTrackingService {
      * @param expectedMemberNames Array of metadata names to poll
      * @param pollingTimeout maximum amount of time in seconds to poll for SourceMembers
      */
-    pollForSourceTracking(expectedMembers: RemoteSyncInput[]): Promise<void>;
+    pollForSourceTracking(registry: RegistryAccess, expectedMembers: RemoteSyncInput[]): Promise<void>;
     /**
      * Adds the given SourceMembers to the list of tracked MemberRevisions, optionally updating
      * the lastRetrievedFromServer field (sync), and persists the changes to maxRevision.json.
@@ -82,4 +83,5 @@ export declare class RemoteSourceTrackingService {
  * 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 declare const remoteChangeElementToChangeResult: (rce: RemoteChangeElement) => ChangeResult;
+export declare const remoteChangeElementToChangeResult: (registry: RegistryAccess) => ((rce: RemoteChangeElement) => ChangeResult);
+export {};