@salesforce/source-tracking 0.4.4 → 1.0.0

package/CHANGELOG.md

@@ -2,6 +2,50 @@
 
 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.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
+
+- path-scoped singleton ([de46db4](https://github.com/forcedotcom/source-tracking/commit/de46db4b08a3fe087a2931936655c75b3b7cc32c))
+
+### Bug Fixes
+
+- distributed .gitignore and loose pkgDir matching ([a148a36](https://github.com/forcedotcom/source-tracking/commit/a148a366739b6941f3f479b375147897103316bb))
+- remove singleton behavior for localShadowRepo ([887bb68](https://github.com/forcedotcom/source-tracking/commit/887bb684528df8df07fe9b4edf1bd2f4165fe3e2))
+
+### [0.5.1](https://github.com/forcedotcom/source-tracking/compare/v0.5.0...v0.5.1) (2021-12-03)
+
+### Bug Fixes
+
+- support addressable child types ([8251095](https://github.com/forcedotcom/source-tracking/commit/82510955ba8ffe4a2e7e5411973795da3671d01e))
+
+## [0.5.0](https://github.com/forcedotcom/source-tracking/compare/v0.4.4...v0.5.0) (2021-12-02)
+
+### ⚠ BREAKING CHANGES
+
+- mpd suport (array of componentSets for localChanges)
+
+### Features
+
+- delete bundle member but not the bundle ([fbb81f2](https://github.com/forcedotcom/source-tracking/commit/fbb81f25af4cb9e81e3bbee93a08b072318eca10))
+- delete bundle members instead of bundle ([0aedbd5](https://github.com/forcedotcom/source-tracking/commit/0aedbd56b3bf34ce9e344ec03bb258c9db2098aa))
+- mpd suport (array of componentSets for localChanges) ([dd072bb](https://github.com/forcedotcom/source-tracking/commit/dd072bb86450a2e071dca3aece3cba6a2339b05a))
+- trackingFiles handle deleted bundle members ([137cd39](https://github.com/forcedotcom/source-tracking/commit/137cd391f0ea8ae60b3351d7b3361ae97b890d45))
+
+### Bug Fixes
+
+- deploy by pkgDir groupings, not all ([7f1262e](https://github.com/forcedotcom/source-tracking/commit/7f1262e1d05a57d3094849d052376b13dd7a5ec7))
+- windows paths when pkgDir path has separators in it ([b0ab346](https://github.com/forcedotcom/source-tracking/commit/b0ab3468d9c54722f832fb7d27a84525d593d4f7))
+
 ### [0.4.4](https://github.com/forcedotcom/source-tracking/compare/v0.4.3...v0.4.4) (2021-12-01)
 
 ### Features

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018, Salesforce.com, Inc.
+Copyright (c) 2022, Salesforce.com, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

package/lib/shared/functions.d.ts

@@ -1,3 +1,10 @@
+import { SourceComponent } from '@salesforce/source-deploy-retrieve';
 import { RemoteChangeElement, ChangeResult } from './types';
 export declare const getMetadataKey: (metadataType: string, metadataName: string) => string;
 export declare const getKeyFromObject: (element: RemoteChangeElement | ChangeResult) => string;
+export declare const isBundle: (cmp: SourceComponent) => boolean;
+/**
+ * Verify that a filepath starts exactly with a complete parent path
+ * ex: '/foo/bar-extra/baz'.startsWith('foo/bar') would be true, but this function understands that they are not in the same folder
+ */
+export declare const pathIsInFolder: (filePath: string, folder: string) => boolean;

package/lib/shared/functions.js

@@ -6,7 +6,9 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKeyFromObject = exports.getMetadataKey = void 0;
+exports.pathIsInFolder = exports.isBundle = exports.getKeyFromObject = exports.getMetadataKey = void 0;
+const path_1 = require("path");
+const ts_types_1 = require("@salesforce/ts-types");
 const getMetadataKey = (metadataType, metadataName) => {
     return `${metadataType}__${metadataName}`;
 };
@@ -18,4 +20,21 @@ const getKeyFromObject = (element) => {
     throw new Error(`unable to complete key from ${JSON.stringify(element)}`);
 };
 exports.getKeyFromObject = getKeyFromObject;
+const isBundle = (cmp) => { var _a; return ((_a = cmp.type.strategies) === null || _a === void 0 ? void 0 : _a.adapter) === 'bundle'; };
+exports.isBundle = isBundle;
+/**
+ * Verify that a filepath starts exactly with a complete parent path
+ * ex: '/foo/bar-extra/baz'.startsWith('foo/bar') would be true, but this function understands that they are not in the same folder
+ */
+const pathIsInFolder = (filePath, folder) => {
+    const biggerStringParts = (0, path_1.normalize)(filePath).split(path_1.sep).filter(nonEmptyStringFilter);
+    return (0, path_1.normalize)(folder)
+        .split(path_1.sep)
+        .filter(nonEmptyStringFilter)
+        .every((part, index) => part === biggerStringParts[index]);
+};
+exports.pathIsInFolder = pathIsInFolder;
+const nonEmptyStringFilter = (value) => {
+    return (0, ts_types_1.isString)(value) && value.length > 0;
+};
 //# sourceMappingURL=functions.js.map

package/lib/shared/guards.d.ts

@@ -1,4 +1,3 @@
 import { SourceComponent, MetadataMember } from '@salesforce/source-deploy-retrieve';
-export declare const stringGuard: (input: string | undefined) => input is string;
 export declare const sourceComponentGuard: (input: SourceComponent | undefined) => input is SourceComponent;
 export declare const metadataMemberGuard: (input: MetadataMember | undefined) => input is MetadataMember;

package/lib/shared/guards.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.metadataMemberGuard = exports.sourceComponentGuard = exports.stringGuard = void 0;
+exports.metadataMemberGuard = exports.sourceComponentGuard = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -8,10 +8,6 @@ exports.metadataMemberGuard = exports.sourceComponentGuard = exports.stringGuard
  * 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 stringGuard = (input) => {
-    return typeof input === 'string';
-};
-exports.stringGuard = stringGuard;
 const sourceComponentGuard = (input) => {
     return input instanceof source_deploy_retrieve_1.SourceComponent;
 };

package/lib/shared/localShadowRepo.d.ts

@@ -11,12 +11,13 @@ interface CommitRequest {
     message?: string;
 }
 export declare class ShadowRepo {
-    private static instance;
+    private static instanceMap;
     gitDir: string;
     projectPath: string;
     private packageDirs;
     private status;
     private logger;
+    private gitIgnoreLocations;
     private constructor();
     static getInstance(options: ShadowRepoOptions): Promise<ShadowRepo>;
     init(): Promise<void>;
@@ -74,6 +75,7 @@ export declare class ShadowRepo {
      * @returns sha (string)
      */
     commitChanges({ deployedFiles, deletedFiles, message, }?: CommitRequest): Promise<string>;
+    private locateIgnoreFiles;
     private stashIgnoreFile;
     private unStashIgnoreFile;
 }

package/lib/shared/localShadowRepo.js

@@ -12,6 +12,7 @@ const path = require("path");
 const os = require("os");
 const core_1 = require("@salesforce/core");
 const git = require("isomorphic-git");
+const functions_1 = require("./functions");
 const gitIgnoreFileName = '.gitignore';
 const stashedGitIgnoreFileName = '.BAK.gitignore';
 /**
@@ -28,16 +29,19 @@ const HEAD = 1;
 const WORKDIR = 2;
 class ShadowRepo {
     constructor(options) {
+        this.gitIgnoreLocations = [];
         this.gitDir = getGitDir(options.orgId, options.projectPath);
         this.projectPath = options.projectPath;
         this.packageDirs = options.packageDirs;
     }
+    // think of singleton behavior but unique to the projectPath
     static async getInstance(options) {
-        if (!ShadowRepo.instance) {
-            ShadowRepo.instance = new ShadowRepo(options);
-            await ShadowRepo.instance.init();
+        if (!ShadowRepo.instanceMap.has(options.projectPath)) {
+            const newInstance = new ShadowRepo(options);
+            await newInstance.init();
+            ShadowRepo.instanceMap.set(options.projectPath, newInstance);
         }
-        return ShadowRepo.instance;
+        return ShadowRepo.instanceMap.get(options.projectPath);
     }
     async init() {
         this.logger = await core_1.Logger.child('ShadowRepo');
@@ -54,6 +58,7 @@ 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
@@ -81,18 +86,31 @@ class ShadowRepo {
     async getStatus(noCache = false) {
         if (!this.status || noCache) {
             try {
+                // only ask about OS once but use twice
+                const isWindows = os.type() === 'Windows_NT';
                 await this.stashIgnoreFile();
+                const filepaths = isWindows
+                    ? // iso-git uses posix paths, but packageDirs has already normalized them so we need to convert if windows
+                        this.packageDirs.map((dir) => dir.path.split(path.sep).join(path.posix.sep))
+                    : this.packageDirs.map((dir) => dir.path);
                 // status hasn't been initalized yet
                 this.status = await git.statusMatrix({
                     fs: core_1.fs,
                     dir: this.projectPath,
                     gitdir: this.gitDir,
-                    filepaths: this.packageDirs.map((dir) => dir.path),
-                    // filter out hidden files and __tests__ patterns, regardless of gitignore
-                    filter: (f) => !f.includes(`${path.sep}.`) && !f.includes('__tests__'),
+                    filepaths,
+                    filter: (f) => 
+                    // no hidden files
+                    !f.includes(`${path.sep}.`) &&
+                        // no lwc tests
+                        !f.includes('__tests__') &&
+                        // no gitignore files
+                        ![gitIgnoreFileName, stashedGitIgnoreFileName].includes(path.basename(f)) &&
+                        // isogit uses `startsWith` for filepaths so it's possible to get a false positive
+                        filepaths.some((pkgDir) => (0, functions_1.pathIsInFolder)(f, pkgDir)),
                 });
                 // isomorphic-git stores things in unix-style tree.  Convert to windows-style if necessary
-                if (os.type() === 'Windows_NT') {
+                if (isWindows) {
                     this.status = this.status.map((row) => [path.normalize(row[FILE]), row[HEAD], row[WORKDIR], row[3]]);
                 }
             }
@@ -190,20 +208,31 @@ class ShadowRepo {
             await this.unStashIgnoreFile();
         }
     }
+    async locateIgnoreFiles() {
+        // set the gitIgnoreLocations so we only have to do it once
+        this.gitIgnoreLocations = (await git.walk({
+            fs: core_1.fs,
+            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))))
+            .map((ignoreFile) => path.join(this.projectPath, ignoreFile));
+    }
     async stashIgnoreFile() {
-        const originalLocation = path.join(this.projectPath, gitIgnoreFileName);
-        // another process may have already stashed the file
-        if (core_1.fs.existsSync(originalLocation)) {
-            await core_1.fs.promises.rename(originalLocation, path.join(this.projectPath, stashedGitIgnoreFileName));
-        }
+        // allSettled allows them to fail (example, the file wasn't where it was expected).
+        await Promise.allSettled(this.gitIgnoreLocations.map((originalLocation) => core_1.fs.promises.rename(originalLocation, originalLocation.replace(gitIgnoreFileName, stashedGitIgnoreFileName))));
     }
     async unStashIgnoreFile() {
-        const stashedLocation = path.join(this.projectPath, stashedGitIgnoreFileName);
-        // another process may have already un-stashed the file
-        if (core_1.fs.existsSync(stashedLocation)) {
-            await core_1.fs.promises.rename(stashedLocation, path.join(this.projectPath, gitIgnoreFileName));
-        }
+        // allSettled allows them to fail (example, the file wasn't where it was expected).
+        await Promise.allSettled(this.gitIgnoreLocations.map((originalLocation) => core_1.fs.promises.rename(originalLocation.replace(gitIgnoreFileName, stashedGitIgnoreFileName), originalLocation)));
     }
 }
 exports.ShadowRepo = ShadowRepo;
+ShadowRepo.instanceMap = new Map();
 //# sourceMappingURL=localShadowRepo.js.map

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,6 +1,6 @@
 "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.
@@ -8,6 +8,7 @@ exports.getMetadataKeyFromFileResponse = void 0;
  * 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 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
 const pathAfterFullName = (fileResponse) => fileResponse && fileResponse.filePath
@@ -38,8 +39,19 @@ 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)));
+    }
+    // standard key for everything else
     return [(0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName)];
 };
 exports.getMetadataKeyFromFileResponse = getMetadataKeyFromFileResponse;
+exports.mappingsForSourceMemberTypesToMetadataType = new Map([
+    ['AuraDefinition', 'AuraDefinitionBundle'],
+    ['LightningComponentResource', 'LightningComponentBundle'],
+]);
 //# sourceMappingURL=metadataKeys.js.map

package/lib/shared/remoteSourceTrackingService.js

@@ -477,18 +477,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.d.ts

@@ -27,7 +27,12 @@ export declare class SourceTracking extends AsyncCreatable {
     private forceIgnore;
     constructor(options: SourceTrackingOptions);
     init(): Promise<void>;
-    localChangesAsComponentSet(): Promise<ComponentSet>;
+    /**
+     *
+     * @param byPackageDir if true, returns one ComponentSet for each packageDir with changes
+     * @returns ComponentSet[]
+     */
+    localChangesAsComponentSet(byPackageDir?: boolean): Promise<ComponentSet[]>;
     /**
      * Does most of the work for the force:source:status command.
      * Outputs need a bit of massage since this aims to provide nice json.
@@ -102,7 +107,7 @@ export declare class SourceTracking extends AsyncCreatable {
      * uses SDR to translate remote metadata records into local file paths (which only typically have the filename).
      *
      * @input elements: ChangeResult[]
-     * @input excludeUnresolvables: boolean Filter out components where you can't get the name and type (that is, it's probably not a valid source component)
+     * @input excludeUnresolvable: boolean Filter out components where you can't get the name and type (that is, it's probably not a valid source component)
      * @input resolveDeleted: constructs a virtualTree instead of the actual filesystem--useful when the files no longer exist
      * @input useFsForceIgnore: (default behavior) use forceIgnore from the filesystem.  If false, uses the base forceIgnore from SDR
      */

package/lib/sourceTracking.js

@@ -8,7 +8,7 @@ exports.SourceTracking = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const fs = require("fs");
-const path = require("path");
+const path_1 = require("path");
 const os_1 = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
@@ -16,9 +16,9 @@ const ts_types_1 = require("@salesforce/ts-types");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const remoteSourceTrackingService_1 = require("./shared/remoteSourceTrackingService");
 const localShadowRepo_1 = require("./shared/localShadowRepo");
-const filenamesToVirtualTree_1 = require("./shared/filenamesToVirtualTree");
 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)
  *
@@ -39,43 +39,82 @@ class SourceTracking extends kit_1.AsyncCreatable {
     async init() {
         // reserved for future use
     }
-    async localChangesAsComponentSet() {
+    /**
+     *
+     * @param byPackageDir if true, returns one ComponentSet for each packageDir with changes
+     * @returns ComponentSet[]
+     */
+    async localChangesAsComponentSet(byPackageDir = false) {
+        var _a;
         const [projectConfig] = await Promise.all([this.project.resolveProjectConfig(), this.ensureLocalTracking()]);
+        (_a = this.forceIgnore) !== null && _a !== void 0 ? _a : (this.forceIgnore = source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().name));
         const sourceApiVersion = (0, ts_types_1.getString)(projectConfig, 'sourceApiVersion');
-        const componentSet = new source_deploy_retrieve_1.ComponentSet();
-        if (sourceApiVersion) {
-            componentSet.sourceApiVersion = sourceApiVersion;
-        }
-        const [nonDeletes, deletes] = await Promise.all([
-            this.localRepo.getNonDeleteFilenames(),
-            this.localRepo.getDeleteFilenames(),
-        ]);
-        if (nonDeletes.length === 0 && deletes.length === 0) {
-            this.logger.debug('no local changes found in source tracking files');
-            return componentSet;
-        }
         // optimistic resolution...some files may not be possible to resolve
         const resolverForNonDeletes = new source_deploy_retrieve_1.MetadataResolver();
         // we need virtual components for the deletes.
         // TODO: could we use the same for the non-deletes?
-        const resolverForDeletes = new source_deploy_retrieve_1.MetadataResolver(undefined, (0, filenamesToVirtualTree_1.filenamesToVirtualTree)(deletes));
-        nonDeletes
-            .flatMap((filename) => {
-            try {
-                return resolverForNonDeletes.getComponentsFromPath(filename);
-            }
-            catch (e) {
-                this.logger.warn(`unable to resolve ${filename}`);
-                return undefined;
+        const [allNonDeletes, allDeletes] = (await Promise.all([this.localRepo.getNonDeleteFilenames(), this.localRepo.getDeleteFilenames()]))
+            // remove the forceIgnored items early
+            .map((group) => group.filter((item) => this.forceIgnore.accepts(item)));
+        // it'll be easier to filter filenames and work with smaller component sets than to filter SourceComponents
+        const groupings = (byPackageDir
+            ? this.packagesDirs.map((pkgDir) => ({
+                path: pkgDir.name,
+                nonDeletes: allNonDeletes.filter((f) => (0, functions_1.pathIsInFolder)(f, pkgDir.name)),
+                deletes: allDeletes.filter((f) => (0, functions_1.pathIsInFolder)(f, pkgDir.name)),
+            }))
+            : [
+                {
+                    nonDeletes: allNonDeletes,
+                    deletes: allDeletes,
+                    path: this.packagesDirs.map((dir) => dir.name).join(';'),
+                },
+            ]).filter((group) => group.deletes.length || group.nonDeletes.length);
+        this.logger.debug(`will build array of ${groupings.length} componentSet(s)`);
+        return groupings
+            .map((grouping) => {
+            this.logger.debug(`building componentSet for ${grouping.path} (deletes: ${grouping.deletes.length} nonDeletes: ${grouping.nonDeletes.length})`);
+            const componentSet = new source_deploy_retrieve_1.ComponentSet();
+            if (sourceApiVersion) {
+                componentSet.sourceApiVersion = sourceApiVersion;
             }
+            const resolverForDeletes = new source_deploy_retrieve_1.MetadataResolver(undefined, source_deploy_retrieve_1.VirtualTreeContainer.fromFilePaths(grouping.deletes));
+            grouping.deletes
+                .flatMap((filename) => resolverForDeletes.getComponentsFromPath(filename))
+                .filter(guards_1.sourceComponentGuard)
+                .map((component) => {
+                // if the component is a file in a bundle type AND there are files from the bundle that are not deleted, set the bundle for deploy, not for delete
+                if ((0, functions_1.isBundle)(component) && component.content && fs.existsSync(component.content)) {
+                    // all bundle types have a directory name
+                    try {
+                        resolverForNonDeletes
+                            .getComponentsFromPath((0, path_1.resolve)(component.content))
+                            .filter(guards_1.sourceComponentGuard)
+                            .map((nonDeletedComponent) => componentSet.add(nonDeletedComponent));
+                    }
+                    catch (e) {
+                        this.logger.warn(`unable to find component at ${component.content}.  That's ok if it was supposed to be deleted`);
+                    }
+                }
+                else {
+                    componentSet.add(component, source_deploy_retrieve_1.DestructiveChangesType.POST);
+                }
+            });
+            grouping.nonDeletes
+                .flatMap((filename) => {
+                try {
+                    return resolverForNonDeletes.getComponentsFromPath((0, path_1.resolve)(filename));
+                }
+                catch (e) {
+                    this.logger.warn(`unable to resolve ${filename}`);
+                    return undefined;
+                }
+            })
+                .filter(guards_1.sourceComponentGuard)
+                .map((component) => componentSet.add(component));
+            return componentSet;
         })
-            .filter(guards_1.sourceComponentGuard)
-            .map((component) => componentSet.add(component));
-        deletes
-            .flatMap((filename) => resolverForDeletes.getComponentsFromPath(filename))
-            .filter(guards_1.sourceComponentGuard)
-            .map((component) => componentSet.add(component, source_deploy_retrieve_1.DestructiveChangesType.POST));
-        return componentSet;
+            .filter((componentSet) => componentSet.size > 0);
     }
     /**
      * Does most of the work for the force:source:status command.
@@ -100,7 +139,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
         }
         if (local && remote) {
             // keys like ApexClass__MyClass.cls
-            const conflictFiles = (await this.getConflicts()).flatMap((conflict) => conflict.filenames).filter(guards_1.stringGuard);
+            const conflictFiles = (await this.getConflicts()).flatMap((conflict) => conflict.filenames).filter(ts_types_1.isString);
             results = results.map((row) => ({
                 ...row,
                 conflict: !!row.filePath && conflictFiles.includes(row.filePath),
@@ -129,7 +168,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
             }
             if (options.format === 'SourceComponent') {
                 const resolver = options.state === 'delete'
-                    ? new source_deploy_retrieve_1.MetadataResolver(undefined, (0, filenamesToVirtualTree_1.filenamesToVirtualTree)(filenames))
+                    ? new source_deploy_retrieve_1.MetadataResolver(undefined, source_deploy_retrieve_1.VirtualTreeContainer.fromFilePaths(filenames))
                     : new source_deploy_retrieve_1.MetadataResolver();
                 return filenames
                     .flatMap((filename) => {
@@ -224,9 +263,28 @@ class SourceTracking extends kit_1.AsyncCreatable {
     async updateLocalTracking(options) {
         var _a, _b;
         await this.ensureLocalTracking();
+        // relative paths make smaller trees AND isogit wants them relative
+        const relativeOptions = {
+            files: ((_a = options.files) !== null && _a !== void 0 ? _a : []).map((file) => this.ensureRelative(file)),
+            deletedFiles: ((_b = options.deletedFiles) !== null && _b !== void 0 ? _b : []).map((file) => this.ensureRelative(file)),
+        };
+        // plot twist: if you delete a member of a bundle (ex: lwc/foo/foo.css) and push, it'll not be in the fileResponses (deployedFiles) or deletedFiles
+        // what got deleted?  Any local changes NOT in the fileResponses but part of a successfully deployed bundle
+        const deployedFilesAsVirtualComponentSet = source_deploy_retrieve_1.ComponentSet.fromSource({
+            // resolve from highest possible level.  TODO: can we use [.]
+            fsPaths: relativeOptions.files.length ? [relativeOptions.files[0].split(path_1.sep)[0]] : [],
+            tree: source_deploy_retrieve_1.VirtualTreeContainer.fromFilePaths(relativeOptions.files),
+        });
+        // these are top-level bundle paths like lwc/foo
+        const bundlesWithDeletedFiles = (await this.getChanges({ origin: 'local', state: 'delete', format: 'SourceComponent' }))
+            .filter(functions_1.isBundle)
+            .filter((cmp) => deployedFilesAsVirtualComponentSet.has({ type: cmp.type, fullName: cmp.fullName }))
+            .map((cmp) => cmp.content)
+            .filter(ts_types_1.isString);
         await this.localRepo.commitChanges({
-            deployedFiles: (_a = options.files) === null || _a === void 0 ? void 0 : _a.map((file) => this.ensureRelative(file)),
-            deletedFiles: (_b = options.deletedFiles) === null || _b === void 0 ? void 0 : _b.map((file) => this.ensureRelative(file)),
+            deployedFiles: relativeOptions.files,
+            deletedFiles: relativeOptions.deletedFiles.concat((await this.localRepo.getDeleteFilenames()).filter((deployedFile) => bundlesWithDeletedFiles.some((bundlePath) => (0, functions_1.pathIsInFolder)(deployedFile, bundlePath)) &&
+                !relativeOptions.files.includes(deployedFile))),
         });
     }
     /**
@@ -253,7 +311,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
         }
         this.localRepo = await localShadowRepo_1.ShadowRepo.getInstance({
             orgId: this.orgId,
-            projectPath: this.projectPath,
+            projectPath: (0, path_1.normalize)(this.projectPath),
             packageDirs: this.packagesDirs,
         });
         // loads the status from file so that it's cached
@@ -377,7 +435,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
      * uses SDR to translate remote metadata records into local file paths (which only typically have the filename).
      *
      * @input elements: ChangeResult[]
-     * @input excludeUnresolvables: boolean Filter out components where you can't get the name and type (that is, it's probably not a valid source component)
+     * @input excludeUnresolvable: boolean Filter out components where you can't get the name and type (that is, it's probably not a valid source component)
      * @input resolveDeleted: constructs a virtualTree instead of the actual filesystem--useful when the files no longer exist
      * @input useFsForceIgnore: (default behavior) use forceIgnore from the filesystem.  If false, uses the base forceIgnore from SDR
      */
@@ -386,9 +444,9 @@ class SourceTracking extends kit_1.AsyncCreatable {
             return [];
         }
         this.logger.debug(`populateTypesAndNames for ${elements.length} change elements`);
-        const filenames = elements.flatMap((element) => element.filenames).filter(guards_1.stringGuard);
+        const filenames = elements.flatMap((element) => element.filenames).filter(ts_types_1.isString);
         // component set generated from the filenames on all local changes
-        const resolver = new source_deploy_retrieve_1.MetadataResolver(undefined, resolveDeleted ? (0, filenamesToVirtualTree_1.filenamesToVirtualTree)(filenames) : undefined, useFsForceIgnore);
+        const resolver = new source_deploy_retrieve_1.MetadataResolver(undefined, resolveDeleted ? source_deploy_retrieve_1.VirtualTreeContainer.fromFilePaths(filenames) : undefined, useFsForceIgnore);
         const sourceComponents = filenames
             .flatMap((filename) => {
             try {
@@ -415,9 +473,9 @@ class SourceTracking extends kit_1.AsyncCreatable {
             if ((matchingComponent === null || matchingComponent === void 0 ? void 0 : matchingComponent.fullName) && (matchingComponent === null || matchingComponent === void 0 ? void 0 : matchingComponent.type.name)) {
                 const filenamesFromMatchingComponent = [matchingComponent.xml, ...matchingComponent.walkContent()];
                 // Set the ignored status at the component level so it can apply to all its files, some of which may not match the ignoreFile (ex: ApexClass)
-                this.forceIgnore = (_a = this.forceIgnore) !== null && _a !== void 0 ? _a : source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path);
+                (_a = this.forceIgnore) !== null && _a !== void 0 ? _a : (this.forceIgnore = source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path));
                 const ignored = filenamesFromMatchingComponent
-                    .filter(guards_1.stringGuard)
+                    .filter(ts_types_1.isString)
                     .filter((filename) => !filename.includes('__tests__'))
                     .some((filename) => this.forceIgnore.denies(filename));
                 filenamesFromMatchingComponent.map((filename) => {
@@ -461,11 +519,18 @@ class SourceTracking extends kit_1.AsyncCreatable {
         return results;
     }
     registrySupportsType(type) {
-        if (this.registry.findType((metadataType) => metadataType.name === 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;
         }
-        process.emitWarning(`Unable to find type ${type} in registry`);
-        return false;
+        catch (e) {
+            process.emitWarning(`Unable to find type ${type} in registry`);
+            return false;
+        }
     }
     /**
      * uses SDR to translate remote metadata records into local file paths
@@ -490,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),
@@ -522,7 +592,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
         return Array.from(elementMap.values());
     }
     ensureRelative(filePath) {
-        return path.isAbsolute(filePath) ? path.relative(this.projectPath, filePath) : filePath;
+        return (0, path_1.isAbsolute)(filePath) ? (0, path_1.relative)(this.projectPath, filePath) : filePath;
     }
     async getLocalChangesAsFilenames(state) {
         if (state === 'modify') {
@@ -564,7 +634,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
     async remoteChangesToOutputRows(input) {
         var _a, _b, _c, _d;
         this.logger.debug('converting ChangeResult to a row', input);
-        this.forceIgnore = (_a = this.forceIgnore) !== null && _a !== void 0 ? _a : source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path);
+        (_a = this.forceIgnore) !== null && _a !== void 0 ? _a : (this.forceIgnore = source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path));
         const baseObject = {
             type: (_b = input.type) !== null && _b !== void 0 ? _b : '',
             origin: input.origin,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "0.4.4",
+  "version": "1.0.0",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -24,7 +24,8 @@
     "pretest": "sf-compile-test",
     "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": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
+    "test:nuts:local": "mocha \"**/local/*.nut.ts\" --slow 4500 --timeout 600000 --parallel"
   },
   "keywords": [
     "force",
@@ -42,16 +43,16 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@salesforce/core": "^2.31.0",
+    "@salesforce/core": "^2.33.1",
     "@salesforce/kit": "^1.5.17",
-    "@salesforce/source-deploy-retrieve": "^5.8.0",
+    "@salesforce/source-deploy-retrieve": "^5.9.3",
     "isomorphic-git": "^1.9.2",
     "ts-retry-promise": "^0.6.0"
   },
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^1.3.7",
-    "@salesforce/dev-config": "^2.1.2",
-    "@salesforce/dev-scripts": "^1.0.0",
+    "@salesforce/dev-config": "^3.0.0",
+    "@salesforce/dev-scripts": "^2.0.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.3.21",
     "@types/shelljs": "^0.8.9",
@@ -65,11 +66,11 @@
     "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",
-    "mocha": "^9.0.3",
+    "mocha": "^9.1.3",
     "nyc": "^15.1.0",
     "prettier": "^2.3.2",
     "pretty-quick": "^3.1.1",
@@ -80,33 +81,6 @@
     "ts-prune": "^0.10.0",
     "typescript": "^4.4.4"
   },
-  "oclif": {
-    "commands": "./lib/commands",
-    "bin": "sfdx",
-    "devPlugins": [
-      "@oclif/plugin-help",
-      "@oclif/plugin-command-snapshot",
-      "@salesforce/plugin-command-reference"
-    ],
-    "topics": {
-      "force": {
-        "external": true,
-        "subtopics": {
-          "user": {
-            "description": "commands that perform user-related admin tasks",
-            "subtopics": {
-              "permset": {
-                "description": "Use to interact with permission sets assigned to a user"
-              },
-              "password": {
-                "description": "Used to generate and set passwords for users"
-              }
-            }
-          }
-        }
-      }
-    }
-  },
   "config": {
     "commitizen": {
       "path": "cz-conventional-changelog"

package/lib/shared/filenamesToVirtualTree.d.ts

@@ -1,10 +0,0 @@
-import { VirtualTreeContainer } from '@salesforce/source-deploy-retrieve';
-/**
- * @deprecated this is moving to SDR
- * Designed for recreating virtual files from deleted files where the only information we have is the file's former location
- * Any use of MetadataResolver was trying to access the non-existent files and throwing
- *
- * @param filenames full paths to files
- * @returns VirtualTreeContainer to use with MetadataResolver
- */
-export declare const filenamesToVirtualTree: (filenames: string[]) => VirtualTreeContainer;

package/lib/shared/filenamesToVirtualTree.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.filenamesToVirtualTree = 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 source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
-/**
- * @deprecated this is moving to SDR
- * Designed for recreating virtual files from deleted files where the only information we have is the file's former location
- * Any use of MetadataResolver was trying to access the non-existent files and throwing
- *
- * @param filenames full paths to files
- * @returns VirtualTreeContainer to use with MetadataResolver
- */
-const filenamesToVirtualTree = (filenames) => {
-    // a map to reduce array iterations
-    const virtualDirectoryByFullPath = new Map();
-    filenames.map((filename) => {
-        var _a;
-        const splits = filename.split(path.sep);
-        for (let i = 0; i < splits.length - 1; i++) {
-            const fullPathSoFar = splits.slice(0, i + 1).join(path.sep);
-            const existing = virtualDirectoryByFullPath.get(fullPathSoFar);
-            virtualDirectoryByFullPath.set(fullPathSoFar, {
-                dirPath: fullPathSoFar,
-                // only add to children if we don't already have it
-                children: Array.from(new Set((_a = existing === null || existing === void 0 ? void 0 : existing.children) !== null && _a !== void 0 ? _a : []).add(splits[i + 1])),
-            });
-        }
-    });
-    return new source_deploy_retrieve_1.VirtualTreeContainer(Array.from(virtualDirectoryByFullPath.values()));
-};
-exports.filenamesToVirtualTree = filenamesToVirtualTree;
-//# sourceMappingURL=filenamesToVirtualTree.js.map

package/oclif.manifest.json

@@ -1 +0,0 @@
-{"version":"0.4.4","commands":{}}