@salesforce/packaging 1.3.0 → 1.4.0

package/lib/interfaces/packagingSObjects.d.ts

@@ -225,7 +225,7 @@ export declare namespace PackagingSObjects {
         EnableRss: boolean;
         UpgradeType: Nullable<'delete-only' | 'deprecate-only' | 'mixed-mode'>;
         ApexCompileType: Nullable<'all' | 'package'>;
-        SkipHandlers: boolean;
+        SkipHandlers: string;
         Status: 'ERROR' | 'IN_PROGRESS' | 'SUCCESS' | 'UNKNOWN';
         Errors: Nullable<SubscriberPackageInstallErrors>;
     };

package/lib/package/packageInstall.js

@@ -76,10 +76,21 @@ function isErrorPackageNotAvailable(err) {
 }
 exports.isErrorPackageNotAvailable = isErrorPackageNotAvailable;
 async function getInstallationStatus(subscriberPackageVersionId, installationKey, connection) {
-    const QUERY_NO_KEY = `SELECT Id, SubscriberPackageId, InstallValidationStatus FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
-    const escapedInstallationKey = installationKey ? (0, packageUtils_1.escapeInstallationKey)(installationKey) : null;
-    const queryWithKey = `${QUERY_NO_KEY} AND InstallationKey ='${escapedInstallationKey}'`;
-    return connection.tooling.query(queryWithKey);
+    let query = `SELECT Id, SubscriberPackageId, InstallValidationStatus FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
+    if (installationKey) {
+        query += ` AND InstallationKey ='${(0, packageUtils_1.escapeInstallationKey)(installationKey)}'`;
+    }
+    try {
+        return await connection.tooling.query(query);
+    }
+    catch (e) {
+        if (e instanceof Error && isErrorPackageNotAvailable(e)) {
+            getLogger().debug('getInstallationStatus:', e.name);
+        }
+        else {
+            throw e;
+        }
+    }
 }
 exports.getInstallationStatus = getInstallationStatus;
 async function waitForPublish(connection, subscriberPackageVersionId, frequency, timeout, installationKey) {
@@ -88,7 +99,7 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
         return;
     }
     let queryResult;
-    let installValidationStatus;
+    let installValidationStatus = 'PACKAGE_UNAVAILABLE';
     const pollingOptions = {
         frequency: (0, packageUtils_1.numberToDuration)(frequency || 0),
         timeout: pollingTimeout,
@@ -99,14 +110,12 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
             // or for an InstallValidationStatus of UNINSTALL_IN_PROGRESS
             if (queryResult?.records?.length) {
                 installValidationStatus = queryResult.records[0].InstallValidationStatus;
-                await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install['subscriber-status'], installValidationStatus);
-                if (!['PACKAGE_UNAVAILABLE', 'UNINSTALL_IN_PROGRESS'].includes(installValidationStatus)) {
-                    return { completed: true, payload: installValidationStatus };
-                }
             }
-            const tokens = installValidationStatus ? [` Status = ${installValidationStatus}`] : [];
-            getLogger().debug(installMsgs.getMessage('publishWaitProgress', tokens));
+            getLogger().debug(installMsgs.getMessage('publishWaitProgress', [` Status = ${installValidationStatus}`]));
             await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install['subscriber-status'], installValidationStatus);
+            if (!['PACKAGE_UNAVAILABLE', 'UNINSTALL_IN_PROGRESS'].includes(installValidationStatus)) {
+                return { completed: true, payload: installValidationStatus };
+            }
             return { completed: false, payload: installValidationStatus };
         },
     };
@@ -122,6 +131,7 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
         const error = installMsgs.createError('subscriberPackageVersionNotPublished');
         error.setData(queryResult?.records[0]);
         if (error.stack && e.stack) {
+            getLogger().debug(`Error during waitForPublish polling:\n${e.stack}`);
             // append the original stack to this new error
             error.stack += `\nDUE TO:\n${e.stack}`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -62,7 +62,7 @@
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^3.1.1",
     "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/ts-sinon": "^1.4.5",
+    "@salesforce/ts-sinon": "^1.4.6",
     "@types/debug": "4.1.7",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",