@salesforce/packaging 1.4.16 → 1.4.17

package/lib/package/packageCreate.js

@@ -8,13 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackage = exports.createPackageDirEntry = exports.createPackageRequestFromContext = void 0;
 const core_1 = require("@salesforce/core");
-const ts_types_1 = require("@salesforce/ts-types");
 const pkgUtils = require("../utils/packageUtils");
 const packageUtils_1 = require("../utils/packageUtils");
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_create');
 function createPackageRequestFromContext(project, options) {
-    const namespace = options.noNamespace ? '' : project.getSfProjectJson().getContents().namespace || '';
+    const namespace = options.noNamespace ? '' : project.getSfProjectJson().getContents().namespace ?? '';
     return {
         Name: options.name,
         Description: options.description,
@@ -29,22 +26,21 @@ exports.createPackageRequestFromContext = createPackageRequestFromContext;
  * Create packageDirectory json entry for this package that can be written to sfdx-project.json
  *
  * @param project
- * @param packageId the 0Ho id of the package to create the entry for
+ * @param options - package create options
  * @private
  */
 function createPackageDirEntry(project, options) {
-    let packageDirs = project.getSfProjectJson().getContents().packageDirectories;
+    const packageDirs = project.getSfProjectJson().getContents().packageDirectories ?? [];
     let isNew = false;
-    if (!packageDirs) {
-        packageDirs = [];
-    }
     // see if package exists (exists means it has an id or package)
-    let packageDir = packageDirs.find((pd) => pd.path === options.path && !pd.id && !pd.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 = packageDir.path || options.path;
+        packageDir.path = (0, packageUtils_1.replaceIfEmpty)(packageDir.path, options.path);
     }
     if (packageDirs.length === 0) {
         packageDir.default = true;
@@ -52,10 +48,10 @@ function createPackageDirEntry(project, options) {
     else if (isNew) {
         packageDir.default = !packageDirs.find((pd) => pd.default);
     }
-    packageDir.package = packageDir.package || options.name;
-    packageDir.versionName = packageDir.versionName || pkgUtils.DEFAULT_PACKAGE_DIR.versionName;
-    packageDir.versionNumber = packageDir.versionNumber || pkgUtils.DEFAULT_PACKAGE_DIR.versionNumber;
-    packageDir.versionDescription = packageDir.versionDescription || options.description;
+    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;
 }
 exports.createPackageDirEntry = createPackageDirEntry;
@@ -63,30 +59,23 @@ async function createPackage(connection, project, options) {
     // strip trailing slash from path param
     options.path = options.path.replace(/\/$/, '');
     const request = createPackageRequestFromContext(project, options);
-    let packageId = null;
     const createResult = await connection.tooling
         .sobject('Package2')
         .create(request)
         .catch((err) => {
-        const error = (0, ts_types_1.isString)(err) ? new Error(err) : err;
+        const error = err instanceof Error ? err : new Error(typeof err === 'string' ? err : 'Unknown error');
         throw core_1.SfError.wrap((0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(error)));
     });
     if (!createResult.success) {
         throw pkgUtils.combineSaveErrors('Package2', 'create', createResult.errors);
     }
-    packageId = createResult.id;
-    const queryResult = await connection.tooling.query(`SELECT Id FROM Package2 WHERE Id='${packageId}'`);
-    if (!queryResult?.records[0]) {
-        throw messages.createError('unableToFindPackageWithId', [packageId]);
-    }
-    const record = queryResult.records[0];
     if (!process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE) {
         const packageDirectory = createPackageDirEntry(project, options);
         project.getSfProjectJson().addPackageDirectory(packageDirectory);
-        project.getSfProjectJson().addPackageAlias(options.name, record.Id);
+        project.getSfProjectJson().addPackageAlias(options.name, createResult.id);
         await project.getSfProjectJson().write();
     }
-    return { Id: record.Id };
+    return { Id: createResult.id };
 }
 exports.createPackage = createPackage;
 //# sourceMappingURL=packageCreate.js.map

package/lib/package/packageDelete.js

@@ -16,7 +16,10 @@ async function deletePackage(idOrAlias, project, connection, undelete) {
     const isUndelete = undelete;
     request.IsDeprecated = !isUndelete;
     const updateResult = await connection.tooling.update('Package2', request).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;
     });
     if (!updateResult.success) {
         throw (0, packageUtils_1.combineSaveErrors)('Package2', 'update', updateResult.errors);

package/lib/package/packageInstall.d.ts

@@ -1,12 +1,13 @@
 import { Connection } from '@salesforce/core';
+import { Nullable } from '@salesforce/ts-types';
 import { QueryResult } from 'jsforce';
 import { Duration } from '@salesforce/kit';
-import { PackagingSObjects, PackageInstallCreateRequest, PackageType, PackageInstallOptions } from '../interfaces';
+import { PackageInstallCreateRequest, PackageInstallOptions, PackageType, PackagingSObjects } from '../interfaces';
 import PackageInstallRequest = PackagingSObjects.PackageInstallRequest;
 export declare function createPackageInstallRequest(connection: Connection, pkgInstallCreateRequest: PackageInstallCreateRequest, packageType: PackageType): Promise<PackagingSObjects.PackageInstallRequest>;
 export declare function getStatus(connection: Connection, packageInstallRequestId: string): Promise<PackageInstallRequest>;
 export declare function isErrorFromSPVQueryRestriction(err: Error): boolean;
 export declare function isErrorPackageNotAvailable(err: Error): boolean;
-export declare function getInstallationStatus(subscriberPackageVersionId: string, installationKey: string, connection: Connection): Promise<QueryResult<PackagingSObjects.SubscriberPackageVersion>>;
-export declare function waitForPublish(connection: Connection, subscriberPackageVersionId: string, frequency: number | Duration, timeout: number | Duration, installationKey?: string): Promise<void>;
-export declare function pollStatus(connection: Connection, installRequestId: string, options: PackageInstallOptions): Promise<PackageInstallRequest>;
+export declare function getInstallationStatus(subscriberPackageVersionId: string, installationKey: Nullable<string>, connection: Connection): Promise<QueryResult<PackagingSObjects.SubscriberPackageVersion> | undefined>;
+export declare function waitForPublish(connection: Connection, subscriberPackageVersionId: string, frequency?: number | Duration, timeout?: number | Duration, installationKey?: string | Nullable<string>): Promise<void>;
+export declare function pollStatus(connection: Connection, installRequestId: string, options?: PackageInstallOptions): Promise<PackageInstallRequest>;

package/lib/package/packageInstall.js

@@ -60,7 +60,8 @@ async function createPackageInstallRequest(connection, pkgInstallCreateRequest,
 }
 exports.createPackageInstallRequest = createPackageInstallRequest;
 async function getStatus(connection, packageInstallRequestId) {
-    return (await connection.tooling.retrieve('PackageInstallRequest', packageInstallRequestId));
+    const results = (await connection.tooling.retrieve('PackageInstallRequest', packageInstallRequestId));
+    return results;
 }
 exports.getStatus = getStatus;
 // determines if error is from malformed SubscriberPackageVersion query
@@ -94,14 +95,14 @@ async function getInstallationStatus(subscriberPackageVersionId, installationKey
 }
 exports.getInstallationStatus = getInstallationStatus;
 async function waitForPublish(connection, subscriberPackageVersionId, frequency, timeout, installationKey) {
-    const pollingTimeout = (0, packageUtils_1.numberToDuration)(timeout || 0);
+    const pollingTimeout = (0, packageUtils_1.numberToDuration)(timeout);
     if (pollingTimeout.milliseconds <= 0) {
         return;
     }
     let queryResult;
     let installValidationStatus = 'PACKAGE_UNAVAILABLE';
     const pollingOptions = {
-        frequency: (0, packageUtils_1.numberToDuration)(frequency || 0),
+        frequency: (0, packageUtils_1.numberToDuration)(frequency),
         timeout: pollingTimeout,
         poll: async () => {
             queryResult = await getInstallationStatus(subscriberPackageVersionId, installationKey, connection);
@@ -130,7 +131,7 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
         // if polling timed out
         const error = installMsgs.createError('subscriberPackageVersionNotPublished');
         error.setData(queryResult?.records[0]);
-        if (error.stack && e.stack) {
+        if (error.stack && e instanceof Error && e.stack) {
             getLogger().debug(`Error during waitForPublish polling:\n${e.stack}`);
             // append the original stack to this new error
             error.stack += `\nDUE TO:\n${e.stack}`;
@@ -139,11 +140,11 @@ async function waitForPublish(connection, subscriberPackageVersionId, frequency,
     }
 }
 exports.waitForPublish = waitForPublish;
-async function pollStatus(connection, installRequestId, options) {
-    let packageInstallRequest;
+async function pollStatus(connection, installRequestId, options = { pollingFrequency: 5000, pollingTimeout: 300000 }) {
+    let packageInstallRequest = await getStatus(connection, installRequestId);
     const { pollingFrequency, pollingTimeout } = options;
-    const frequency = (0, packageUtils_1.numberToDuration)(pollingFrequency || 5000);
-    const timeout = (0, packageUtils_1.numberToDuration)(pollingTimeout || 300000);
+    const frequency = (0, packageUtils_1.numberToDuration)(pollingFrequency);
+    const timeout = (0, packageUtils_1.numberToDuration)(pollingTimeout);
     const pollingOptions = {
         frequency,
         timeout,
@@ -169,7 +170,7 @@ async function pollStatus(connection, installRequestId, options) {
         const errMsg = e instanceof Error ? e.message : (0, ts_types_1.isString)(e) ? e : 'polling timed out';
         const error = new core_1.SfError(errMsg, 'PackageInstallTimeout');
         error.setData(packageInstallRequest);
-        if (error.stack && e.stack) {
+        if (error.stack && e instanceof Error && e.stack) {
             // add the original stack to this new error
             error.stack += `\nDUE TO:\n${e.stack}`;
         }

package/lib/package/packageProfileApi.d.ts

@@ -1,21 +1,18 @@
-import { ConfigAggregator, SfProject } from '@salesforce/core';
+import { SfProject } from '@salesforce/core';
 import { AsyncCreatable } from '@salesforce/kit';
 import { ProfileApiOptions } from '../interfaces';
 export declare class PackageProfileApi extends AsyncCreatable<ProfileApiOptions> {
-    private options;
     readonly profiles: ProfileInformation[];
-    apiVersion: string;
     nodeEntities: {
         name: string[];
-        childElement: string[];
         parentElement: string[];
+        childElement: string[];
     };
     otherProfileSettings: {
         name: string[];
-        childElement: string[];
         parentElement: string[];
+        childElement: string[];
     };
-    config: ConfigAggregator;
     project: SfProject;
     includeUserLicenses: boolean;
     generateProfileInformation: boolean;

package/lib/package/packageProfileApi.js

@@ -15,6 +15,63 @@ const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 core_1.Messages.importMessagesDirectory(__dirname);
 const profileApiMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'profile_api');
+// nodeEntities is used to determine which elements in the profile are relevant to the source being packaged.
+// name refers to the entity type name in source that the element pertains to.  As an example, a profile may
+// have an entry like the example below, which should only be added to the packaged profile if the related
+// CustomObject is in the source being packaged:
+//   <objectPermissions>
+//      <allowCreate>true</allowCreate>
+//       ...
+//      <object>MyCustomObject__c</object>
+//       ...
+//   </objectPermissions>
+//
+// For this example: nodeEntities.parentElement = objectPermissions and nodeEntities.childElement = object
+const NODE_ENTITIES = {
+    name: [
+        'CustomObject',
+        'CustomField',
+        'Layout',
+        'CustomTab',
+        'CustomApplication',
+        'ApexClass',
+        'CustomPermission',
+        'ApexPage',
+        'ExternalDataSource',
+        'RecordType',
+    ],
+    parentElement: [
+        'objectPermissions',
+        'fieldPermissions',
+        'layoutAssignments',
+        'tabVisibilities',
+        'applicationVisibilities',
+        'classAccesses',
+        'customPermissions',
+        'pageAccesses',
+        'externalDataSourceAccesses',
+        'recordTypeVisibilities',
+    ],
+    childElement: [
+        'object',
+        'field',
+        'layout',
+        'tab',
+        'application',
+        'apexClass',
+        'name',
+        'apexPage',
+        'externalDataSource',
+        'recordType',
+    ],
+};
+// There are some profile settings that are allowed to be packaged that may not necessarily map to a specific metadata
+// object. We should still handle these accordingly, but a little differently than the above mentioned types.
+const OTHER_PROFILE_SETTINGS = {
+    name: ['CustomSettings', 'CustomMetadataTypeAccess'],
+    parentElement: ['customSettingAccesses', 'customMetadataTypeAccesses'],
+    childElement: ['name', 'name'],
+};
 /*
  * This class provides functions used to re-write .profiles in the workspace when creating a package2 version.
  * All profiles found in the workspaces are extracted out and then re-written to only include metadata in the profile
@@ -23,74 +80,17 @@ const profileApiMessages = core_1.Messages.loadMessages('@salesforce/packaging',
 class PackageProfileApi extends kit_1.AsyncCreatable {
     constructor(options) {
         super(options);
-        this.options = options;
         this.profiles = [];
+        this.nodeEntities = NODE_ENTITIES;
+        this.otherProfileSettings = OTHER_PROFILE_SETTINGS;
+        this.includeUserLicenses = false;
         this.generateProfileInformation = false;
+        this.project = options.project;
+        this.includeUserLicenses = options.includeUserLicenses ?? false;
+        this.generateProfileInformation = options.generateProfileInformation ?? false;
     }
-    async init() {
-        this.project = this.options.project;
-        this.includeUserLicenses = this.options.includeUserLicenses;
-        this.generateProfileInformation = this.options.generateProfileInformation;
-        this.config = await core_1.ConfigAggregator.create();
-        this.apiVersion = this.config.getPropertyValue('apiVersion');
-        // nodeEntities is used to determine which elements in the profile are relevant to the source being packaged.
-        // name refers to the entity type name in source that the element pertains to.  As an example, a profile may
-        // have an entry like the example below, which should only be added to the packaged profile if the related
-        // CustomObject is in the source being packaged:
-        //   <objectPermissions>
-        //      <allowCreate>true</allowCreate>
-        //       ...
-        //      <object>MyCustomObject__c</object>
-        //       ...
-        //   </objectPermissions>
-        //
-        // For this example: nodeEntities.parentElement = objectPermissions and nodeEntities.childElement = object
-        this.nodeEntities = {
-            name: [
-                'CustomObject',
-                'CustomField',
-                'Layout',
-                'CustomTab',
-                'CustomApplication',
-                'ApexClass',
-                'CustomPermission',
-                'ApexPage',
-                'ExternalDataSource',
-                'RecordType',
-            ],
-            parentElement: [
-                'objectPermissions',
-                'fieldPermissions',
-                'layoutAssignments',
-                'tabVisibilities',
-                'applicationVisibilities',
-                'classAccesses',
-                'customPermissions',
-                'pageAccesses',
-                'externalDataSourceAccesses',
-                'recordTypeVisibilities',
-            ],
-            childElement: [
-                'object',
-                'field',
-                'layout',
-                'tab',
-                'application',
-                'apexClass',
-                'name',
-                'apexPage',
-                'externalDataSource',
-                'recordType',
-            ],
-        };
-        // There are some profile settings that are allowed to be packaged that may not necessarily map to a specific metadata
-        // object. We should still handle these accordingly, but a little differently than the above mentioned types.
-        this.otherProfileSettings = {
-            name: ['CustomSettings', 'CustomMetadataTypeAccess'],
-            parentElement: ['customSettingAccesses', 'customMetadataTypeAccesses'],
-            childElement: ['name', 'name'],
-        };
-    }
+    // eslint-disable-next-line class-methods-use-this,@typescript-eslint/no-empty-function
+    async init() { }
     /**
      * For any profile present in the workspace, this function generates a subset of data that only contains references
      * to items in the manifest.
@@ -107,71 +107,74 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
         }
         profilePaths.forEach((profilePath) => {
             // profile metadata can present in any directory in the package structure
-            const profileName = profilePath.match(/([^/]+)\.profile-meta.xml/)[1];
-            const profileDom = new xmldom_1.DOMParser().parseFromString(fs.readFileSync(profilePath, 'utf-8'));
-            const newDom = new xmldom_1.DOMParser().parseFromString('<?xml version="1.0" encoding="UTF-8"?><Profile xmlns="http://soap.sforce.com/2006/04/metadata"></Profile>');
-            const profileNode = newDom.getElementsByTagName('Profile')[0];
-            let hasNodes = false;
-            // We need to keep track of all the members for when we package up the "OtherProfileSettings"
-            let allMembers = [];
-            manifest.Package.forEach((element) => {
-                const name = element.name;
-                const members = element.members;
-                allMembers = allMembers.concat(members);
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                const idx = this.nodeEntities.name.indexOf(name[0]);
-                if (idx > -1) {
-                    hasNodes =
-                        this.copyNodes(profileDom, this.nodeEntities.parentElement[idx], this.nodeEntities.childElement[idx], members, profileNode, profileName) || hasNodes;
-                }
-            });
-            // Go through each of the other profile settings we might want to include. We pass in "all" the members since these
-            // will reference anything that could be packaged. The "copyNodes" function will only include the type if it
-            // exists in the profile itself
-            this.otherProfileSettings.name.forEach((element) => {
-                const idx = this.otherProfileSettings.name.indexOf(element);
-                if (idx > -1) {
-                    hasNodes =
-                        this.copyNodes(profileDom, this.otherProfileSettings.parentElement[idx], this.otherProfileSettings.childElement[idx], allMembers, profileNode, profileName) || hasNodes;
-                }
-            });
-            // add userLicenses to the profile
-            if (this.includeUserLicenses === true) {
-                const userLicenses = profileDom.getElementsByTagName('userLicense');
-                if (userLicenses) {
-                    hasNodes = true;
-                    for (const userLicense of Array.from(userLicenses)) {
-                        profileNode.appendChild(userLicense.cloneNode(true));
+            const profileNameMatch = profilePath.match(/([^/]+)\.profile-meta.xml/);
+            const profileName = profileNameMatch ? profileNameMatch[1] : null;
+            if (profileName) {
+                const profileDom = new xmldom_1.DOMParser().parseFromString(fs.readFileSync(profilePath, 'utf-8'));
+                const newDom = new xmldom_1.DOMParser().parseFromString('<?xml version="1.0" encoding="UTF-8"?><Profile xmlns="http://soap.sforce.com/2006/04/metadata"></Profile>');
+                const profileNode = newDom.getElementsByTagName('Profile')[0];
+                let hasNodes = false;
+                // We need to keep track of all the members for when we package up the "OtherProfileSettings"
+                let allMembers = [];
+                manifest.Package.forEach((element) => {
+                    const name = element.name;
+                    const members = element.members;
+                    allMembers = allMembers.concat(members);
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    const idx = this.nodeEntities.name.indexOf(name[0]);
+                    if (idx > -1) {
+                        hasNodes =
+                            this.copyNodes(profileDom, this.nodeEntities.parentElement[idx], this.nodeEntities.childElement[idx], members, profileNode, profileName) ?? hasNodes;
                     }
-                }
-            }
-            const xmlSrcFile = path.basename(profilePath);
-            const xmlFile = xmlSrcFile.replace(/(.*)(-meta.xml)/, '$1');
-            const destFilePath = path.join(destPath, xmlFile);
-            if (hasNodes) {
-                const serializer = new xmldom_1.XMLSerializer();
-                serializer.serializeToString(newDom);
-                fs.writeFileSync(destFilePath, serializer.serializeToString(newDom), 'utf-8');
-            }
-            else {
-                // remove from manifest
-                // eslint-disable-next-line @typescript-eslint/no-shadow
-                const profileName = xmlFile.replace(/(.*)(\.profile)/, '$1');
-                excludedProfiles.push(profileName);
-                if (this.generateProfileInformation) {
-                    const profile = this.profiles.find(({ ProfileName }) => ProfileName === profileName);
-                    if (profile) {
-                        profile.setIsPackaged(false);
+                });
+                // Go through each of the other profile settings we might want to include. We pass in "all" the members since these
+                // will reference anything that could be packaged. The "copyNodes" function will only include the type if it
+                // exists in the profile itself
+                this.otherProfileSettings.name.forEach((element) => {
+                    const idx = this.otherProfileSettings.name.indexOf(element);
+                    if (idx > -1) {
+                        hasNodes =
+                            this.copyNodes(profileDom, this.otherProfileSettings.parentElement[idx], this.otherProfileSettings.childElement[idx], allMembers, profileNode, profileName) ?? hasNodes;
+                    }
+                });
+                // add userLicenses to the profile
+                if (this.includeUserLicenses) {
+                    const userLicenses = profileDom.getElementsByTagName('userLicense');
+                    if (userLicenses) {
+                        hasNodes = true;
+                        for (const userLicense of Array.from(userLicenses)) {
+                            profileNode.appendChild(userLicense.cloneNode(true));
+                        }
                     }
                 }
-                try {
-                    fs.unlinkSync(destFilePath);
+                const xmlSrcFile = path.basename(profilePath);
+                const xmlFile = xmlSrcFile.replace(/(.*)(-meta.xml)/, '$1');
+                const destFilePath = path.join(destPath, xmlFile);
+                if (hasNodes) {
+                    const serializer = new xmldom_1.XMLSerializer();
+                    serializer.serializeToString(newDom);
+                    fs.writeFileSync(destFilePath, serializer.serializeToString(newDom), 'utf-8');
                 }
-                catch (err) {
-                    // It is normal for the file to not exist if the profile is in the workspace but not in the directory being packaged.
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    if (err.code !== 'ENOENT') {
-                        throw err;
+                else {
+                    // remove from manifest
+                    // eslint-disable-next-line @typescript-eslint/no-shadow
+                    const profileName = xmlFile.replace(/(.*)(\.profile)/, '$1');
+                    excludedProfiles.push(profileName);
+                    if (this.generateProfileInformation) {
+                        const profile = this.profiles.find(({ ProfileName }) => ProfileName === profileName);
+                        if (profile) {
+                            profile.setIsPackaged(false);
+                        }
+                    }
+                    try {
+                        fs.unlinkSync(destFilePath);
+                    }
+                    catch (err) {
+                        // It is normal for the file to not exist if the profile is in the workspace but not in the directory being packaged.
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                        if (err instanceof Error && 'code' in err && err.code !== 'ENOENT') {
+                            throw err;
+                        }
                     }
                 }
             }
@@ -187,22 +190,25 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
     filterAndGenerateProfilesForManifest(typesArr, excludedDirectories = []) {
         const profilePaths = this.findAllProfiles(excludedDirectories);
         // Filter all profiles
-        typesArr = (typesArr || []).filter((kvp) => kvp.name[0] !== 'Profile');
+        const filteredTypesArr = (typesArr ?? []).filter((kvp) => kvp.name[0] !== 'Profile');
         if (profilePaths) {
             const members = [];
             profilePaths.forEach((profilePath) => {
                 // profile metadata can present in any directory in the package structure
-                const profileName = profilePath.match(/([^/]+)\.profile-meta.xml/)[1];
-                members.push(profileName);
-                if (this.generateProfileInformation) {
-                    this.profiles.push(new ProfileInformation(profileName, profilePath, true, []));
+                const profileNameMatch = profilePath.match(/([^/]+)\.profile-meta.xml/);
+                const profileName = profileNameMatch ? profileNameMatch[1] : null;
+                if (profileName) {
+                    members.push(profileName);
+                    if (this.generateProfileInformation) {
+                        this.profiles.push(new ProfileInformation(profileName, profilePath, true, []));
+                    }
                 }
             });
             if (members.length > 0) {
-                typesArr.push({ name: ['Profile'], members });
+                filteredTypesArr.push({ name: ['Profile'], members });
             }
         }
-        return typesArr;
+        return filteredTypesArr;
     }
     getProfileInformation() {
         return this.profiles;
@@ -216,18 +222,20 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
         // eslint-disable-next-line @typescript-eslint/prefer-for-of
         for (let i = 0; i < nodes.length; i++) {
             const name = nodes[i].getElementsByTagName(childElement)[0].childNodes[0].nodeValue;
-            if (members.includes(name)) {
-                // appendChild will take the passed in node (newNode) and find the parent if it exists and then remove
-                // the newNode from the parent.  This causes issues with the way this is copying the nodes, so pass in a clone instead.
-                const currentNode = nodes[i].cloneNode(true);
-                appendToNode.appendChild(currentNode);
-                nodesAdded = true;
-            }
-            else if (this.generateProfileInformation) {
-                // Tell the user which profile setting has been removed from the package
-                const profile = this.profiles.find(({ ProfileName }) => ProfileName === profileName);
-                if (profile) {
-                    profile.appendRemovedSetting(name);
+            if (name) {
+                if (members.includes(name)) {
+                    // appendChild will take the passed in node (newNode) and find the parent if it exists and then remove
+                    // the newNode from the parent.  This causes issues with the way this is copying the nodes, so pass in a clone instead.
+                    const currentNode = nodes[i].cloneNode(true);
+                    appendToNode.appendChild(currentNode);
+                    nodesAdded = true;
+                }
+                else if (this.generateProfileInformation) {
+                    // Tell the user which profile setting has been removed from the package
+                    const profile = this.profiles.find(({ ProfileName }) => ProfileName === profileName);
+                    if (profile) {
+                        profile.appendRemovedSetting(name);
+                    }
                 }
             }
         }

package/lib/package/packageUninstall.js

@@ -17,7 +17,7 @@ const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_
 const pkgMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'package');
 async function getUninstallErrors(conn, id) {
     const errorQueryResult = await conn.tooling.query(`"SELECT Message FROM PackageVersionUninstallRequestError WHERE ParentRequest.Id = '${id}' ORDER BY Message"`);
-    return errorQueryResult?.records || [];
+    return errorQueryResult?.records ?? [];
 }
 exports.getUninstallErrors = getUninstallErrors;
 async function pollUninstall(uninstallRequestId, conn, frequency, wait) {
@@ -58,17 +58,23 @@ async function uninstallPackage(id, conn, frequency = kit_1.Duration.seconds(0),
         const uninstallRequest = await conn.tooling.sobject('SubscriberPackageVersionUninstallRequest').create({
             SubscriberPackageVersionId: id,
         });
-        if (wait.seconds === 0) {
-            return (await conn.tooling
-                .sobject('SubscriberPackageVersionUninstallRequest')
-                .retrieve(uninstallRequest.id));
-        }
-        else {
-            return await pollUninstall(uninstallRequest.id, conn, frequency, wait);
+        if (uninstallRequest.success) {
+            if (wait.seconds === 0) {
+                return (await conn.tooling
+                    .sobject('SubscriberPackageVersionUninstallRequest')
+                    .retrieve(uninstallRequest.id));
+            }
+            else {
+                return await pollUninstall(uninstallRequest.id, conn, frequency, wait);
+            }
         }
+        throw (0, packageUtils_1.combineSaveErrors)('SubscriberPackageVersionUninstallRequest', 'create', uninstallRequest.errors);
     }
     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.uninstallPackage = uninstallPackage;