@salesforce/packaging 3.7.1 → 3.7.3

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -1,5 +1,6 @@
 import { Duration } from '@salesforce/kit';
-import { Connection, NamedPackageDir, SfProject } from '@salesforce/core';
+import { Connection } from '@salesforce/core';
+import { NamedPackagingDir, SfProject } from '@salesforce/core/project';
 import type { SaveResult } from '@jsforce/jsforce-node';
 import { Attributes } from 'graphology-types';
 import { Optional } from '@salesforce/ts-types';
@@ -121,7 +122,7 @@ export type PackageCreateOptions = {
     errorNotificationUsername: string;
     path: string;
 };
-export type PackageDescriptorJson = Partial<NamedPackageDir> & Partial<{
+export type PackageDescriptorJson = Partial<NamedPackagingDir> & Partial<{
     id: string;
     features: string[];
     orgPreferences: string[];
@@ -238,11 +239,12 @@ export type SubscriberPackageVersionOptions = {
     password: Optional<string>;
 };
 export type ConvertPackageOptions = {
-    installationKey: string;
-    definitionfile: string;
+    installationKey?: string;
+    definitionfile?: string;
+    /** @deprecated stop using it*/
     installationKeyBypass: boolean;
     wait: Duration;
-    buildInstance: string;
+    buildInstance?: string;
     frequency?: Duration;
     seedMetadata?: string;
 };

package/lib/package/packageConvert.js

@@ -47,13 +47,7 @@ const packageVersionCreate_1 = require("./packageVersionCreate");
 var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
-let logger;
-const getLogger = () => {
-    if (!logger) {
-        logger = core_1.Logger.childFromRoot('packageConvert');
-    }
-    return logger;
-};
+const POLL_INTERVAL_SECONDS = 30;
 async function findOrCreatePackage2(seedPackage, connection, project) {
     const query = `SELECT Id, Name FROM Package2 WHERE ConvertedFromPackageId = '${seedPackage}'`;
     const queryResult = (await connection.tooling.query(query)).records;
@@ -97,11 +91,8 @@ async function findOrCreatePackage2(seedPackage, connection, project) {
 }
 exports.findOrCreatePackage2 = findOrCreatePackage2;
 async function convertPackage(pkg, connection, options, project) {
-    let maxRetries = 0;
+    const maxRetries = options.wait ? (60 / POLL_INTERVAL_SECONDS) * options.wait.minutes : 0;
     const branch = 'main';
-    if (options.wait) {
-        maxRetries = (60 / pkgUtils.POLL_INTERVAL_SECONDS) * options.wait.minutes;
-    }
     const packageId = await findOrCreatePackage2(pkg, connection, project);
     const apiVersion = project?.getSfProjectJson()?.get('sourceApiVersion');
     const request = await createPackageVersionCreateRequest({
@@ -109,7 +100,10 @@ async function convertPackage(pkg, connection, options, project) {
         definitionfile: options.definitionfile,
         buildinstance: options.buildInstance,
         seedmetadata: options.seedMetadata,
-    }, packageId, apiVersion);
+    }, packageId, 
+    // TODO: createPackageVersionCreateRequest requires apiVersion exist.
+    // UT fail if we validate that it exists (there might not even be a project)
+    apiVersion);
     // TODO: a lot of this is duplicated from PC, PVC, and PVCR.
     const createResult = await connection.tooling.create('Package2VersionCreateRequest', request);
     if (!createResult.success) {
@@ -119,7 +113,7 @@ async function convertPackage(pkg, connection, options, project) {
     }
     let results;
     if (options.wait) {
-        results = await pollForStatusWithInterval(createResult.id, maxRetries, packageId, branch, project, connection, options.frequency ?? kit_1.Duration.seconds(pkgUtils.POLL_INTERVAL_SECONDS));
+        results = await pollForStatusWithInterval(createResult.id, maxRetries, packageId, branch, project, connection, options.frequency ?? kit_1.Duration.seconds(POLL_INTERVAL_SECONDS));
     }
     else {
         results = await (0, packageVersionCreateRequest_1.byId)(packageId, connection);
@@ -171,7 +165,7 @@ async function createPackageVersionCreateRequest(context, packageId, apiVersion)
     const hasSeedMetadata = await new packageVersionCreate_1.MetadataResolver().resolveMetadata(context.seedmetadata, seedMetadataFolder, 'seedMDDirectoryDoesNotExist', apiVersion);
     if (hasSeedMetadata) {
         // Zip the seedMetadataFolder folder and put the zip in {packageVersBlobDirectory}/{seedMetadataZipFile}
-        getLogger().debug(`Including metadata found in '${context.seedmetadata}'.`);
+        core_1.Logger.childFromRoot('packageConvert:pollForStatusWithInterval').debug(`Including metadata found in '${context.seedmetadata}'.`);
         await pkgUtils.zipDir(seedMetadataFolder, seedMetadataZipFile);
     }
     await settingsGenerator.createDeploy();
@@ -201,6 +195,7 @@ async function createRequestObject(packageId, options, packageVersTmpRoot, packa
     return requestObject;
 }
 async function pollForStatusWithInterval(id, retries, packageId, branch, project, connection, interval) {
+    const logger = core_1.Logger.childFromRoot('packageConvert:pollForStatusWithInterval');
     let remainingRetries = retries;
     const pollingClient = await core_1.PollingClient.create({
         poll: async () => {
@@ -259,7 +254,7 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, project
                     message: '',
                     timeRemaining: remainingTime,
                 });
-                getLogger().info(`Request in progress. Sleeping ${interval.seconds} seconds. Will wait a total of ${remainingTime.seconds} more seconds before timing out. Current Status='${(0, kit_1.camelCaseToTitleCase)(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='${(0, kit_1.camelCaseToTitleCase)(results[0]?.Status)}'`);
                 remainingRetries--;
                 return { completed: false, payload: results[0] };
             }
@@ -282,7 +277,5 @@ async function addPackageAlias(project, packageName, packageId) {
  * @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 ? false : statuses.some((status) => results[0].Status === status);
-}
+const isStatusEqualTo = (results, statuses = []) => (!results?.length ? false : statuses.some((status) => results[0].Status === status));
 //# sourceMappingURL=packageConvert.js.map

package/lib/package/packageCreate.d.ts

@@ -1,4 +1,5 @@
-import { Connection, NamedPackageDir, PackageDir, SfProject } from '@salesforce/core';
+import { Connection, SfProject } from '@salesforce/core';
+import { PackagePackageDir } from '@salesforce/schemas';
 import { PackageCreateOptions, PackagingSObjects } from '../interfaces';
 type Package2Request = Pick<PackagingSObjects.Package2, 'Name' | 'Description' | 'NamespacePrefix' | 'ContainerOptions' | 'IsOrgDependent' | 'PackageErrorUsername'>;
 export declare function createPackageRequestFromContext(project: SfProject, options: PackageCreateOptions): Package2Request;
@@ -9,7 +10,7 @@ export declare function createPackageRequestFromContext(project: SfProject, opti
  * @param options - package create options
  * @private
  */
-export declare function createPackageDirEntry(project: SfProject, options: PackageCreateOptions): PackageDir | NamedPackageDir;
+export declare function createPackageDirEntry(project: SfProject, options: PackageCreateOptions): PackagePackageDir;
 export declare function createPackage(connection: Connection, project: SfProject, options: PackageCreateOptions): Promise<{
     Id: string;
 }>;

package/lib/package/packageCreate.js

@@ -55,34 +55,22 @@ exports.createPackageRequestFromContext = createPackageRequestFromContext;
  */
 function createPackageDirEntry(project, options) {
     const packageDirs = project.getSfProjectJson().getContents().packageDirectories ?? [];
-    let isNew = false;
-    // see if package exists (exists means it has an id or package)
-    let packageDir = packageDirs
-        .map((pd) => pd)
-        .find((pd) => pd.path === options.path && !pd.id && !pd.package);
-    if (!packageDir) {
-        // no match - create a new one
-        isNew = true;
-        packageDir = { ...pkgUtils.DEFAULT_PACKAGE_DIR };
-        packageDir.path = (0, packageUtils_1.replaceIfEmpty)(packageDir.path, options.path);
-    }
-    if (packageDirs.length === 0) {
-        packageDir.default = true;
-    }
-    else if (isNew) {
-        packageDir.default = !packageDirs.find((pd) => pd.default);
-    }
-    packageDir.package = (0, packageUtils_1.replaceIfEmpty)(packageDir.package, options.name);
-    packageDir.versionName = (0, packageUtils_1.replaceIfEmpty)(packageDir.versionName, pkgUtils.DEFAULT_PACKAGE_DIR.versionName);
-    packageDir.versionNumber = (0, packageUtils_1.replaceIfEmpty)(packageDir.versionNumber, pkgUtils.DEFAULT_PACKAGE_DIR.versionNumber);
-    packageDir.versionDescription = (0, packageUtils_1.replaceIfEmpty)(packageDir.versionDescription, options.description);
-    return packageDir;
+    return {
+        package: options.name,
+        versionName: 'ver 0.1',
+        versionNumber: '0.1.0.NEXT',
+        ...(packageDirs.filter((pd) => pd.path === options.path).find((pd) => !('id' in pd)) ?? {
+            // no match - create a new one
+            path: options.path,
+            default: packageDirs.length === 0 ? true : !packageDirs.some((pd) => pd.default === true),
+        }),
+        versionDescription: options.description,
+    };
 }
 exports.createPackageDirEntry = createPackageDirEntry;
 async function createPackage(connection, project, options) {
-    // strip trailing slash from path param
-    options.path = options.path.replace(/\/$/, '');
-    const request = createPackageRequestFromContext(project, options);
+    const cleanOptions = sanitizePackageCreateOptions(options);
+    const request = createPackageRequestFromContext(project, cleanOptions);
     const createResult = await connection.tooling
         .sobject('Package2')
         .create(request)
@@ -94,12 +82,17 @@ async function createPackage(connection, project, options) {
         throw pkgUtils.combineSaveErrors('Package2', 'create', createResult.errors);
     }
     if (!kit_1.env.getBoolean('SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE')) {
-        const packageDirectory = createPackageDirEntry(project, options);
+        const packageDirectory = createPackageDirEntry(project, cleanOptions);
         project.getSfProjectJson().addPackageDirectory(packageDirectory);
-        project.getSfProjectJson().addPackageAlias(options.name, createResult.id);
+        project.getSfProjectJson().addPackageAlias(cleanOptions.name, createResult.id);
         await project.getSfProjectJson().write();
     }
     return { Id: createResult.id };
 }
 exports.createPackage = createPackage;
+/** strip trailing slash from path param */
+const sanitizePackageCreateOptions = (options) => ({
+    ...options,
+    path: options.path.replace(/\/$/, ''),
+});
 //# sourceMappingURL=packageCreate.js.map

package/lib/package/packageDelete.js

@@ -11,10 +11,7 @@ const packageUtils_1 = require("../utils/packageUtils");
 async function deletePackage(idOrAlias, project, connection, undelete) {
     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;
-    request.IsDeprecated = !isUndelete;
+    const request = { Id: packageId, IsDeprecated: !undelete };
     const updateResult = await connection.tooling.update('Package2', request).catch((err) => {
         if (err instanceof Error) {
             throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));

package/lib/package/packageVersion.d.ts

@@ -48,7 +48,7 @@ export declare class PackageVersion {
     private readonly project;
     private readonly connection;
     private data?;
-    private packageType;
+    private packageType?;
     private id;
     constructor(options: PackageVersionOptions);
     /**

package/lib/package/packageVersionCreate.js

@@ -38,6 +38,7 @@ const node_os_1 = __importDefault(require("node:os"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
+const project_1 = require("@salesforce/core/project");
 const kit_1 = require("@salesforce/kit");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const ts_types_1 = require("@salesforce/ts-types");
@@ -276,7 +277,7 @@ class PackageVersionCreate {
         const mdOptions = {
             deploydir: packageVersMetadataFolder,
             sourceDir: sourceBaseDir,
-            sourceApiVersion: this.project?.getSfProjectJson()?.get('sourceApiVersion') ?? undefined,
+            sourceApiVersion: this.project?.getSfProjectJson()?.get('sourceApiVersion'),
         };
         await node_fs_1.default.promises.mkdir(packageVersBlobDirectory, { recursive: true });
         const settingsGenerator = new core_1.ScratchOrgSettingsGenerator({ asDirectory: true });
@@ -401,6 +402,7 @@ class PackageVersionCreate {
             // don't package the profiles from any un-packagedMetadata dir in the project
             profileExcludeDirs = this.project
                 .getPackageDirectories()
+                .filter(project_1.isNamedPackagingDirectory)
                 .map((packageDir) => packageDir.unpackagedMetadata?.path)
                 .filter(ts_types_1.isString);
             let debugMsg = 'Searching for profiles to include from all packageDirectories';
@@ -504,7 +506,8 @@ class PackageVersionCreate {
                 if (!packageName)
                     throw messages.createError('errorMissingPackage', [this.options.packageId]);
             }
-            packageObject = this.project.findPackage((namedPackageDir) => namedPackageDir.package === packageName || namedPackageDir.name === packageName);
+            packageObject = this.project.findPackage((namedPackageDir) => (0, project_1.isPackagingDirectory)(namedPackageDir) &&
+                (namedPackageDir.package === packageName || namedPackageDir.name === packageName));
         }
         else {
             // We'll either have a package ID or alias, or a directory path
@@ -512,9 +515,9 @@ class PackageVersionCreate {
                 throw messages.createError('errorMissingPackagePath', [JSON.stringify(this.options)]);
             }
             packageObject = this.project.getPackageFromPath(this.options.path);
-            packageName = packageObject?.package;
-            if (!packageName)
+            if (!packageObject || !(0, project_1.isPackagingDirectory)(packageObject))
                 throw messages.createError('errorCouldNotFindPackageUsingPath', [this.options.path]);
+            packageName = packageObject?.package;
         }
         if (!packageObject) {
             throw messages.createError('errorCouldNotFindPackageDir', [
@@ -564,7 +567,9 @@ class PackageVersionCreate {
     }
     async getPackageDirFromId(pkg) {
         if (pkg.startsWith('0Ho')) {
-            const dir = (await this.project.getSfProjectJson().getPackageDirectories()).filter((p) => p.package === pkg);
+            const dir = (await this.project.getSfProjectJson().getPackageDirectories())
+                .filter(project_1.isPackagingDirectory)
+                .filter((p) => p.package === pkg);
             if (dir.length === 1) {
                 return dir[0];
             }

package/lib/package/packageVersionRetrieve.js

@@ -21,13 +21,6 @@ const package_1 = require("./package");
 const packageVersion_1 = require("./packageVersion");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package');
-let logger;
-const getLogger = () => {
-    if (!logger) {
-        logger = core_1.Logger.childFromRoot('packageVersionRetrieve');
-    }
-    return logger;
-};
 /**
  * Download the metadata files for a previously published package version, convert them to source format, and put them into a new project folder within the sfdx project.
  *
@@ -96,8 +89,9 @@ exports.retrievePackageVersionMetadata = retrievePackageVersionMetadata;
  *
  */
 async function attemptToUpdateProjectJson(project, connection, packageId, subscriberPackageVersionId, dependencyIds, destinationFolder) {
+    const logger = core_1.Logger.childFromRoot('packageVersionRetrieve');
     if (kit_1.env.getBoolean('SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_RETRIEVE')) {
-        getLogger().info('Skipping sfdx-project.json updates because SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_RETRIEVE is set');
+        logger.info('Skipping sfdx-project.json updates because SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_RETRIEVE is set');
         return;
     }
     try {
@@ -105,15 +99,14 @@ async function attemptToUpdateProjectJson(project, connection, packageId, subscr
             .sobject('MetadataPackage')
             .retrieve(packageId));
         if (packageInfo.PackageCategory !== 'Package2') {
-            getLogger().info(`Skipping sfdx-project.json updates because ${packageId} is not a 2GP package. It has a PackageCategory of '${packageInfo.PackageCategory}'`);
+            logger.info(`Skipping sfdx-project.json updates because ${packageId} is not a 2GP package. It has a PackageCategory of '${packageInfo.PackageCategory}'`);
             return;
         }
         const queryOptions = {
             whereClause: `WHERE SubscriberPackageVersionId = '${subscriberPackageVersionId}'`,
         };
-        const versions = await packageVersion_1.PackageVersion.queryPackage2Version(connection, queryOptions);
-        if (versions.length && versions[0]) {
-            const version = versions[0];
+        const [version] = await packageVersion_1.PackageVersion.queryPackage2Version(connection, queryOptions);
+        if (version) {
             const pkg = new package_1.Package({
                 packageAliasOrId: version.Package2Id,
                 project,
@@ -130,13 +123,12 @@ async function attemptToUpdateProjectJson(project, connection, packageId, subscr
                     packageType: pkgData.ContainerOptions,
                     errorNotificationUsername: pkgData.PackageErrorUsername,
                 });
-                const dependencies = dependencyIds.map((dep) => ({ package: dep }));
                 const namedDir = {
                     ...dirEntry,
                     versionNumber: '<set version number>',
                     versionName: '<set version name>',
                     ancestorVersion: '<set ancestor version>',
-                    dependencies,
+                    dependencies: dependencyIds.map((dep) => ({ package: dep })),
                 };
                 project.getSfProjectJson().addPackageDirectory(namedDir);
                 const packageVersionVersionString = `${version.MajorVersion}.${version.MinorVersion}.${version.PatchVersion}-${version.BuildNumber}`;
@@ -148,16 +140,16 @@ async function attemptToUpdateProjectJson(project, connection, packageId, subscr
                 await project.getSfProjectJson().write();
             }
             else {
-                getLogger().warn(`Failed to update sfdx-project.json. Could not find package for ${version.Package2Id}. This should never happen.`);
+                logger.warn(`Failed to update sfdx-project.json. Could not find package for ${version.Package2Id}. This should never happen.`);
             }
         }
         else {
-            getLogger().info(`Could not find Package2Version record for ${subscriberPackageVersionId}. No updates to sfdx-project.json will be made.`);
+            logger.info(`Could not find Package2Version record for ${subscriberPackageVersionId}. No updates to sfdx-project.json will be made.`);
         }
     }
     catch (e) {
         const msg = e instanceof Error ? e.message : e;
-        getLogger().error(`Encountered error trying to update sfdx-project.json after retrieving package version metadata: ${msg}`);
+        logger.error(`Encountered error trying to update sfdx-project.json after retrieving package version metadata: ${msg}`);
     }
 }
 //# sourceMappingURL=packageVersionRetrieve.js.map

package/lib/package1/package1Version.d.ts

@@ -11,7 +11,7 @@ import MetadataPackageVersion = PackagingSObjects.MetadataPackageVersion;
  *
  * `const pkgList = await Package1Version.list(connection);`
  *
- * Create a new 1GP package vesion in the org:
+ * Create a new 1GP package version in the org:
  *
  * `const myPkg = await Package1Version.create(connection, options, pollingOptions);`
  *
@@ -54,7 +54,6 @@ export declare class Package1Version implements IPackageVersion1GP {
      * @returns Array of package version results
      */
     static list(connection: Connection, id?: string): Promise<MetadataPackageVersion[]>;
-    private static packageUploadPolling;
     /**
      * Queries the org for the package version with the given ID
      */

package/lib/package1/package1Version.js

@@ -25,7 +25,7 @@ const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package1
  *
  * `const pkgList = await Package1Version.list(connection);`
  *
- * Create a new 1GP package vesion in the org:
+ * Create a new 1GP package version in the org:
  *
  * `const myPkg = await Package1Version.create(connection, options, pollingOptions);`
  *
@@ -64,7 +64,7 @@ class Package1Version {
             if (pollingOptions.timeout.seconds) {
                 const timeout = pollingOptions.timeout.seconds;
                 const pollingClient = await core_1.PollingClient.create({
-                    poll: () => Package1Version.packageUploadPolling(connection, createRequest.id, timeout, pollingOptions.frequency.seconds),
+                    poll: () => packageUploadPolling(connection, createRequest.id, timeout, pollingOptions.frequency.seconds),
                     ...pollingOptions,
                 });
                 return pollingClient.subscribe();
@@ -113,30 +113,6 @@ class Package1Version {
             tooling: true,
         }))?.records;
     }
-    static async packageUploadPolling(connection, id, timeout, frequency) {
-        const pollingResult = await connection.tooling.sobject('PackageUploadRequest').retrieve(id);
-        switch (pollingResult.Status) {
-            case 'SUCCESS':
-                return { completed: true, payload: pollingResult };
-            case 'IN_PROGRESS':
-            case 'QUEUED':
-                timeout -= frequency;
-                await core_1.Lifecycle.getInstance().emit(interfaces_1.Package1VersionEvents.create.progress, { timeout, pollingResult });
-                return { completed: false, payload: pollingResult };
-            default: {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                const errors = pollingResult?.Errors?.errors;
-                if (errors?.length > 0) {
-                    throw messages.createError('package1VersionCreateCommandUploadFailure', [
-                        errors.map((e) => e.message).join(node_os_1.default.EOL),
-                    ]);
-                }
-                else {
-                    throw messages.createError('package1VersionCreateCommandUploadFailureDefault');
-                }
-            }
-        }
-    }
     /**
      * Queries the org for the package version with the given ID
      */
@@ -146,4 +122,28 @@ class Package1Version {
     }
 }
 exports.Package1Version = Package1Version;
+const packageUploadPolling = async (connection, id, timeout, frequency) => {
+    const pollingResult = await connection.tooling.sobject('PackageUploadRequest').retrieve(id);
+    switch (pollingResult.Status) {
+        case 'SUCCESS':
+            return { completed: true, payload: pollingResult };
+        case 'IN_PROGRESS':
+        case 'QUEUED':
+            timeout -= frequency;
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.Package1VersionEvents.create.progress, { timeout, pollingResult });
+            return { completed: false, payload: pollingResult };
+        default: {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            const errors = pollingResult?.Errors?.errors;
+            if (errors?.length > 0) {
+                throw messages.createError('package1VersionCreateCommandUploadFailure', [
+                    errors.map((e) => e.message).join(node_os_1.default.EOL),
+                ]);
+            }
+            else {
+                throw messages.createError('package1VersionCreateCommandUploadFailureDefault');
+            }
+        }
+    }
+};
 //# sourceMappingURL=package1Version.js.map

package/lib/utils/packageUtils.d.ts

@@ -12,14 +12,6 @@ export type IdRegistry = {
     [key: string]: IdRegistryValue;
 };
 export declare const INSTALL_URL_BASE: SfdcUrl;
-export declare const POLL_INTERVAL_SECONDS = 30;
-export declare const DEFAULT_PACKAGE_DIR: {
-    path: string;
-    package: string;
-    versionName: string;
-    versionNumber: string;
-    default: boolean;
-};
 export declare const BY_LABEL: IdRegistry;
 /**
  * A function to generate a unique id and return it in the context of a template, if supplied.
@@ -114,9 +106,8 @@ export declare function copyDir(src: string, dest: string): void;
  * overridden from definition file based on case-insensitive matches.
  */
 export declare function copyDescriptorProperties(packageDescriptorJson: PackageDescriptorJson, definitionFileJson: ScratchOrgInfo): PackageDescriptorJson;
-export declare function replaceIfEmpty<T>(value: T, replacement: T): T;
 /**
- * Brand new SFDX projects contain a force-app directory tree contiaining empty folders
+ * Brand new SFDX projects contain a force-app directory tree containing empty folders
  * and a few .eslintrc.json files. We still want to consider such a directory tree
  * as 'empty' for the sake of operations like downloading package version metadata.
  *

package/lib/utils/packageUtils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPackageDirectoryEffectivelyEmpty = exports.replaceIfEmpty = exports.copyDescriptorProperties = exports.copyDir = exports.zipDir = exports.numberToDuration = exports.combineSaveErrors = exports.generatePackageAliasEntry = exports.getPackageVersionNumber = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getContainerOptions = exports.escapeInstallationKey = exports.getPackageVersionId = exports.massageErrorMessage = exports.applyErrorAction = exports.validateIdNoThrow = exports.validateId = exports.uniqid = exports.BY_LABEL = exports.DEFAULT_PACKAGE_DIR = exports.POLL_INTERVAL_SECONDS = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
+exports.isPackageDirectoryEffectivelyEmpty = exports.copyDescriptorProperties = exports.copyDir = exports.zipDir = exports.numberToDuration = exports.combineSaveErrors = exports.generatePackageAliasEntry = exports.getPackageVersionNumber = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getContainerOptions = exports.escapeInstallationKey = exports.getPackageVersionId = exports.massageErrorMessage = exports.applyErrorAction = exports.validateIdNoThrow = exports.validateId = exports.uniqid = exports.BY_LABEL = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
@@ -69,14 +69,6 @@ const ID_REGISTRY = [
 exports.INSTALL_URL_BASE = new core_1.SfdcUrl('https://login.salesforce.com/packaging/installPackage.apexp?p0=');
 // https://developer.salesforce.com/docs/atlas.en-us.salesforce_app_limits_cheatsheet.meta/salesforce_app_limits_cheatsheet/salesforce_app_limits_platform_soslsoql.htm
 const SOQL_WHERE_CLAUSE_MAX_LENGTH = 4000;
-exports.POLL_INTERVAL_SECONDS = 30;
-exports.DEFAULT_PACKAGE_DIR = {
-    path: '',
-    package: '',
-    versionName: 'ver 0.1',
-    versionNumber: '0.1.0.NEXT',
-    default: true,
-};
 exports.BY_LABEL = (() => Object.fromEntries(ID_REGISTRY.map((id) => [id.label.replace(/ /g, '_').toUpperCase(), { prefix: id.prefix, label: id.label }])))();
 /**
  * A function to generate a unique id and return it in the context of a template, if supplied.
@@ -216,7 +208,7 @@ exports.escapeInstallationKey = escapeInstallationKey;
  */
 // eslint-disable-next-line @typescript-eslint/require-await
 async function getContainerOptions(packageIds, connection) {
-    const ids = (0, kit_1.ensureArray)(packageIds).filter((id) => id);
+    const ids = (0, kit_1.ensureArray)(packageIds).filter(ts_types_1.isString);
     if (ids.length === 0) {
         return new Map();
     }
@@ -430,20 +422,16 @@ exports.copyDir = copyDir;
  * overridden from definition file based on case-insensitive matches.
  */
 function copyDescriptorProperties(packageDescriptorJson, definitionFileJson) {
-    const packageDescriptorJsonCopy = Object.assign({}, packageDescriptorJson);
-    const definitionFileJsonCopy = Object.assign({}, definitionFileJson);
+    const packageDescriptorJsonCopy = structuredClone(packageDescriptorJson);
+    const definitionFileJsonCopy = structuredClone(definitionFileJson);
     return Object.assign({}, packageDescriptorJsonCopy, Object.fromEntries(['country', 'edition', 'language', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].map((prop) => {
         const matchCase = Object.keys(definitionFileJsonCopy).find((key) => key.toLowerCase() === prop.toLowerCase());
         return [[prop], matchCase ? definitionFileJsonCopy[matchCase] : undefined];
     })));
 }
 exports.copyDescriptorProperties = copyDescriptorProperties;
-function replaceIfEmpty(value, replacement) {
-    return !(0, kit_1.isEmpty)(value) ? value : replacement;
-}
-exports.replaceIfEmpty = replaceIfEmpty;
 /**
- * Brand new SFDX projects contain a force-app directory tree contiaining empty folders
+ * Brand new SFDX projects contain a force-app directory tree containing empty folders
  * and a few .eslintrc.json files. We still want to consider such a directory tree
  * as 'empty' for the sake of operations like downloading package version metadata.
  *

package/messages/subscriber_package_version.md

@@ -1,6 +1,6 @@
 # errorInvalidIdNoRecordFound
 
-The subscriber package version %s is invalid, no subscriber package version record found.
+The subscriber package version %s is either invalid or not yet available on your instance of salesforce.com. First double-check the ID to ensure it's correct. If it is, check back after a while and retry the package install.
 
 # errorInvalidAliasOrId
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -42,10 +42,10 @@
   ],
   "dependencies": {
     "@jsforce/jsforce-node": "^3.2.0",
-    "@salesforce/core": "^7.4.1",
+    "@salesforce/core": "8.0.1",
     "@salesforce/kit": "^3.1.6",
     "@salesforce/schemas": "^1.9.0",
-    "@salesforce/source-deploy-retrieve": "^11.6.5",
+    "@salesforce/source-deploy-retrieve": "^12.0.1",
     "@salesforce/ts-types": "^2.0.9",
     "@salesforce/types": "^1.1.0",
     "fast-xml-parser": "^4.4.0",
@@ -57,12 +57,11 @@
     "object-treeify": "^2"
   },
   "devDependencies": {
-    "@salesforce/cli-plugins-testkit": "^5.3.8",
-    "@salesforce/dev-scripts": "^9.1.2",
-    "@salesforce/ts-sinon": "^1.4.19",
+    "@salesforce/cli-plugins-testkit": "^5.3.15",
+    "@salesforce/dev-scripts": "^10.2.0",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",
-    "eslint-plugin-sf-plugin": "^1.18.5",
+    "eslint-plugin-sf-plugin": "^1.18.8",
     "shelljs": "0.8.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"