@salesforce/packaging 3.5.19 → 3.5.21

package/lib/package/packageInstall.js

@@ -134,6 +134,14 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
         await pollingClient.subscribe();
     }
     catch (e) {
+        // For installation key problems throw that error.
+        if (e instanceof Error && e.name.includes('INSTALL_KEY')) {
+            throw core_1.SfError.create({
+                name: e.name,
+                message: e.message,
+                cause: e,
+            });
+        }
         // if polling timed out
         const error = installMsgs.createError('subscriberPackageVersionNotPublished');
         if (queryResult?.records[0]) {

package/lib/package/subscriberPackageVersion.d.ts

@@ -3,6 +3,7 @@ import { Duration } from '@salesforce/kit';
 import { Nullable, Optional } from '@salesforce/ts-types';
 import { InstalledPackages, PackageDescriptorJson, PackageInstallCreateRequest, PackageInstallOptions, PackageType, PackagingSObjects, SubscriberPackageVersionOptions } from '../interfaces';
 import { VersionNumber } from './versionNumber';
+type SPV = PackagingSObjects.SubscriberPackageVersion;
 export declare const SubscriberPackageVersionFields: string[];
 /**
  * Provides the ability to get, list, install, and uninstall 2nd
@@ -147,7 +148,7 @@ export declare class SubscriberPackageVersion {
     getData(options?: {
         force?: boolean;
         includeHighCostFields?: boolean;
-    }): Promise<PackagingSObjects.SubscriberPackageVersion | undefined>;
+    }): Promise<SPV | undefined>;
     /**
      * Wait for the subscriber package version to be replicated across instances and available to be queried against
      *
@@ -201,3 +202,4 @@ export declare class SubscriberPackageVersion {
     getField<T>(field: string): Promise<T>;
     private getFieldsForQuery;
 }
+export {};

package/lib/package/subscriberPackageVersion.js

@@ -313,22 +313,28 @@ class SubscriberPackageVersion {
                 return this.data;
             }
             try {
-                const queryNoKey = `SELECT ${queryFields.toString()} FROM SubscriberPackageVersion WHERE Id ='${await this.getId()}'`;
-                const escapedInstallationKey = this.password ? (0, packageUtils_1.escapeInstallationKey)(this.password) : null;
-                const queryWithKey = `${queryNoKey} AND InstallationKey ='${escapedInstallationKey}'`;
-                this.data = await this.connection.singleRecordQuery(queryWithKey, {
-                    tooling: true,
-                });
+                let query = `SELECT ${queryFields.toString()} FROM SubscriberPackageVersion WHERE Id ='${await this.getId()}'`;
+                if (this.password) {
+                    query = `${query} AND InstallationKey ='${(0, packageUtils_1.escapeInstallationKey)(this.password)}'`;
+                }
+                this.data = await this.connection.singleRecordQuery(query, { tooling: true });
             }
             catch (err) {
-                const error = err instanceof Error
-                    ? err
-                    : typeof err === 'string'
-                        ? new Error(err)
-                        : typeof err === 'number'
-                            ? err
-                            : new Error('Unknown error');
-                throw messages.createError('errorInvalidIdNoRecordFound', [this.options.aliasOrId], undefined, error);
+                if (err instanceof Error) {
+                    if (err.message === 'Request failed') {
+                        // Use a better error message. This is typically a bad ID.
+                        const errMsg = messages.getMessage('errorInvalidIdNoRecordFound', [this.options.aliasOrId]);
+                        err.message = `${errMsg} - (${err.message})`;
+                    }
+                    throw core_1.SfError.create({
+                        name: err.name,
+                        message: err.message,
+                        cause: err,
+                    });
+                }
+                else {
+                    throw core_1.SfError.wrap(err);
+                }
             }
         }
         return this.data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "3.5.19",
+  "version": "3.5.21",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -42,10 +42,10 @@
   ],
   "dependencies": {
     "@jsforce/jsforce-node": "^3.2.0",
-    "@salesforce/core": "^7.3.8",
-    "@salesforce/kit": "^3.1.1",
+    "@salesforce/core": "^7.3.9",
+    "@salesforce/kit": "^3.1.2",
     "@salesforce/schemas": "^1.9.0",
-    "@salesforce/source-deploy-retrieve": "^11.4.4",
+    "@salesforce/source-deploy-retrieve": "^11.6.3",
     "@salesforce/ts-types": "^2.0.9",
     "@salesforce/types": "^1.1.0",
     "fast-xml-parser": "^4.3.6",