@salesforce/packaging 0.1.11 → 0.1.13

package/lib/package/packageAncestry.js

@@ -1,16 +1,16 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PackageAncestryNode_version, _PackageAncestryNode_MajorVersion, _PackageAncestryNode_MinorVersion, _PackageAncestryNode_PatchVersion, _PackageAncestryNode_BuildNumber, _PackageAncestryNode_AncestorId, _PackageAncestryNode_SubscriberPackageVersionId, _PackageAncestryNode_depthCounter;
+var _PackageAncestry_requestedPackageId, _PackageAncestryNode_version, _PackageAncestryNode_MajorVersion, _PackageAncestryNode_MinorVersion, _PackageAncestryNode_PatchVersion, _PackageAncestryNode_BuildNumber, _PackageAncestryNode_AncestorId, _PackageAncestryNode_SubscriberPackageVersionId, _PackageAncestryNode_depthCounter;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageAncestryNode = exports.AncestryDotProducer = exports.AncestryJsonProducer = exports.AncestryTreeProducer = exports.PackageAncestry = void 0;
 /*
@@ -27,11 +27,11 @@ const tree_1 = require("@oclif/core/lib/cli-ux/styled/tree");
 const graphology_traversal_1 = require("graphology-traversal");
 const pkgUtils = require("../utils/packageUtils");
 const utils_1 = require("../utils");
+const packageVersion_1 = require("./packageVersion");
+const package_1 = require("./package");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_ancestry');
 const SELECT_PACKAGE_VERSION = 'SELECT AncestorId, SubscriberPackageVersionId, MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version';
-const SELECT_PACKAGE_CONTAINER_OPTIONS = 'SELECT ContainerOptions FROM Package2   ';
-const SELECT_PACKAGE_VERSION_CONTAINER_OPTIONS = 'SELECT Package2ContainerOptions FROM SubscriberPackageVersion';
 // Add this to query calls to only show released package versions in the output
 const releasedOnlyFilter = ' AND IsReleased = true';
 const sortAncestryNodeData = (a, b) => {
@@ -41,15 +41,17 @@ const sortAncestryNodeData = (a, b) => {
 };
 /**
  * A class that represents the package ancestry graph.
+ * Given a package Id (0Ho) or a package version Id (04t), it will build a graph of the package's ancestors.
  */
 class PackageAncestry extends kit_1.AsyncCreatable {
     constructor(options) {
         super(options);
         this.options = options;
+        _PackageAncestry_requestedPackageId.set(this, void 0);
         this.graph = new graphology_1.DirectedGraph();
     }
     get requestedPackageId() {
-        return this._requestedPackageId;
+        return __classPrivateFieldGet(this, _PackageAncestry_requestedPackageId, "f");
     }
     async init() {
         await this.buildAncestryTree();
@@ -155,7 +157,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     }
     async getRoots() {
         let roots = [];
-        this._requestedPackageId = pkgUtils.getPackageIdFromAlias(this.options.packageId, this.options.project);
+        __classPrivateFieldSet(this, _PackageAncestry_requestedPackageId, pkgUtils.getPackageIdFromAlias(this.options.packageId, this.options.project), "f");
         switch (this.requestedPackageId.slice(0, 3)) {
             case '0Ho':
                 pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, this.requestedPackageId);
@@ -168,16 +170,10 @@ class PackageAncestry extends kit_1.AsyncCreatable {
             default:
                 throw messages.createError('idOrAliasNotFound', [this.requestedPackageId]);
         }
+        await this.validatePackageType();
         return roots;
     }
     async findRootsForPackageVersion() {
-        // Check to see if the package version is part of an unlocked package
-        // if so, throw an error since ancestry only applies to managed packages
-        const versionQuery = `${SELECT_PACKAGE_VERSION_CONTAINER_OPTIONS} WHERE Id = '${this.requestedPackageId}'`;
-        const packageVersionTypeResults = await this.options.connection.singleRecordQuery(versionQuery, { tooling: true });
-        if (packageVersionTypeResults.Package2ContainerOptions !== 'Managed') {
-            throw messages.createError('unlockedPackageError');
-        }
         // Start with the node, and shoot up
         let node = await this.getPackageVersion(this.requestedPackageId);
         while (node.AncestorId !== null) {
@@ -187,6 +183,34 @@ class PackageAncestry extends kit_1.AsyncCreatable {
         }
         return [node];
     }
+    async validatePackageType() {
+        // Check to see if the package version is part of an unlocked package
+        // if so, throw an error since ancestry only applies to managed packages
+        let packageType;
+        switch (this.requestedPackageId.slice(0, 3)) {
+            case '04t':
+                // eslint-disable-next-line no-case-declarations
+                const packageVersion = new packageVersion_1.PackageVersion({
+                    idOrAlias: this.requestedPackageId,
+                    project: this.options.project,
+                    connection: this.options.connection,
+                });
+                packageType = await packageVersion.getPackageType();
+                break;
+            case '0Ho':
+                // eslint-disable-next-line no-case-declarations
+                const pkg = new package_1.Package({
+                    packageAliasOrId: this.requestedPackageId,
+                    project: this.options.project,
+                    connection: this.options.connection,
+                });
+                packageType = await pkg.getType();
+                break;
+        }
+        if (packageType !== 'Managed') {
+            throw messages.createError('unlockedPackageError');
+        }
+    }
     async getPackageVersion(nodeId) {
         const query = `${SELECT_PACKAGE_VERSION} WHERE SubscriberPackageVersionId = '${nodeId}'`;
         try {
@@ -205,14 +229,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     async findRootsForPackage() {
         // Check to see if the package is an unlocked package
         // if so, throw and error since ancestry only applies to managed packages
-        const query = `${SELECT_PACKAGE_CONTAINER_OPTIONS} WHERE Id = '${this.requestedPackageId}'`;
-        const packageTypeResults = await this.options.connection.tooling.query(query);
-        if (packageTypeResults?.records?.length === 0) {
-            throw messages.createError('invalidId', [this.requestedPackageId]);
-        }
-        else if (packageTypeResults?.records?.length && packageTypeResults?.records[0].ContainerOptions !== 'Managed') {
-            throw messages.createError('unlockedPackageError');
-        }
+        await this.validatePackageType();
         const normalQuery = `${SELECT_PACKAGE_VERSION} WHERE AncestorId = NULL AND Package2Id = '${this.requestedPackageId}' ${releasedOnlyFilter}`;
         const subscriberPackageVersions = (await this.options.connection.tooling.query(normalQuery)).records?.map((record) => new PackageAncestryNode(record));
         // The package exists, but there are no versions for the provided package
@@ -254,6 +271,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     }
 }
 exports.PackageAncestry = PackageAncestry;
+_PackageAncestry_requestedPackageId = new WeakMap();
 class AncestryTreeProducer extends tree_1.Tree {
     constructor(options) {
         super();

package/lib/package/packageConvert.js

@@ -183,9 +183,8 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, withPro
                             const record = pkgQueryResult.records[0];
                             return `${record.MajorVersion}.${record.MinorVersion}.${record.PatchVersion}-${record.BuildNumber}`;
                         });
-                        // TODO SfProjectJson.addPackageAlias
-                        const newConfig = await (0, utils_1.generatePackageAliasEntry)(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
-                        withProject.getSfProjectJson().set('packageAliases', newConfig);
+                        const [alias, id] = await (0, utils_1.generatePackageAliasEntry)(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
+                        withProject.getSfProjectJson().addPackageAlias(alias, id);
                         await withProject.getSfProjectJson().write();
                     }
                     await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.convert.success, {

package/lib/package/packageCreate.d.ts

@@ -3,23 +3,13 @@ import { PackageCreateOptions, PackagingSObjects } from '../interfaces';
 declare type Package2Request = Pick<PackagingSObjects.Package2, 'Name' | 'Description' | 'NamespacePrefix' | 'ContainerOptions' | 'IsOrgDependent' | 'PackageErrorUsername'>;
 export declare function createPackageRequestFromContext(project: SfProject, options: PackageCreateOptions): Package2Request;
 /**
- * Generate packageDirectory json entry for this package that can be written to sfdx-project.json
+ * Create packageDirectory json entry for this package that can be written to sfdx-project.json
  *
  * @param project
  * @param packageId the 0Ho id of the package to create the entry for
  * @private
  */
-export declare function generatePackageDirEntry(project: SfProject, options: PackageCreateOptions): PackageDir[] | NamedPackageDir[];
-/**
- * Generate package alias json entry for this package that can be written to sfdx-project.json
- *
- * @param context
- * @param packageId the 0Ho id of the package to create the alias entry for
- * @private
- */
-export declare function generatePackageAliasEntry(project: SfProject, options: PackageCreateOptions, packageId: string): {
-    [key: string]: string;
-};
+export declare function createPackageDirEntry(project: SfProject, options: PackageCreateOptions): PackageDir | NamedPackageDir;
 export declare function createPackage(connection: Connection, project: SfProject, options: PackageCreateOptions): Promise<{
     Id: string;
 }>;

package/lib/package/packageCreate.js

@@ -6,10 +6,11 @@
  * 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.createPackage = exports.generatePackageAliasEntry = exports.generatePackageDirEntry = exports.createPackageRequestFromContext = void 0;
+exports.createPackage = exports.createPackageDirEntry = exports.createPackageRequestFromContext = void 0;
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const pkgUtils = require("../utils/packageUtils");
+const packageUtils_1 = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_create');
 function createPackageRequestFromContext(project, options) {
@@ -25,61 +26,39 @@ function createPackageRequestFromContext(project, options) {
 }
 exports.createPackageRequestFromContext = createPackageRequestFromContext;
 /**
- * Generate packageDirectory json entry for this package that can be written to sfdx-project.json
+ * Create packageDirectory json entry for this package that can be written to sfdx-project.json
  *
  * @param project
  * @param packageId the 0Ho id of the package to create the entry for
  * @private
  */
-function generatePackageDirEntry(project, options) {
-    // TODO: use SfProjectJson#addPackageDirectory for this maintenance
-    let packageDirs = project.getPackageDirectories();
+function createPackageDirEntry(project, options) {
+    let packageDirs = project.getSfProjectJson().getContents().packageDirectories;
+    let isNew = false;
     if (!packageDirs) {
         packageDirs = [];
     }
-    // add an entry if it doesn't exist
-    // or update an existing entry if it matches path but has no package or id attribute (W-5092620)
-    let packageDir = project.getPackage(options.name) ||
-        project
-            .getPackageDirectories()
-            // TODO: I don't understand where id is coming from, because it is not in sfdx-project.json schema
-            .find((pd) => pd.path === options.path && !pd.id && !pd.package);
-    if (packageDir) {
-        // update existing entry
-        packageDir.package = options.name;
-        packageDir.versionName ?? (packageDir.versionName = pkgUtils.DEFAULT_PACKAGE_DIR.versionName);
-        packageDir.versionNumber ?? (packageDir.versionNumber = pkgUtils.DEFAULT_PACKAGE_DIR.versionNumber);
-        // set as default if this is the only entry or no other entry is the default
-        if (!Reflect.getOwnPropertyDescriptor(packageDir, 'default')) {
-            packageDir.default = !pkgUtils.getConfigPackageDirectory(packageDirs, 'default', true);
-        }
-    }
-    else {
-        // add new entry
+    // see if package exists (exists means it has an id or package)
+    let packageDir = packageDirs.find((pd) => pd.path === options.path && !pd.id && !pd.package);
+    if (!packageDir) {
+        // no match - create a new one
+        isNew = true;
         packageDir = pkgUtils.DEFAULT_PACKAGE_DIR;
-        packageDir.package = options.name;
-        // set as default if this is the only entry or no other entry is the default
-        packageDir.default = !pkgUtils.getConfigPackageDirectory(packageDirs, 'default', true);
-        packageDir.path = options.path;
-        packageDirs.push(packageDir);
+        packageDir.path = packageDir.path || options.path;
     }
-    return packageDirs;
-}
-exports.generatePackageDirEntry = generatePackageDirEntry;
-/**
- * Generate package alias json entry for this package that can be written to sfdx-project.json
- *
- * @param context
- * @param packageId the 0Ho id of the package to create the alias entry for
- * @private
- */
-function generatePackageAliasEntry(project, options, packageId) {
-    const packageAliases = project.getSfProjectJson().getContents().packageAliases || {};
-    const packageName = options.name;
-    packageAliases[packageName] = packageId;
-    return packageAliases;
+    if (packageDirs.length === 0) {
+        packageDir.default = true;
+    }
+    else if (isNew) {
+        packageDir.default = !packageDirs.find((pd) => pd.default);
+    }
+    packageDir.package = packageDir.package || options.name;
+    packageDir.versionName = packageDir.versionName || pkgUtils.DEFAULT_PACKAGE_DIR.versionName;
+    packageDir.versionNumber = packageDir.versionNumber || pkgUtils.DEFAULT_PACKAGE_DIR.versionNumber;
+    packageDir.versionDescription = packageDir.versionDescription || options.description;
+    return packageDir;
 }
-exports.generatePackageAliasEntry = generatePackageAliasEntry;
+exports.createPackageDirEntry = createPackageDirEntry;
 async function createPackage(connection, project, options) {
     // strip trailing slash from path param
     options.path = options.path.replace(/\/$/, '');
@@ -89,8 +68,8 @@ async function createPackage(connection, project, options) {
         .sobject('Package2')
         .create(request)
         .catch((err) => {
-        const error = (0, ts_types_1.isString)(err) ? err : err.message;
-        throw core_1.SfError.wrap(error);
+        const error = (0, ts_types_1.isString)(err) ? new Error(err) : err;
+        throw core_1.SfError.wrap((0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(error)));
     });
     if (!createResult.success) {
         throw pkgUtils.combineSaveErrors('Package2', 'create', createResult.errors);
@@ -102,12 +81,10 @@ async function createPackage(connection, project, options) {
     }
     const record = queryResult.records[0];
     if (!process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE) {
-        const packageDirectory = generatePackageDirEntry(project, options);
-        const packageAliases = generatePackageAliasEntry(project, options, record.Id);
-        const projectJson = project.getSfProjectJson();
-        projectJson.set('packageDirectories', packageDirectory);
-        projectJson.set('packageAliases', packageAliases);
-        await projectJson.write();
+        const packageDirectory = createPackageDirEntry(project, options);
+        project.getSfProjectJson().addPackageDirectory(packageDirectory);
+        project.getSfProjectJson().addPackageAlias(options.name, record.Id);
+        await project.getSfProjectJson().write();
     }
     return { Id: record.Id };
 }

package/lib/package/packageDelete.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deletePackage = void 0;
 const pkgUtils = require("../utils/packageUtils");
 const utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 async function deletePackage(idOrAlias, project, connection, undelete) {
     const packageId = pkgUtils.getPackageIdFromAlias(idOrAlias, project);
     pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, packageId);
@@ -16,7 +17,9 @@ async function deletePackage(idOrAlias, project, connection, undelete) {
     request.Id = packageId;
     const isUndelete = undelete;
     request.IsDeprecated = !isUndelete;
-    const updateResult = await connection.tooling.update('Package2', request);
+    const updateResult = await connection.tooling.update('Package2', request).catch((err) => {
+        throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
+    });
     if (!updateResult.success) {
         throw (0, utils_1.combineSaveErrors)('Package2', 'update', updateResult.errors);
     }

package/lib/package/packageInstall.d.ts

@@ -1,19 +1,12 @@
 import { Connection } from '@salesforce/core';
-import { Optional } from '@salesforce/ts-types';
+import { QueryResult } from 'jsforce';
 import { Duration } from '@salesforce/kit';
-import { PackagingSObjects, PackageInstallOptions, PackageInstallCreateRequest } from '../interfaces';
+import { PackagingSObjects, PackageInstallCreateRequest, PackageType, PackageInstallOptions } from '../interfaces';
 import PackageInstallRequest = PackagingSObjects.PackageInstallRequest;
-export declare function installPackage(connection: Connection, pkgInstallCreateRequest: PackageInstallCreateRequest, options?: PackageInstallOptions): Promise<PackageInstallRequest>;
-/**
- * Returns an array of RSS and CSP external sites for the package.
- *
- * @param connection The `Connection` object to the org.
- * @param subscriberPackageVersionId The ID of the subscriber package version (begins with "04t")
- * @param installationKey The installation key (if any) for the subscriber package version.
- * @returns an array of RSS and CSP site URLs, or undefined if the package doesn't have any.
- */
-export declare function getExternalSites(connection: Connection, subscriberPackageVersionId: string, installationKey?: string): Promise<Optional<string[]>>;
-export declare function getStatus(connection: Connection, installRequestId: string): Promise<PackageInstallRequest>;
+export declare function createPackageInstallRequest(connection: Connection, pkgInstallCreateRequest: PackageInstallCreateRequest, packageType: PackageType): Promise<PackagingSObjects.PackageInstallRequest>;
+export declare function getStatus(connection: Connection, packageInstallRequestId: string): Promise<PackageInstallRequest>;
 export declare function isErrorFromSPVQueryRestriction(err: Error): boolean;
 export declare function isErrorPackageNotAvailable(err: Error): boolean;
-export declare function waitForPublish(connection: Connection, subscriberPackageVersionId: string, timeout: number | Duration, installationKey?: string): Promise<void>;
+export declare function getInstallationStatus(subscriberPackageVersionId: string, installationKey: string, connection: Connection): Promise<QueryResult<PackagingSObjects.SubscriberPackageVersion>>;
+export declare function waitForPublish(connection: Connection, subscriberPackageVersionId: string, frequency: number | Duration, timeout: number | Duration, installationKey?: string): Promise<void>;
+export declare function pollStatus(connection: Connection, installRequestId: string, options: PackageInstallOptions): Promise<PackageInstallRequest>;

package/lib/package/packageInstall.js

@@ -6,13 +6,12 @@
  * 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.waitForPublish = exports.isErrorPackageNotAvailable = exports.isErrorFromSPVQueryRestriction = exports.getStatus = exports.getExternalSites = exports.installPackage = void 0;
+exports.pollStatus = exports.waitForPublish = exports.getInstallationStatus = exports.isErrorPackageNotAvailable = exports.isErrorFromSPVQueryRestriction = exports.getStatus = exports.createPackageInstallRequest = void 0;
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
-const kit_1 = require("@salesforce/kit");
 const utils_1 = require("../utils");
-const constants_1 = require("../constants");
 const interfaces_1 = require("../interfaces");
+const constants_1 = require("../constants");
 core_1.Messages.importMessagesDirectory(__dirname);
 const installMsgs = core_1.Messages.loadMessages('@salesforce/packaging', 'package_install');
 let logger;
@@ -22,27 +21,7 @@ const getLogger = () => {
     }
     return logger;
 };
-/**
- * Given 04t the package type type (Managed, Unlocked, Locked(deprecated?))
- *
- * @param packageVersionId the 04t
- * @param connection For tooling query
- * @param installKey For tooling query, if an installation key is applicable to the package version it must be passed in the queries
- * @throws Error with message when package2 cannot be found
- */
-async function getPackageTypeBy04t(packageVersionId, connection, installKey) {
-    let query = `SELECT Package2ContainerOptions FROM SubscriberPackageVersion WHERE id ='${packageVersionId}'`;
-    if (installKey) {
-        const escapedInstallationKey = installKey.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
-        query += ` AND InstallationKey ='${escapedInstallationKey}'`;
-    }
-    const queryResult = await connection.tooling.query(query);
-    if (!queryResult || queryResult.records === null || queryResult.records.length === 0) {
-        throw installMsgs.createError('errorInvalidPackageId', [packageVersionId]);
-    }
-    return queryResult.records[0].Package2ContainerOptions;
-}
-async function installPackage(connection, pkgInstallCreateRequest, options) {
+async function createPackageInstallRequest(connection, pkgInstallCreateRequest, packageType) {
     const defaults = {
         ApexCompileType: 'all',
         EnableRss: false,
@@ -55,9 +34,8 @@ async function installPackage(connection, pkgInstallCreateRequest, options) {
     if (request.Password) {
         request.Password = (0, utils_1.escapeInstallationKey)(request.Password);
     }
-    const pkgType = await getPackageTypeBy04t(request.SubscriberPackageVersionKey, connection, request.Password);
     // Only unlocked packages can change the UpgradeType and ApexCompile options from the defaults.
-    if (pkgType !== 'Unlocked') {
+    if (packageType !== 'Unlocked') {
         if (request.UpgradeType !== defaults.UpgradeType) {
             const msg = installMsgs.getMessage('upgradeTypeOnlyForUnlockedWarning');
             await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.warning, msg);
@@ -79,106 +57,13 @@ async function installPackage(connection, pkgInstallCreateRequest, options) {
             result.errors.toString(),
         ]);
     }
-    if (options?.pollingTimeout == null) {
-        return getStatus(connection, packageInstallRequestId);
-    }
-    else {
-        return pollStatus(connection, packageInstallRequestId, options);
-    }
+    return getStatus(connection, packageInstallRequestId);
 }
-exports.installPackage = installPackage;
-/**
- * Returns an array of RSS and CSP external sites for the package.
- *
- * @param connection The `Connection` object to the org.
- * @param subscriberPackageVersionId The ID of the subscriber package version (begins with "04t")
- * @param installationKey The installation key (if any) for the subscriber package version.
- * @returns an array of RSS and CSP site URLs, or undefined if the package doesn't have any.
- */
-async function getExternalSites(connection, subscriberPackageVersionId, installationKey) {
-    const queryNoKey = `SELECT RemoteSiteSettings, CspTrustedSites FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
-    let queryResult;
-    try {
-        const escapedInstallationKey = installationKey ? (0, utils_1.escapeInstallationKey)(installationKey) : null;
-        const queryWithKey = `${queryNoKey} AND InstallationKey ='${escapedInstallationKey}'`;
-        getLogger().debug(`Checking package: [${subscriberPackageVersionId}] for external sites`);
-        queryResult = await connection.tooling.query(queryWithKey);
-    }
-    catch (e) {
-        // First check for Implementation Restriction error that is enforced in 214, before it was possible to query
-        // against InstallationKey, otherwise surface the error.
-        if (e instanceof Error && isErrorFromSPVQueryRestriction(e)) {
-            queryResult = await connection.tooling.query(queryNoKey);
-        }
-        else {
-            throw e;
-        }
-    }
-    if (queryResult?.records?.length > 0) {
-        const record = queryResult.records[0];
-        const rssUrls = record.RemoteSiteSettings.settings.map((rss) => rss.url);
-        const cspUrls = record.CspTrustedSites.settings.map((csp) => csp.endpointUrl);
-        const sites = [...rssUrls, ...cspUrls];
-        if (sites.length) {
-            return sites;
-        }
-    }
-}
-exports.getExternalSites = getExternalSites;
-async function getStatus(connection, installRequestId) {
-    return (await connection.tooling.retrieve('PackageInstallRequest', installRequestId));
+exports.createPackageInstallRequest = createPackageInstallRequest;
+async function getStatus(connection, packageInstallRequestId) {
+    return (await connection.tooling.retrieve('PackageInstallRequest', packageInstallRequestId));
 }
 exports.getStatus = getStatus;
-// internal
-async function pollStatus(connection, installRequestId, options) {
-    let packageInstallRequest;
-    const { pollingFrequency, pollingTimeout } = options;
-    let frequency;
-    if (pollingFrequency != null) {
-        frequency = (0, ts_types_1.isNumber)(pollingFrequency) ? kit_1.Duration.milliseconds(pollingFrequency) : pollingFrequency;
-    }
-    else {
-        frequency = kit_1.Duration.milliseconds(constants_1.consts.PACKAGE_INSTALL_POLL_FREQUENCY);
-    }
-    let timeout;
-    if (pollingTimeout != null) {
-        timeout = (0, ts_types_1.isNumber)(pollingTimeout) ? kit_1.Duration.minutes(pollingTimeout) : pollingTimeout;
-    }
-    else {
-        timeout = kit_1.Duration.minutes(constants_1.consts.PACKAGE_INSTALL_POLL_TIMEOUT);
-    }
-    const pollingOptions = {
-        frequency,
-        timeout,
-        poll: async () => {
-            packageInstallRequest = await getStatus(connection, installRequestId);
-            getLogger().debug(installMsgs.getMessage('packageInstallPolling', [packageInstallRequest?.Status]));
-            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.status, packageInstallRequest);
-            if (['SUCCESS', 'ERROR'].includes(packageInstallRequest?.Status)) {
-                return { completed: true, payload: packageInstallRequest };
-            }
-            return { completed: false };
-        },
-    };
-    const pollingClient = await core_1.PollingClient.create(pollingOptions);
-    try {
-        getLogger().debug(`Polling for PackageInstallRequest status. Package ID = ${installRequestId}`);
-        getLogger().debug(`Polling frequency (ms): ${pollingOptions.frequency.milliseconds}`);
-        getLogger().debug(`Polling timeout (min): ${pollingOptions.timeout.minutes}`);
-        await pollingClient.subscribe();
-        return packageInstallRequest;
-    }
-    catch (e) {
-        const errMsg = e instanceof Error ? e.message : (0, ts_types_1.isString)(e) ? e : 'polling timed out';
-        const error = new core_1.SfError(errMsg, 'PackageInstallTimeout');
-        error.setData(packageInstallRequest);
-        if (error.stack && e.stack) {
-            // add the original stack to this new error
-            error.stack += `\nDUE TO:\n${e.stack}`;
-        }
-        throw error;
-    }
-}
 // determines if error is from malformed SubscriberPackageVersion query
 // this is in place to allow cli to run against app version 214, where SPV queries
 // do not require installation key
@@ -191,45 +76,39 @@ function isErrorPackageNotAvailable(err) {
     return err.name === 'UNKNOWN_EXCEPTION' || err.name === 'PACKAGE_UNAVAILABLE';
 }
 exports.isErrorPackageNotAvailable = isErrorPackageNotAvailable;
-async function waitForPublish(connection, subscriberPackageVersionId, timeout, installationKey) {
+async function getInstallationStatus(subscriberPackageVersionId, installationKey, connection) {
+    const QUERY_NO_KEY = `SELECT Id, SubscriberPackageId, InstallValidationStatus FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
+    const escapedInstallationKey = installationKey ? (0, utils_1.escapeInstallationKey)(installationKey) : null;
+    const queryWithKey = `${QUERY_NO_KEY} AND InstallationKey ='${escapedInstallationKey}'`;
+    return connection.tooling.query(queryWithKey);
+}
+exports.getInstallationStatus = getInstallationStatus;
+async function waitForPublish(connection, subscriberPackageVersionId, frequency, timeout, installationKey) {
+    const pollingTimeout = (0, utils_1.numberToDuration)(timeout || 0);
+    if (pollingTimeout.milliseconds <= 0) {
+        return;
+    }
     let queryResult;
+    let installValidationStatus;
     const pollingOptions = {
-        frequency: kit_1.Duration.milliseconds(constants_1.consts.PACKAGE_INSTALL_POLL_FREQUENCY),
-        timeout: (0, ts_types_1.isNumber)(timeout) ? kit_1.Duration.minutes(timeout) : timeout,
+        frequency: (0, utils_1.numberToDuration)(frequency || 0),
+        timeout: pollingTimeout,
         poll: async () => {
-            const QUERY_NO_KEY = `SELECT Id, SubscriberPackageId, InstallValidationStatus FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
-            try {
-                const escapedInstallationKey = installationKey ? (0, utils_1.escapeInstallationKey)(installationKey) : null;
-                const queryWithKey = `${QUERY_NO_KEY} AND InstallationKey ='${escapedInstallationKey}'`;
-                queryResult = await connection.tooling.query(queryWithKey);
-            }
-            catch (e) {
-                // Check first for Implementation Restriction error that is enforced in 214, before it was possible to query
-                // against InstallationKey, otherwise surface the error.
-                if (e instanceof Error && isErrorFromSPVQueryRestriction(e)) {
-                    queryResult = await connection.tooling.query(QUERY_NO_KEY);
-                }
-                else {
-                    if (e instanceof Error && !isErrorPackageNotAvailable(e)) {
-                        throw e;
-                    }
-                }
-            }
+            queryResult = await getInstallationStatus(subscriberPackageVersionId, installationKey, connection);
             // Continue retrying if there is no record
             // or for an InstallValidationStatus of PACKAGE_UNAVAILABLE (replication to the subscriber's instance has not completed)
             // or for an InstallValidationStatus of UNINSTALL_IN_PROGRESS
-            let installValidationStatus;
             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: queryResult };
+                    return { completed: true, payload: installValidationStatus };
                 }
             }
             const tokens = installValidationStatus ? [` Status = ${installValidationStatus}`] : [];
             getLogger().debug(installMsgs.getMessage('publishWaitProgress', tokens));
             await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install['subscriber-status'], installValidationStatus);
-            return { completed: false, payload: queryResult };
+            return { completed: false, payload: installValidationStatus };
         },
     };
     const pollingClient = await core_1.PollingClient.create(pollingOptions);
@@ -242,7 +121,7 @@ async function waitForPublish(connection, subscriberPackageVersionId, timeout, i
     catch (e) {
         // if polling timed out
         const error = installMsgs.createError('subscriberPackageVersionNotPublished');
-        error.setData(queryResult);
+        error.setData(queryResult?.records[0]);
         if (error.stack && e.stack) {
             // append the original stack to this new error
             error.stack += `\nDUE TO:\n${e.stack}`;
@@ -251,4 +130,42 @@ async function waitForPublish(connection, subscriberPackageVersionId, timeout, i
     }
 }
 exports.waitForPublish = waitForPublish;
+async function pollStatus(connection, installRequestId, options) {
+    let packageInstallRequest;
+    const { pollingFrequency, pollingTimeout } = options;
+    const frequency = (0, utils_1.numberToDuration)(pollingFrequency || constants_1.consts.PACKAGE_INSTALL_POLL_FREQUENCY);
+    const timeout = (0, utils_1.numberToDuration)(pollingTimeout || constants_1.consts.PACKAGE_INSTALL_POLL_TIMEOUT);
+    const pollingOptions = {
+        frequency,
+        timeout,
+        poll: async () => {
+            packageInstallRequest = await getStatus(connection, installRequestId);
+            getLogger().debug(installMsgs.getMessage('packageInstallPolling', [packageInstallRequest?.Status]));
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.status, packageInstallRequest);
+            if (['SUCCESS', 'ERROR'].includes(packageInstallRequest?.Status)) {
+                return { completed: true, payload: packageInstallRequest };
+            }
+            return { completed: false };
+        },
+    };
+    const pollingClient = await core_1.PollingClient.create(pollingOptions);
+    try {
+        getLogger().debug(`Polling for PackageInstallRequest status. Package ID = ${installRequestId}`);
+        getLogger().debug(`Polling frequency (ms): ${pollingOptions.frequency.milliseconds}`);
+        getLogger().debug(`Polling timeout (min): ${pollingOptions.timeout.minutes}`);
+        await pollingClient.subscribe();
+        return packageInstallRequest;
+    }
+    catch (e) {
+        const errMsg = e instanceof Error ? e.message : (0, ts_types_1.isString)(e) ? e : 'polling timed out';
+        const error = new core_1.SfError(errMsg, 'PackageInstallTimeout');
+        error.setData(packageInstallRequest);
+        if (error.stack && e.stack) {
+            // add the original stack to this new error
+            error.stack += `\nDUE TO:\n${e.stack}`;
+        }
+        throw error;
+    }
+}
+exports.pollStatus = pollStatus;
 //# sourceMappingURL=packageInstall.js.map