@salesforce/source-tracking 7.4.10-dev.0 → 7.5.0

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

@@ -1,9 +1,18 @@
 "use strict";
 /*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ * 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.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateExpectedSourceMembers = void 0;
@@ -49,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.
@@ -75,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,17 +1,59 @@
 "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 (c) 2023, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ * 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.
  */
-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");
@@ -20,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;
@@ -78,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));
 };
@@ -92,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,11 +1,20 @@
 "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 (c) 2023, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ * 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.
  */
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
@@ -27,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, }) => {
@@ -42,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);
     }
@@ -62,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 {};

package/lib/shared/remote/remoteSourceTrackingService.js

@@ -1,18 +1,60 @@
 "use strict";
 /*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ * 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.
  */
+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.remoteChangeElementToChangeResult = exports.RemoteSourceTrackingService = void 0;
 const node_path_1 = __importDefault(require("node:path"));
-const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = require("node:os");
+const fs = __importStar(require("graceful-fs"));
 const ts_retry_promise_1 = require("ts-retry-promise");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
@@ -77,8 +119,8 @@ class RemoteSourceTrackingService {
     static async delete(orgId) {
         const fileToDelete = (0, fileOperations_1.getFilePath)(orgId);
         // the file might not exist, in which case we don't need to delete it
-        if (node_fs_1.default.existsSync(fileToDelete)) {
-            await node_fs_1.default.promises.unlink(fileToDelete);
+        if (fs.existsSync(fileToDelete)) {
+            await fs.promises.unlink(fileToDelete);
         }
         return node_path_1.default.isAbsolute(fileToDelete) ? fileToDelete : node_path_1.default.join(process.cwd(), fileToDelete);
     }
@@ -86,16 +128,18 @@ class RemoteSourceTrackingService {
      * pass in a series of SDR FilResponses .\
      * it sets their last retrieved revision to the current revision counter from the server.
      */
-    async syncSpecifiedElements(elements) {
+    async syncSpecifiedElements(registry, elements) {
         if (elements.length === 0) {
             return;
         }
-        const quietLogger = elements.length > 100 ? this.logger.silent.bind(this.logger) : this.logger.debug.bind(this.logger);
+        const quietLogger = elements.length > 100
+            ? this.logger.silent?.bind(this.logger) ?? (() => { })
+            : this.logger.debug.bind(this.logger);
         quietLogger(`Syncing ${elements.length} Revisions by key`);
         // this can be super-repetitive on a large ExperienceBundle where there is an element for each file but only one Revision for the entire bundle
         // 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)(element)))).map((metadataKey) => {
+        Array.from(new Set(elements.flatMap((element) => (0, metadataKeys_1.getMetadataKeyFromFileResponse)(registry)(element)))).map((metadataKey) => {
             const revision = this.sourceMembers.get(metadataKey) ?? this.sourceMembers.get(decodeURI(metadataKey));
             if (!revision) {
                 this.logger.warn(`found no matching revision for ${metadataKey}`);
@@ -178,14 +222,14 @@ class RemoteSourceTrackingService {
      * @param expectedMemberNames Array of metadata names to poll
      * @param pollingTimeout maximum amount of time in seconds to poll for SourceMembers
      */
-    async pollForSourceTracking(expectedMembers) {
+    async pollForSourceTracking(registry, expectedMembers) {
         if (core_1.envVars.getBoolean('SF_DISABLE_SOURCE_MEMBER_POLLING')) {
             return this.logger.warn('Not polling for SourceMembers since SF_DISABLE_SOURCE_MEMBER_POLLING = true.');
         }
         if (expectedMembers.length === 0) {
             return;
         }
-        const outstandingSourceMembers = (0, expectedSourceMembers_1.calculateExpectedSourceMembers)(expectedMembers);
+        const outstandingSourceMembers = (0, expectedSourceMembers_1.calculateExpectedSourceMembers)(registry, expectedMembers);
         const originalOutstandingSize = outstandingSourceMembers.size;
         // this will be the absolute timeout from the start of the poll.  We can also exit early if it doesn't look like more results are coming in
         let highestRevisionSoFar = this.serverMaxRevisionCounter;
@@ -293,7 +337,9 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`),
         if (sourceMembers.length === 0) {
             return;
         }
-        const quietLogger = sourceMembers.length > 100 ? this.logger.silent.bind(this.logger) : this.logger.debug.bind(this.logger);
+        const quietLogger = sourceMembers.length > 100
+            ? this.logger.silent?.bind(this.logger) ?? (() => { })
+            : this.logger.debug.bind(this.logger);
         quietLogger(`Upserting ${sourceMembers.length} SourceMembers to maxRevision.json`);
         // Update the serverMaxRevisionCounter to the highest RevisionCounter
         this.serverMaxRevisionCounter = Math.max(this.serverMaxRevisionCounter, ...sourceMembers.map((m) => m.RevisionCounter));
@@ -325,7 +371,7 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`),
             throw new core_1.SfError(messages.getMessage('NonSourceTrackedOrgError'), 'NonSourceTrackedOrgError');
         }
         this.logger = core_1.Logger.getRawRootLogger().child({ name: this.constructor.name });
-        if (node_fs_1.default.existsSync(this.filePath)) {
+        if (fs.existsSync(this.filePath)) {
             // read the file contents and turn it into the map
             const rawContents = await (0, fileOperations_1.readFileContents)(this.filePath);
             if (rawContents.serverMaxRevisionCounter && rawContents.sourceMembers) {
@@ -361,18 +407,21 @@ exports.RemoteSourceTrackingService = 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
  */
-const remoteChangeElementToChangeResult = (rce) => ({
-    ...rce,
-    ...(metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.has(rce.type)
-        ? {
-            // SNOWFLAKE: EmailTemplateFolder is treated as an alias for EmailFolder so it has a mapping.
-            // The name must be handled differently than with bundle types.
-            name: rce.type === 'EmailTemplateFolder' ? rce.name : rce.name.split('/')[0],
-            type: metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.get(rce.type),
-        }
-        : {}),
-    origin: 'remote', // we know they're remote
-});
+const remoteChangeElementToChangeResult = (registry) => {
+    const mappings = (0, metadataKeys_1.getMappingsForSourceMemberTypesToMetadataType)(registry);
+    return (rce) => ({
+        ...rce,
+        ...(mappings.has(rce.type)
+            ? {
+                // SNOWFLAKE: EmailTemplateFolder is treated as an alias for EmailFolder so it has a mapping.
+                // The name must be handled differently than with bundle types.
+                name: rce.type === 'EmailTemplateFolder' ? rce.name : rce.name.split('/')[0],
+                type: mappings.get(rce.type),
+            }
+            : {}),
+        origin: 'remote', // we know they're remote
+    });
+};
 exports.remoteChangeElementToChangeResult = remoteChangeElementToChangeResult;
 /**
  *

package/lib/shared/remote/types.js

@@ -1,9 +1,18 @@
 "use strict";
 /*
- * Copyright (c) 2023, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ * 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.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SOURCE_MEMBER_FIELDS = void 0;

package/lib/shared/remoteChangeIgnoring.d.ts

@@ -1,5 +1,5 @@
-import { ForceIgnore, MetadataMember } from '@salesforce/source-deploy-retrieve';
+import { ForceIgnore, MetadataMember, RegistryAccess } from '@salesforce/source-deploy-retrieve';
 import { ChangeResult } from './types';
 import { ChangeResultWithNameAndType } from './types';
-export declare const removeIgnored: (changeResults: ChangeResult[], forceIgnore: ForceIgnore, defaultPkgDir: string) => MetadataMember[];
+export declare const removeIgnored: (changeResults: ChangeResult[], forceIgnore: ForceIgnore, defaultPkgDir: string, registry: RegistryAccess) => MetadataMember[];
 export declare const ensureNameAndType: (cr: ChangeResult) => ChangeResultWithNameAndType;

package/lib/shared/remoteChangeIgnoring.js

@@ -1,25 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureNameAndType = exports.removeIgnored = void 0;
-/*
- * Copyright (c) 2023, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const sfError_1 = require("@salesforce/core/sfError");
 const filePathGenerator_1 = require("@salesforce/source-deploy-retrieve/lib/src/utils/filePathGenerator");
 const guards_1 = require("./guards");
 const functions_1 = require("./functions");
-const removeIgnored = (changeResults, forceIgnore, defaultPkgDir) => {
-    const registry = new source_deploy_retrieve_1.RegistryAccess();
-    return changeResults
-        .map(exports.ensureNameAndType)
-        .map((0, functions_1.changeResultToMetadataComponent)(registry))
-        .filter((mc) => !(0, filePathGenerator_1.filePathsFromMetadataComponent)(mc, defaultPkgDir).some((0, functions_1.forceIgnoreDenies)(forceIgnore)))
-        .map(metadataComponentToMetadataMember);
-};
+const removeIgnored = (changeResults, forceIgnore, defaultPkgDir, registry) => changeResults
+    .map(exports.ensureNameAndType)
+    .map((0, functions_1.changeResultToMetadataComponent)(registry))
+    .filter((mc) => !(0, filePathGenerator_1.filePathsFromMetadataComponent)(mc, defaultPkgDir).some((0, functions_1.forceIgnoreDenies)(forceIgnore)))
+    .map(metadataComponentToMetadataMember);
 exports.removeIgnored = removeIgnored;
 const metadataComponentToMetadataMember = (mc) => ({
     type: mc.type.name,

package/lib/shared/types.d.ts

@@ -39,7 +39,7 @@ export type ConflictResponse = {
     type: string;
     filePath: string;
 };
-export type SourceConflictErrorType = {
+type SourceConflictErrorType = {
     name: 'SourceConflictError';
 } & SfError<ConflictResponse[]>;
 export declare class SourceConflictError extends SfError<ConflictResponse[]> implements SourceConflictErrorType {
@@ -54,3 +54,4 @@ export type SourceMemberPollingEvent = {
     consecutiveEmptyResults: number;
 };
 export type ChangeResultWithNameAndType = ChangeResult & Required<Pick<ChangeResult, 'name' | 'type'>>;
+export {};

package/lib/shared/types.js

@@ -1,9 +1,18 @@
 "use strict";
 /*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ * 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.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceConflictError = void 0;

package/lib/sourceTracking.d.ts

@@ -18,6 +18,8 @@ export type SourceTrackingOptions = {
      * If you're using STL as part of a long running process (ex: vscode extensions), set this to false
      */
     ignoreLocalCache?: boolean;
+    /** pass in an instance of SDR's RegistryAccess.  If not provided, a new one will be created */
+    registry?: RegistryAccess;
 };
 type RemoteChangesResults = {
     componentSetFromNonDeletes: ComponentSet;