@salesforce/packaging 0.1.11 → 0.1.13

package/lib/package/packageInstalledList.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInstalledList = void 0;
+const utils_1 = require("../utils");
 async function packageInstalledList(conn) {
-    const query = 'SELECT Id, SubscriberPackageId, SubscriberPackage.NamespacePrefix, SubscriberPackage.Name, SubscriberPackageVersion.Id, SubscriberPackageVersion.Name, SubscriberPackageVersion.MajorVersion, SubscriberPackageVersion.MinorVersion, SubscriberPackageVersion.PatchVersion, SubscriberPackageVersion.BuildNumber FROM InstalledSubscriberPackage ORDER BY SubscriberPackageId';
-    return (await conn.tooling.query(query)).records;
+    try {
+        const query = 'SELECT Id, SubscriberPackageId, SubscriberPackage.NamespacePrefix, SubscriberPackage.Name, SubscriberPackageVersion.Id, SubscriberPackageVersion.Name, SubscriberPackageVersion.MajorVersion, SubscriberPackageVersion.MinorVersion, SubscriberPackageVersion.PatchVersion, SubscriberPackageVersion.BuildNumber FROM InstalledSubscriberPackage ORDER BY SubscriberPackageId';
+        return (await conn.tooling.query(query)).records;
+    }
+    catch (err) {
+        throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+    }
 }
 exports.packageInstalledList = packageInstalledList;
 //# sourceMappingURL=packageInstalledList.js.map

package/lib/package/packageUninstall.d.ts

@@ -2,5 +2,9 @@ import { Connection } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { PackagingSObjects } from '../interfaces';
 declare type UninstallResult = PackagingSObjects.SubscriberPackageVersionUninstallRequest;
-export declare function uninstallPackage(id: string, conn: Connection, wait?: Duration): Promise<UninstallResult>;
+export declare function getUninstallErrors(conn: Connection, id: string): Promise<Array<{
+    Message: string;
+}>>;
+export declare function pollUninstall(uninstallRequestId: string, conn: Connection, frequency: Duration, wait: Duration): Promise<UninstallResult>;
+export declare function uninstallPackage(id: string, conn: Connection, frequency?: Duration, wait?: Duration): Promise<UninstallResult>;
 export {};

package/lib/package/packageUninstall.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uninstallPackage = void 0;
+exports.uninstallPackage = exports.pollUninstall = exports.getUninstallErrors = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -11,54 +11,64 @@ const os = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");
+const utils_1 = require("../utils");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_uninstall');
 const pkgMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'package');
-async function poll(id, conn) {
-    const uninstallRequest = await conn.tooling.sobject('SubscriberPackageVersionUninstallRequest').retrieve(id);
-    switch (uninstallRequest.Status) {
-        case 'Success': {
-            return { completed: true, payload: uninstallRequest };
-        }
-        case 'InProgress':
-        case 'Queued': {
-            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.uninstall, {
-                ...uninstallRequest,
-            });
-            return { completed: false, payload: uninstallRequest };
-        }
-        default: {
-            const err = pkgMessages.getMessage('defaultErrorMessage', [id, uninstallRequest.Id]);
-            const errorQueryResult = await conn.tooling.query(`"SELECT Message FROM PackageVersionUninstallRequestError WHERE ParentRequest.Id = '${id}' ORDER BY Message"`);
-            const errors = [];
-            if (errorQueryResult.records.length) {
-                errors.push('\n=== Errors\n');
-                errorQueryResult.records.forEach((record) => {
-                    errors.push(`(${errors.length}) ${record.Message}${os.EOL}`);
+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 || [];
+}
+exports.getUninstallErrors = getUninstallErrors;
+async function pollUninstall(uninstallRequestId, conn, frequency, wait) {
+    const poll = async (id, conn) => {
+        const uninstallRequest = (await conn.tooling
+            .sobject('SubscriberPackageVersionUninstallRequest')
+            .retrieve(id));
+        switch (uninstallRequest.Status) {
+            case 'Success': {
+                return { completed: true, payload: uninstallRequest };
+            }
+            case 'InProgress':
+            case 'Queued': {
+                await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageEvents.uninstall, {
+                    ...uninstallRequest,
                 });
+                return { completed: false, payload: uninstallRequest };
+            }
+            default: {
+                const err = pkgMessages.getMessage('defaultErrorMessage', [id, uninstallRequest.Id]);
+                const errorMessages = await getUninstallErrors(conn, id);
+                const errors = errorMessages.map((error, index) => `(${index + 1}) ${error.Message}${os.EOL}`);
+                const combinedErrors = errors.length ? `\n=== Errors\n${errors.join(os.EOL)}` : '';
+                throw new core_1.SfError(`${err}${combinedErrors}`, 'UNINSTALL_ERROR', [messages.getMessage('uninstallErrorAction')]);
             }
-            throw new core_1.SfError(`${err}${errors.join(os.EOL)}`, 'UNINSTALL_ERROR', [
-                messages.getMessage('uninstallErrorAction'),
-            ]);
         }
-    }
-}
-async function uninstallPackage(id, conn, wait = kit_1.Duration.seconds(0)) {
-    const uninstallRequest = await conn.tooling.sobject('SubscriberPackageVersionUninstallRequest').create({
-        SubscriberPackageVersionId: id,
+    };
+    const pollingClient = await core_1.PollingClient.create({
+        poll: () => poll(uninstallRequestId, conn),
+        frequency,
+        timeout: wait,
     });
-    if (wait.seconds === 0) {
-        return (await conn.tooling
-            .sobject('SubscriberPackageVersionUninstallRequest')
-            .retrieve(uninstallRequest.id));
-    }
-    else {
-        const pollingClient = await core_1.PollingClient.create({
-            poll: () => poll(uninstallRequest.id, conn),
-            frequency: kit_1.Duration.seconds(5),
-            timeout: wait,
+    return pollingClient.subscribe();
+}
+exports.pollUninstall = pollUninstall;
+async function uninstallPackage(id, conn, frequency = kit_1.Duration.seconds(0), wait = kit_1.Duration.seconds(0)) {
+    try {
+        const uninstallRequest = await conn.tooling.sobject('SubscriberPackageVersionUninstallRequest').create({
+            SubscriberPackageVersionId: id,
         });
-        return pollingClient.subscribe();
+        if (wait.seconds === 0) {
+            return (await conn.tooling
+                .sobject('SubscriberPackageVersionUninstallRequest')
+                .retrieve(uninstallRequest.id));
+        }
+        else {
+            return pollUninstall(uninstallRequest.id, conn, frequency, wait);
+        }
+    }
+    catch (err) {
+        throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
     }
 }
 exports.uninstallPackage = uninstallPackage;

package/lib/package/packageVersion.d.ts

@@ -1,6 +1,6 @@
 import { Connection, SfProject } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
-import { PackageSaveResult, PackageVersionCreateOptions, PackageVersionCreateRequestQueryOptions, PackageVersionCreateRequestResult, PackageVersionListOptions, PackageVersionListResult, PackageVersionOptions, PackageVersionReportResult, PackageVersionUpdateOptions, PackagingSObjects } from '../interfaces';
+import { PackageSaveResult, PackageType, PackageVersionCreateOptions, PackageVersionCreateRequestQueryOptions, PackageVersionCreateRequestResult, PackageVersionOptions, PackageVersionReportResult, PackageVersionUpdateOptions, PackagingSObjects } from '../interfaces';
 declare type Package2Version = PackagingSObjects.Package2Version;
 export declare const Package2VersionFields: string[];
 export declare class PackageVersion {
@@ -8,6 +8,7 @@ export declare class PackageVersion {
     private readonly project;
     private readonly connection;
     private data;
+    private packageType;
     constructor(options: PackageVersionOptions);
     /**
      * Sends a request to create a new package version and optionally polls for
@@ -26,6 +27,7 @@ export declare class PackageVersion {
      * Gets current state of a package version create request.
      *
      * @param createPackageRequestId
+     * @param connection
      */
     static getCreateStatus(createPackageRequestId: string, connection: Connection): Promise<PackageVersionCreateRequestResult>;
     /**
@@ -35,7 +37,7 @@ export declare class PackageVersion {
      * @param options PackageVersionCreateRequestQueryOptions
      * @returns the list of package version create requests.
      */
-    static createdList(connection: Connection, options?: PackageVersionCreateRequestQueryOptions): Promise<PackageVersionCreateRequestResult[]>;
+    static getPackageVersionCreateRequests(connection: Connection, options?: PackageVersionCreateRequestQueryOptions): Promise<PackageVersionCreateRequestResult[]>;
     /**
      * Convenience function that will wait for a package version to be created.
      *
@@ -49,7 +51,28 @@ export declare class PackageVersion {
         frequency: Duration;
         timeout: Duration;
     }): Promise<PackageVersionCreateRequestResult>;
-    static list(connection: Connection, project: SfProject, options: PackageVersionListOptions): Promise<PackageVersionListResult[]>;
+    /**
+     * Gets current state of a package version create request.
+     *
+     * @param createPackageRequestId
+     * @param connection
+     */
+    static getCreateVersionReport(createPackageRequestId: string, connection: Connection): Promise<PackageVersionCreateRequestResult>;
+    /**
+     * Convenience function that will wait for a package version to be created.
+     *
+     * This function emits LifeCycle events, "enqueued", "in-progress", "success", "error" and "timed-out" to
+     * progress and current status. Events also carry a payload of type PackageVersionCreateRequestResult.
+     *
+     * @param createPackageVersionRequestId
+     * @param project
+     * @param connection
+     * @param polling frequency and timeout Durations to be used in polling
+     * */
+    static waitForCreateVersion(createPackageVersionRequestId: string, project: SfProject, connection: Connection, polling: {
+        frequency: Duration;
+        timeout: Duration;
+    }): Promise<PackageVersionCreateRequestResult>;
     /**
      * Get the package version ID for this PackageVersion.
      *
@@ -62,13 +85,25 @@ export declare class PackageVersion {
      * @returns The SubscriberPackageVersionId (04t).
      */
     getSubscriberId(): Promise<string>;
+    /**
+     * Get the package Id for this PackageVersion.
+     *
+     * @returns The PackageId (0Ho).
+     */
+    getPackageId(): Promise<string>;
+    /**
+     * Get the package type for this PackageVersion.
+     *
+     * @returns The PackageType (Managed, Unlocked).
+     */
+    getPackageType(): Promise<PackageType>;
     /**
      * Get the Package2Version SObject data for this PackageVersion.
      *
      * @param force force a refresh of the package version data.
      * @returns Package2Version
      */
-    getPackageVersionData(force?: boolean): Promise<Package2Version>;
+    getData(force?: boolean): Promise<Package2Version>;
     /**
      * Deletes this PackageVersion.
      */
@@ -83,11 +118,23 @@ export declare class PackageVersion {
      * @param verbose Whether to get a detailed version of the report, at the expense of performance.
      */
     report(verbose?: boolean): Promise<PackageVersionReportResult>;
-    install(): Promise<void>;
-    uninstall(): Promise<void>;
+    /**
+     * Promotes this PackageVersion to released state.
+     */
     promote(): Promise<PackageSaveResult>;
     update(options: PackageVersionUpdateOptions): Promise<PackageSaveResult>;
+    /**
+     * Creates a new package version.
+     *
+     * @param options
+     * @param polling frequency and timeout Durations to be used in polling
+     */
+    create(options: PackageVersionCreateOptions, polling?: {
+        frequency: Duration;
+        timeout: Duration;
+    }): Promise<Partial<PackageVersionCreateRequestResult>>;
     private updateDeprecation;
     private updateProjectWithPackageVersion;
+    private resolveId;
 }
 export {};

package/lib/package/packageVersion.js

@@ -14,7 +14,6 @@ const utils_1 = require("../utils");
 const packageVersionCreate_1 = require("./packageVersionCreate");
 const packageVersionReport_1 = require("./packageVersionReport");
 const packageVersionCreateRequestReport_1 = require("./packageVersionCreateRequestReport");
-const packageVersionList_1 = require("./packageVersionList");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version');
@@ -56,7 +55,7 @@ class PackageVersion {
         this.connection = this.options.connection;
         this.project = this.options.project;
         this.data = {};
-        const id = (0, utils_1.getPackageIdFromAlias)(this.options.idOrAlias, this.project);
+        const id = this.resolveId();
         // validate ID
         if (id.startsWith('04t')) {
             (0, utils_1.validateId)(utils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, id);
@@ -88,13 +87,14 @@ class PackageVersion {
         return await PackageVersion.pollCreateStatus(createResult.Id, options.connection, options.project, polling).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)(err);
+            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
         });
     }
     /**
      * Gets current state of a package version create request.
      *
      * @param createPackageRequestId
+     * @param connection
      */
     static async getCreateStatus(createPackageRequestId, connection) {
         return await (0, packageVersionCreateRequestReport_1.getCreatePackageVersionCreateRequestReport)({
@@ -103,7 +103,7 @@ class PackageVersion {
         }).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)(err);
+            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
         });
     }
     /**
@@ -113,7 +113,7 @@ class PackageVersion {
      * @param options PackageVersionCreateRequestQueryOptions
      * @returns the list of package version create requests.
      */
-    static async createdList(connection, options) {
+    static async getPackageVersionCreateRequests(connection, options) {
         return (0, packageVersionCreateRequest_1.list)({ ...options, connection });
     }
     /**
@@ -183,21 +183,88 @@ class PackageVersion {
             throw (0, utils_1.applyErrorAction)(err);
         }
     }
-    static async list(connection, project, options) {
-        // resolve/verify packages
-        const packages = options.packages.map((pkg) => {
-            const id = (0, utils_1.getPackageIdFromAlias)(pkg, project);
-            // validate ID
-            if (id.startsWith('0Ho')) {
-                (0, utils_1.validateId)(utils_1.BY_LABEL.PACKAGE_ID, id);
-                return id;
-            }
-            else {
-                throw messages.createError('errorInvalidPackageVersionId', [id]);
-            }
+    /**
+     * Gets current state of a package version create request.
+     *
+     * @param createPackageRequestId
+     * @param connection
+     */
+    static async getCreateVersionReport(createPackageRequestId, connection) {
+        return await (0, packageVersionCreateRequestReport_1.getCreatePackageVersionCreateRequestReport)({
+            createPackageVersionRequestId: createPackageRequestId,
+            connection,
+        }).catch((err) => {
+            // TODO
+            // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
+            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+        });
+    }
+    /**
+     * Convenience function that will wait for a package version to be created.
+     *
+     * This function emits LifeCycle events, "enqueued", "in-progress", "success", "error" and "timed-out" to
+     * progress and current status. Events also carry a payload of type PackageVersionCreateRequestResult.
+     *
+     * @param createPackageVersionRequestId
+     * @param project
+     * @param connection
+     * @param polling frequency and timeout Durations to be used in polling
+     * */
+    static async waitForCreateVersion(createPackageVersionRequestId, project, connection, polling) {
+        if (polling.timeout?.milliseconds <= 0) {
+            return PackageVersion.getCreateVersionReport(createPackageVersionRequestId, connection);
+        }
+        let remainingWaitTime = polling.timeout;
+        let report;
+        const pollingClient = await core_1.PollingClient.create({
+            poll: async () => {
+                report = await this.getCreateVersionReport(createPackageVersionRequestId, connection);
+                switch (report.Status) {
+                    case 'Queued':
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.enqueued, { ...report, remainingWaitTime });
+                        remainingWaitTime = kit_1.Duration.seconds(remainingWaitTime.seconds - polling.frequency.seconds);
+                        return {
+                            completed: false,
+                            payload: report,
+                        };
+                    case 'InProgress':
+                    case 'Initializing':
+                    case 'VerifyingFeaturesAndSettings':
+                    case 'VerifyingDependencies':
+                    case 'VerifyingMetadata':
+                    case 'FinalizingPackageVersion':
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.progress, {
+                            ...report,
+                            remainingWaitTime,
+                        });
+                        remainingWaitTime = kit_1.Duration.seconds(remainingWaitTime.seconds - polling.frequency.seconds);
+                        return {
+                            completed: false,
+                            payload: report,
+                        };
+                    case 'Success':
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.success, report);
+                        await new PackageVersion({
+                            idOrAlias: report.SubscriberPackageVersionId,
+                            project,
+                            connection,
+                        }).updateProjectWithPackageVersion(report);
+                        return { completed: true, payload: report };
+                    case 'Error':
+                        await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.error, report);
+                        return { completed: true, payload: report };
+                }
+            },
+            frequency: polling.frequency,
+            timeout: polling.timeout,
         });
-        options.packages = packages;
-        return (await (0, packageVersionList_1.listPackageVersions)({ ...options, ...{ connection } })).records;
+        try {
+            return pollingClient.subscribe();
+        }
+        catch (err) {
+            await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create['timed-out'], report);
+            throw (0, utils_1.applyErrorAction)(err);
+        }
     }
     /**
      * Get the package version ID for this PackageVersion.
@@ -206,7 +273,7 @@ class PackageVersion {
      */
     async getId() {
         if (!this.data.Id) {
-            await this.getPackageVersionData();
+            await this.getData();
         }
         return this.data.Id;
     }
@@ -217,17 +284,39 @@ class PackageVersion {
      */
     async getSubscriberId() {
         if (!this.data.SubscriberPackageVersionId) {
-            await this.getPackageVersionData();
+            await this.getData();
         }
         return this.data.SubscriberPackageVersionId;
     }
+    /**
+     * Get the package Id for this PackageVersion.
+     *
+     * @returns The PackageId (0Ho).
+     */
+    async getPackageId() {
+        if (!this.data.Package2Id) {
+            await this.getData();
+        }
+        return this.data.Package2Id;
+    }
+    /**
+     * Get the package type for this PackageVersion.
+     *
+     * @returns The PackageType (Managed, Unlocked).
+     */
+    async getPackageType() {
+        if (!this.packageType) {
+            this.packageType = (await this.connection.singleRecordQuery(`select ContainerOptions from Package2 where Id = '${await this.getPackageId()}' limit 1`, { tooling: true })).ContainerOptions;
+        }
+        return this.packageType;
+    }
     /**
      * Get the Package2Version SObject data for this PackageVersion.
      *
      * @param force force a refresh of the package version data.
      * @returns Package2Version
      */
-    async getPackageVersionData(force = false) {
+    async getData(force = false) {
         if (!this.data.Name || force) {
             let queryConfig;
             if (this.data.Id) {
@@ -284,16 +373,13 @@ class PackageVersion {
         }).catch((err) => {
             // TODO
             // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, utils_1.applyErrorAction)(err);
+            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
         });
         return results[0];
     }
-    install() {
-        return Promise.resolve(undefined);
-    }
-    uninstall() {
-        return Promise.resolve(undefined);
-    }
+    /**
+     * Promotes this PackageVersion to released state.
+     */
     async promote() {
         const id = await this.getId();
         return this.options.connection.tooling.update('Package2Version', { IsReleased: true, Id: id });
@@ -318,6 +404,27 @@ class PackageVersion {
         result.id = await this.getSubscriberId();
         return result;
     }
+    /**
+     * Creates a new package version.
+     *
+     * @param options
+     * @param polling frequency and timeout Durations to be used in polling
+     */
+    async create(options, polling = {
+        frequency: kit_1.Duration.seconds(0),
+        timeout: kit_1.Duration.seconds(0),
+    }) {
+        const pvc = new packageVersionCreate_1.PackageVersionCreate({ ...options, ...this.options });
+        const createResult = await pvc.createPackageVersion();
+        if (polling.timeout?.milliseconds > 0) {
+            return await PackageVersion.waitForCreateVersion(createResult.Id, this.project, this.connection, polling).catch((err) => {
+                // TODO
+                // until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
+                throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+            });
+        }
+        return createResult;
+    }
     async updateDeprecation(isDeprecated) {
         const id = await this.getId();
         // setup the request
@@ -345,6 +452,9 @@ class PackageVersion {
             await this.project.getSfProjectJson().write();
         }
     }
+    resolveId() {
+        return (0, utils_1.getPackageIdFromAlias)(this.options.idOrAlias, this.project);
+    }
 }
 exports.PackageVersion = PackageVersion;
 //# sourceMappingURL=packageVersion.js.map

package/lib/package/packageVersionCreate.d.ts

@@ -5,8 +5,8 @@ export declare class PackageVersionCreate {
     private readonly project;
     private readonly connection;
     private packageObject;
-    private packageType;
     private packageId;
+    private pkg;
     private readonly logger;
     constructor(options: PackageVersionCreateOptions);
     createPackageVersion(): Promise<Partial<PackageVersionCreateRequestResult>>;
@@ -35,6 +35,7 @@ export declare class PackageVersionCreate {
     private resolveApexTestPermissions;
     private resolveUnpackagedMetadata;
     private packageVersionCreate;
+    private getPackageType;
     private resolveUserLicenses;
     private validateOptionsForPackageType;
     /**
@@ -47,7 +48,6 @@ export declare class PackageVersionCreate {
     private setPackageDescriptorJsonValues;
     private validateVersionNumber;
     private validatePatchVersion;
-    private massageErrorMessage;
     private getAncestorId;
     private validateAncestorId;
     private getAncestorIdHighestRelease;

package/lib/package/packageVersionCreate.js

@@ -21,6 +21,7 @@ const interfaces_1 = require("../interfaces");
 const utils_2 = require("../utils");
 const packageProfileApi_1 = require("./packageProfileApi");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
+const package_1 = require("./package");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 const DESCRIPTOR_FILE = 'package2-descriptor.json';
@@ -36,7 +37,7 @@ class PackageVersionCreate {
             return this.packageVersionCreate();
         }
         catch (err) {
-            throw pkgUtils.applyErrorAction(this.massageErrorMessage(err));
+            throw pkgUtils.applyErrorAction(pkgUtils.massageErrorMessage(err));
         }
     }
     // convert source to mdapi format and copy to tmp dir packaging up
@@ -68,7 +69,6 @@ class PackageVersionCreate {
                 fs.rmdirSync(convertResult.packagePath, { recursive: true });
             }
             convertResult.packagePath = outputDirectory;
-            return convertResult;
         }
         return convertResult;
     }
@@ -446,7 +446,7 @@ class PackageVersionCreate {
             this.packageObject = this.project.findPackage((pkg) => pkg.package === packageName || pkg.name === packageName);
         }
         else {
-            // due to flag validation, we'll either have a package or path flag
+            // 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 (!packageName)
@@ -463,7 +463,17 @@ class PackageVersionCreate {
         // 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);
-        await this.validateOptionsForPackageType();
+        try {
+            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]);
+            }
+            throw err;
+        }
         const request = await this.createPackageVersionCreateRequestFromOptions();
         const createResult = await this.connection.tooling.create('Package2VersionCreateRequest', request);
         if (!createResult.success) {
@@ -475,6 +485,17 @@ class PackageVersionCreate {
         }
         return (await (0, packageVersionCreateRequest_1.byId)(createResult.id, this.connection))[0];
     }
+    async getPackageType() {
+        // this.packageId should be an 0Ho package Id at this point
+        if (!this.pkg) {
+            this.pkg = new package_1.Package({
+                packageAliasOrId: this.packageId,
+                project: this.project,
+                connection: this.connection,
+            });
+        }
+        return this.pkg.getType();
+    }
     async resolveUserLicenses(includeUserLicenses) {
         const shouldGenerateProfileInformation = this.logger.shouldLog(core_1.LoggerLevel.INFO) || this.logger.shouldLog(core_1.LoggerLevel.DEBUG);
         return await packageProfileApi_1.PackageProfileApi.create({
@@ -484,8 +505,7 @@ class PackageVersionCreate {
         });
     }
     async validateOptionsForPackageType() {
-        this.packageType = await pkgUtils.getPackageType(this.packageId, this.connection);
-        if (this.packageType === 'Unlocked') {
+        if ((await this.getPackageType()) === 'Unlocked') {
             // Don't allow scripts in unlocked packages
             if (this.options.postinstallscript || this.options.uninstallscript) {
                 throw messages.createError('errorScriptsNotApplicableToUnlockedPackage');
@@ -583,30 +603,12 @@ class PackageVersionCreate {
             }
         }
     }
-    massageErrorMessage(err) {
-        if (err.name === 'INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST') {
-            err['message'] = messages.getMessage('invalidPackageTypeMessage');
-        }
-        if (err.name === 'MALFORMED_ID' &&
-            (err.message.includes('Version ID') || err.message.includes('Version Definition ID'))) {
-            err['message'] = messages.getMessage('malformedPackageVersionIdMessage');
-        }
-        if (err.name === 'MALFORMED_ID' && err.message.includes('Package2 ID')) {
-            err['message'] = messages.getMessage('malformedPackageIdMessage');
-        }
-        // remove references to Second Generation
-        if (err.message.includes('Second Generation ')) {
-            err['message'] = err.message.replace('Second Generation ', '');
-        }
-        return err;
-    }
     // eslint-disable-next-line complexity
     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 ?? (0, utils_2.getPackageIdFromAlias)(packageDescriptorJson.package, project);
         // No need to proceed if Unlocked
-        const packageType = await (0, utils_2.getPackageType)(packageId, this.connection);
-        if (packageType === 'Unlocked') {
+        if ((await this.getPackageType()) === 'Unlocked') {
             return '';
         }
         let ancestorId = '';