@apexdevtools/git-ops 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # git-ops - Changelog
 
+## 1.4.1 - 2024-11-22
+
+- Fix missing deploy error reporting
+
 ## 1.4.0 - 2024-02-07
 
 - Add `getDeployableClasses` API for native based tracking

package/lib/src/tracking.d.ts

@@ -35,6 +35,8 @@ export declare class OrgTracking {
     getLocalStatus(withConflicts?: boolean): Promise<SyncStatus>;
     deployAndUpdateSourceTracking(paths: Array<string>): Promise<void>;
     private deploy;
+    private reportDeployStatus;
+    private reportDeployErrors;
     private updateSourceTracking;
     private toSyncStatusRow;
     private withWorkingDir;

package/lib/src/tracking.js

@@ -69,33 +69,55 @@ class OrgTracking {
     deployAndUpdateSourceTracking(paths) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.withWorkingDir(this.options.projectDir, () => __awaiter(this, void 0, void 0, function* () {
-                return this.deploy(paths)
-                    .then(res => this.updateSourceTracking(res))
-                    .catch(e => this.logger.logError(e));
+                try {
+                    this.logger.logDeployProgress('Starting deploy');
+                    const result = yield this.deploy(paths);
+                    if (result.response.success) {
+                        yield this.updateSourceTracking(result);
+                    }
+                    else {
+                        this.reportDeployErrors(result);
+                    }
+                    this.logger.logDeployProgress('Finished deploy');
+                }
+                catch (e) {
+                    this.logger.logError(e);
+                }
             }));
         });
     }
     deploy(paths) {
         return __awaiter(this, void 0, void 0, function* () {
-            const set = source_deploy_retrieve_1.ComponentSet.fromSource(paths);
-            const deploy = yield set.deploy({
+            const deploy = yield source_deploy_retrieve_1.ComponentSet.fromSource(paths).deploy({
                 usernameOrConnection: this.options.connection,
             });
-            this.logger.logDeployProgress('Starting deploy');
-            deploy.onUpdate(response => {
-                const { status, numberComponentsDeployed, numberComponentsTotal } = response;
-                const progress = `${numberComponentsDeployed}/${numberComponentsTotal}`;
-                const message = `Status: ${status} Progress: ${progress}`;
-                this.logger.logDeployProgress(message);
-            });
-            return yield deploy.pollStatus().then(res => {
-                this.logger.logMessage('Finished deploy');
-                return res;
-            });
+            deploy.onUpdate(response => this.reportDeployStatus(response));
+            const result = yield deploy.pollStatus();
+            this.reportDeployStatus(result.response);
+            return result;
         });
     }
+    reportDeployStatus(response) {
+        const { status, numberComponentsDeployed, numberComponentsTotal, numberComponentErrors, } = response;
+        const progress = `${numberComponentsDeployed}/${numberComponentsTotal}`;
+        const message = `Status: ${status} | Progress: ${progress} | Errors: ${numberComponentErrors}`;
+        this.logger.logDeployProgress(message);
+    }
+    reportDeployErrors(result) {
+        const errors = result.getFileResponses().reduce((a, c) => {
+            if (c.state === source_deploy_retrieve_1.ComponentStatus.Failed) {
+                a.push(new Error(`${c.fullName}: ${c.error}`));
+            }
+            return a;
+        }, []);
+        if (errors.length) {
+            this.logger.logDeployProgress('Deploy errors:');
+            errors.forEach(err => this.logger.logError(err));
+        }
+    }
     updateSourceTracking(result) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logDeployProgress('Starting source tracking update');
             const project = core_1.SfProject.getInstance(this.options.projectDir);
             const org = yield core_1.Org.create({ connection: this.options.connection });
             const tracking = yield source_tracking_1.SourceTracking.create({
@@ -104,6 +126,7 @@ class OrgTracking {
                 ignoreLocalCache: true,
             });
             yield tracking.updateTrackingFromDeploy(result);
+            this.logger.logDeployProgress('Finished source tracking update');
         });
     }
     toSyncStatusRow(from) {

package/lib/test/tracking.spec.js

@@ -105,7 +105,7 @@ const mockDeploy = {
         .fn()
         .mockImplementation(() => Promise.resolve(mockDeployResult)),
 };
-const mockDeployResult = { done: true };
+const mockDeployResult = { response: { success: true } };
 const mockComponentSet = {
     deploy: jest
         .fn()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apexdevtools/git-ops",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Library to do git operations to find changed files in a given git repository",
   "author": {
     "name": "Apex Dev Tools Team",