@salesforce/source-tracking 0.5.2 → 1.1.0

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.1.0](https://github.com/forcedotcom/source-tracking/compare/v1.0.2...v1.1.0) (2022-02-16)
+
+### Features
+
+- smarter polling ([3d5bb05](https://github.com/forcedotcom/source-tracking/commit/3d5bb05ccf05127304037ec6085660be5da8fe24))
+
+### Bug Fixes
+
+- handle lwc in a pkgDir of the same name ([621d8cf](https://github.com/forcedotcom/source-tracking/commit/621d8cfc00f2eb4ded160802b2076e140d0a2d06))
+- increase max-fetch default ([9854ed8](https://github.com/forcedotcom/source-tracking/commit/9854ed8677c13d0b2d818355660ab71c144e6a3e))
+- lastIndexOf handles foo/lwc/foo ([8632ee6](https://github.com/forcedotcom/source-tracking/commit/8632ee61f88faf32024e99f1c5590f6b134a3b08))
+- smarter polling and excluded files ([6df02a7](https://github.com/forcedotcom/source-tracking/commit/6df02a716e238e38b699b98f638ef42ed8cedeca))
+
+### [1.0.2](https://github.com/forcedotcom/source-tracking/compare/v1.0.1...v1.0.2) (2022-01-25)
+
+### Bug Fixes
+
+- handle gitignore outside pkgDirs ([23a65c8](https://github.com/forcedotcom/source-tracking/commit/23a65c89c8b55525b5d8efe88195d734d337d82a))
+
+### [1.0.1](https://github.com/forcedotcom/source-tracking/compare/v1.0.0...v1.0.1) (2022-01-25)
+
+### Bug Fixes
+
+- emailTempalteFolder via aliased types ([f4c88f9](https://github.com/forcedotcom/source-tracking/commit/f4c88f9b59ad6d061933bfd3f6827e44a59b0e80))
+
+## [1.0.0](https://github.com/forcedotcom/source-tracking/compare/v0.5.2...v1.0.0) (2022-01-20)
+
+### Bug Fixes
+
+- handle element count errors ([8817329](https://github.com/forcedotcom/source-tracking/commit/8817329f8198ce701aba22c7a4476ef31a4d73a4))
+- lightning EmailTemplateFolder ([554c766](https://github.com/forcedotcom/source-tracking/commit/554c76676a85c7a4b673879116912cde51dd1498))
+- remove emailtf attempt ([262839d](https://github.com/forcedotcom/source-tracking/commit/262839dc025c7094d8868d3ae9d769dd39ad5324))
+- sourceMember excepton for nondecomposed children ([05db59e](https://github.com/forcedotcom/source-tracking/commit/05db59e7a6e070224a45f5fbf08013565c9f2131))
+
 ### [0.5.2](https://github.com/forcedotcom/source-tracking/compare/v0.5.1...v0.5.2) (2022-01-05)
 
 ### Features

package/lib/shared/localShadowRepo.js

@@ -50,6 +50,7 @@ class ShadowRepo {
             this.logger.debug('initializing git repo');
             await this.gitInit();
         }
+        await this.locateIgnoreFiles();
     }
     /**
      * Initialize a new source tracking shadow repo.  Think of git init
@@ -58,7 +59,6 @@ class ShadowRepo {
     async gitInit() {
         await core_1.fs.promises.mkdir(this.gitDir, { recursive: true });
         await git.init({ fs: core_1.fs, dir: this.projectPath, gitdir: this.gitDir, defaultBranch: 'main' });
-        await this.locateIgnoreFiles();
     }
     /**
      * Delete the local tracking files
@@ -215,13 +215,10 @@ class ShadowRepo {
             dir: this.projectPath,
             gitdir: this.gitDir,
             trees: [git.WORKDIR()],
-            // TODO: this can be marginally faster if we limit it to pkgDirs and toplevel project files
             // eslint-disable-next-line @typescript-eslint/require-await
             map: async (filepath) => filepath,
         }))
-            .filter((filepath) => filepath.includes(gitIgnoreFileName) &&
-            // can be top-level like '.' (no sep) OR must be in one of the package dirs
-            (!filepath.includes(path.sep) || this.packageDirs.some((dir) => (0, functions_1.pathIsInFolder)(filepath, dir.name))))
+            .filter((filepath) => filepath.includes(gitIgnoreFileName))
             .map((ignoreFile) => path.join(this.projectPath, ignoreFile));
     }
     async stashIgnoreFile() {

package/lib/shared/metadataKeys.d.ts

@@ -1,2 +1,3 @@
 import { RemoteSyncInput } from './types';
 export declare const getMetadataKeyFromFileResponse: (fileResponse: RemoteSyncInput) => string[];
+export declare const mappingsForSourceMemberTypesToMetadataType: Map<string, string>;

package/lib/shared/metadataKeys.js

@@ -1,24 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetadataKeyFromFileResponse = void 0;
+exports.mappingsForSourceMemberTypesToMetadataType = exports.getMetadataKeyFromFileResponse = void 0;
 /*
  * 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
  */
-const path = require("path");
+const path_1 = require("path");
+const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const functions_1 = require("./functions");
-// LWC can have child folders (ex: dynamic templates like /templates/noDataIllustration.html
+// See UT for examples of the complexity this must handle
+// keys always use forward slashes, even on Windows
 const pathAfterFullName = (fileResponse) => fileResponse && fileResponse.filePath
-    ? fileResponse.filePath.substr(fileResponse.filePath.indexOf(fileResponse.fullName)).replace(/\\/gi, '/')
+    ? (0, path_1.join)((0, path_1.dirname)(fileResponse.filePath).substring((0, path_1.dirname)(fileResponse.filePath).lastIndexOf(fileResponse.fullName)), (0, path_1.basename)(fileResponse.filePath)).replace(/\\/gi, '/')
     : '';
+const registry = new source_deploy_retrieve_1.RegistryAccess();
+// only compute once
+const aliasTypes = registry
+    .getAliasTypes()
+    .map((aliasType) => [aliasType.name, registry.getTypeByName(aliasType.aliasFor).name]);
+const reverseAliasTypes = new Map(aliasTypes.map(([alias, type]) => [type, alias]));
 // 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) => {
     // also create an element for the parent object
     if (fileResponse.type === 'CustomField' && fileResponse.filePath) {
-        const splits = path.normalize(fileResponse.filePath).split(path.sep);
+        const splits = (0, path_1.normalize)(fileResponse.filePath).split(path_1.sep);
         const objectFolderIndex = splits.indexOf('objects');
         return [
             (0, functions_1.getMetadataKey)('CustomObject', splits[objectFolderIndex + 1]),
@@ -38,8 +46,27 @@ const getMetadataKeyFromFileResponse = (fileResponse) => {
             (0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName),
         ];
     }
-    // standard key
+    // CustomLabels (file) => CustomLabel[] (how they're storedin SourceMembers)
+    if (fileResponse.type === 'CustomLabels' && fileResponse.filePath) {
+        return source_deploy_retrieve_1.ComponentSet.fromSource(fileResponse.filePath)
+            .getSourceComponents()
+            .toArray()
+            .flatMap((component) => component.getChildren().map((child) => (0, functions_1.getMetadataKey)('CustomLabel', child.fullName)));
+    }
+    // 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)) {
+        return [
+            (0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName),
+            (0, functions_1.getMetadataKey)(reverseAliasTypes.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,
+    ['AuraDefinition', 'AuraDefinitionBundle'],
+    ['LightningComponentResource', 'LightningComponentBundle'],
+]);
 //# sourceMappingURL=metadataKeys.js.map

package/lib/shared/remoteSourceTrackingService.d.ts

@@ -58,6 +58,12 @@ export declare class RemoteSourceTrackingService extends ConfigFile<RemoteSource
     static getInstance(options: RemoteSourceTrackingService.Options): Promise<RemoteSourceTrackingService>;
     static getFileName(): string;
     static getFilePath(orgId: string): string;
+    /**
+     * Delete the RemoteSourceTracking for a given org.
+     *
+     * @param orgId
+     * @returns the path of the deleted source tracking file
+     */
     static delete(orgId: string): Promise<string>;
     /**
      * Initializes the service with existing remote source tracking data, or sets
@@ -119,6 +125,7 @@ export declare class RemoteSourceTrackingService extends ConfigFile<RemoteSource
      * @param pollingTimeout maximum amount of time in seconds to poll for SourceMembers
      */
     pollForSourceTracking(expectedMembers: RemoteSyncInput[]): Promise<void>;
+    private calculateExpectedSourceMembers;
     private calculateTimeout;
     private querySourceMembersFrom;
     private querySourceMembersTo;

package/lib/shared/remoteSourceTrackingService.js

@@ -7,6 +7,7 @@
  */
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable @typescript-eslint/member-ordering */
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remoteChangeElementToChangeResult = exports.RemoteSourceTrackingService = void 0;
 const path = require("path");
@@ -16,6 +17,12 @@ const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const kit_1 = require("@salesforce/kit");
 const metadataKeys_1 = require("./metadataKeys");
 const functions_1 = require("./functions");
+/*
+ * after some results have returned, how many times should we poll for missing sourcemembers
+ * even when there is a longer timeout remaining (because the deployment is very large)
+ */
+const POLLING_DELAY_MS = 1000;
+const CONSECUTIVE_EMPTY_POLLING_RESULT_LIMIT = ((_a = kit_1.env.getNumber('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT')) !== null && _a !== void 0 ? _a : 120) / kit_1.Duration.milliseconds(POLLING_DELAY_MS).seconds;
 /**
  * This service handles source tracking of metadata between a local project and an org.
  * Source tracking state is persisted to .sfdx/orgs/<orgId>/maxRevision.json.
@@ -82,6 +89,12 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
     static getFilePath(orgId) {
         return path.join('.sfdx', 'orgs', orgId, RemoteSourceTrackingService.getFileName());
     }
+    /**
+     * Delete the RemoteSourceTracking for a given org.
+     *
+     * @param orgId
+     * @returns the path of the deleted source tracking file
+     */
     static async delete(orgId) {
         const fileToDelete = RemoteSourceTrackingService.getFilePath(orgId);
         // the file might not exist, in which case we don't need to delete it
@@ -199,13 +212,9 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
         // Called during a source:tracking:reset
         this.setServerMaxRevision(0);
         this.initSourceMembers();
-        let members;
-        if (toRevision != null) {
-            members = await this.querySourceMembersTo(toRevision);
-        }
-        else {
-            members = await this.querySourceMembersFrom({ fromRevision: 0 });
-        }
+        const members = toRevision != null
+            ? await this.querySourceMembersTo(toRevision)
+            : await this.querySourceMembersFrom({ fromRevision: 0 });
         await this.trackSourceMembers(members, true);
         return members.map((member) => (0, functions_1.getMetadataKey)(member.MemberType, member.MemberName));
     }
@@ -253,18 +262,20 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
         }
         let serverMaxRevisionCounter = this.getServerMaxRevision();
         sourceMembers.forEach((change) => {
+            var _a;
             // try accessing the sourceMembers object at the index of the change's name
             // if it exists, we'll update the fields - if it doesn't, we'll create and insert it
             const key = (0, functions_1.getMetadataKey)(change.MemberType, change.MemberName);
-            let sourceMember = this.getSourceMember(key);
-            if (sourceMember) {
+            const sourceMember = (_a = this.getSourceMember(key)) !== null && _a !== void 0 ? _a : {
+                serverRevisionCounter: change.RevisionCounter,
+                lastRetrievedFromServer: null,
+                memberType: change.MemberType,
+                isNameObsolete: change.IsNameObsolete,
+            };
+            if (sourceMember.lastRetrievedFromServer) {
                 // We are already tracking this element so we'll update it
                 if (!quiet) {
-                    let msg = `Updating ${key} to RevisionCounter: ${change.RevisionCounter}`;
-                    if (sync) {
-                        msg += ' and syncing';
-                    }
-                    this.logger.debug(msg);
+                    this.logger.debug(`Updating ${key} to RevisionCounter: ${change.RevisionCounter}${sync ? ' and syncing' : ''}`);
                 }
                 sourceMember.serverRevisionCounter = change.RevisionCounter;
                 sourceMember.isNameObsolete = change.IsNameObsolete;
@@ -272,18 +283,8 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             else {
                 // We are not yet tracking it so we'll insert a new record
                 if (!quiet) {
-                    let msg = `Inserting ${key} with RevisionCounter: ${change.RevisionCounter}`;
-                    if (sync) {
-                        msg += ' and syncing';
-                    }
-                    this.logger.debug(msg);
+                    this.logger.debug(`Inserting ${key} with RevisionCounter: ${change.RevisionCounter}${sync ? ' and syncing' : ''}`);
                 }
-                sourceMember = {
-                    serverRevisionCounter: change.RevisionCounter,
-                    lastRetrievedFromServer: null,
-                    memberType: change.MemberType,
-                    isNameObsolete: change.IsNameObsolete,
-                };
             }
             // If we are syncing changes then we need to update the lastRetrievedFromServer field to
             // match the RevisionCounter from the SourceMember.
@@ -348,59 +349,59 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             this.logger.warn('Not polling for SourceMembers since SFDX_DISABLE_SOURCE_MEMBER_POLLING = true.');
             return;
         }
-        if (expectedMembers.length === 0) {
+        const outstandingSourceMembers = this.calculateExpectedSourceMembers(expectedMembers);
+        if (expectedMembers.length === 0 || outstandingSourceMembers.size === 0) {
             // Don't bother polling if we're not matching SourceMembers
             return;
         }
-        const outstandingSourceMembers = new Map();
-        // filter known Source tracking issues
-        expectedMembers
-            .filter((fileResponse) => {
-            var _a;
-            // unchanged files will never be in the sourceMembers.  Not really sure why SDR returns them.
-            return fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Unchanged &&
-                // if a listView is the only change inside an object, the object won't have a sourceMember change.  We won't wait for those to be found
-                fileResponse.type !== 'CustomObject' &&
-                // aura meta.xml aren't tracked as SourceMembers
-                !((_a = fileResponse.filePath) === null || _a === void 0 ? void 0 : _a.endsWith('.cmp-meta.xml'));
-        })
-            .map((member) => {
-            (0, metadataKeys_1.getMetadataKeyFromFileResponse)(member).map((key) => outstandingSourceMembers.set(key, member));
-        });
-        const originalSize = outstandingSourceMembers.size;
-        const fromRevision = this.getServerMaxRevision();
+        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
         const pollingTimeout = this.calculateTimeout(outstandingSourceMembers.size);
-        this.logger.debug(`Polling for ${outstandingSourceMembers.size} SourceMembers from revision ${fromRevision} with timeout of ${pollingTimeout}s`);
+        let highestRevisionSoFar = this.getServerMaxRevision();
         let pollAttempts = 0;
+        let consecutiveEmptyResults = 0;
+        let someResultsReturned = false;
+        this.logger.debug(`Polling for ${outstandingSourceMembers.size} SourceMembers from revision ${highestRevisionSoFar} with timeout of ${pollingTimeout.seconds}s`);
         const poll = async () => {
             pollAttempts += 1; // not used to stop polling, but for debug logging
-            // get sourceMembers since maxRevision
+            // get sourceMembers added since our most recent max
+            // use the "new highest" revision from the last poll that returned results
             const queriedMembers = await this.querySourceMembersFrom({
-                fromRevision,
+                fromRevision: highestRevisionSoFar,
                 quiet: pollAttempts !== 1,
                 useCache: false,
             });
-            // remove anything returned from the query list
-            queriedMembers.map((member) => {
-                outstandingSourceMembers.delete((0, functions_1.getMetadataKey)(member.MemberType, member.MemberName));
-            });
-            this.logger.debug(`[${pollAttempts}] Found ${originalSize - outstandingSourceMembers.size} of ${originalSize} SourceMembers`);
+            if (queriedMembers.length) {
+                queriedMembers.map((member) => {
+                    // remove anything returned from the query list
+                    outstandingSourceMembers.delete((0, functions_1.getMetadataKey)(member.MemberType, member.MemberName));
+                    highestRevisionSoFar = Math.max(highestRevisionSoFar, member.RevisionCounter);
+                });
+                consecutiveEmptyResults = 0;
+                // flips on the first batch of results
+                someResultsReturned = true;
+            }
+            else {
+                consecutiveEmptyResults++;
+            }
+            this.logger.debug(`[${pollAttempts}] Found ${originalOutstandingSize - outstandingSourceMembers.size} of ${originalOutstandingSize} expected SourceMembers`);
             // update but don't sync
             await this.trackSourceMembers(queriedMembers, false);
             // exit if all have returned
             if (outstandingSourceMembers.size === 0) {
                 return;
             }
-            if (outstandingSourceMembers.size < 20) {
-                this.logger.debug(outstandingSourceMembers.size < 20
-                    ? `Still looking for SourceMembers: ${Array.from(outstandingSourceMembers.keys()).join(',')}`
-                    : `Still looking for ${outstandingSourceMembers.size} Source Members`);
+            if (someResultsReturned && consecutiveEmptyResults >= CONSECUTIVE_EMPTY_POLLING_RESULT_LIMIT) {
+                throw new ts_retry_promise_1.NotRetryableError(`Polling found no results for ${consecutiveEmptyResults} consecutive attempts`);
             }
+            this.logger.debug(outstandingSourceMembers.size < 20
+                ? `Still looking for SourceMembers: ${Array.from(outstandingSourceMembers.keys()).join(',')}`
+                : `Still looking for ${outstandingSourceMembers.size} Source Members`);
             throw new Error();
         };
         const pollingFunction = (0, ts_retry_promise_1.retryDecorator)(poll, {
-            timeout: pollingTimeout * 1000,
-            delay: 1000,
+            timeout: pollingTimeout.milliseconds,
+            delay: POLLING_DELAY_MS,
             retries: 'INFINITELY',
         });
         try {
@@ -408,27 +409,71 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             this.logger.debug(`Retrieved all SourceMember data after ${pollAttempts} attempts`);
         }
         catch {
-            this.logger.warn(`Polling for SourceMembers timed out after ${pollAttempts} attempts`);
+            this.logger.warn(`Polling for SourceMembers timed out after ${pollAttempts} attempts (last ${consecutiveEmptyResults} were empty) )`);
             if (outstandingSourceMembers.size < 51) {
                 this.logger.debug(`Could not find ${outstandingSourceMembers.size} SourceMembers: ${Array.from(outstandingSourceMembers).join(',')}`);
             }
             else {
                 this.logger.debug(`Could not find SourceMembers for ${outstandingSourceMembers.size} components`);
             }
+            void core_1.Lifecycle.getInstance().emitTelemetry({
+                eventName: 'sourceMemberPollingTimeout',
+                library: 'SourceTracking',
+                timeoutSeconds: pollingTimeout.seconds,
+                attempts: pollAttempts,
+                consecutiveEmptyResults,
+                missingQuantity: outstandingSourceMembers.size,
+                deploymentSize: expectedMembers.length,
+                types: [...new Set(Array.from(outstandingSourceMembers.values()).map((member) => member.type))]
+                    .sort()
+                    .join(','),
+                members: Array.from(outstandingSourceMembers.keys()).join(','),
+            });
         }
     }
+    calculateExpectedSourceMembers(expectedMembers) {
+        const outstandingSourceMembers = new Map();
+        // filter known Source tracking issues
+        expectedMembers
+            .filter((fileResponse) => {
+            var _a, _b, _c, _d, _e;
+            // unchanged files will never be in the sourceMembers.  Not really sure why SDR returns them.
+            return fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Unchanged &&
+                // if a listView is the only change inside an object, the object won't have a sourceMember change.  We won't wait for those to be found
+                // we don't know which email folder type might be there, so don't require either
+                // Portal doesn't support source tracking, according to the coverage report
+                !['CustomObject', 'EmailFolder', 'EmailTemplateFolder', 'StandardValueSet', 'Portal'].includes(fileResponse.type) &&
+                // don't wait on workflow children
+                !fileResponse.type.startsWith('Workflow') &&
+                // aura xml aren't tracked as SourceMembers
+                !((_a = fileResponse.filePath) === null || _a === void 0 ? void 0 : _a.endsWith('.cmp-meta.xml')) &&
+                !((_b = fileResponse.filePath) === null || _b === void 0 ? void 0 : _b.endsWith('.tokens-meta.xml')) &&
+                !((_c = fileResponse.filePath) === null || _c === void 0 ? void 0 : _c.endsWith('.evt-meta.xml')) &&
+                !((_d = fileResponse.filePath) === null || _d === void 0 ? void 0 : _d.endsWith('.app-meta.xml')) &&
+                !((_e = fileResponse.filePath) === null || _e === void 0 ? void 0 : _e.endsWith('.intf-meta.xml'));
+        })
+            .map((member) => {
+            (0, metadataKeys_1.getMetadataKeyFromFileResponse)(member)
+                // CustomObject could have been added by the key generator
+                // remove some individual members known to not work with tracking even when their type does
+                .filter((key) => !key.startsWith('CustomObject') && key !== 'Profile__Standard' && key !== 'CustomTab__standard-home')
+                .map((key) => outstandingSourceMembers.set(key, member));
+        });
+        return outstandingSourceMembers;
+    }
     calculateTimeout(memberCount) {
-        const overriddenTimeout = (0, kit_1.toNumber)(kit_1.env.getString('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT', '0'));
+        var _a;
+        const overriddenTimeout = (_a = kit_1.env.getNumber('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT', 0)) !== null && _a !== void 0 ? _a : 0;
         if (overriddenTimeout > 0) {
             this.logger.debug(`Overriding SourceMember polling timeout to ${overriddenTimeout}`);
-            return overriddenTimeout;
+            return kit_1.Duration.seconds(overriddenTimeout);
         }
         // Calculate a polling timeout for SourceMembers based on the number of
         // member names being polled plus a buffer of 5 seconds.  This will
         // wait 50s for each 1000 components, plus 5s.
         const pollingTimeout = Math.ceil(memberCount * 0.05) + 5;
         this.logger.debug(`Computed SourceMember polling timeout of ${pollingTimeout}s`);
-        return pollingTimeout;
+        return kit_1.Duration.seconds(pollingTimeout);
     }
     async querySourceMembersFrom({ fromRevision, quiet = false, useCache = true, } = {}) {
         const rev = fromRevision != null ? fromRevision : this.getServerMaxRevision();
@@ -460,7 +505,7 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             this.logger.debug(query);
         }
         try {
-            const results = await this.org.getConnection().tooling.autoFetchQuery(query);
+            const results = await this.org.getConnection().tooling.autoFetchQuery(query, { maxFetch: 50000 });
             return results.records;
         }
         catch (error) {
@@ -477,18 +522,14 @@ RemoteSourceTrackingService.remoteSourceTrackingServiceDictionary = {};
 const remoteChangeElementToChangeResult = (rce) => {
     return {
         ...rce,
-        ...(mappingsForSourceMemberTypesToMetadataType.has(rce.type)
+        ...(metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.has(rce.type)
             ? {
                 name: rce.name.split('/')[0],
-                type: mappingsForSourceMemberTypesToMetadataType.get(rce.type),
+                type: metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.get(rce.type),
             }
             : {}),
         origin: 'remote', // we know they're remote
     };
 };
 exports.remoteChangeElementToChangeResult = remoteChangeElementToChangeResult;
-const mappingsForSourceMemberTypesToMetadataType = new Map([
-    ['AuraDefinition', 'AuraDefinitionBundle'],
-    ['LightningComponentResource', 'LightningComponentBundle'],
-]);
 //# sourceMappingURL=remoteSourceTrackingService.js.map

package/lib/sourceTracking.js

@@ -18,6 +18,7 @@ const remoteSourceTrackingService_1 = require("./shared/remoteSourceTrackingServ
 const localShadowRepo_1 = require("./shared/localShadowRepo");
 const guards_1 = require("./shared/guards");
 const functions_1 = require("./shared/functions");
+const metadataKeys_1 = require("./shared/metadataKeys");
 /**
  * Manages source tracking files (remote and local)
  *
@@ -519,6 +520,9 @@ class SourceTracking extends kit_1.AsyncCreatable {
     }
     registrySupportsType(type) {
         try {
+            if (metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.has(type)) {
+                return true;
+            }
             // this must use getTypeByName because findType doesn't support addressable child types (ex: customField!)
             this.registry.getTypeByName(type);
             return true;
@@ -551,11 +555,16 @@ class SourceTracking extends kit_1.AsyncCreatable {
         const remoteChangesAsComponentSet = new source_deploy_retrieve_1.ComponentSet(remoteChangesAsMetadataMember);
         this.logger.debug(` the generated component set has ${remoteChangesAsComponentSet.size.toString()} items`);
         if (remoteChangesAsComponentSet.size < elements.length) {
+            // there *could* be something missing
+            // some types (ex: LWC) show up as multiple files in the remote changes, but only one in the component set
             // iterate the elements to see which ones didn't make it into the component set
-            throw new Error(`unable to generate complete component set for ${elements
-                .filter((element) => !remoteChangesAsComponentSet.has({ type: element === null || element === void 0 ? void 0 : element.type, fullName: element === null || element === void 0 ? void 0 : element.name }))
-                .map((element) => `${element.name} (${element.type})`)
-                .join(os_1.EOL)}`);
+            const missingComponents = elements.filter((element) => !remoteChangesAsComponentSet.has({ type: element === null || element === void 0 ? void 0 : element.type, fullName: element === null || element === void 0 ? void 0 : element.name }));
+            // Throw if anything was actually missing
+            if (missingComponents.length > 0) {
+                throw new Error(`unable to generate complete component set for ${elements
+                    .map((element) => `${element.name} (${element.type})`)
+                    .join(os_1.EOL)}`);
+            }
         }
         const matchingLocalSourceComponentsSet = source_deploy_retrieve_1.ComponentSet.fromSource({
             fsPaths: this.packagesDirs.map((dir) => dir.path),

package/messages/compatibility.json

@@ -1,5 +1,5 @@
 {
   "sourceTrackingFileVersionMismatch": "This project uses the %s version of source tracking files.",
   "clearSuggestion": "Clear the %s version of the tracking files by running '%s'",
-  "useOtherVersion": "Use the %s version of the command, '%s' to preserve the tracking files)"
+  "useOtherVersion": "Use the %s version of the command, '%s' to preserve the tracking files"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "0.5.2",
+  "version": "1.1.0",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "prune:dead": "ts-prune | grep -v 'source-deploy-retrieve' | grep -v 'index.ts'",
     "test": "sf-test",
     "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
-    "test:nuts:local": "mocha \"**/local*.nut.ts\" --slow 4500 --timeout 600000 --parallel"
+    "test:nuts:local": "mocha \"**/local/*.nut.ts\" --slow 4500 --timeout 600000 --parallel"
   },
   "keywords": [
     "force",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@salesforce/core": "^2.33.1",
     "@salesforce/kit": "^1.5.17",
-    "@salesforce/source-deploy-retrieve": "^5.8.2",
+    "@salesforce/source-deploy-retrieve": "^5.9.4",
     "isomorphic-git": "^1.9.2",
     "ts-retry-promise": "^0.6.0"
   },
@@ -66,7 +66,7 @@
     "eslint-config-salesforce-license": "^0.1.6",
     "eslint-config-salesforce-typescript": "^0.2.7",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsdoc": "^37.0.1",
     "eslint-plugin-prettier": "^3.4.0",
     "husky": "^7.0.4",