@salesforce/source-tracking 1.1.6 → 1.1.7

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.7](https://github.com/forcedotcom/source-tracking/compare/v1.1.6...v1.1.7) (2022-03-16)
+
+### Bug Fixes
+
+- use isogit multiple add ([0845df8](https://github.com/forcedotcom/source-tracking/commit/0845df81845f07bd2bece444118497b2ef72e7aa))
+
 ### [1.1.6](https://github.com/forcedotcom/source-tracking/compare/v1.1.5...v1.1.6) (2022-03-14)
 
 ### [1.1.5](https://github.com/forcedotcom/source-tracking/compare/v1.1.4...v1.1.5) (2022-03-11)

package/lib/shared/localShadowRepo.d.ts

@@ -9,6 +9,7 @@ interface CommitRequest {
     deployedFiles?: string[];
     deletedFiles?: string[];
     message?: string;
+    needsUpdatedStatus?: boolean;
 }
 export declare class ShadowRepo {
     private static instanceMap;
@@ -74,7 +75,7 @@ export declare class ShadowRepo {
      *
      * @returns sha (string)
      */
-    commitChanges({ deployedFiles, deletedFiles, message, }?: CommitRequest): Promise<string>;
+    commitChanges({ deployedFiles, deletedFiles, message, needsUpdatedStatus, }?: CommitRequest): Promise<string>;
     private locateIgnoreFiles;
     private stashIgnoreFile;
     private unStashIgnoreFile;

package/lib/shared/localShadowRepo.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShadowRepo = void 0;
 const path = require("path");
 const os = require("os");
+const fs = require("fs");
 const core_1 = require("@salesforce/core");
 const git = require("isomorphic-git");
 const functions_1 = require("./functions");
@@ -46,7 +47,7 @@ class ShadowRepo {
     async init() {
         this.logger = await core_1.Logger.child('ShadowRepo');
         // initialize the shadow repo if it doesn't exist
-        if (!core_1.fs.existsSync(this.gitDir)) {
+        if (!fs.existsSync(this.gitDir)) {
             this.logger.debug('initializing git repo');
             await this.gitInit();
         }
@@ -57,8 +58,8 @@ 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 fs.promises.mkdir(this.gitDir, { recursive: true });
+        await git.init({ fs, dir: this.projectPath, gitdir: this.gitDir, defaultBranch: 'main' });
     }
     /**
      * Delete the local tracking files
@@ -66,12 +67,12 @@ class ShadowRepo {
      * @returns the deleted directory
      */
     async delete() {
-        if (typeof core_1.fs.promises.rm === 'function') {
-            await core_1.fs.promises.rm(this.gitDir, { recursive: true, force: true });
+        if (typeof fs.promises.rm === 'function') {
+            await fs.promises.rm(this.gitDir, { recursive: true, force: true });
         }
         else {
             // when node 12 support is over, switch to promise version
-            core_1.fs.rmdirSync(this.gitDir, { recursive: true });
+            fs.rmdirSync(this.gitDir, { recursive: true });
         }
         return this.gitDir;
     }
@@ -95,7 +96,7 @@ class ShadowRepo {
                     : this.packageDirs.map((dir) => dir.path);
                 // status hasn't been initalized yet
                 this.status = await git.statusMatrix({
-                    fs: core_1.fs,
+                    fs,
                     dir: this.projectPath,
                     gitdir: this.gitDir,
                     filepaths,
@@ -173,37 +174,36 @@ class ShadowRepo {
      *
      * @returns sha (string)
      */
-    async commitChanges({ deployedFiles = [], deletedFiles = [], message = 'sfdx source tracking', } = {}) {
+    async commitChanges({ deployedFiles = [], deletedFiles = [], message = 'sfdx source tracking', needsUpdatedStatus = true, } = {}) {
         // if no files are specified, commit all changes
         if (deployedFiles.length === 0 && deletedFiles.length === 0) {
             // this is valid, might not be an error
             return 'no files to commit';
         }
-        this.logger.debug('changes are', deployedFiles);
-        this.logger.debug('deletes are', deletedFiles);
         await this.stashIgnoreFile();
         // these are stored in posix/style/path format.  We have to convert inbound stuff from windows
         if (os.type() === 'Windows_NT') {
             deployedFiles = deployedFiles.map((filepath) => path.normalize(filepath).split(path.sep).join(path.posix.sep));
             deletedFiles = deletedFiles.map((filepath) => path.normalize(filepath).split(path.sep).join(path.posix.sep));
         }
-        const uniqueDeployedFiles = Array.from(new Set(deployedFiles));
-        const uniqueDeletedFiles = Array.from(new Set(deletedFiles));
         try {
-            // stage changes
-            await Promise.all([
-                ...uniqueDeployedFiles.map((filepath) => git.add({ fs: core_1.fs, dir: this.projectPath, gitdir: this.gitDir, filepath })),
-                ...uniqueDeletedFiles.map((filepath) => git.remove({ fs: core_1.fs, dir: this.projectPath, gitdir: this.gitDir, filepath })),
-            ]);
+            if (deployedFiles.length) {
+                await git.add({ fs, dir: this.projectPath, gitdir: this.gitDir, filepath: [...new Set(deployedFiles)] });
+            }
+            for (const filepath of [...new Set(deletedFiles)]) {
+                await git.remove({ fs, dir: this.projectPath, gitdir: this.gitDir, filepath });
+            }
             const sha = await git.commit({
-                fs: core_1.fs,
+                fs,
                 dir: this.projectPath,
                 gitdir: this.gitDir,
                 message,
                 author: { name: 'sfdx source tracking' },
             });
             // status changed as a result of the commit.  This prevents users from having to run getStatus(true) to avoid cache
-            await this.getStatus(true);
+            if (needsUpdatedStatus) {
+                await this.getStatus(true);
+            }
             return sha;
         }
         finally {
@@ -213,7 +213,7 @@ class ShadowRepo {
     async locateIgnoreFiles() {
         // set the gitIgnoreLocations so we only have to do it once
         this.gitIgnoreLocations = (await git.walk({
-            fs: core_1.fs,
+            fs,
             dir: this.projectPath,
             gitdir: this.gitDir,
             trees: [git.WORKDIR()],
@@ -225,11 +225,11 @@ class ShadowRepo {
     }
     async stashIgnoreFile() {
         // 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))));
+        await Promise.allSettled(this.gitIgnoreLocations.map((originalLocation) => fs.promises.rename(originalLocation, originalLocation.replace(gitIgnoreFileName, stashedGitIgnoreFileName))));
     }
     async unStashIgnoreFile() {
         // 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)));
+        await Promise.allSettled(this.gitIgnoreLocations.map((originalLocation) => fs.promises.rename(originalLocation.replace(gitIgnoreFileName, stashedGitIgnoreFileName), originalLocation)));
     }
 }
 exports.ShadowRepo = ShadowRepo;

package/lib/shared/remoteSourceTrackingService.js

@@ -11,6 +11,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remoteChangeElementToChangeResult = exports.RemoteSourceTrackingService = void 0;
 const path = require("path");
+const fs = require("fs");
 const ts_retry_promise_1 = require("ts-retry-promise");
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
@@ -98,8 +99,8 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
     static async delete(orgId) {
         const fileToDelete = RemoteSourceTrackingService.getFilePath(orgId);
         // the file might not exist, in which case we don't need to delete it
-        if (core_1.fs.existsSync(fileToDelete)) {
-            await core_1.fs.promises.unlink(fileToDelete);
+        if (fs.existsSync(fileToDelete)) {
+            await fs.promises.unlink(fileToDelete);
         }
         return path.isAbsolute(fileToDelete) ? fileToDelete : path.join(process.cwd(), fileToDelete);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -46,7 +46,7 @@
     "@salesforce/core": "^2.33.1",
     "@salesforce/kit": "^1.5.17",
     "@salesforce/source-deploy-retrieve": "^5.9.4",
-    "isomorphic-git": "^1.9.2",
+    "isomorphic-git": "1.14.0",
     "ts-retry-promise": "^0.6.0"
   },
   "devDependencies": {