@salesforce/packaging 0.0.18 → 0.0.21

package/lib/package/packageVersionCreateRequest.d.ts

@@ -1,4 +1,4 @@
 import { Connection } from '@salesforce/core';
 import { PackageVersionCreateRequestResult, PackageVersionCreateRequestQueryOptions } from '../interfaces';
 export declare function list(options?: PackageVersionCreateRequestQueryOptions): Promise<PackageVersionCreateRequestResult[]>;
-export declare function byId(packageVersionCreateRequestId: any, connection: Connection): Promise<PackageVersionCreateRequestResult[]>;
+export declare function byId(packageVersionCreateRequestId: string, connection: Connection): Promise<PackageVersionCreateRequestResult[]>;

package/lib/package/packageVersionReport.js

@@ -40,17 +40,16 @@ async function getPackageVersionReport(options) {
         const record = records[0];
         record.Version = [record.MajorVersion, record.MinorVersion, record.PatchVersion, record.BuildNumber].join('.');
         const containerOptions = await pkgUtils.getContainerOptions([record.Package2Id], options.connection);
-        const packageType = containerOptions.get(record.Package2Id);
-        let ancestorVersion = null;
+        record.PackageType = containerOptions.get(record.Package2Id);
+        record.AncestorVersion = null;
         if (record.AncestorId) {
             // lookup AncestorVersion value
             const ancestorVersionMap = await pkgUtils.getPackageVersionStrings([record.AncestorId], options.connection);
-            ancestorVersion = ancestorVersionMap.get(record.AncestorId);
+            record.AncestorVersion = ancestorVersionMap.get(record.AncestorId);
         }
         else {
-            // otherwise display 'N/A' if package is Unlocked Packages
-            if (packageType !== 'Managed') {
-                ancestorVersion = null;
+            if (record.PackageType !== 'Managed') {
+                record.AncestorVersion = null;
                 record.AncestorId = null;
             }
         }
@@ -58,10 +57,9 @@ async function getPackageVersionReport(options) {
             record.Package2.IsOrgDependent === true || record.ValidationSkipped === true
                 ? null
                 : record.HasPassedCodeCoverageCheck;
-        record.Package2.IsOrgDependent = packageType === 'Managed' ? null : !!record.Package2.IsOrgDependent;
+        record.Package2.IsOrgDependent = record.PackageType === 'Managed' ? null : !!record.Package2.IsOrgDependent;
         // set HasMetadataRemoved to null Unlocked, otherwise use existing value
-        record.HasMetadataRemoved = packageType !== 'Managed' ? null : !!record.HasMetadataRemoved;
-        record.AncestorVersion = ancestorVersion;
+        record.HasMetadataRemoved = record.PackageType !== 'Managed' ? null : !!record.HasMetadataRemoved;
         return records;
     }
     return [];

package/lib/package1/package1VersionList.d.ts

@@ -2,7 +2,7 @@ import { Connection } from '@salesforce/core';
 import { Package1Display } from '../interfaces';
 /**
  * Lists package versions available in dev org. If package ID is supplied, only list versions of that package,
- *  otherwise, list all package versions
+ * otherwise, list all package versions
  *
  * @param connection: sfdx-core Connection to the org
  * @param metadataPackageId: optional, if present ID of package to list versions for (starts with 033)

package/lib/package1/package1VersionList.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.package1VersionList = void 0;
 /**
  * Lists package versions available in dev org. If package ID is supplied, only list versions of that package,
- *  otherwise, list all package versions
+ * otherwise, list all package versions
  *
  * @param connection: sfdx-core Connection to the org
  * @param metadataPackageId: optional, if present ID of package to list versions for (starts with 033)

package/lib/utils/packageUtils.d.ts

@@ -2,7 +2,7 @@ import { Connection, NamedPackageDir, PackageDir, SfdcUrl, SfError, SfProject }
 import { Duration } from '@salesforce/kit';
 import { Many, Nullable } from '@salesforce/ts-types';
 import { SaveError } from 'jsforce';
-import { PackagingSObjects, PackageVersionCreateRequestResult, PackageVersionCreateOptions } from '../interfaces';
+import { PackageType, PackageVersionCreateRequestResult, PackagingSObjects } from '../interfaces';
 export declare const VERSION_NUMBER_SEP = ".";
 export declare type IdRegistryValue = {
     prefix: string;
@@ -24,10 +24,9 @@ export declare const DEFAULT_PACKAGE_DIR: {
 export declare const BY_PREFIX: IdRegistry;
 export declare const BY_LABEL: IdRegistry;
 export declare function validateId(idObj: Many<IdRegistryValue>, value: string): void;
-export declare function validateIdNoThrow(idObj: Many<IdRegistryValue>, value: any): any;
-export declare function validateVersionNumber(versionNumberString: string, supportedBuildNumberToken: string, supportedBuildNumberToken2: string): string;
+export declare function validateIdNoThrow(idObj: Many<IdRegistryValue>, value: any): IdRegistryValue | false;
+export declare function validateVersionNumber(versionNumberString: string, supportedBuildNumberToken: string, supportedBuildNumberToken2?: string): string;
 export declare function validatePatchVersion(connection: Connection, versionNumberString: string, packageId: string): Promise<void>;
-export declare function validUrl(url: string): boolean;
 export declare function isErrorFromSPVQueryRestriction(err: Error): boolean;
 export declare function isErrorPackageNotAvailable(err: Error): boolean;
 export declare function massageErrorMessage(err: Error): Error;
@@ -47,7 +46,7 @@ export declare function escapeInstallationKey(key?: string): Nullable<string>;
  * @param connection For tooling query
  * @throws Error with message when package2 cannot be found
  */
-export declare function getPackageType(packageId: string, connection: Connection): Promise<string>;
+export declare function getPackageType(packageId: string, connection: Connection): Promise<PackageType>;
 /**
  * Given 04t the package type type (Managed, Unlocked, Locked(deprecated?))
  *
@@ -71,7 +70,7 @@ export declare function getSubscriberPackageVersionId(versionId: string, connect
  * @param packageIds The list of package IDs
  * @param connection For tooling query
  */
-export declare function getContainerOptions(packageIds: string[], connection: Connection): Promise<Map<string, string>>;
+export declare function getContainerOptions(packageIds: string[], connection: Connection): Promise<Map<string, PackageType>>;
 /**
  * Return the Package2Version.HasMetadataRemoved field value for the given Id (05i)
  *
@@ -99,20 +98,9 @@ export declare function getPackageVersionStrings(subscriberPackageVersionIds: st
  */
 export declare function queryWithInConditionChunking<T = Record<string, unknown>>(query: string, items: string[], replaceToken: string, connection: Connection): Promise<T[]>;
 /**
- *   Returns the number of items that can be included in a quoted comma-separated string (e.g., "'item1','item2'") not exceeding maxLength
+ * Returns the number of items that can be included in a quoted comma-separated string (e.g., "'item1','item2'") not exceeding maxLength
  */
 export declare function getInClauseItemsCount(items: string[], startIndex: number, maxLength: number): number;
-/**
- * Given a package descriptor, return the ancestor ID. This code was duplicated to scratchOrgInfoGenerator.getAncestorIds,
- * changes here may need to be duplicated there until that code, and/or this code is moved to a separate plugin.
- *
- * @param packageDescriptorJson JSON for packageDirectories element in sfdx-project.json
- * @param connection For tooling query
- * @param project The project to use for looking up the ancestor ID
- * @param versionNumberString The version number string to use for looking up the ancestor ID
- * @param skipAncestorCheck If true, skip the check for the ancestor ID
- */
-export declare function getAncestorId(packageDescriptorJson: PackageDir, connection: Connection, project: SfProject, versionNumberString: string, skipAncestorCheck: boolean): Promise<string>;
 export declare function validateAncestorId(ancestorId: string, highestReleasedVersion: PackagingSObjects.Package2Version, explicitUseNoAncestor: boolean, isPatch: boolean, skipAncestorCheck: boolean, origSpecifiedAncestor: string): string;
 export declare function getAncestorIdHighestRelease(connection: Connection, packageId: string, versionNumberString: string, explicitUseHighestRelease: boolean, skipAncestorCheck: boolean): Promise<{
     finalAncestorId: string;
@@ -148,7 +136,21 @@ export declare function convertCamelCaseStringToSentence(stringIn: string): stri
 export declare function getPackageAliasesFromId(packageId: string, project: SfProject): string[];
 export declare function findOrCreatePackage(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>;
-export declare function getSoqlWhereClauseMaxLength(): number;
+/**
+ * Generate package alias json entry for this package version that can be written to sfdx-project.json
+ *
+ * @param connection
+ * @param project SfProject instance for the project
+ * @param packageVersionId 04t id of the package to create the alias entry for
+ * @param packageVersionNumber that will be appended to the package name to form the alias
+ * @param branch
+ * @param packageId the 0Ho id
+ * @private
+ */
+export declare function generatePackageAliasEntry(connection: Connection, project: SfProject, packageVersionId: string, packageVersionNumber: string, branch: string, packageId: string): Promise<{
+    packageAliases: {
+        [p: string]: string;
+    };
+}>;
 export declare function formatDate(date: Date): string;
 export declare function combineSaveErrors(sObject: string, crudOperation: string, errors: SaveError[]): SfError;
-export declare function resolveCanonicalPackageProperty(options: PackageVersionCreateOptions): "id" | "package";

package/lib/utils/packageUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveCanonicalPackageProperty = exports.combineSaveErrors = exports.formatDate = exports.getSoqlWhereClauseMaxLength = exports.pollForStatusWithInterval = exports.findOrCreatePackage = exports.getPackageAliasesFromId = exports.convertCamelCaseStringToSentence = exports.getPackageIdFromAlias = exports.getConfigPackageDirectory = exports.getConfigPackageDirectories = exports.getPackageVersionNumber = exports.concatVersion = exports.getAncestorIdHighestRelease = exports.validateAncestorId = exports.getAncestorId = 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.validUrl = 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.pollForStatusWithInterval = exports.findOrCreatePackage = exports.getPackageAliasesFromId = exports.convertCamelCaseStringToSentence = exports.getPackageIdFromAlias = exports.getConfigPackageDirectory = exports.getConfigPackageDirectories = exports.getPackageVersionNumber = exports.concatVersion = exports.getAncestorIdHighestRelease = 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.
@@ -107,11 +107,6 @@ async function validatePatchVersion(connection, versionNumberString, packageId)
 }
 exports.validatePatchVersion = validatePatchVersion;
 // TODO: let's get rid of this in favor of SfdcUrl.isValidUrl()
-// check that the provided url has a valid format
-function validUrl(url) {
-    return core_1.SfdcUrl.isValidUrl(url);
-}
-exports.validUrl = validUrl;
 // determines if error is from malformed SubscriberPackageVersion query
 // this is in place to allow cli to run against app version 214, where SPV queries
 // do not require installation key
@@ -225,7 +220,7 @@ exports.escapeInstallationKey = escapeInstallationKey;
 async function getPackageType(packageId, connection) {
     const query = `SELECT ContainerOptions FROM Package2 WHERE id ='${packageId}'`;
     const queryResult = await connection.tooling.query(query);
-    if (!queryResult || queryResult.records === null || queryResult.records.length === 0) {
+    if (queryResult.records.length === 0) {
         throw messages.createError('errorInvalidPackageId', [packageId]);
     }
     return queryResult.records[0].ContainerOptions;
@@ -380,7 +375,7 @@ async function queryWithInConditionChunking(query, items, replaceToken, connecti
 }
 exports.queryWithInConditionChunking = queryWithInConditionChunking;
 /**
- *   Returns the number of items that can be included in a quoted comma-separated string (e.g., "'item1','item2'") not exceeding maxLength
+ * Returns the number of items that can be included in a quoted comma-separated string (e.g., "'item1','item2'") not exceeding maxLength
  */
 // TODO: this function cannot handle a single item that is longer than maxLength - what to do, since this could be the root cause of an infinite loop?
 function getInClauseItemsCount(items, startIndex, maxLength) {
@@ -401,106 +396,6 @@ function getInClauseItemsCount(items, startIndex, maxLength) {
     return includedCount;
 }
 exports.getInClauseItemsCount = getInClauseItemsCount;
-/**
- * Given a package descriptor, return the ancestor ID. This code was duplicated to scratchOrgInfoGenerator.getAncestorIds,
- * changes here may need to be duplicated there until that code, and/or this code is moved to a separate plugin.
- *
- * @param packageDescriptorJson JSON for packageDirectories element in sfdx-project.json
- * @param connection For tooling query
- * @param project The project to use for looking up the ancestor ID
- * @param versionNumberString The version number string to use for looking up the ancestor ID
- * @param skipAncestorCheck If true, skip the check for the ancestor ID
- */
-async function getAncestorId(packageDescriptorJson, connection, project, versionNumberString, skipAncestorCheck) {
-    // eslint-disable-next-line complexity
-    return Promise.resolve().then(async () => {
-        // If an id property is present, use it.  Otherwise, look up the package id from the package property.
-        const packageId = packageDescriptorJson['id'] ?? getPackageIdFromAlias(packageDescriptorJson.package, project);
-        // No need to proceed if Unlocked
-        const packageType = await getPackageType(packageId, connection);
-        if (packageType === 'Unlocked') {
-            return '';
-        }
-        let ancestorId = '';
-        // ancestorID can be alias, 05i, or 04t;
-        // validate and convert to 05i, as needed
-        const versionNumber = versionNumberString.split(exports.VERSION_NUMBER_SEP);
-        const isPatch = versionNumber[2] !== '0';
-        let origSpecifiedAncestor = packageDescriptorJson.ancestorId;
-        let highestReleasedVersion = null;
-        const explicitUseHighestRelease = packageDescriptorJson.ancestorId === versionNumber_1.BuildNumberToken.HIGHEST_VERSION_NUMBER_TOKEN ||
-            packageDescriptorJson.ancestorVersion === versionNumber_1.BuildNumberToken.HIGHEST_VERSION_NUMBER_TOKEN;
-        const explicitUseNoAncestor = packageDescriptorJson.ancestorId === versionNumber_1.BuildNumberToken.NONE_VERSION_NUMBER_TOKEN ||
-            packageDescriptorJson.ancestorVersion === versionNumber_1.BuildNumberToken.NONE_VERSION_NUMBER_TOKEN;
-        if ((explicitUseHighestRelease || explicitUseNoAncestor) &&
-            packageDescriptorJson.ancestorId &&
-            packageDescriptorJson.ancestorVersion) {
-            if (packageDescriptorJson.ancestorId !== packageDescriptorJson.ancestorVersion) {
-                // both ancestorId and ancestorVersion specified, HIGHEST and/or NONE are used, the values disagree
-                throw messages.createError('errorAncestorIdVersionHighestOrNoneMismatch', [
-                    packageDescriptorJson.ancestorId,
-                    packageDescriptorJson.ancestorVersion,
-                ]);
-            }
-        }
-        if (explicitUseNoAncestor && skipAncestorCheck) {
-            return '';
-        }
-        else {
-            const result = await getAncestorIdHighestRelease(connection, packageId, versionNumberString, explicitUseHighestRelease, skipAncestorCheck);
-            if (result.finalAncestorId) {
-                return result.finalAncestorId;
-            }
-            highestReleasedVersion = result.highestReleasedVersion;
-        }
-        // at this point if explicitUseHighestRelease=true, we have returned the ancestorId or thrown an error
-        // highestReleasedVersion should be null only if skipAncestorCheck or if there is no existing released package version
-        if (!explicitUseNoAncestor && packageDescriptorJson.ancestorId) {
-            ancestorId = getPackageIdFromAlias(packageDescriptorJson.ancestorId, project);
-            validateId([exports.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, exports.BY_LABEL.PACKAGE_VERSION_ID], ancestorId);
-            ancestorId = await getPackageVersionId(ancestorId, connection);
-        }
-        if (!explicitUseNoAncestor && packageDescriptorJson.ancestorVersion) {
-            const regNumbers = new RegExp('^[0-9]+$');
-            const versionNumber = packageDescriptorJson.ancestorVersion.split(exports.VERSION_NUMBER_SEP);
-            if (versionNumber.length < 3 ||
-                versionNumber.length > 4 ||
-                !versionNumber[0].match(regNumbers) ||
-                !versionNumber[1].match(regNumbers) ||
-                !versionNumber[2].match(regNumbers)) {
-                throw messages.createError('errorInvalidAncestorVersionFormat', [packageDescriptorJson.ancestorVersion]);
-            }
-            const query = 'SELECT Id, IsReleased FROM Package2Version ' +
-                `WHERE Package2Id = '${packageId}' AND MajorVersion = ${versionNumber[0]} AND MinorVersion = ${versionNumber[1]} AND PatchVersion = ${versionNumber[2]}`;
-            let queriedAncestorId;
-            const ancestorVersionResult = await connection.tooling.query(query);
-            if (!ancestorVersionResult || !ancestorVersionResult.totalSize) {
-                throw messages.createError('errorNoMatchingAncestor', [packageDescriptorJson.ancestorVersion, packageId]);
-            }
-            else {
-                const releasedAncestor = ancestorVersionResult.records.find((rec) => rec.IsReleased === true);
-                if (!releasedAncestor) {
-                    throw messages.createError('errorAncestorNotReleased', [packageDescriptorJson.ancestorVersion]);
-                }
-                else {
-                    queriedAncestorId = releasedAncestor.Id;
-                }
-            }
-            // check for discrepancy between queried ancestorId and descriptor's ancestorId
-            if (Object.prototype.hasOwnProperty.call(packageDescriptorJson, 'ancestorId') &&
-                ancestorId !== queriedAncestorId) {
-                throw messages.createError('errorAncestorIdVersionMismatch', [
-                    packageDescriptorJson.ancestorVersion,
-                    packageDescriptorJson.ancestorId,
-                ]);
-            }
-            ancestorId = queriedAncestorId;
-            origSpecifiedAncestor = packageDescriptorJson.ancestorVersion;
-        }
-        return validateAncestorId(ancestorId, highestReleasedVersion, explicitUseNoAncestor, isPatch, skipAncestorCheck, origSpecifiedAncestor);
-    });
-}
-exports.getAncestorId = getAncestorId;
 function validateAncestorId(ancestorId, highestReleasedVersion, explicitUseNoAncestor, isPatch, skipAncestorCheck, origSpecifiedAncestor) {
     if (explicitUseNoAncestor) {
         if (!highestReleasedVersion) {
@@ -682,11 +577,11 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, withPro
                             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);
+                        const newConfig = await generatePackageAliasEntry(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
                         withProject.getSfProjectJson().set('packageAliases', newConfig);
                         await withProject.getSfProjectJson().write();
                     }
-                    core_1.Lifecycle.getInstance().emit(Package2VersionStatus.success, {
+                    await core_1.Lifecycle.getInstance().emit(Package2VersionStatus.success, {
                         id,
                         packageVersionCreateRequestResult: results[0],
                         projectUpdated,
@@ -700,25 +595,26 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, withPro
                         // 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');
                     }
-                    core_1.Lifecycle.getInstance().emit(Package2VersionStatus.error, { id, status });
+                    await core_1.Lifecycle.getInstance().emit(Package2VersionStatus.error, { id, status });
                     throw new core_1.SfError(status);
                 }
             }
             else {
                 const remainingTime = kit_1.Duration.milliseconds(interval.milliseconds * remainingRetries);
-                core_1.Lifecycle.getInstance().emit(Package2VersionStatus.inProgress, {
+                await core_1.Lifecycle.getInstance().emit(Package2VersionStatus.inProgress, {
                     id,
                     packageVersionCreateRequestResult: results[0],
                     message: '',
                     remainingTime,
                 });
-                logger.info(`Request in progress. Sleeping ${interval} seconds. Will wait a total of ${remainingTime.seconds} more seconds before timing out. Current Status='${convertCamelCaseStringToSentence(results[0]?.Status)}'`);
+                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] };
             }
@@ -740,16 +636,15 @@ exports.pollForStatusWithInterval = pollForStatusWithInterval;
  * @param packageId the 0Ho id
  * @private
  */
-async function _generatePackageAliasEntry(connection, project, packageVersionId, packageVersionNumber, branch, packageId) {
+async function generatePackageAliasEntry(connection, project, packageVersionId, packageVersionNumber, branch, packageId) {
     const configContent = project.getSfProjectJson().getContents();
     const packageAliases = configContent.packageAliases || {};
     const aliasForPackageId = getPackageAliasesFromId(packageId, project);
     let packageName;
     if (!aliasForPackageId || aliasForPackageId.length === 0) {
         const query = `SELECT Name FROM Package2 WHERE Id = '${packageId}'`;
-        packageName = await connection.tooling
-            .query(query)
-            .then((pkgQueryResult) => pkgQueryResult.records[0]?.Name);
+        const package2 = await connection.singleRecordQuery(query, { tooling: true });
+        packageName = package2.Name;
     }
     else {
         packageName = aliasForPackageId[0];
@@ -760,6 +655,7 @@ async function _generatePackageAliasEntry(connection, project, packageVersionId,
     packageAliases[packageAlias] = packageVersionId;
     return { packageAliases };
 }
+exports.generatePackageAliasEntry = generatePackageAliasEntry;
 /**
  * Return true if the queryResult.records[0].Status is equal to one of the values in statuses.
  *
@@ -770,14 +666,9 @@ async function _generatePackageAliasEntry(connection, project, packageVersionId,
 function _isStatusEqualTo(results, statuses) {
     return results?.length <= 0 ? false : statuses?.some((status) => results[0].Status === status);
 }
-// added for unit testing
-function getSoqlWhereClauseMaxLength() {
-    return exports.SOQL_WHERE_CLAUSE_MAX_LENGTH;
-}
-exports.getSoqlWhereClauseMaxLength = getSoqlWhereClauseMaxLength;
 function formatDate(date) {
     const pad = (num) => {
-        return num < 10 ? `0${num}` : num;
+        return num < 10 ? `0${num}` : `${num}`;
     };
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
@@ -787,39 +678,7 @@ function combineSaveErrors(sObject, crudOperation, errors) {
         const fieldsString = error.fields?.length > 0 ? `Fields: [${error.fields.join(', ')}]` : '';
         return `Error: ${error.errorCode} Message: ${error.message} ${fieldsString}`;
     });
-    const sfError = messages.createError('errorDuringSObjectCRUDOperation', [
-        crudOperation,
-        sObject,
-        errorMessages.join(os.EOL),
-    ]);
-    return sfError;
+    return messages.createError('errorDuringSObjectCRUDOperation', [crudOperation, sObject, errorMessages.join(os.EOL)]);
 }
 exports.combineSaveErrors = combineSaveErrors;
-function resolveCanonicalPackageProperty(options) {
-    let canonicalPackageProperty;
-    if (!options.package) {
-        const packageValProp = this.getPackageValuePropertyFromDirectory(options.path, options);
-        options.package = packageValProp.packageValue;
-        canonicalPackageProperty = packageValProp.packageProperty;
-    }
-    else if (!options.path) {
-        canonicalPackageProperty = this.getPackagePropertyFromPackage(this.project.getPackageDirectories(), options);
-        options.path = this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 'path', canonicalPackageProperty, options.package, 'package', options);
-    }
-    else {
-        canonicalPackageProperty = this.getPackagePropertyFromPackage(this.project.getPackageDirectories(), options);
-        this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), canonicalPackageProperty, 'path', options.path, 'path', options);
-        const expectedPackageId = this.getConfigPackageDirectoriesValue(this.packageDirs, canonicalPackageProperty, 'path', options.path, 'path', options);
-        // This will throw an error if the package id flag value doesn't match
-        // any of the :id values in the package dirs.
-        this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 'path', canonicalPackageProperty, options.package, 'package', options);
-        // This will throw an error if the package id flag value doesn't match
-        // the correct corresponding directory with that packageId.
-        if (options.package !== expectedPackageId) {
-            throw messages.createError('errorDirectoryIdMismatch', ['--path', options.path, '--package', options.package]);
-        }
-    }
-    return canonicalPackageProperty;
-}
-exports.resolveCanonicalPackageProperty = resolveCanonicalPackageProperty;
 //# sourceMappingURL=packageUtils.js.map

package/messages/messages.md

@@ -177,14 +177,6 @@ Only one package in a Dev Hub is allowed per converted from first-generation pac
 
 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.,
-
-# errorAncestorNotApplicableToUnlockedPackage
-
-Can’t create package version. Specifying an ancestor is available only for second-generation managed packages. Remove the ancestorId or ancestorVersion from your sfdx-project.json file, and then create the package version again.,
-
 # itemDoesNotFitWithinMaxLength
 
 When calculating the number of items to be included in query "%s", when formatted, was too long.
@@ -207,34 +199,14 @@ The %s value [%s], doesn’t match the %s value in any packageDirectories specif
 
 The %s value, [%s], and %s value, [%s], were both found in sfdx-project.json but don’t match. If you supply both values, they must match the path and package values in one of the packageDirectories.,
 
-# tempFileLocation
-
-The temp files are located at: %s.
-
-# failedToCreatePVCRequest
-
-Failed to create request %s: %s
-
-# versionNumberNotFoundInDevHub
+# errorInvalidPackageId
 
-No version number was found in Dev Hub for package id %s and branch %s and version number %s that resolved to build number %s.
-
-# noReleaseVersionFound
-
-No released version was found in Dev Hub for package id %s and version number %s.
-
-# noReleaseVersionFoundForBranch
-
-No version number was found in Dev Hub for package id $s and branch %s and version number %s.
+The provided package ID '%s' is invalid.
 
 # packagingDirNotFoundInConfigFile
 
 Config file %s does not contain a packaging directory for %s.
 
-# unpackagedMDDirectoryDoesNotExist
-
-Un-packaged metadata directory %s was specified but does not exist.
-
 # directoryDoesNotExist
 
 Directory %s does not exist.
@@ -255,3 +227,7 @@ Can't uninstall the package %s during uninstall request %s.
 # uninstallErrorAction
 
 Verify installed package ID and resolve errors, then try again.
+
+# errorNoSubscriberPackageRecord
+
+No subscriber package was found for seed id: %s'

package/messages/packageVersionCreate.md

@@ -0,0 +1,71 @@
+# errorPackageAndPackageIdCollision
+
+You can’t have both "package" and "packageId" (deprecated) defined as dependencies in sfdx-project.json.
+
+# errorDependencyPair
+
+Dependency must specify either a subscriberPackageVersionId or both packageId and versionNumber: %s
+
+# errorNoIdInHub
+
+No package ID was found in Dev Hub for package ID: %s.
+
+# versionNumberNotFoundInDevHub
+
+No version number was found in Dev Hub for package id %s and branch %s and version number %s that resolved to build number %s.
+
+# buildNumberResolvedForLatest
+
+Dependency on package %s was resolved to version number %s, branch %s, %s.
+
+# buildNumberResolvedForReleased
+
+Dependency on package %s was resolved to the released version number %s, %s.
+
+# noReleaseVersionFound
+
+No released version was found in Dev Hub for package id %s and version number %s.
+
+# noReleaseVersionFoundForBranch
+
+No version number was found in Dev Hub for package id $s and branch %s and version number %s.
+
+# tempFileLocation
+
+The temp files are located at: %s.
+
+# signupDuplicateSettingsSpecified
+
+You cannot use 'settings' and 'orgPreferences' in your scratch definition file, please specify one or the other.
+
+# unpackagedMDDirectoryDoesNotExist
+
+Un-packaged metadata directory %s was specified but does not exist.
+
+# errorEmptyPackageDirs
+
+sfdx-project.json must contain a packageDirectories entry for a package. You can run the force:package:create command to auto-populate such an entry.
+
+# failedToCreatePVCRequest
+
+Failed to create request %s: %s
+
+# 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.
+
+# errorAncestorNotApplicableToUnlockedPackage
+
+Can’t create package version. Specifying an ancestor is available only for second-generation managed packages. Remove the ancestorId or ancestorVersion from your sfdx-project.json file, and then create the package version again.
+
+# defaultVersionName
+
+versionName is blank in sfdx-project.json, so it will be set to this default value based on the versionNumber: %s
+
+# releaseNotesUrl
+
+release notes URL
+
+# postInstallUrl
+
+post-install URL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "packing libraries to Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -35,7 +35,7 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@salesforce/core": "^3.24.0",
+    "@salesforce/core": "^3.26.1",
     "@salesforce/kit": "^1.5.44",
     "@salesforce/schemas": "^1.2.0",
     "@salesforce/source-deploy-retrieve": "^6.2.0",