@salesforce/source-tracking 1.3.1 → 1.4.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.4.2](https://github.com/forcedotcom/source-tracking/compare/v1.4.1...v1.4.2) (2022-04-29)
+
+### Bug Fixes
+
+- use absolute paths in ComponentSet for matching local source ([#153](https://github.com/forcedotcom/source-tracking/issues/153)) ([b5690a5](https://github.com/forcedotcom/source-tracking/commit/b5690a5c4f3a3fe02f733fa1578467e2278e62bf))
+
+### [1.4.1](https://github.com/forcedotcom/source-tracking/compare/v1.4.0...v1.4.1) (2022-04-28)
+
+## [1.4.0](https://github.com/forcedotcom/source-tracking/compare/v1.3.1...v1.4.0) (2022-04-27)
+
+### Features
+
+- comp set for pulls ([4b361a4](https://github.com/forcedotcom/source-tracking/commit/4b361a4f31ac4f810762ee8d6f8447f7eef1be31))
+
 ### [1.3.1](https://github.com/forcedotcom/source-tracking/compare/v1.3.0...v1.3.1) (2022-03-25)
 
 ### Bug Fixes

package/lib/sourceTracking.d.ts

@@ -33,6 +33,7 @@ export declare class SourceTracking extends AsyncCreatable {
      * @returns ComponentSet[]
      */
     localChangesAsComponentSet(byPackageDir?: boolean): Promise<ComponentSet[]>;
+    remoteNonDeletesAsComponentSet(): 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.

package/lib/sourceTracking.js

@@ -116,6 +116,33 @@ class SourceTracking extends kit_1.AsyncCreatable {
         })
             .filter((componentSet) => componentSet.size > 0);
     }
+    async remoteNonDeletesAsComponentSet() {
+        const [changeResults, sourceBackedComponents] = await Promise.all([
+            // all changes based on remote tracking
+            this.getChanges({
+                origin: 'remote',
+                state: 'nondelete',
+                format: 'ChangeResult',
+            }),
+            // only returns source-backed components (SBC)
+            this.getChanges({
+                origin: 'remote',
+                state: 'nondelete',
+                format: 'SourceComponent',
+            }),
+        ]);
+        const componentSet = new source_deploy_retrieve_1.ComponentSet(sourceBackedComponents);
+        // there may be remote adds not in the SBC.  So we add those manually
+        changeResults.forEach((cr) => {
+            if (cr.type && cr.name && !componentSet.has({ type: cr.type, fullName: cr.name })) {
+                componentSet.add({
+                    type: cr.type,
+                    fullName: cr.name,
+                });
+            }
+        });
+        return 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.
@@ -203,7 +230,7 @@ class SourceTracking extends kit_1.AsyncCreatable {
                 fullName: element === null || element === void 0 ? void 0 : element.name,
             })));
             const matchingLocalSourceComponentsSet = source_deploy_retrieve_1.ComponentSet.fromSource({
-                fsPaths: this.packagesDirs.map((dir) => dir.path),
+                fsPaths: this.packagesDirs.map((dir) => (0, path_1.resolve)(dir.fullPath)),
                 include: remoteChangesAsComponentSet,
             });
             if (options.format === 'string') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "1.3.1",
+  "version": "1.4.2",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@salesforce/core": "^2.33.1",
     "@salesforce/kit": "^1.5.17",
-    "@salesforce/source-deploy-retrieve": "^5.9.4",
+    "@salesforce/source-deploy-retrieve": "^5.12.12",
     "graceful-fs": "^4.2.9",
     "isomorphic-git": "1.17.0",
     "ts-retry-promise": "^0.6.0"