@salesforce/packaging 0.0.34 → 0.0.36

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.
 
+### [0.0.36](https://github.com/forcedotcom/packaging/compare/v0.0.35...v0.0.36) (2022-09-14)
+
+### Bug Fixes
+
+- standardize event names across classes, methods, and events ([d97c231](https://github.com/forcedotcom/packaging/commit/d97c231928582dd092bf0ce225dffa3298cce8eb))
+
+### [0.0.35](https://github.com/forcedotcom/packaging/compare/v0.0.34...v0.0.35) (2022-09-09)
+
+### Bug Fixes
+
+- apply fixes from qa issues ([2949f18](https://github.com/forcedotcom/packaging/commit/2949f1875da2e953977769cd1a8b4d8131fbdc1a))
+
 ### [0.0.34](https://github.com/forcedotcom/packaging/compare/v0.0.33...v0.0.34) (2022-09-08)
 
 ### Bug Fixes

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -15,7 +15,7 @@ export interface IPackage {
     install(pkgInstallCreateRequest: PackageInstallCreateRequest, options?: PackageInstallOptions): Promise<PackageInstallRequest>;
     getInstallStatus(installRequestId: string): Promise<PackageInstallRequest>;
     list(): Promise<QueryResult<PackagingSObjects.Package2>>;
-    uninstall(): Promise<void>;
+    uninstall(id: string, wait: Duration): Promise<PackagingSObjects.SubscriberPackageVersionUninstallRequest>;
     update(options: PackageUpdateOptions): Promise<PackageSaveResult>;
     waitForPublish(subscriberPackageVersionKey: string, timeout: number | Duration, installationKey?: string): any;
     getExternalSites(subscriberPackageVersionKey: string, installationKey?: string): any;
@@ -308,3 +308,33 @@ export interface AncestryRepresentationProducer {
     addNode(node: AncestryRepresentationProducer): void;
     produce<T>(): T | string | void;
 }
+export declare const PackageEvents: {
+    convert: {
+        success: string;
+        error: string;
+        progress: string;
+    };
+    install: {
+        warning: string;
+        presend: string;
+        postsend: string;
+        status: string;
+        'subscriber-status': string;
+    };
+    uninstall: string;
+};
+export declare const PackageVersionEvents: {
+    create: {
+        enqueued: string;
+        progress: string;
+        success: string;
+        error: string;
+        'timed-out': string;
+        'preserve-files': string;
+    };
+};
+export declare const Package1VersionEvents: {
+    create: {
+        progress: string;
+    };
+};

package/lib/interfaces/packagingInterfacesAndType.js

@@ -6,8 +6,38 @@
  * 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.PackageVersionCreateRequestResultInProgressStatuses = void 0;
+exports.Package1VersionEvents = exports.PackageVersionEvents = exports.PackageEvents = exports.PackageVersionCreateRequestResultInProgressStatuses = void 0;
 const packagingSObjects_1 = require("./packagingSObjects");
 var Package2VersionStatus = packagingSObjects_1.PackagingSObjects.Package2VersionStatus;
 exports.PackageVersionCreateRequestResultInProgressStatuses = Object.values(Package2VersionStatus).filter((status) => !['Queued', 'Success', 'Error'].includes(status));
+exports.PackageEvents = {
+    convert: {
+        success: 'Package/convert-success',
+        error: 'Package/convert-error',
+        progress: 'Package/convert-in-progress',
+    },
+    install: {
+        warning: 'Package/install-warning',
+        presend: 'Package/install-presend',
+        postsend: 'Package/install-postsend',
+        status: 'Package/install-status',
+        'subscriber-status': 'Package/install-subscriber-status',
+    },
+    uninstall: 'Package/uninstall',
+};
+exports.PackageVersionEvents = {
+    create: {
+        enqueued: 'PackageVersion/create-enqueued',
+        progress: 'PackageVersion/create-in-progress',
+        success: 'PackageVersion/create-success',
+        error: 'PackageVersion/create-error',
+        'timed-out': 'PackageVersion/create-timed-out',
+        'preserve-files': 'PackageVersion/create-preserve-files',
+    },
+};
+exports.Package1VersionEvents = {
+    create: {
+        progress: 'Package1Version/create-progress',
+    },
+};
 //# sourceMappingURL=packagingInterfacesAndType.js.map

package/lib/package/package.d.ts

@@ -32,7 +32,7 @@ export declare class Package extends AsyncCreatable<PackageOptions> implements I
     install(pkgInstallCreateRequest: PackageInstallCreateRequest, options?: PackageInstallOptions): Promise<PackageInstallRequest>;
     getInstallStatus(installRequestId: string): Promise<PackageInstallRequest>;
     list(): Promise<QueryResult<PackagingSObjects.Package2>>;
-    uninstall(): Promise<void>;
+    uninstall(id: string, wait: Duration): Promise<PackagingSObjects.SubscriberPackageVersionUninstallRequest>;
     /**
      * Reports on the uninstall progress of a package.
      *

package/lib/package/package.js

@@ -12,6 +12,7 @@ const kit_1 = require("@salesforce/kit");
 const packageList_1 = require("./packageList");
 const packageInstall_1 = require("./packageInstall");
 const packageConvert_1 = require("./packageConvert");
+const packageUninstall_1 = require("./packageUninstall");
 const packagePrefixes = {
     PackageId: '0Ho',
     SubscriberPackageVersionId: '04t',
@@ -70,8 +71,8 @@ class Package extends kit_1.AsyncCreatable {
     list() {
         return (0, packageList_1.listPackages)(this.options.connection);
     }
-    uninstall() {
-        return Promise.resolve(undefined);
+    async uninstall(id, wait) {
+        return await (0, packageUninstall_1.uninstallPackage)(id, this.options.connection, wait);
     }
     /**
      * Reports on the uninstall progress of a package.

package/lib/package/packageAncestry.d.ts

@@ -3,7 +3,7 @@ import { AsyncCreatable } from '@salesforce/kit';
 import { Tree } from '@oclif/core/lib/cli-ux/styled/tree';
 import { Attributes } from 'graphology-types';
 import { AncestryRepresentationProducer, AncestryRepresentationProducerOptions, PackageAncestryNodeOptions, PackageAncestryOptions } from '../interfaces';
-import { VersionNumber } from '../utils/versionNumber';
+import { VersionNumber } from '../utils';
 /**
  * A class that represents the package ancestry graph.
  */

package/lib/package/packageAncestry.js

@@ -26,14 +26,19 @@ const kit_1 = require("@salesforce/kit");
 const tree_1 = require("@oclif/core/lib/cli-ux/styled/tree");
 const graphology_traversal_1 = require("graphology-traversal");
 const pkgUtils = require("../utils/packageUtils");
-const versionNumber_1 = require("../utils/versionNumber");
+const utils_1 = require("../utils");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+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) => {
+    const aVersion = new utils_1.VersionNumber(a.options.node.MajorVersion, a.options.node.MinorVersion, a.options.node.PatchVersion, a.options.node.BuildNumber);
+    const bVersion = new utils_1.VersionNumber(b.options.node.MajorVersion, b.options.node.MinorVersion, b.options.node.PatchVersion, b.options.node.BuildNumber);
+    return aVersion.compareTo(bVersion);
+};
 /**
  * A class that represents the package ancestry graph.
  */
@@ -310,11 +315,7 @@ class AncestryJsonProducer {
         producers.push(this);
         while (producers.length > 0) {
             const producer = producers.shift();
-            producer.data.children.sort((a, b) => {
-                const aVersion = new versionNumber_1.VersionNumber(a.data.MajorVersion, a.data.MinorVersion, a.data.PatchVersion, a.data.BuildNumber);
-                const bVersion = new versionNumber_1.VersionNumber(b.data.MajorVersion, b.data.MinorVersion, b.data.PatchVersion, b.data.BuildNumber);
-                return aVersion.compareTo(bVersion);
-            });
+            producer.children.sort(sortAncestryNodeData);
             producers.push(...producer.children);
         }
         return this.data.children[0];
@@ -356,6 +357,7 @@ class AncestryDotProducer {
             if (producer.options) {
                 dotLines.push(AncestryDotProducer.buildDotNode(producer));
             }
+            producer.children.sort(sortAncestryNodeData);
             producers.push(...producer.children);
         }
         producers.push(this);
@@ -382,7 +384,7 @@ class PackageAncestryNode extends kit_1.AsyncCreatable {
         _PackageAncestryNode_AncestorId.set(this, void 0);
         _PackageAncestryNode_SubscriberPackageVersionId.set(this, void 0);
         _PackageAncestryNode_depthCounter.set(this, void 0);
-        __classPrivateFieldSet(this, _PackageAncestryNode_version, new versionNumber_1.VersionNumber(this.options.MajorVersion, this.options.MinorVersion, this.options.PatchVersion, this.options.BuildNumber), "f");
+        __classPrivateFieldSet(this, _PackageAncestryNode_version, new utils_1.VersionNumber(this.options.MajorVersion, this.options.MinorVersion, this.options.PatchVersion, this.options.BuildNumber), "f");
         __classPrivateFieldSet(this, _PackageAncestryNode_AncestorId, this.options.AncestorId, "f");
         __classPrivateFieldSet(this, _PackageAncestryNode_SubscriberPackageVersionId, this.options.SubscriberPackageVersionId, "f");
         __classPrivateFieldSet(this, _PackageAncestryNode_MajorVersion, typeof this.options.MajorVersion === 'number'

package/lib/package/packageConvert.js

@@ -14,11 +14,15 @@ const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const uniqid_1 = require("../utils/uniqid");
 const pkgUtils = require("../utils/packageUtils");
+const interfaces_1 = require("../interfaces");
 const constants_1 = require("../constants");
 const srcDevUtil = require("../utils/srcDevUtils");
+const utils_1 = require("../utils");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
+const pvcr = require("./packageVersionCreateRequest");
+var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'packageVersionCreate');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 async function convertPackage(pkg, connection, options, project) {
     let maxRetries = 0;
     const branch = 'main';
@@ -38,7 +42,7 @@ async function convertPackage(pkg, connection, options, project) {
     }
     let results;
     if (options.wait) {
-        results = await pkgUtils.pollForStatusWithInterval(createResult.id, maxRetries, packageId, branch, project, connection, new kit_1.Duration(pkgUtils.POLL_INTERVAL_SECONDS, kit_1.Duration.Unit.SECONDS));
+        results = await pollForStatusWithInterval(createResult.id, maxRetries, packageId, branch, project, connection, new kit_1.Duration(pkgUtils.POLL_INTERVAL_SECONDS, kit_1.Duration.Unit.SECONDS));
     }
     else {
         results = await (0, packageVersionCreateRequest_1.byId)(packageId, connection);
@@ -82,4 +86,81 @@ async function createRequestObject(packageId, options, packageVersTmpRoot, packa
     await fs.promises.rm(packageVersTmpRoot, { recursive: true });
     return requestObject;
 }
+async function pollForStatusWithInterval(id, retries, packageId, branch, withProject, connection, interval) {
+    let remainingRetries = retries;
+    const pollingClient = await core_1.PollingClient.create({
+        poll: async () => {
+            const results = await pvcr.byId(id, connection);
+            if (_isStatusEqualTo(results, [Package2VersionStatus.success, Package2VersionStatus.error])) {
+                // complete
+                if (_isStatusEqualTo(results, [Package2VersionStatus.success])) {
+                    // update sfdx-project.json
+                    let projectUpdated = false;
+                    if (withProject && !process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE) {
+                        projectUpdated = true;
+                        const query = `SELECT MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version WHERE Id = '${results[0].Package2VersionId}'`;
+                        const packageVersionVersionString = await connection.tooling
+                            .query(query)
+                            .then((pkgQueryResult) => {
+                            const record = pkgQueryResult.records[0];
+                            return `${record.MajorVersion}.${record.MinorVersion}.${record.PatchVersion}-${record.BuildNumber}`;
+                        });
+                        const newConfig = await (0, utils_1.generatePackageAliasEntry)(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
+                        withProject.getSfProjectJson().set('packageAliases', newConfig);
+                        await withProject.getSfProjectJson().write();
+                    }
+                    await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.convert.success, {
+                        id,
+                        packageVersionCreateRequestResult: results[0],
+                        projectUpdated,
+                    });
+                    return { completed: true, payload: results[0] };
+                }
+                else {
+                    let status = 'Unknown Error';
+                    if (results?.length > 0 && results[0].Error.length > 0) {
+                        const errors = [];
+                        // for multiple errors, display one per line prefixed with (x)
+                        if (results[0].Error.length > 1) {
+                            results[0].Error.forEach((error) => {
+                                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                                errors.push(`(${errors.length + 1}) ${error}`);
+                            });
+                            errors.unshift(messages.getMessage('versionCreateFailedWithMultipleErrors'));
+                        }
+                        status = errors.length !== 0 ? errors.join('\n') : results[0].Error.join('\n');
+                    }
+                    await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.convert.error, { id, status });
+                    throw new core_1.SfError(status);
+                }
+            }
+            else {
+                const remainingTime = kit_1.Duration.seconds(interval.seconds * remainingRetries);
+                await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.convert.progress, {
+                    id,
+                    packageVersionCreateRequestResult: results[0],
+                    message: '',
+                    timeRemaining: remainingTime,
+                });
+                const logger = core_1.Logger.childFromRoot('packageConvert');
+                logger.info(`Request in progress. Sleeping ${interval.seconds} seconds. Will wait a total of ${remainingTime.seconds} more seconds before timing out. Current Status='${(0, utils_1.convertCamelCaseStringToSentence)(results[0]?.Status)}'`);
+                remainingRetries--;
+                return { completed: false, payload: results[0] };
+            }
+        },
+        frequency: kit_1.Duration.seconds(interval.seconds),
+        timeout: kit_1.Duration.seconds(interval.seconds * retries),
+    });
+    return pollingClient.subscribe();
+}
+/**
+ * Return true if the queryResult.records[0].Status is equal to one of the values in statuses.
+ *
+ * @param results to examine
+ * @param statuses array of statuses to look for
+ * @returns {boolean} if one of the values in status is found.
+ */
+function _isStatusEqualTo(results, statuses) {
+    return results?.length <= 0 ? false : statuses?.some((status) => results[0].Status === status);
+}
 //# sourceMappingURL=packageConvert.js.map

package/lib/package/packageCreate.js

@@ -11,7 +11,7 @@ const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const pkgUtils = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_create');
 function _createPackageRequestFromContext(project, options) {
     const namespace = options.noNamespace ? '' : project.getSfProjectJson().getContents().namespace || '';
     return {

package/lib/package/packageInstall.d.ts

@@ -1,8 +1,7 @@
 import { Connection } from '@salesforce/core';
 import { Optional } from '@salesforce/ts-types';
 import { Duration } from '@salesforce/kit';
-import { PackagingSObjects } from '../interfaces';
-import { PackageInstallOptions, PackageInstallCreateRequest } from '../interfaces/packagingInterfacesAndType';
+import { PackagingSObjects, PackageInstallOptions, PackageInstallCreateRequest } from '../interfaces';
 import PackageInstallRequest = PackagingSObjects.PackageInstallRequest;
 export declare function installPackage(connection: Connection, pkgInstallCreateRequest: PackageInstallCreateRequest, options?: PackageInstallOptions): Promise<PackageInstallRequest>;
 /**

package/lib/package/packageInstall.js

@@ -10,10 +10,11 @@ exports.waitForPublish = exports.getStatus = exports.getExternalSites = exports.
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const packageUtils_1 = require("../utils/packageUtils");
+const utils_1 = require("../utils");
 const constants_1 = require("../constants");
+const interfaces_1 = require("../interfaces");
 core_1.Messages.importMessagesDirectory(__dirname);
-const installMsgs = core_1.Messages.loadMessages('@salesforce/packaging', 'package-install');
+const installMsgs = core_1.Messages.loadMessages('@salesforce/packaging', 'package_install');
 let logger;
 const getLogger = () => {
     if (!logger) {
@@ -32,25 +33,25 @@ async function installPackage(connection, pkgInstallCreateRequest, options) {
     };
     const request = Object.assign({}, defaults, pkgInstallCreateRequest);
     if (request.Password) {
-        request.Password = (0, packageUtils_1.escapeInstallationKey)(request.Password);
+        request.Password = (0, utils_1.escapeInstallationKey)(request.Password);
     }
-    const pkgType = await (0, packageUtils_1.getPackageTypeBy04t)(request.SubscriberPackageVersionKey, connection, request.Password);
+    const pkgType = await (0, utils_1.getPackageTypeBy04t)(request.SubscriberPackageVersionKey, connection, request.Password);
     // Only unlocked packages can change the UpgradeType and ApexCompile options from the defaults.
     if (pkgType !== 'Unlocked') {
         if (request.UpgradeType !== defaults.UpgradeType) {
             const msg = installMsgs.getMessage('upgradeTypeOnlyForUnlockedWarning');
-            await core_1.Lifecycle.getInstance().emit('PackageInstallRequest:warning', msg);
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.warning, msg);
             delete request.UpgradeType;
         }
         if (request.ApexCompileType !== defaults.ApexCompileType) {
             const msg = installMsgs.getMessage('apexCompileOnlyForUnlockedWarning');
-            await core_1.Lifecycle.getInstance().emit('PackageInstallRequest:warning', msg);
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.warning, msg);
             delete request.ApexCompileType;
         }
     }
-    await core_1.Lifecycle.getInstance().emit('PackageInstallRequest:presend', request);
+    await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.presend, request);
     const result = await connection.tooling.create('PackageInstallRequest', request);
-    await core_1.Lifecycle.getInstance().emit('PackageInstallRequest:postsend', result);
+    await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.postsend, result);
     const packageInstallRequestId = result.id;
     if (!packageInstallRequestId) {
         throw installMsgs.createError('packageInstallRequestError', [
@@ -78,7 +79,7 @@ async function getExternalSites(connection, subscriberPackageVersionId, installa
     const queryNoKey = `SELECT RemoteSiteSettings, CspTrustedSites FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
     let queryResult;
     try {
-        const escapedInstallationKey = installationKey ? (0, packageUtils_1.escapeInstallationKey)(installationKey) : null;
+        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);
@@ -86,7 +87,7 @@ async function getExternalSites(connection, subscriberPackageVersionId, installa
     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 && (0, packageUtils_1.isErrorFromSPVQueryRestriction)(e)) {
+        if (e instanceof Error && (0, utils_1.isErrorFromSPVQueryRestriction)(e)) {
             queryResult = await connection.tooling.query(queryNoKey);
         }
         else {
@@ -132,7 +133,7 @@ async function pollStatus(connection, installRequestId, options) {
         poll: async () => {
             packageInstallRequest = await getStatus(connection, installRequestId);
             getLogger().debug(installMsgs.getMessage('packageInstallPolling', [packageInstallRequest?.Status]));
-            await core_1.Lifecycle.getInstance().emit('PackageInstallRequest:status', packageInstallRequest);
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install.status, packageInstallRequest);
             if (['SUCCESS', 'ERROR'].includes(packageInstallRequest?.Status)) {
                 return { completed: true, payload: packageInstallRequest };
             }
@@ -166,18 +167,18 @@ async function waitForPublish(connection, subscriberPackageVersionId, timeout, i
         poll: async () => {
             const QUERY_NO_KEY = `SELECT Id, SubscriberPackageId, InstallValidationStatus FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
             try {
-                const escapedInstallationKey = installationKey ? (0, packageUtils_1.escapeInstallationKey)(installationKey) : null;
+                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 && (0, packageUtils_1.isErrorFromSPVQueryRestriction)(e)) {
+                if (e instanceof Error && (0, utils_1.isErrorFromSPVQueryRestriction)(e)) {
                     queryResult = await connection.tooling.query(QUERY_NO_KEY);
                 }
                 else {
-                    if (e instanceof Error && !(0, packageUtils_1.isErrorPackageNotAvailable)(e)) {
+                    if (e instanceof Error && !(0, utils_1.isErrorPackageNotAvailable)(e)) {
                         throw e;
                     }
                 }
@@ -188,14 +189,14 @@ async function waitForPublish(connection, subscriberPackageVersionId, timeout, i
             let installValidationStatus;
             if (queryResult?.records?.length) {
                 installValidationStatus = queryResult.records[0].InstallValidationStatus;
-                await core_1.Lifecycle.getInstance().emit('SubscriberPackageVersion: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: queryResult };
                 }
             }
             const tokens = installValidationStatus ? [` Status = ${installValidationStatus}`] : [];
             getLogger().debug(installMsgs.getMessage('publishWaitProgress', tokens));
-            await core_1.Lifecycle.getInstance().emit('SubscriberPackageVersion:status', installValidationStatus);
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.install['subscriber-status'], installValidationStatus);
             return { completed: false, payload: queryResult };
         },
     };

package/lib/package/packageProfileApi.js

@@ -14,8 +14,7 @@ const xmldom_1 = require("@xmldom/xmldom");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 core_1.Messages.importMessagesDirectory(__dirname);
-// TODO: need to transfer these messages
-const profileApiMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const profileApiMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'profile_api');
 /*
  * This class provides functions used to re-write .profiles in the workspace when creating a package2 version.
  * All profiles found in the workspaces are extracted out and then re-written to only include metadata in the profile
@@ -256,22 +255,22 @@ class ProfileInformation {
         this.settingsRemoved.push(setting);
     }
     logDebug() {
-        let info = profileApiMessages.getMessage('profile_api.addProfileToPackage', [this.ProfileName, this.ProfilePath]);
+        let info = profileApiMessages.getMessage('addProfileToPackage', [this.ProfileName, this.ProfilePath]);
         this.settingsRemoved.forEach((setting) => {
-            info += '\n\t' + profileApiMessages.getMessage('profile_api.removeProfileSetting', [setting, this.ProfileName]);
+            info += '\n\t' + profileApiMessages.getMessage('removeProfileSetting', [setting, this.ProfileName]);
         });
         if (!this.IsPackaged) {
-            info += '\n\t' + profileApiMessages.getMessage('profile_api.removeProfile', [this.ProfileName]);
+            info += '\n\t' + profileApiMessages.getMessage('removeProfile', [this.ProfileName]);
         }
         info += '\n';
         return info;
     }
     logInfo() {
         if (this.IsPackaged) {
-            return profileApiMessages.getMessage('profile_api.addProfileToPackage', [this.ProfileName, this.ProfilePath]);
+            return profileApiMessages.getMessage('addProfileToPackage', [this.ProfileName, this.ProfilePath]);
         }
         else {
-            return profileApiMessages.getMessage('profile_api.profileNotIncluded', [this.ProfileName]);
+            return profileApiMessages.getMessage('profileNotIncluded', [this.ProfileName]);
         }
     }
 }

package/lib/package/packageUninstall.js

@@ -10,8 +10,10 @@ exports.uninstallPackage = void 0;
 const os = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
+const interfaces_1 = require("../interfaces");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_uninstall');
+const pkgMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'package');
 async function poll(id, conn) {
     const uninstallRequest = await conn.tooling.sobject('SubscriberPackageVersionUninstallRequest').retrieve(id);
     switch (uninstallRequest.Status) {
@@ -20,13 +22,13 @@ async function poll(id, conn) {
         }
         case 'InProgress':
         case 'Queued': {
-            core_1.Lifecycle.getInstance().emit('packageUninstall', {
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.uninstall, {
                 ...uninstallRequest,
             });
             return { completed: false, payload: uninstallRequest };
         }
         default: {
-            const err = messages.getMessage('defaultErrorMessage', [id, uninstallRequest.Id]);
+            const err = pkgMessages.getMessage('defaultErrorMessage', [id, uninstallRequest.Id]);
             const errorQueryResult = await conn.tooling.query(`"SELECT Message FROM PackageVersionUninstallRequestError WHERE ParentRequest.Id = '${id}' ORDER BY Message"`);
             const errors = [];
             if (errorQueryResult.records.length) {

package/lib/package/packageVersion.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageVersion = void 0;
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
+const interfaces_1 = require("../interfaces");
 const utils_1 = require("../utils");
 const packageVersionCreate_1 = require("./packageVersionCreate");
 const packageVersionReport_1 = require("./packageVersionReport");
@@ -114,7 +115,7 @@ class PackageVersion {
                 report = await this.getCreateVersionReport(createPackageVersionRequestId);
                 switch (report.Status) {
                     case 'Queued':
-                        await core_1.Lifecycle.getInstance().emit('enqueued', { ...report, remainingWaitTime });
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.enqueued, { ...report, remainingWaitTime });
                         remainingWaitTime = kit_1.Duration.seconds(remainingWaitTime.seconds - polling.frequency.seconds);
                         return {
                             completed: false,
@@ -126,18 +127,21 @@ class PackageVersion {
                     case 'VerifyingDependencies':
                     case 'VerifyingMetadata':
                     case 'FinalizingPackageVersion':
-                        await core_1.Lifecycle.getInstance().emit('in-progress', { ...report, remainingWaitTime });
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.progress, {
+                            ...report,
+                            remainingWaitTime,
+                        });
                         remainingWaitTime = kit_1.Duration.seconds(remainingWaitTime.seconds - polling.frequency.seconds);
                         return {
                             completed: false,
                             payload: report,
                         };
                     case 'Success':
-                        await core_1.Lifecycle.getInstance().emit('success', report);
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.success, report);
                         await this.updateProjectWithPackageVersion(this.project, report);
                         return { completed: true, payload: report };
                     case 'Error':
-                        await core_1.Lifecycle.getInstance().emit('error', report);
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.error, report);
                         return { completed: true, payload: report };
                 }
             },
@@ -148,7 +152,7 @@ class PackageVersion {
             return pollingClient.subscribe();
         }
         catch (err) {
-            await core_1.Lifecycle.getInstance().emit('timed-out', report);
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create['timed-out'], report);
             throw (0, utils_1.applyErrorAction)(err);
         }
     }

package/lib/package/packageVersionCreate.js

@@ -16,12 +16,13 @@ const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchO
 const xml2js = require("xml2js");
 const uniqid_1 = require("../utils/uniqid");
 const pkgUtils = require("../utils/packageUtils");
-const versionNumber_1 = require("../utils/versionNumber");
 const utils_1 = require("../utils");
+const interfaces_1 = require("../interfaces");
+const utils_2 = require("../utils");
 const packageProfileApi_1 = require("./packageProfileApi");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'packageVersionCreate');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 const logger = core_1.Logger.childFromRoot('packageVersionCreate');
 const DESCRIPTOR_FILE = 'package2-descriptor.json';
 class PackageVersionCreate {
@@ -57,7 +58,7 @@ class PackageVersionCreate {
         if (packageName) {
             // SDR will build an output path like /output/directory/packageName/package.xml
             // this was breaking from toolbelt, so to revert it we copy the directory up a level and delete the original
-            (0, utils_1.copyDir)(convertResult.packagePath, outputDirectory);
+            (0, utils_2.copyDir)(convertResult.packagePath, outputDirectory);
             try {
                 fs.rmSync(convertResult.packagePath, { recursive: true });
             }
@@ -91,7 +92,7 @@ class PackageVersionCreate {
         // Just override dependency.packageId value to the resolved alias.
         dependency.packageId = packageIdFromAlias;
         pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, dependency.packageId);
-        pkgUtils.validateVersionNumber(dependency.versionNumber, versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN, versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN);
+        pkgUtils.validateVersionNumber(dependency.versionNumber, utils_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN, utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN);
         // Validate that the Package2 id exists on the server
         const query = `SELECT Id FROM Package2 WHERE Id = '${dependency.packageId}'`;
         const result = await this.connection.tooling.query(query);
@@ -114,7 +115,7 @@ class PackageVersionCreate {
             // if a 04t id is specified just use it.
             return dependency;
         }
-        const versionNumber = versionNumber_1.VersionNumber.from(dependency.versionNumber);
+        const versionNumber = utils_1.VersionNumber.from(dependency.versionNumber);
         const buildNumber = versionNumber.build;
         // use the dependency.branch if present otherwise use the branch of the version being created
         const branch = dependency.branch || dependency.branch === '' ? dependency.branch : this.options.branch;
@@ -124,7 +125,7 @@ class PackageVersionCreate {
         // now that we have a full build number, query for the associated 04t.
         // because the build number may not be unique across versions, add in conditionals for
         // the branch or the RELEASED token (if used)
-        const branchOrReleasedCondition = buildNumber === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN
+        const branchOrReleasedCondition = buildNumber === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN
             ? 'AND IsReleased = true'
             : `AND Branch = ${branchString}`;
         const query = `SELECT SubscriberPackageVersionId FROM Package2Version WHERE Package2Id = '${dependency.packageId}' AND MajorVersion = ${versionNumber.major} AND MinorVersion = ${versionNumber.minor} AND PatchVersion = ${versionNumber.patch} AND BuildNumber = ${resolvedBuildNumber} ${branchOrReleasedCondition}`;
@@ -142,7 +143,7 @@ class PackageVersionCreate {
         // warn user of the resolved build number when LATEST and RELEASED keywords are used
         if (versionNumber.isbuildKeyword()) {
             versionNumber.build = resolvedBuildNumber;
-            if (buildNumber === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
+            if (buildNumber === utils_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
                 logger.info(messages.getMessage('buildNumberResolvedForLatest', [
                     dependency.package,
                     versionNumber.toString(),
@@ -150,7 +151,7 @@ class PackageVersionCreate {
                     dependency.subscriberPackageVersionId,
                 ]));
             }
-            else if (buildNumber === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+            else if (buildNumber === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
                 logger.info(messages.getMessage('buildNumberResolvedForReleased', [
                     dependency.package,
                     versionNumber.toString(),
@@ -172,18 +173,18 @@ class PackageVersionCreate {
         // query for the LATEST or RELEASED build number (excluding deleted versions)
         let branchCondition = '';
         let releasedCondition = '';
-        if (versionNumber[3] === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
+        if (versionNumber[3] === utils_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
             // respect the branch when querying for LATEST
             const branchString = !branch || branch === '' ? 'null' : `'${branch}'`;
             branchCondition = `AND Branch = ${branchString}`;
         }
-        else if (versionNumber[3] === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+        else if (versionNumber[3] === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
             releasedCondition = 'AND IsReleased = true';
         }
         const query = `SELECT MAX(BuildNumber) FROM Package2Version WHERE Package2Id = '${packageId}' AND IsDeprecated != true AND MajorVersion = ${versionNumber.major} AND MinorVersion = ${versionNumber.minor} AND PatchVersion = ${versionNumber.patch} ${branchCondition} ${releasedCondition}`;
         const results = await this.connection.tooling.query(query);
         if (results.records?.length === 0 || results.records[0].expr0 == null) {
-            if (versionNumber.build === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+            if (versionNumber.build === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
                 throw messages.createError('noReleaseVersionFound', [packageId, versionNumber.toString()]);
             }
             else {
@@ -208,7 +209,7 @@ class PackageVersionCreate {
         };
         if (preserveFiles) {
             const message = messages.getMessage('tempFileLocation', [packageVersTmpRoot]);
-            await core_1.Lifecycle.getInstance().emit('packageVersionCreate:preserveFiles', {
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create['preserve-files'], {
                 location: packageVersTmpRoot,
                 message,
             });
@@ -285,7 +286,7 @@ class PackageVersionCreate {
         // branch can be set via options or descriptor; option takes precedence
         this.options.branch = this.options.branch ?? packageDescriptorJson.branch;
         const resultValues = await Promise.all(!dependencies ? [] : dependencies.map((dependency) => this.retrieveSubscriberPackageVersionId(dependency)));
-        const ancestorId = await (0, utils_1.getAncestorId)(packageDescriptorJson, this.options.project, this.options.connection, this.options.versionnumber ?? packageDescriptorJson.versionNumber, this.options.skipancestorcheck);
+        const ancestorId = await (0, utils_2.getAncestorId)(packageDescriptorJson, this.options.project, this.options.connection, this.options.versionnumber ?? packageDescriptorJson.versionNumber, this.options.skipancestorcheck);
         // If dependencies exist, the resultValues array will contain the dependencies populated with a resolved
         // subscriber pkg version id.
         if (resultValues.length > 0) {
@@ -351,19 +352,19 @@ class PackageVersionCreate {
         });
         await fs.promises.writeFile(path.join(packageVersMetadataFolder, 'package.xml'), xml, 'utf-8');
         // Zip the packageVersMetadataFolder folder and put the zip in {packageVersBlobDirectory}/package.zip
-        await (0, utils_1.zipDir)(packageVersMetadataFolder, metadataZipFile);
+        await (0, utils_2.zipDir)(packageVersMetadataFolder, metadataZipFile);
         if (hasUnpackagedMetadata) {
             // Zip the unpackagedMetadataFolder folder and put the zip in {packageVersBlobDirectory}/{unpackagedMetadataZipFile}
-            await (0, utils_1.zipDir)(unpackagedMetadataFolder, unpackagedMetadataZipFile);
+            await (0, utils_2.zipDir)(unpackagedMetadataFolder, unpackagedMetadataZipFile);
         }
         // Zip up the expanded settings (if present)
         if (settingsGenerator.hasSettings()) {
             await settingsGenerator.createDeploy();
             await settingsGenerator.createDeployPackageContents(this.apiVersionFromPackageXml);
-            await (0, utils_1.zipDir)(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
+            await (0, utils_2.zipDir)(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
         }
         // Zip the Version Info and package.zip files into another zip
-        await (0, utils_1.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
+        await (0, utils_2.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
     }
     resolveApexTestPermissions(packageDescriptorJson) {
         // Process permissionSet and permissionSetLicenses that should be enabled when running Apex tests
@@ -418,7 +419,7 @@ class PackageVersionCreate {
             throw messages.createError('errorEmptyPackageDirs');
         }
         // from the packageDirectories in sfdx-project.json, find the correct package entry either by finding a matching package (name) or path
-        this.packageAlias = (0, utils_1.getPackageAliasesFromId)(this.options.packageId, this.options.project).join();
+        this.packageAlias = (0, utils_2.getPackageAliasesFromId)(this.options.packageId, this.options.project).join();
         this.packageId = this.options.packageId;
         // set on the class, so we can access them in other methods without redoing this logic
         this.packageObject = this.project
@@ -491,8 +492,8 @@ class PackageVersionCreate {
         if (!packageDescriptorJson.versionName) {
             const versionNumber = packageDescriptorJson.versionNumber;
             packageDescriptorJson.versionName =
-                versionNumber.split(pkgUtils.VERSION_NUMBER_SEP)[3] === versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN
-                    ? versionNumber.substring(0, versionNumber.indexOf(pkgUtils.VERSION_NUMBER_SEP + versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN))
+                versionNumber.split(pkgUtils.VERSION_NUMBER_SEP)[3] === utils_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN
+                    ? versionNumber.substring(0, versionNumber.indexOf(pkgUtils.VERSION_NUMBER_SEP + utils_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN))
                     : versionNumber;
             logger.warn(options, messages.getMessage('defaultVersionName', [packageDescriptorJson.versionName]));
         }

package/lib/package/packageVersionCreateRequest.js

@@ -11,7 +11,7 @@ const util = require("util");
 const core_1 = require("@salesforce/core");
 const packageUtils = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 const STATUS_ERROR = 'Error';
 const QUERY = 'SELECT Id, Status, Package2Id, Package2VersionId, Package2Version.SubscriberPackageVersionId, Tag, Branch, ' +
     'CreatedDate, Package2Version.HasMetadataRemoved, CreatedById ' +

package/lib/package/packageVersionList.js

@@ -11,7 +11,7 @@ const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const utils_1 = require("../utils");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 // Stripping CodeCoverage, HasPassedCodeCoverageCheck as they are causing a perf issue in 47.0+ W-6997762
 const DEFAULT_SELECT = 'SELECT Id, Package2Id, SubscriberPackageVersionId, Name, Package2.Name, Package2.NamespacePrefix, Package2.IsOrgDependent, ' +
     'Description, Tag, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber, IsReleased, ' +

package/lib/package1/package1VersionCreate.js

@@ -10,8 +10,9 @@ exports.package1VersionCreate = void 0;
 const os = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
+const interfaces_1 = require("../interfaces");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package1_version_create');
 const packageUploadRequestStatus = async (id, connection, timeout, frequency) => {
     const pollingResult = await connection.tooling.sobject('PackageUploadRequest').retrieve(id);
     switch (pollingResult.Status) {
@@ -20,7 +21,7 @@ const packageUploadRequestStatus = async (id, connection, timeout, frequency) =>
         case 'IN_PROGRESS':
         case 'QUEUED':
             timeout -= frequency;
-            await core_1.Lifecycle.getInstance().emit('package1VersionCreate:progress', { timeout, pollingResult });
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.Package1VersionEvents.create.progress, { timeout, pollingResult });
             return { completed: false, payload: pollingResult };
         default: {
             if (pollingResult?.Errors?.errors?.length > 0) {

package/lib/utils/packageUtils.d.ts

@@ -1,8 +1,7 @@
 import { Connection, NamedPackageDir, PackageDir, SfdcUrl, SfError, SfProject } from '@salesforce/core';
-import { Duration } from '@salesforce/kit';
 import { Many, Nullable } from '@salesforce/ts-types';
 import { SaveError } from 'jsforce';
-import { PackageDescriptorJson, PackageType, PackageVersionCreateRequestResult, PackagingSObjects } from '../interfaces';
+import { PackageDescriptorJson, PackageType, PackagingSObjects } from '../interfaces';
 export declare const VERSION_NUMBER_SEP = ".";
 export declare type IdRegistryValue = {
     prefix: string;
@@ -136,7 +135,6 @@ export declare function convertCamelCaseStringToSentence(stringIn: string): stri
  */
 export declare function getPackageAliasesFromId(packageId: string, project: SfProject): string[];
 export declare function findOrCreatePackage2(seedPackage: string, connection: Connection): Promise<string>;
-export declare function pollForStatusWithInterval(id: string, retries: number, packageId: string, branch: string, withProject: SfProject, connection: Connection, interval: Duration): Promise<PackageVersionCreateRequestResult>;
 /**
  * Generate package alias json entry for this package version that can be written to sfdx-project.json
  *

package/lib/utils/packageUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combineSaveErrors = exports.formatDate = exports.generatePackageAliasEntry = exports.pollForStatusWithInterval = exports.findOrCreatePackage2 = exports.getPackageAliasesFromId = exports.convertCamelCaseStringToSentence = exports.getPackageIdFromAlias = exports.getConfigPackageDirectory = exports.getConfigPackageDirectories = exports.getPackageVersionNumber = exports.concatVersion = exports.getAncestorIdHighestRelease = exports.getAncestorId = exports.validateAncestorId = exports.getInClauseItemsCount = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getHasMetadataRemoved = exports.getContainerOptions = exports.getSubscriberPackageVersionId = exports.getPackageTypeBy04t = exports.getPackageType = exports.escapeInstallationKey = exports.getPackageVersionId = exports.applyErrorAction = exports.massageErrorMessage = exports.isErrorPackageNotAvailable = exports.isErrorFromSPVQueryRestriction = exports.validatePatchVersion = exports.validateVersionNumber = exports.validateIdNoThrow = exports.validateId = exports.BY_LABEL = exports.BY_PREFIX = exports.DEFAULT_PACKAGE_DIR = exports.POLL_INTERVAL_SECONDS = exports.SOQL_WHERE_CLAUSE_MAX_LENGTH = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
+exports.combineSaveErrors = exports.formatDate = exports.generatePackageAliasEntry = exports.findOrCreatePackage2 = exports.getPackageAliasesFromId = exports.convertCamelCaseStringToSentence = exports.getPackageIdFromAlias = exports.getConfigPackageDirectory = exports.getConfigPackageDirectories = exports.getPackageVersionNumber = exports.concatVersion = exports.getAncestorIdHighestRelease = exports.getAncestorId = exports.validateAncestorId = exports.getInClauseItemsCount = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getHasMetadataRemoved = exports.getContainerOptions = exports.getSubscriberPackageVersionId = exports.getPackageTypeBy04t = exports.getPackageType = exports.escapeInstallationKey = exports.getPackageVersionId = exports.applyErrorAction = exports.massageErrorMessage = exports.isErrorPackageNotAvailable = exports.isErrorFromSPVQueryRestriction = exports.validatePatchVersion = exports.validateVersionNumber = exports.validateIdNoThrow = exports.validateId = exports.BY_LABEL = exports.BY_PREFIX = exports.DEFAULT_PACKAGE_DIR = exports.POLL_INTERVAL_SECONDS = exports.SOQL_WHERE_CLAUSE_MAX_LENGTH = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
@@ -10,12 +10,9 @@ exports.combineSaveErrors = exports.formatDate = exports.generatePackageAliasEnt
 const os = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
-const interfaces_1 = require("../interfaces");
-const pvcr = require("../package/packageVersionCreateRequest");
 const versionNumber_1 = require("./versionNumber");
-var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'pkg_utils');
 exports.VERSION_NUMBER_SEP = '.';
 const INVALID_TYPE_REGEX = /[\w]*(sObject type '[A-Za-z]*Package[2]?[A-Za-z]*' is not supported)[\w]*/im;
 const ID_REGISTRY = [
@@ -47,7 +44,6 @@ exports.DEFAULT_PACKAGE_DIR = {
     versionNumber: '0.1.0.NEXT',
     default: true,
 };
-const logger = core_1.Logger.childFromRoot('packageUtils');
 exports.BY_PREFIX = (() => {
     return Object.fromEntries(ID_REGISTRY.map((id) => [id.prefix, { prefix: id.prefix, label: id.label }]));
 })();
@@ -643,73 +639,6 @@ async function findOrCreatePackage2(seedPackage, connection) {
     return createResult.id;
 }
 exports.findOrCreatePackage2 = findOrCreatePackage2;
-async function pollForStatusWithInterval(id, retries, packageId, branch, withProject, connection, interval) {
-    let remainingRetries = retries;
-    const pollingClient = await core_1.PollingClient.create({
-        poll: async () => {
-            const results = await pvcr.byId(id, connection);
-            if (_isStatusEqualTo(results, [Package2VersionStatus.success, Package2VersionStatus.error])) {
-                // complete
-                if (_isStatusEqualTo(results, [Package2VersionStatus.success])) {
-                    // update sfdx-project.json
-                    let projectUpdated = false;
-                    if (withProject && !process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE) {
-                        projectUpdated = true;
-                        const query = `SELECT MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version WHERE Id = '${results[0].Package2VersionId}'`;
-                        const packageVersionVersionString = await connection.tooling
-                            .query(query)
-                            .then((pkgQueryResult) => {
-                            const record = pkgQueryResult.records[0];
-                            return `${record.MajorVersion}.${record.MinorVersion}.${record.PatchVersion}-${record.BuildNumber}`;
-                        });
-                        const newConfig = await generatePackageAliasEntry(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
-                        withProject.getSfProjectJson().set('packageAliases', newConfig);
-                        await withProject.getSfProjectJson().write();
-                    }
-                    await core_1.Lifecycle.getInstance().emit(Package2VersionStatus.success, {
-                        id,
-                        packageVersionCreateRequestResult: results[0],
-                        projectUpdated,
-                    });
-                    return { completed: true, payload: results[0] };
-                }
-                else {
-                    let status = 'Unknown Error';
-                    if (results?.length > 0 && results[0].Error.length > 0) {
-                        const errors = [];
-                        // for multiple errors, display one per line prefixed with (x)
-                        if (results[0].Error.length > 1) {
-                            results[0].Error.forEach((error) => {
-                                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                                errors.push(`(${errors.length + 1}) ${error}`);
-                            });
-                            errors.unshift(messages.getMessage('versionCreateFailedWithMultipleErrors'));
-                        }
-                        status = errors.length !== 0 ? errors.join('\n') : results[0].Error.join('\n');
-                    }
-                    await core_1.Lifecycle.getInstance().emit(Package2VersionStatus.error, { id, status });
-                    throw new core_1.SfError(status);
-                }
-            }
-            else {
-                const remainingTime = kit_1.Duration.seconds(interval.seconds * remainingRetries);
-                await core_1.Lifecycle.getInstance().emit(Package2VersionStatus.inProgress, {
-                    id,
-                    packageVersionCreateRequestResult: results[0],
-                    message: '',
-                    timeRemaining: remainingTime,
-                });
-                logger.info(`Request in progress. Sleeping ${interval.seconds} seconds. Will wait a total of ${remainingTime.seconds} more seconds before timing out. Current Status='${convertCamelCaseStringToSentence(results[0]?.Status)}'`);
-                remainingRetries--;
-                return { completed: false, payload: results[0] };
-            }
-        },
-        frequency: kit_1.Duration.seconds(interval.seconds),
-        timeout: kit_1.Duration.seconds(interval.seconds * retries),
-    });
-    return pollingClient.subscribe();
-}
-exports.pollForStatusWithInterval = pollForStatusWithInterval;
 /**
  * Generate package alias json entry for this package version that can be written to sfdx-project.json
  *
@@ -741,16 +670,6 @@ async function generatePackageAliasEntry(connection, project, packageVersionId,
     return packageAliases;
 }
 exports.generatePackageAliasEntry = generatePackageAliasEntry;
-/**
- * Return true if the queryResult.records[0].Status is equal to one of the values in statuses.
- *
- * @param results to examine
- * @param statuses array of statuses to look for
- * @returns {boolean} if one of the values in status is found.
- */
-function _isStatusEqualTo(results, statuses) {
-    return results?.length <= 0 ? false : statuses?.some((status) => results[0].Status === status);
-}
 function formatDate(date) {
     const pad = (num) => {
         return num < 10 ? `0${num}` : `${num}`;

package/lib/utils/versionNumber.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionNumber = exports.BuildNumberToken = void 0;
 const core_1 = require("@salesforce/core");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'version_number');
 var BuildNumberToken;
 (function (BuildNumberToken) {
     BuildNumberToken["LATEST_BUILD_NUMBER_TOKEN"] = "LATEST";

package/messages/messages.md

@@ -173,10 +173,6 @@ The requested resource does not exist
 Only one package in a Dev Hub is allowed per converted from first-generation package, but the following were found:
 %s
 
-# versionCreateFailedWithMultipleErrors
-
-Multiple errors occurred:
-
 # errorScriptsNotApplicableToUnlockedPackage
 
 We can’t create the package version. This parameter is available only for second-generation managed packages. Create the package version without the postinstallscript or uninstallscript parameters.,
@@ -267,3 +263,19 @@ No subscriber package was found for seed id: %s'
 # idOrAliasNotFound
 
 Can't find package with id or alias: %s
+
+# unlockedPackageError
+
+Can’t display package ancestry. Package ancestry is available only for second-generation managed packages. Retry this command and specify a second-generation managed package or package version.
+
+# noVersionsError
+
+Can’t display package ancestry. The specified package has no associated released package versions. Retry this command after you create and promote at least one package version.
+
+# invalidId
+
+Can’t display the ancestry tree for %s. Specify a valid package ID (starts with 0Ho) or package version ID (starts with 04t), and try creating the ancestry tree again.
+
+# versionNotFound
+
+Can’t display the ancestry tree for %s. Verify the package version number (starts with 04t) or the package version alias listed in the sfdx-project.json file, and try creating the ancestry tree again.

package/messages/package1_version_create.md

@@ -0,0 +1,8 @@
+# package1VersionCreateCommandUploadFailureDefault
+
+Package version creation failed with unknown error
+
+# package1VersionCreateCommandUploadFailure
+
+Package upload failed.
+%s

package/messages/package_ancestry.md

@@ -0,0 +1,19 @@
+# idOrAliasNotFound
+
+Can't find package with id or alias: %s
+
+# unlockedPackageError
+
+Can’t display package ancestry. Package ancestry is available only for second-generation managed packages. Retry this command and specify a second-generation managed package or package version.
+
+# noVersionsError
+
+Can’t display package ancestry. The specified package has no associated released package versions. Retry this command after you create and promote at least one package version.
+
+# invalidId
+
+Can’t display the ancestry tree for %s. Specify a valid package ID (starts with 0Ho) or package version ID (starts with 04t), and try creating the ancestry tree again.
+
+# versionNotFound
+
+Can’t display the ancestry tree for %s. Verify the package version number (starts with 04t) or the package version alias listed in the sfdx-project.json file, and try creating the ancestry tree again.

package/messages/package_create.md

@@ -0,0 +1,3 @@
+# unableToFindPackageWithId
+
+Unable to find Package with Id: "%s"

package/messages/{package-install.md → package_install.md}

@@ -22,7 +22,3 @@ Waiting for the Subscriber Package Version ID to be published to the target org.
 # subscriberPackageVersionNotPublished
 
 The subscriber package version is not fully available.
-
-# subscriberPackageVersionNotPublished.actions
-
-If this is a recently created package version, try again in a few minutes or contact the package publisher.

package/messages/package_uninstall.md

@@ -0,0 +1,3 @@
+# uninstallErrorAction
+
+Verify installed package ID and resolve errors, then try again.

package/messages/{packageVersionCreate.md → package_version_create.md}

@@ -62,10 +62,14 @@ Can’t create package version. Specifying an ancestor is available only for sec
 
 versionName is blank in sfdx-project.json, so it will be set to this default value based on the versionNumber: %s
 
-# releaseNotesUrl
+# malformedUrl
 
-release notes URL
+The %s value "%s" from the command line or sfdx-project.json is not in the correct format for a URL. It must be a valid URL in the format "http://salesforce.com". More information: https://nodejs.org/api/url.html#url_url_strings_and_url_objects
 
-# postInstallUrl
+# versionCreateFailedWithMultipleErrors
 
-post-install URL
+Multiple errors occurred:
+
+# invalidDaysNumber
+
+Provide a valid positive number for %s.

package/messages/pkg_utils.md

@@ -0,0 +1,122 @@
+# errorNoSubscriberPackageRecord
+
+No subscriber package was found for seed id: %s'
+
+# errorInvalidPackageId
+
+The provided package ID '%s' is invalid.
+
+# errorDuringSObjectCRUDOperation
+
+An error occurred during CRUD operation %s on entity %s.
+%s
+
+# errorInvalidBuildNumberForKeywords
+
+The provided VersionNumber '%s' is invalid. Provide an integer value or use the keyword '%s' or '%s' for the build number.
+
+# errorInvalidPatchNumber
+
+The provided VersionNumber '%s' is not supported. Provide a patch number of 0.
+
+# errorInvalidAncestorVersionFormat
+
+The ancestor versionNumber must be in the format major.minor.patch but the value found is [%s].
+
+# errorNoMatchingMajorMinorForPatch
+
+Can’t create patch version. The specified package ancestor [%s] either isn’t a promoted and released version, or can’t be found. Check the specified ancestor version, and then retry creating the patch version.
+
+# errorNoMatchingAncestor
+
+The ancestorId for ancestorVersion [%s] can't be found. Package ID [%s].
+
+# errorAncestorNotReleased
+
+The ancestor package version [%s] specified in the sfdx-project.json file hasn’t been promoted and released. Release the ancestor package version before specifying it as the ancestor in a new package or patch version.
+
+# errorAncestorNotHighest
+
+Can’t create package version. The ancestor version [%s] you specified isn’t the highest released package version. Set the ancestor version to %s, and try creating the package version again. You can also specify --skipancestorcheck to override the ancestry requirement.
+
+# errorAncestorNoneNotAllowed
+
+Can’t create package version because you didn’t specify a package ancestor. Set the ancestor version to %s, and try creating the package version. You can also specify --skipancestorcheck to override the ancestry requirement.
+
+# errorAncestorIdVersionMismatch
+
+Can’t create package version. The ancestorVersion listed in your sfdx-project.json file doesn’t map to this package. Ensure the ancestor ID is correct, or set the ID to ancestorID:HIGHEST to ensure the highest released package version is used as the ancestor. Then try creating the package version again.
+
+# errorAncestorIdVersionHighestOrNoneMismatch
+
+Can’t create package version. The ancestorId [%s] and ancestorVersion [%s] in your sfdx-project.json file don’t map to the same package version. Remove the incorrect entry, and try creating the package version again.
+
+# errorInvalidIdNoMatchingVersionId
+
+The %s %s is invalid, as a corresponding %s was not found
+
+# invalidPackageTypeAction
+
+Specify Unlocked or Managed for package type.
+
+# invalidPackageTypeMessage
+
+Invalid package type
+
+# idNotFoundAction
+
+It`s possible that this package was created on a different Dev Hub. Authenticate to the Dev Hub org that owns the package, and reference that Dev Hub when running the command.
+
+# malformedPackageVersionIdAction
+
+Use "sfdx force:package:version:list" to verify the 05i package version ID.
+
+# malformedPackageVersionIdMessage
+
+We can’t find this package version ID for this Dev Hub.
+
+# malformedPackageIdAction
+
+Use "sfdx force:package:list" to verify the 0Ho package version ID.
+
+# malformedPackageIdMessage
+
+We can’t find this package ID for this Dev Hub.
+
+# notFoundMessage
+
+The requested resource does not exist
+
+# errorMoreThanOnePackage2WithSeed
+
+Only one package in a Dev Hub is allowed per converted from first-generation package, but the following were found:
+%s
+
+# versionCreateFailedWithMultipleErrors
+
+Multiple errors occurred:
+
+# itemDoesNotFitWithinMaxLength
+
+When calculating the number of items to be included in query "%s", when formatted, was too long.
+The item was (truncated): %s with a length of %s. The maximum length of items, when formatted is %s.
+
+# packageNotEnabledAction
+
+Packaging is not enabled on this org. Verify that you are authenticated to the desired org and try again. Otherwise, contact Salesforce Customer Support for more information.
+
+# packageInstanceNotEnabled
+
+Your org does not have permission to specify a build instance for your package version. Verify that you are authenticated to the desired org and try again. Otherwise, contact Salesforce Customer Support for more information.
+
+# packageSourceOrgNotEnabled
+
+Your Dev Hub does not have permission to specify a source org for your build org. Verify that you are authenticated to the correct Dev Hub and try again. Otherwise, contact Salesforce Customer Support for assistance.
+
+# invalidIdOrAlias
+
+The %s: %s isn't defined in the sfdx-project.json. Add it to the packageDirectories section and add the alias to packageAliases with its %s ID.
+
+# errorInvalidBuildNumber
+
+The provided VersionNumber '%s' is invalid. Provide an integer value or use the keyword '%s' for the build number.

package/messages/profile_api.md

@@ -0,0 +1,15 @@
+# addProfileToPackage
+
+The profile "%s" from the "%s" directory was added to this package version.
+
+# removeProfileSetting
+
+The "%s" profile setting was removed from the "%s" profile.
+
+# removeProfile
+
+The "%s" profile has been removed from the package because its settings don't correspond with anything in the package version.
+
+# profileNotIncluded
+
+The "%s" profile was not added to the package because its settings don't correspond to anything in the package version."

package/messages/version_number.md

@@ -0,0 +1,15 @@
+# errorInvalidBuildNumberToken
+
+The provided VersionNumber '%s' is invalid. Build number token must be a number or one of these tokens '%s'.
+
+# errorMissingVersionNumber
+
+The VersionNumber property must be specified.
+
+# errorInvalidMajorMinorPatchNumber
+
+VersionNumber parts major, minor or patch must be a number but the value found is [%s].
+
+# errorInvalidVersionNumber
+
+VersionNumber must be in the format major.minor.patch.build but the value found is [%s].

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "packing libraries to Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -36,7 +36,7 @@
   ],
   "dependencies": {
     "@oclif/core": "^1.14.2",
-    "@salesforce/core": "^3.26.2",
+    "@salesforce/core": "^3.30.0",
     "@salesforce/kit": "^1.6.0",
     "@salesforce/schemas": "^1.2.0",
     "@salesforce/source-deploy-retrieve": "^6.2.0",