@salesforce/packaging 1.4.16 → 1.4.18

package/lib/package/packageVersionCreate.js

@@ -16,8 +16,8 @@ const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchO
 const xml2js = require("xml2js");
 const kit_1 = require("@salesforce/kit");
 const pkgUtils = require("../utils/packageUtils");
-const interfaces_1 = require("../interfaces");
 const packageUtils_1 = require("../utils/packageUtils");
+const interfaces_1 = require("../interfaces");
 const packageProfileApi_1 = require("./packageProfileApi");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 const package_1 = require("./package");
@@ -38,7 +38,10 @@ class PackageVersionCreate {
             return this.packageVersionCreate();
         }
         catch (err) {
-            throw pkgUtils.applyErrorAction(pkgUtils.massageErrorMessage(err));
+            if (err instanceof Error) {
+                throw pkgUtils.applyErrorAction(pkgUtils.massageErrorMessage(err));
+            }
+            throw err;
         }
     }
     async validateDependencyValues(dependency) {
@@ -50,8 +53,11 @@ class PackageVersionCreate {
         if (dependency.packageId && dependency.package) {
             throw messages.createError('errorPackageAndPackageIdCollision', []);
         }
-        const packageIdFromAlias = this.project.getPackageIdFromAlias(dependency.packageId || dependency.package) ??
-            (dependency.packageId || dependency.package);
+        const idOrPackage = dependency.packageId ?? dependency.package;
+        if (!idOrPackage) {
+            throw messages.createError('errorPackageOrPackageIdMissing', []);
+        }
+        const packageIdFromAlias = this.project.getPackageIdFromAlias(idOrPackage) ?? idOrPackage;
         // If valid 04t package, just return it to be used straight away.
         if (pkgUtils.validateIdNoThrow(pkgUtils.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, packageIdFromAlias)) {
             dependency.subscriberPackageVersionId = packageIdFromAlias;
@@ -87,10 +93,16 @@ class PackageVersionCreate {
             // if a 04t id is specified just use it.
             return dependency;
         }
+        if (!dependency.versionNumber) {
+            throw messages.createError('errorDependencyPair', [JSON.stringify(dependency)]);
+        }
+        if (!dependency.packageId) {
+            throw messages.createError('errorDependencyPair', [JSON.stringify(dependency)]);
+        }
         const versionNumber = versionNumber_1.VersionNumber.from(dependency.versionNumber);
         const buildNumber = versionNumber.build;
         // use the dependency.branch if present otherwise use the branch of the version being created
-        const branch = dependency.branch || dependency.branch === '' ? dependency.branch : this.options.branch;
+        const branch = dependency.branch === '' ? dependency.branch : this.options.branch;
         const branchString = !branch || branch === '' ? 'null' : `'${branch}'`;
         // resolve a build number keyword to an actual number, if needed
         const resolvedBuildNumber = await this.resolveBuildNumber(versionNumber, dependency.packageId, branch);
@@ -145,12 +157,12 @@ class PackageVersionCreate {
         // query for the LATEST or RELEASED build number (excluding deleted versions)
         let branchCondition = '';
         let releasedCondition = '';
-        if (versionNumber[3] === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
+        if (versionNumber.build === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
             // respect the branch when querying for LATEST
             const branchString = !branch || branch === '' ? 'null' : `'${branch}'`;
             branchCondition = `AND Branch = ${branchString}`;
         }
-        else if (versionNumber[3] === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+        else if (versionNumber.build === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
             releasedCondition = 'AND IsReleased = true';
         }
         const query = `SELECT MAX(BuildNumber) FROM Package2Version WHERE Package2Id = '${packageId}' AND IsDeprecated != true AND MajorVersion = ${versionNumber.major} AND MinorVersion = ${versionNumber.minor} AND PatchVersion = ${versionNumber.patch} ${branchCondition} ${releasedCondition}`;
@@ -176,8 +188,8 @@ class PackageVersionCreate {
             InstallKey: this.options.installationkey,
             Instance: this.options.buildinstance,
             SourceOrg: this.options.sourceorg,
-            CalculateCodeCoverage: this.options.codecoverage || false,
-            SkipValidation: this.options.skipvalidation || false,
+            CalculateCodeCoverage: this.options.codecoverage ?? false,
+            SkipValidation: this.options.skipvalidation ?? false,
             // note: the createRequest's Language corresponds to the AllPackageVersion's language
             Language: this.options.language,
         };
@@ -209,7 +221,7 @@ class PackageVersionCreate {
      * @private
      */
     async createPackageVersionCreateRequestFromOptions() {
-        const preserveFiles = !!(this.options.preserve || process.env.SFDX_PACKAGE2_VERSION_CREATE_PRESERVE);
+        const preserveFiles = !!(this.options.preserve ?? process.env.SFDX_PACKAGE2_VERSION_CREATE_PRESERVE);
         const uniqueHash = (0, packageUtils_1.uniqid)({ template: `${this.packageId}-%s` });
         const packageVersTmpRoot = path.join(os.tmpdir(), `${uniqueHash}`);
         const packageVersMetadataFolder = path.join(packageVersTmpRoot, 'md-files');
@@ -222,17 +234,17 @@ class PackageVersionCreate {
         const seedMetadataZipFile = path.join(packageVersBlobDirectory, 'seed-metadata-package.zip');
         const settingsZipFile = path.join(packageVersBlobDirectory, 'settings.zip');
         const packageVersBlobZipFile = path.join(packageVersTmpRoot, 'package-version-info.zip');
-        const sourceBaseDir = path.join(this.project.getPath(), this.packageObject.path ?? '');
+        const sourceBaseDir = path.join(this.project.getPath(), this.packageObject?.path ?? '');
         const mdOptions = {
             deploydir: packageVersMetadataFolder,
             sourceDir: sourceBaseDir,
-            sourceApiVersion: this.project?.getSfProjectJson()?.get('sourceApiVersion'),
+            sourceApiVersion: this.project?.getSfProjectJson()?.get('sourceApiVersion') ?? undefined,
         };
         // Stores any additional client side info that might be needed later on in the process
         const clientSideInfo = new Map();
         await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
         const settingsGenerator = new scratchOrgSettingsGenerator_1.default({ asDirectory: true });
-        const packageDescriptorJson = (0, kit_1.cloneJson)(this.packageObject);
+        let packageDescriptorJson = (0, kit_1.cloneJson)(this.packageObject);
         const apvLanguage = packageDescriptorJson.language;
         // Copy all the metadata from the workspace to a tmp folder
         const componentSet = await this.metadataResolver.generateMDFolderForArtifact(mdOptions);
@@ -264,15 +276,7 @@ class PackageVersionCreate {
                 // this is not allowed, exit with an error
                 throw messages.createError('signupDuplicateSettingsSpecified');
             }
-            // these scratch org definition file values will be applied to the build org
-            ['country', 'language', 'edition', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].forEach((prop) => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                const propValue = definitionFileJson[prop];
-                if (propValue) {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                    packageDescriptorJson[prop] = propValue;
-                }
-            });
+            packageDescriptorJson = (0, packageUtils_1.copyDescriptorProperties)(packageDescriptorJson, definitionFileJson);
         }
         this.resolveApexTestPermissions(packageDescriptorJson);
         // All dependencies for the packaging dir should be resolved to an 04t id to be passed to the server.
@@ -282,7 +286,11 @@ class PackageVersionCreate {
         this.options.branch = this.options.branch ?? packageDescriptorJson.branch;
         this.options.language = this.options.language ?? apvLanguage;
         const resultValues = await Promise.all(!dependencies ? [] : dependencies.map((dependency) => this.retrieveSubscriberPackageVersionId(dependency)));
-        const ancestorId = await this.getAncestorId(packageDescriptorJson, this.options.project, this.options.versionnumber ?? packageDescriptorJson.versionNumber, this.options.skipancestorcheck);
+        const versionNumber = this.options.versionnumber ?? packageDescriptorJson.versionNumber;
+        if (!versionNumber) {
+            throw messages.createError('versionNumberRequired');
+        }
+        const ancestorId = await this.getAncestorId(packageDescriptorJson, this.options.project, versionNumber, !!this.options.skipancestorcheck);
         // If dependencies exist, the resultValues array will contain the dependencies populated with a resolved
         // subscriber pkg version id.
         if (resultValues.length > 0) {
@@ -301,7 +309,7 @@ class PackageVersionCreate {
         return this.createRequestObject(preserveFiles, packageVersTmpRoot, packageVersBlobZipFile);
     }
     verifyHasSource(componentSet) {
-        if (componentSet?.converted.length === 0) {
+        if (componentSet?.converted?.length === 0) {
             throw messages.createError('noSourceInRootDirectory', [this.packageObject.path ?? '<unknown>']);
         }
     }
@@ -320,8 +328,6 @@ class PackageVersionCreate {
         }
         fs.mkdirSync(packageVersMetadataFolder, { recursive: true });
         fs.mkdirSync(packageVersProfileFolder, { recursive: true });
-        // Apply any necessary exclusions to typesArr.
-        let typesArr = packageJson.Package.types;
         this.apiVersionFromPackageXml = packageJson.Package.version;
         const sourceApiVersion = this.project?.getSfProjectJson()?.get('sourceApiVersion');
         const hasSeedMetadata = await this.metadataResolver.resolveMetadata(this.packageObject.seedMetadata?.path, seedMetadataFolder, 'seedMDDirectoryDoesNotExist', sourceApiVersion);
@@ -330,17 +336,18 @@ class PackageVersionCreate {
         if (this.options.codecoverage) {
             hasUnpackagedMetadata = await this.metadataResolver.resolveMetadata(unpackagedMetadataPath, unpackagedMetadataFolder, 'unpackagedMDDirectoryDoesNotExist', sourceApiVersion);
         }
-        // don't package the profiles from any unpackagedMetadata dir in the project
+        // don't package the profiles from any un-packagedMetadata dir in the project
         const profileExcludeDirs = this.project
             .getPackageDirectories()
-            .filter((packageDir) => packageDir.unpackagedMetadata?.path)
-            .map((packageDir) => packageDir.unpackagedMetadata.path);
-        typesArr = this.options.profileApi.filterAndGenerateProfilesForManifest(typesArr, profileExcludeDirs);
+            .map((packageDir) => packageDir.unpackagedMetadata?.path)
+            .filter((packageDirPath) => packageDirPath);
+        const typesArr = this.options?.profileApi?.filterAndGenerateProfilesForManifest(packageJson.Package.types, profileExcludeDirs) ??
+            packageJson.Package.types;
         // Next generate profiles and retrieve any profiles that were excluded because they had no matching nodes.
-        const excludedProfiles = this.options.profileApi.generateProfiles(packageVersProfileFolder, {
+        const excludedProfiles = this.options?.profileApi?.generateProfiles(packageVersProfileFolder, {
             Package: typesArr,
         }, profileExcludeDirs);
-        if (excludedProfiles.length > 0) {
+        if (excludedProfiles?.length) {
             const profileIdx = typesArr.findIndex((e) => e.name[0] === 'Profile');
             typesArr[profileIdx].members = typesArr[profileIdx].members.filter((e) => !excludedProfiles.includes(e));
         }
@@ -351,7 +358,7 @@ class PackageVersionCreate {
         });
         const xml = xmlBuilder.buildObject(packageJson);
         // Log information about the profiles being packaged up
-        const profiles = this.options.profileApi.getProfileInformation();
+        const profiles = this.options?.profileApi?.getProfileInformation() ?? [];
         profiles.forEach((profile) => {
             if (this.logger.shouldLog(core_1.LoggerLevel.DEBUG)) {
                 this.logger.debug(profile.logDebug());
@@ -419,6 +426,7 @@ class PackageVersionCreate {
         }
         // establish the package Id (0ho) and load the package directory
         let packageName;
+        let packageObject;
         if (this.options.packageId) {
             const pkg = this.options.packageId;
             // for backward compatibility allow for a packageDirectory package property to be an id (0Ho) instead of an alias.
@@ -428,23 +436,29 @@ class PackageVersionCreate {
                 if (!packageName)
                     throw messages.createError('errorMissingPackage', [this.options.packageId]);
             }
-            this.packageObject = this.project.findPackage((namedPackageDir) => namedPackageDir.package === packageName || namedPackageDir.name === packageName);
+            packageObject = this.project.findPackage((namedPackageDir) => namedPackageDir.package === packageName || namedPackageDir.name === packageName);
         }
         else {
             // We'll either have a package ID or alias, or a directory path
-            this.packageObject = this.project.getPackageFromPath(this.options.path);
-            packageName = this.packageObject?.package;
+            if (!this.options.path) {
+                throw messages.createError('errorMissingPackagePath', [JSON.stringify(this.options)]);
+            }
+            packageObject = this.project.getPackageFromPath(this.options.path);
+            packageName = packageObject?.package;
             if (!packageName)
                 throw messages.createError('errorCouldNotFindPackageUsingPath', [this.options.path]);
         }
-        if (!this.packageObject) {
+        if (!packageObject) {
             throw messages.createError('errorCouldNotFindPackageDir', [
                 this.options.packageId ? 'packageId or alias' : 'path',
-                this.options.packageId || this.options.path,
+                this.options.packageId ?? this.options.path,
             ]);
         }
+        else {
+            this.packageObject = packageObject;
+        }
         this.packageId = this.project.getPackageIdFromAlias(packageName) ?? packageName;
-        this.options.profileApi = await this.resolveUserLicenses(this.packageObject.includeProfileUserLicenses);
+        this.options.profileApi = await this.resolveUserLicenses(!!this.packageObject.includeProfileUserLicenses);
         // At this point, the packageIdFromAlias should have been resolved to an Id.  Now, we
         // need to validate that the Id is correct.
         pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, this.packageId);
@@ -452,21 +466,20 @@ class PackageVersionCreate {
             await this.validateOptionsForPackageType();
         }
         catch (error) {
-            const err = error;
-            if (err.name === 'NOT_FOUND') {
-                // this means the 0Ho package was not found in the org. throw a better error.
-                throw messages.createError('errorNoIdInHub', [this.packageId]);
+            if (error instanceof Error) {
+                if (error.name === 'NOT_FOUND') {
+                    // this means the 0Ho package was not found in the org. throw a better error.
+                    throw messages.createError('errorNoIdInHub', [this.packageId]);
+                }
             }
-            throw err;
+            throw error;
         }
         const request = await this.createPackageVersionCreateRequestFromOptions();
         const createResult = await this.connection.tooling.create('Package2VersionCreateRequest', request);
         if (!createResult.success) {
             const errStr = createResult.errors?.join(', ') ?? createResult.errors;
-            throw messages.createError('failedToCreatePVCRequest', [
-                createResult.id ? ` [${createResult.id}]` : '',
-                errStr.toString(),
-            ]);
+            const id = createResult.id ?? '';
+            throw messages.createError('failedToCreatePVCRequest', [id === '' ? '' : ` [${id}]`, errStr.toString()]);
         }
         return (await (0, packageVersionCreateRequest_1.byId)(createResult.id, this.connection))[0];
     }
@@ -478,7 +491,6 @@ class PackageVersionCreate {
                 return dir[0];
             }
         }
-        return;
     }
     async getPackageType() {
         // this.packageId should be an 0Ho package Id at this point
@@ -543,7 +555,7 @@ class PackageVersionCreate {
         if (!packageDescriptorJson.versionName) {
             const versionNumber = packageDescriptorJson.versionNumber;
             packageDescriptorJson.versionName =
-                versionNumber.split(pkgUtils.VERSION_NUMBER_SEP)[3] === versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN
+                versionNumber?.split(pkgUtils.VERSION_NUMBER_SEP)[3] === versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN
                     ? versionNumber.substring(0, versionNumber.indexOf(pkgUtils.VERSION_NUMBER_SEP + versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN))
                     : versionNumber;
             this.logger.warn(messages.getMessage('defaultVersionName', [packageDescriptorJson.versionName]));
@@ -605,7 +617,7 @@ class PackageVersionCreate {
     async getAncestorId(packageDescriptorJson, project, versionNumberString, skipAncestorCheck) {
         // If an id property is present, use it.  Otherwise, look up the package id from the package property.
         const packageId = packageDescriptorJson.id ??
-            project.getPackageIdFromAlias(packageDescriptorJson.package) ??
+            project.getPackageIdFromAlias(packageDescriptorJson.package ?? '') ??
             packageDescriptorJson.package;
         // No need to proceed if Unlocked
         if ((await this.getPackageType()) === 'Unlocked') {
@@ -615,7 +627,7 @@ class PackageVersionCreate {
         // ancestorID can be alias, 05i, or 04t;
         // validate and convert to 05i, as needed
         const versionNumber = versionNumber_1.VersionNumber.from(versionNumberString);
-        let origSpecifiedAncestor = packageDescriptorJson.ancestorId;
+        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;
@@ -647,7 +659,7 @@ class PackageVersionCreate {
         if (!explicitUseNoAncestor && packageDescriptorJson.ancestorId) {
             ancestorId = project.getPackageIdFromAlias(packageDescriptorJson.ancestorId) ?? packageDescriptorJson.ancestorId;
             (0, packageUtils_1.validateId)([packageUtils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, packageUtils_1.BY_LABEL.PACKAGE_VERSION_ID], ancestorId);
-            ancestorId = await (0, packageUtils_1.getPackageVersionId)(ancestorId, this.connection);
+            ancestorId = (await (0, packageUtils_1.getPackageVersionId)(ancestorId, this.connection)) ?? '';
         }
         if (!explicitUseNoAncestor && packageDescriptorJson.ancestorVersion) {
             const regNumbers = new RegExp('^[0-9]+$');
@@ -663,7 +675,7 @@ class PackageVersionCreate {
                 `WHERE Package2Id = '${packageId}' AND MajorVersion = ${versionNumberSplit[0]} AND MinorVersion = ${versionNumberSplit[1]} AND PatchVersion = ${versionNumberSplit[2]}`;
             let queriedAncestorId;
             const ancestorVersionResult = await this.connection.tooling.query(query);
-            if (!ancestorVersionResult || !ancestorVersionResult.totalSize) {
+            if (!ancestorVersionResult.totalSize) {
                 throw messages.createError('errorNoMatchingAncestor', [packageDescriptorJson.ancestorVersion, packageId]);
             }
             else {
@@ -715,6 +727,9 @@ class PackageVersionCreate {
         return ancestorId;
     }
     async getAncestorIdHighestRelease(packageId, versionNumberString, explicitUseHighestRelease, skipAncestorCheck) {
+        if (!packageId) {
+            throw messages.createError('packageIdCannotBeUndefined');
+        }
         const versionNumber = versionNumberString.split(packageUtils_1.VERSION_NUMBER_SEP);
         const isPatch = versionNumber[2] !== '0';
         const result = {
@@ -733,7 +748,7 @@ class PackageVersionCreate {
             const majorMinorVersionResult = await this.connection.tooling.query(query);
             const majorMinorVersionRecords = majorMinorVersionResult.records;
             if (majorMinorVersionRecords && majorMinorVersionRecords?.length === 1 && majorMinorVersionRecords[0]) {
-                result.finalAncestorId = majorMinorVersionRecords[0].Id;
+                result.finalAncestorId = majorMinorVersionRecords[0].Id ?? null;
             }
             else {
                 const majorMinorNotFound = `${versionNumber[0]}.${versionNumber[1]}.0`;
@@ -781,17 +796,24 @@ class MetadataResolver {
     }
     // convert source to mdapi format and copy to tmp dir packaging up
     async generateMDFolderForArtifact(options) {
-        const sourcepath = options.sourcePaths ?? [options.sourceDir];
-        const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
+        const sourcePaths = (0, kit_1.ensureArray)(options.sourcePaths ?? options.sourceDir ? options.sourceDir : undefined).filter((srcPath) => srcPath);
+        const componentSetOptions = {
             sourceapiversion: options.sourceApiVersion,
-            sourcepath,
-        });
+            ...(sourcePaths.length > 0 ? { sourcepath: sourcePaths } : {}),
+        };
+        if (!options.deploydir) {
+            throw messages.createError('deploydirCannotBeUndefined', [JSON.stringify(options)]);
+        }
+        const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build(componentSetOptions);
         const packageName = options.packageName;
         const outputDirectory = path.resolve(options.deploydir);
         const convertResult = await this.convertMetadata(componentSet, outputDirectory, packageName);
         if (packageName) {
             // SDR will build an output path like /output/directory/packageName/package.xml
             // this was breaking from toolbelt, so to revert it we copy the directory up a level and delete the original
+            if (!convertResult.packagePath) {
+                throw messages.createError('packagePathCannotBeUndefined');
+            }
             (0, packageUtils_1.copyDir)(convertResult.packagePath, outputDirectory);
             try {
                 fs.rmSync(convertResult.packagePath, { recursive: true });

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[]>;
+import { PackageVersionCreateRequestQueryOptions, PackageVersionCreateRequestResult } from '../interfaces';
+export declare function list(connection: Connection, options?: PackageVersionCreateRequestQueryOptions): Promise<PackageVersionCreateRequestResult[]>;
 export declare function byId(packageVersionCreateRequestId: string, connection: Connection): Promise<PackageVersionCreateRequestResult[]>;

package/lib/package/packageVersionCreateRequest.js

@@ -22,13 +22,16 @@ function formatDate(date) {
     const pad = (num) => (num < 10 ? `0${num}` : `${num}`);
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
-async function list(options) {
+async function list(connection, options) {
     try {
         const whereClause = constructWhere(options);
-        return await query(util.format(QUERY, whereClause), options.connection);
+        return await query(util.format(QUERY, whereClause), connection);
     }
     catch (err) {
-        throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
+        if (err instanceof Error) {
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
+        }
+        throw err;
     }
 }
 exports.list = list;
@@ -58,14 +61,8 @@ async function query(query, connection) {
     }));
 }
 async function queryForErrors(packageVersionCreateRequestId, connection) {
-    const errorResults = [];
-    const queryResult = await connection.tooling.query(util.format("SELECT Message FROM Package2VersionCreateRequestError WHERE ParentRequest.Id = '%s'", packageVersionCreateRequestId));
-    if (queryResult.records) {
-        queryResult.records.forEach((record) => {
-            errorResults.push(record.Message);
-        });
-    }
-    return errorResults;
+    const queryResult = await connection.tooling.query(`SELECT Message FROM Package2VersionCreateRequestError WHERE ParentRequest.Id = '${packageVersionCreateRequestId}'`);
+    return queryResult.records ? queryResult.records.map((record) => record.Message) : [];
 }
 function constructWhere(options) {
     const where = [];

package/lib/package/packageVersionCreateRequestReport.js

@@ -17,7 +17,10 @@ async function getCreatePackageVersionCreateRequestReport(options) {
         return results[0];
     }
     catch (err) {
-        throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
+        if (err instanceof Error) {
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
+        }
+        throw err;
     }
 }
 exports.getCreatePackageVersionCreateRequestReport = getCreatePackageVersionCreateRequestReport;

package/lib/package/packageVersionList.d.ts

@@ -1,7 +1,8 @@
+import { Connection } from '@salesforce/core';
 import { QueryResult } from 'jsforce';
-import { PackageVersionListResult, ListPackageVersionOptions } from '../interfaces';
+import { PackageVersionListOptions, PackageVersionListResult } from '../interfaces';
 export declare const DEFAULT_ORDER_BY_FIELDS = "Package2Id, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber";
-export declare function listPackageVersions(options: ListPackageVersionOptions): Promise<QueryResult<PackageVersionListResult>>;
+export declare function listPackageVersions(connection: Connection, options?: PackageVersionListOptions): Promise<QueryResult<PackageVersionListResult>>;
 export declare function assembleQueryParts(select: string, where: string[], orderBy?: string): string;
-export declare function constructWhere(packageIds: string[], createdLastDays: number, lastModLastDays: number, isReleased: boolean): string[];
-export declare function validateDays(paramName: string, lastDays: number): number;
+export declare function constructWhere(options?: PackageVersionListOptions): string[];
+export declare function validateDays(paramName: string, lastDays?: number): number;

package/lib/package/packageVersionList.js

@@ -52,24 +52,24 @@ const getLogger = () => {
     }
     return logger;
 };
-async function listPackageVersions(options) {
-    return options.connection.autoFetchQuery(constructQuery(options), {
+async function listPackageVersions(connection, options) {
+    return connection.autoFetchQuery(constructQuery(Number(connection.version), options), {
         tooling: true,
     });
 }
 exports.listPackageVersions = listPackageVersions;
-function constructQuery(options) {
+function constructQuery(connectionVersion, options) {
     // construct custom WHERE clause, if applicable
-    const where = constructWhere(options.packages, options.createdLastDays, options.modifiedLastDays, options.isReleased);
+    const where = constructWhere(options);
     let queryFields = defaultFields;
-    if (options.verbose) {
+    if (options?.verbose) {
         queryFields = [...queryFields, ...verboseFields];
-        if (Number(options.connection.version) >= 57) {
+        if (connectionVersion >= 57) {
             queryFields = [...queryFields, ...verbose57Fields];
         }
     }
     const query = `SELECT ${queryFields.toString()} FROM Package2Version`;
-    return assembleQueryParts(query, where, options.orderBy);
+    return assembleQueryParts(query, where, options?.orderBy);
 }
 function assembleQueryParts(select, where, orderBy) {
     // construct ORDER BY clause
@@ -81,12 +81,12 @@ function assembleQueryParts(select, where, orderBy) {
 }
 exports.assembleQueryParts = assembleQueryParts;
 // construct custom WHERE clause parts
-function constructWhere(packageIds, createdLastDays, lastModLastDays, isReleased) {
+function constructWhere(options) {
     const where = [];
     // filter on given package ids
-    if (packageIds?.length > 0) {
+    if (options?.packages?.length) {
         // remove dups
-        const uniquePackageIds = [...new Set(packageIds)];
+        const uniquePackageIds = [...new Set(options?.packages)];
         // validate ids
         uniquePackageIds.forEach((packageId) => {
             (0, packageUtils_1.validateId)(packageUtils_1.BY_LABEL.PACKAGE_ID, packageId);
@@ -95,16 +95,16 @@ function constructWhere(packageIds, createdLastDays, lastModLastDays, isReleased
         where.push(`Package2Id IN ('${uniquePackageIds.join("','")}')`);
     }
     // filter on created date, days ago: 0 for today, etc
-    if ((0, ts_types_1.isNumber)(createdLastDays)) {
-        createdLastDays = validateDays('createdlastdays', createdLastDays);
+    if ((0, ts_types_1.isNumber)(options?.createdLastDays)) {
+        const createdLastDays = validateDays('createdlastdays', options?.createdLastDays);
         where.push(`CreatedDate = LAST_N_DAYS:${createdLastDays}`);
     }
     // filter on last mod date, days ago: 0 for today, etc
-    if ((0, ts_types_1.isNumber)(lastModLastDays)) {
-        lastModLastDays = validateDays('modifiedlastdays', lastModLastDays);
-        where.push(`LastModifiedDate = LAST_N_DAYS:${lastModLastDays}`);
+    if ((0, ts_types_1.isNumber)(options?.modifiedLastDays)) {
+        const modifiedLastDays = validateDays('modifiedlastdays', options?.modifiedLastDays);
+        where.push(`LastModifiedDate = LAST_N_DAYS:${modifiedLastDays}`);
     }
-    if (isReleased) {
+    if (options?.isReleased) {
         where.push('IsReleased = true');
     }
     // exclude deleted
@@ -112,9 +112,9 @@ function constructWhere(packageIds, createdLastDays, lastModLastDays, isReleased
     return where;
 }
 exports.constructWhere = constructWhere;
-function validateDays(paramName, lastDays) {
+function validateDays(paramName, lastDays = -1) {
     if (lastDays < 0) {
-        throw messages.createError('invalidDaysNumber', [paramName, `${lastDays}`]);
+        throw messages.createError('invalidDaysNumber', [paramName, lastDays]);
     }
     return lastDays;
 }

package/lib/package/packageVersionReport.js

@@ -40,8 +40,10 @@ async function getPackageVersionReport(options) {
     if (records?.length > 0) {
         const record = records[0];
         record.Version = [record.MajorVersion, record.MinorVersion, record.PatchVersion, record.BuildNumber].join('.');
-        const containerOptions = await pkgUtils.getContainerOptions([record.Package2Id], options.connection);
-        record.PackageType = containerOptions.get(record.Package2Id);
+        const containerOptions = await pkgUtils.getContainerOptions(record.Package2Id, options.connection);
+        if (containerOptions.size > 0 && record.Package2Id) {
+            record.PackageType = containerOptions.get(record.Package2Id);
+        }
         record.AncestorVersion = null;
         if (record.AncestorId) {
             // lookup AncestorVersion value

package/lib/package/subscriberPackageVersion.d.ts

@@ -1,6 +1,6 @@
 import { Connection } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
-import { Optional } from '@salesforce/ts-types';
+import { Nullable, Optional } from '@salesforce/ts-types';
 import { InstalledPackages, PackageInstallCreateRequest, PackageInstallOptions, PackageType, PackagingSObjects, SubscriberPackageVersionOptions } from '../interfaces';
 import { VersionNumber } from './versionNumber';
 export declare const SubscriberPackageVersionFields: string[];
@@ -23,7 +23,7 @@ export declare class SubscriberPackageVersion {
     private readonly password;
     private readonly connection;
     private readonly id;
-    private data;
+    private data?;
     constructor(options: SubscriberPackageVersionOptions);
     /**
      * Fetches the status of a package version install request and will wait for the install to complete, if requested
@@ -35,7 +35,7 @@ export declare class SubscriberPackageVersion {
      * @param installationKey
      * @param options
      */
-    static installStatus(connection: Connection, packageInstallRequestOrId: string | PackagingSObjects.PackageInstallRequest, installationKey?: string, options?: PackageInstallOptions): Promise<PackagingSObjects.PackageInstallRequest>;
+    static installStatus(connection: Connection, packageInstallRequestOrId: string | PackagingSObjects.PackageInstallRequest, installationKey?: string | undefined | Nullable<string>, options?: PackageInstallOptions): Promise<PackagingSObjects.PackageInstallRequest>;
     /**
      * list the packages installed in the org
      *
@@ -135,7 +135,7 @@ export declare class SubscriberPackageVersion {
     getData(options?: {
         force?: boolean;
         includeHighCostFields?: boolean;
-    }): Promise<PackagingSObjects.SubscriberPackageVersion>;
+    }): Promise<PackagingSObjects.SubscriberPackageVersion | undefined>;
     /**
      * Wait for the subscriber package version to be replicated across instances and available to be queried against
      *