@salesforce/source-tracking 0.5.1 → 0.5.2

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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.
 
+### [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

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021, 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

@@ -3,3 +3,8 @@ 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.isBundle = 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}`;
 };
@@ -20,4 +22,19 @@ const getKeyFromObject = (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/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
@@ -94,8 +99,15 @@ class ShadowRepo {
                     dir: this.projectPath,
                     gitdir: this.gitDir,
                     filepaths,
-                    // filter out hidden files and __tests__ patterns, regardless of gitignore
-                    filter: (f) => !f.includes(`${path.sep}.`) && !f.includes('__tests__'),
+                    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 (isWindows) {
@@ -196,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/sourceTracking.js

@@ -59,8 +59,8 @@ class SourceTracking extends kit_1.AsyncCreatable {
         const groupings = (byPackageDir
             ? this.packagesDirs.map((pkgDir) => ({
                 path: pkgDir.name,
-                nonDeletes: allNonDeletes.filter((f) => f.startsWith(pkgDir.name)),
-                deletes: allDeletes.filter((f) => f.startsWith(pkgDir.name)),
+                nonDeletes: allNonDeletes.filter((f) => (0, functions_1.pathIsInFolder)(f, pkgDir.name)),
+                deletes: allDeletes.filter((f) => (0, functions_1.pathIsInFolder)(f, pkgDir.name)),
             }))
             : [
                 {
@@ -282,7 +282,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
             .filter(ts_types_1.isString);
         await this.localRepo.commitChanges({
             deployedFiles: relativeOptions.files,
-            deletedFiles: relativeOptions.deletedFiles.concat((await this.localRepo.getDeleteFilenames()).filter((deployedFile) => bundlesWithDeletedFiles.some((bundlePath) => deployedFile.startsWith(bundlePath)) &&
+            deletedFiles: relativeOptions.deletedFiles.concat((await this.localRepo.getDeleteFilenames()).filter((deployedFile) => bundlesWithDeletedFiles.some((bundlePath) => (0, functions_1.pathIsInFolder)(deployedFile, bundlePath)) &&
                 !relativeOptions.files.includes(deployedFile))),
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "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.8.2",
     "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.2",
+    "@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",
@@ -69,7 +70,7 @@
     "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",