@salesforce/packaging 0.1.20 → 1.0.2

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -4,7 +4,7 @@ import { SaveResult } from 'jsforce';
 import { Attributes } from 'graphology-types';
 import { Optional } from '@salesforce/ts-types';
 import { PackageProfileApi } from '../package/packageProfileApi';
-import { PackageAncestryNode } from '../package';
+import { PackageAncestryNode } from '../package/packageAncestry';
 import { PackagingSObjects } from './packagingSObjects';
 import Package2VersionStatus = PackagingSObjects.Package2VersionStatus;
 import PackageInstallRequest = PackagingSObjects.PackageInstallRequest;

package/lib/package/index.d.ts

@@ -1,8 +1,4 @@
 export * from './package';
-export * from './packageInstall';
 export * from './packageVersion';
-export * from './packageVersionCreateRequest';
-export * from './packageInstalledList';
-export * from './packageVersionCreateRequestReport';
-export * from './packageAncestry';
 export * from './subscriberPackageVersion';
+export { VersionNumber } from './versionNumber';

package/lib/package/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.VersionNumber = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
@@ -21,11 +22,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 __exportStar(require("./package"), exports);
-__exportStar(require("./packageInstall"), exports);
 __exportStar(require("./packageVersion"), exports);
-__exportStar(require("./packageVersionCreateRequest"), exports);
-__exportStar(require("./packageInstalledList"), exports);
-__exportStar(require("./packageVersionCreateRequestReport"), exports);
-__exportStar(require("./packageAncestry"), exports);
 __exportStar(require("./subscriberPackageVersion"), exports);
+var versionNumber_1 = require("./versionNumber");
+Object.defineProperty(exports, "VersionNumber", { enumerable: true, get: function () { return versionNumber_1.VersionNumber; } });
 //# sourceMappingURL=index.js.map

package/lib/package/package.d.ts

@@ -1,5 +1,6 @@
 import { Connection, SfProject } from '@salesforce/core';
 import { ConvertPackageOptions, PackageCreateOptions, PackageOptions, PackageSaveResult, PackageType, PackageUpdateOptions, PackageVersionCreateRequestResult, PackageVersionListOptions, PackageVersionListResult, PackagingSObjects } from '../interfaces';
+import { PackageAncestry } from './packageAncestry';
 export declare const Package2Fields: string[];
 /**
  * Package class.
@@ -38,6 +39,14 @@ export declare class Package {
      * @param options - see {@link PackageVersionListOptions}
      */
     static listVersions(connection: Connection, project: SfProject, options?: PackageVersionListOptions): Promise<PackageVersionListResult[]>;
+    /**
+     * create a PackageAncestry instance
+     *
+     * @param packageId to get version information for
+     * @param project SfProject instance
+     * @param connection Hub Org Connection
+     */
+    static getAncestry(packageId: string, project: SfProject, connection: Connection): Promise<PackageAncestry>;
     /**
      * Convert a 1st generation package to a 2nd generation package.
      * See {@link ConvertPackageOptions} for conversion options.

package/lib/package/package.js

@@ -8,11 +8,12 @@ exports.Package = exports.Package2Fields = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const core_1 = require("@salesforce/core");
-const utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 const packageCreate_1 = require("./packageCreate");
 const packageConvert_1 = require("./packageConvert");
 const packageVersionList_1 = require("./packageVersionList");
 const packageDelete_1 = require("./packageDelete");
+const packageAncestry_1 = require("./packageAncestry");
 const packagePrefixes = {
     PackageId: '0Ho',
     SubscriberPackageVersionId: '04t',
@@ -50,7 +51,8 @@ class Package {
         this.options = options;
         let packageId = this.options.packageAliasOrId;
         if (!packageId.startsWith(packagePrefixes.PackageId)) {
-            packageId = (0, utils_1.getPackageIdFromAlias)(this.options.packageAliasOrId, this.options.project);
+            packageId =
+                this.options.project.getPackageIdFromAlias(this.options.packageAliasOrId) ?? this.options.packageAliasOrId;
             if (packageId === this.options.packageAliasOrId) {
                 throw messages.createError('packageAliasNotFound', [this.options.packageAliasOrId]);
             }
@@ -93,10 +95,10 @@ class Package {
     static async listVersions(connection, project, options) {
         // resolve/verify packages
         const packages = options?.packages?.map((pkg) => {
-            const id = (0, utils_1.getPackageIdFromAlias)(pkg, project);
+            const id = project.getPackageIdFromAlias(pkg) ?? pkg;
             // validate ID
             if (id.startsWith('0Ho')) {
-                (0, utils_1.validateId)(utils_1.BY_LABEL.PACKAGE_ID, id);
+                (0, packageUtils_1.validateId)(packageUtils_1.BY_LABEL.PACKAGE_ID, id);
                 return id;
             }
             else {
@@ -107,6 +109,20 @@ class Package {
         opts.packages = packages || [];
         return (await (0, packageVersionList_1.listPackageVersions)({ ...opts, ...{ connection } })).records;
     }
+    /**
+     * create a PackageAncestry instance
+     *
+     * @param packageId to get version information for
+     * @param project SfProject instance
+     * @param connection Hub Org Connection
+     */
+    static async getAncestry(packageId, project, connection) {
+        return packageAncestry_1.PackageAncestry.create({
+            packageId,
+            project,
+            connection,
+        });
+    }
     /**
      * Convert a 1st generation package to a 2nd generation package.
      * See {@link ConvertPackageOptions} for conversion options.
@@ -182,7 +198,7 @@ class Package {
             return result;
         }
         catch (err) {
-            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
         }
     }
     /**
@@ -199,7 +215,7 @@ class Package {
         return this.packageData;
     }
     verifyAliasForId() {
-        if ((0, utils_1.getPackageAliasesFromId)(this.packageId, this.options.project).length === 0) {
+        if (this.options.project.getAliasesFromPackageId(this.packageId).length === 0) {
             throw new core_1.SfError(messages.getMessage('couldNotFindAliasForId', [this.packageId]));
         }
     }

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';
+import { VersionNumber } from './versionNumber';
 /**
  * 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.

package/lib/package/packageAncestry.js

@@ -26,17 +26,17 @@ 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 utils_1 = require("../utils");
 const packageVersion_1 = require("./packageVersion");
 const package_1 = require("./package");
+const versionNumber_1 = require("./versionNumber");
 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';
 // 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);
+    const aVersion = new versionNumber_1.VersionNumber(a.options.node.MajorVersion, a.options.node.MinorVersion, a.options.node.PatchVersion, a.options.node.BuildNumber);
+    const bVersion = new versionNumber_1.VersionNumber(b.options.node.MajorVersion, b.options.node.MinorVersion, b.options.node.PatchVersion, b.options.node.BuildNumber);
     return aVersion.compareTo(bVersion);
 };
 /**
@@ -161,7 +161,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     }
     async getRoots() {
         let roots = [];
-        __classPrivateFieldSet(this, _PackageAncestry_requestedPackageId, pkgUtils.getPackageIdFromAlias(this.options.packageId, this.options.project), "f");
+        __classPrivateFieldSet(this, _PackageAncestry_requestedPackageId, this.options.project.getPackageIdFromAlias(this.options.packageId) ?? this.options.packageId, "f");
         switch (this.requestedPackageId.slice(0, 3)) {
             case '0Ho':
                 pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, this.requestedPackageId);
@@ -408,7 +408,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 utils_1.VersionNumber(this.options.MajorVersion, this.options.MinorVersion, this.options.PatchVersion, this.options.BuildNumber), "f");
+        __classPrivateFieldSet(this, _PackageAncestryNode_version, new versionNumber_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

@@ -13,12 +13,9 @@ const fs = require("fs");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchOrgSettingsGenerator");
-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 packageUtils_1 = require("../utils/packageUtils");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 const pvcr = require("./packageVersionCreateRequest");
 var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
@@ -67,7 +64,7 @@ async function convertPackage(pkg, connection, options, project) {
         maxRetries = (60 / pkgUtils.POLL_INTERVAL_SECONDS) * options.wait.minutes;
     }
     const packageId = await findOrCreatePackage2(pkg, connection);
-    const apiVersion = pkgUtils.getSourceApiVersion(project);
+    const apiVersion = project?.getSfProjectJson()?.get('sourceApiVersion');
     const request = await createPackageVersionCreateRequest({
         installationkey: options.installationKey,
         definitionfile: options.definitionfile,
@@ -101,13 +98,13 @@ exports.convertPackage = convertPackage;
  * @private
  */
 async function createPackageVersionCreateRequest(context, packageId, apiVersion) {
-    const uniqueId = (0, uniqid_1.uniqid)({ template: `${packageId}-%s` });
+    const uniqueId = (0, packageUtils_1.uniqid)({ template: `${packageId}-%s` });
     const packageVersTmpRoot = path.join(os.tmpdir(), uniqueId);
     const packageVersMetadataFolder = path.join(packageVersTmpRoot, 'md-files');
     const packageVersBlobDirectory = path.join(packageVersTmpRoot, 'package-version-info');
     const settingsZipFile = path.join(packageVersBlobDirectory, 'settings.zip');
     const metadataZipFile = path.join(packageVersBlobDirectory, 'package.zip');
-    const packageVersBlobZipFile = path.join(packageVersTmpRoot, constants_1.consts.PACKAGE_VERSION_INFO_FILE_ZIP);
+    const packageVersBlobZipFile = path.join(packageVersTmpRoot, 'package-version-info.zip');
     const packageDescriptorJson = {
         id: packageId,
     };
@@ -140,15 +137,15 @@ async function createPackageVersionCreateRequest(context, packageId, apiVersion)
     await fs.promises.mkdir(packageVersMetadataFolder, { recursive: true });
     await settingsGenerator.createDeploy();
     await settingsGenerator.createDeployPackageContents(apiVersion);
-    await srcDevUtil.zipDir(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
+    await pkgUtils.zipDir(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
     const shapeDirectory = `${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`;
     const currentPackageXml = await fs.promises.readFile(path.join(shapeDirectory, 'package.xml'), 'utf8');
     await fs.promises.writeFile(path.join(packageVersMetadataFolder, 'package.xml'), currentPackageXml, 'utf-8');
     // Zip the packageVersMetadataFolder folder and put the zip in {packageVersBlobDirectory}/package.zip
-    await srcDevUtil.zipDir(packageVersMetadataFolder, metadataZipFile);
-    await fs.promises.writeFile(path.join(packageVersBlobDirectory, constants_1.consts.PACKAGE2_DESCRIPTOR_FILE), JSON.stringify(packageDescriptorJson, undefined, 2));
+    await pkgUtils.zipDir(packageVersMetadataFolder, metadataZipFile);
+    await fs.promises.writeFile(path.join(packageVersBlobDirectory, 'package2-descriptor.json'), JSON.stringify(packageDescriptorJson, undefined, 2));
     // Zip the Version Info and package.zip files into another zip
-    await srcDevUtil.zipDir(packageVersBlobDirectory, packageVersBlobZipFile);
+    await pkgUtils.zipDir(packageVersBlobDirectory, packageVersBlobZipFile);
     return createRequestObject(packageId, context, packageVersTmpRoot, packageVersBlobZipFile);
 }
 exports.createPackageVersionCreateRequest = createPackageVersionCreateRequest;
@@ -164,7 +161,7 @@ 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) {
+async function pollForStatusWithInterval(id, retries, packageId, branch, project, connection, interval) {
     let remainingRetries = retries;
     const pollingClient = await core_1.PollingClient.create({
         poll: async () => {
@@ -174,7 +171,7 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, withPro
                 if (isStatusEqualTo(results, [Package2VersionStatus.success])) {
                     // update sfdx-project.json
                     let projectUpdated = false;
-                    if (withProject && !process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE) {
+                    if (project && !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
@@ -183,9 +180,9 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, withPro
                             const record = pkgQueryResult.records[0];
                             return `${record.MajorVersion}.${record.MinorVersion}.${record.PatchVersion}-${record.BuildNumber}`;
                         });
-                        const [alias, writtenId] = await (0, utils_1.generatePackageAliasEntry)(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
-                        withProject.getSfProjectJson().addPackageAlias(alias, writtenId);
-                        await withProject.getSfProjectJson().write();
+                        const [alias, writtenId] = await (0, packageUtils_1.generatePackageAliasEntry)(connection, project, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
+                        project.getSfProjectJson().addPackageAlias(alias, writtenId);
+                        await project.getSfProjectJson().write();
                     }
                     await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.convert.success, {
                         id,

package/lib/package/packageDelete.js

@@ -7,12 +7,10 @@
  */
 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);
+    const packageId = project.getPackageIdFromAlias(idOrAlias) ?? idOrAlias;
+    (0, packageUtils_1.validateId)(packageUtils_1.BY_LABEL.PACKAGE_ID, packageId);
     const request = {};
     request.Id = packageId;
     const isUndelete = undelete;
@@ -21,7 +19,7 @@ async function deletePackage(idOrAlias, project, connection, undelete) {
         throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
     });
     if (!updateResult.success) {
-        throw (0, utils_1.combineSaveErrors)('Package2', 'update', updateResult.errors);
+        throw (0, packageUtils_1.combineSaveErrors)('Package2', 'update', updateResult.errors);
     }
     return updateResult;
 }

package/lib/package/packageInstall.js

@@ -9,9 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 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;
@@ -32,7 +31,7 @@ async function createPackageInstallRequest(connection, pkgInstallCreateRequest,
     };
     const request = Object.assign({}, defaults, pkgInstallCreateRequest);
     if (request.Password) {
-        request.Password = (0, utils_1.escapeInstallationKey)(request.Password);
+        request.Password = (0, packageUtils_1.escapeInstallationKey)(request.Password);
     }
     // Only unlocked packages can change the UpgradeType and ApexCompile options from the defaults.
     if (packageType !== 'Unlocked') {
@@ -78,20 +77,20 @@ function isErrorPackageNotAvailable(err) {
 exports.isErrorPackageNotAvailable = isErrorPackageNotAvailable;
 async function getInstallationStatus(subscriberPackageVersionId, installationKey, connection) {
     const QUERY_NO_KEY = `SELECT Id, SubscriberPackageId, InstallValidationStatus FROM SubscriberPackageVersion WHERE Id ='${subscriberPackageVersionId}'`;
-    const escapedInstallationKey = installationKey ? (0, utils_1.escapeInstallationKey)(installationKey) : null;
+    const escapedInstallationKey = installationKey ? (0, packageUtils_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);
+    const pollingTimeout = (0, packageUtils_1.numberToDuration)(timeout || 0);
     if (pollingTimeout.milliseconds <= 0) {
         return;
     }
     let queryResult;
     let installValidationStatus;
     const pollingOptions = {
-        frequency: (0, utils_1.numberToDuration)(frequency || 0),
+        frequency: (0, packageUtils_1.numberToDuration)(frequency || 0),
         timeout: pollingTimeout,
         poll: async () => {
             queryResult = await getInstallationStatus(subscriberPackageVersionId, installationKey, connection);
@@ -133,8 +132,8 @@ 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 frequency = (0, packageUtils_1.numberToDuration)(pollingFrequency || 5000);
+    const timeout = (0, packageUtils_1.numberToDuration)(pollingTimeout || 300000);
     const pollingOptions = {
         frequency,
         timeout,

package/lib/package/packageUninstall.js

@@ -11,7 +11,7 @@ const os = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");
-const utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_uninstall');
 const pkgMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'package');
@@ -68,7 +68,7 @@ async function uninstallPackage(id, conn, frequency = kit_1.Duration.seconds(0),
         }
     }
     catch (err) {
-        throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+        throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
     }
 }
 exports.uninstallPackage = uninstallPackage;

package/lib/package/packageVersion.js

@@ -10,7 +10,7 @@ exports.PackageVersion = exports.Package2VersionFields = 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 packageUtils_1 = require("../utils/packageUtils");
 const packageVersionCreate_1 = require("./packageVersionCreate");
 const packageVersionReport_1 = require("./packageVersionReport");
 const packageVersionCreateRequestReport_1 = require("./packageVersionCreateRequestReport");
@@ -59,11 +59,11 @@ class PackageVersion {
         const id = this.resolveId();
         // validate ID
         if (id.startsWith('04t')) {
-            (0, utils_1.validateId)(utils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, id);
+            (0, packageUtils_1.validateId)(packageUtils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, id);
             this.data.SubscriberPackageVersionId = id;
         }
         else if (id.startsWith('05i')) {
-            (0, utils_1.validateId)(utils_1.BY_LABEL.PACKAGE_VERSION_ID, id);
+            (0, packageUtils_1.validateId)(packageUtils_1.BY_LABEL.PACKAGE_VERSION_ID, id);
             this.data.Id = id;
         }
         else {
@@ -88,7 +88,7 @@ class PackageVersion {
         return PackageVersion.pollCreateStatus(createResult.Id, options.connection, options.project, polling).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
         });
     }
     /**
@@ -104,7 +104,7 @@ class PackageVersion {
         }).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
         });
     }
     /**
@@ -183,7 +183,7 @@ class PackageVersion {
         }
         catch (err) {
             await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create['timed-out'], report);
-            throw (0, utils_1.applyErrorAction)(err);
+            throw (0, packageUtils_1.applyErrorAction)(err);
         }
     }
     /**
@@ -199,7 +199,7 @@ class PackageVersion {
         }).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
         });
     }
     /**
@@ -266,7 +266,7 @@ class PackageVersion {
         }
         catch (err) {
             await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create['timed-out'], report);
-            throw (0, utils_1.applyErrorAction)(err);
+            throw (0, packageUtils_1.applyErrorAction)(err);
         }
     }
     /**
@@ -326,16 +326,16 @@ class PackageVersion {
                 queryConfig = {
                     id: this.data.Id,
                     clause: `Id = '${this.data.Id}'`,
-                    label1: utils_1.BY_LABEL.PACKAGE_VERSION_ID.label,
-                    label2: utils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID.label,
+                    label1: packageUtils_1.BY_LABEL.PACKAGE_VERSION_ID.label,
+                    label2: packageUtils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID.label,
                 };
             }
             else {
                 queryConfig = {
                     id: this.data.SubscriberPackageVersionId,
                     clause: `SubscriberPackageVersionId = '${this.data.SubscriberPackageVersionId}'`,
-                    label1: utils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID.label,
-                    label2: utils_1.BY_LABEL.PACKAGE_VERSION_ID.label,
+                    label1: packageUtils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID.label,
+                    label2: packageUtils_1.BY_LABEL.PACKAGE_VERSION_ID.label,
                 };
             }
             const allFields = exports.Package2VersionFields.toString();
@@ -376,7 +376,7 @@ class PackageVersion {
         }).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
         });
         return results[0];
     }
@@ -423,7 +423,7 @@ class PackageVersion {
             return PackageVersion.waitForCreateVersion(createResult.Id, this.project, this.connection, polling).catch((err) => {
                 // TODO
                 // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-                throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+                throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
             });
         }
         return createResult;
@@ -437,7 +437,7 @@ class PackageVersion {
         };
         const updateResult = await this.connection.tooling.update('Package2Version', request);
         if (!updateResult.success) {
-            throw (0, utils_1.combineSaveErrors)('Package2', 'update', updateResult.errors);
+            throw (0, packageUtils_1.combineSaveErrors)('Package2', 'update', updateResult.errors);
         }
         updateResult.id = await this.getSubscriberId();
         return updateResult;
@@ -446,7 +446,7 @@ class PackageVersion {
         if (!process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE) {
             // get the newly created package version from the server
             const versionResult = (await this.connection.tooling.query(`SELECT Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version WHERE SubscriberPackageVersionId='${results.SubscriberPackageVersionId}'`)).records[0];
-            const version = `${(0, utils_1.getPackageAliasesFromId)(results.Package2Id, this.project).join()}@${versionResult.MajorVersion ?? 0}.${versionResult.MinorVersion ?? 0}.${versionResult.PatchVersion ?? 0}`;
+            const version = `${this.project.getAliasesFromPackageId(results.Package2Id).join()}@${versionResult.MajorVersion ?? 0}.${versionResult.MinorVersion ?? 0}.${versionResult.PatchVersion ?? 0}`;
             const build = versionResult.BuildNumber ? `-${versionResult.BuildNumber}` : '';
             const branch = versionResult.Branch ? `-${versionResult.Branch}` : '';
             // set packageAliases entry '<package>@<major>.<minor>.<patch>-<build>-<branch>: <result.subscriberPackageVersionId>'
@@ -456,7 +456,7 @@ class PackageVersion {
         }
     }
     resolveId() {
-        return (0, utils_1.getPackageIdFromAlias)(this.options.idOrAlias, this.project);
+        return this.project.getPackageIdFromAlias(this.options.idOrAlias) ?? this.options.idOrAlias;
     }
 }
 exports.PackageVersion = PackageVersion;