@salesforce/packaging 0.0.4 → 0.0.7

package/lib/package/packageVersionCreateRequest.d.ts

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

package/lib/package/packageVersionCreateRequest.js

@@ -0,0 +1,85 @@
+"use strict";
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.byId = exports.list = void 0;
+const util = require("util");
+const core_1 = require("@salesforce/core");
+const packageUtils = require("../utils/packageUtils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
+const STATUS_ERROR = 'Error';
+const QUERY = 'SELECT Id, Status, Package2Id, Package2VersionId, Package2Version.SubscriberPackageVersionId, Tag, Branch, ' +
+    'CreatedDate, Package2Version.HasMetadataRemoved, CreatedById ' +
+    'FROM Package2VersionCreateRequest ' +
+    '%s' + // WHERE, if applicable
+    'ORDER BY CreatedDate';
+const ERROR_QUERY = "SELECT Message FROM Package2VersionCreateRequestError WHERE ParentRequest.Id = '%s'";
+const STATUSES = ['Queued', 'InProgress', 'Success', 'Error'];
+async function list(options = {}) {
+    const whereClause = _constructWhere();
+    return _query(util.format(QUERY, whereClause), options.connection);
+}
+exports.list = list;
+async function byId(packageVersionCreateRequestId, connection) {
+    const results = await _query(util.format(QUERY, `WHERE Id = '${packageVersionCreateRequestId}' `), connection);
+    if (results && results.length === 1 && results[0].Status === STATUS_ERROR) {
+        results[0].Error = await _queryErrors(packageVersionCreateRequestId, connection);
+    }
+    return results;
+}
+exports.byId = byId;
+async function _query(query, connection) {
+    const queryResult = await connection.tooling.query(query);
+    return (queryResult.records ? queryResult.records : []).map((record) => ({
+        Id: record.Id,
+        Status: record.Status,
+        Package2Id: record.Package2Id,
+        Package2VersionId: record.Package2VersionId,
+        SubscriberPackageVersionId: record.Package2Version != null ? record.Package2Version.SubscriberPackageVersionId : null,
+        Tag: record.Tag,
+        Branch: record.Branch,
+        Error: [],
+        CreatedDate: packageUtils.formatDate(new Date(record.CreatedDate)),
+        HasMetadataRemoved: record.Package2Version != null ? record.Package2Version.HasMetadataRemoved : null,
+        CreatedBy: record.CreatedById,
+    }));
+}
+async function _queryErrors(packageVersionCreateRequestId, connection) {
+    const errorResults = [];
+    const queryResult = connection.tooling.query(util.format(ERROR_QUERY, packageVersionCreateRequestId));
+    if (queryResult.records) {
+        queryResult.records.forEach((record) => {
+            errorResults.push(record.Message);
+        });
+    }
+    return errorResults;
+}
+function _constructWhere(options) {
+    const where = [];
+    // filter on created date, days ago: 0 for today, etc
+    if (!util.isNullOrUndefined(this.options.createdlastdays)) {
+        if (options.createdlastdays < 0) {
+            throw messages.createError('invalidDaysNumber', ['createdlastdays', options.createdlastdays]);
+        }
+        where.push(`CreatedDate = LAST_N_DAYS:${this.options.createdlastdays}`);
+    }
+    // filter on errors
+    if (options.status) {
+        const foundStatus = STATUSES.find((status) => status.toLowerCase() === this.options.status.toLowerCase());
+        if (!foundStatus) {
+            const args = [options.status];
+            STATUSES.forEach((status) => {
+                args.push(status);
+            });
+            throw messages.createError('invalidStatus', args);
+        }
+        where.push(`Status = '${foundStatus}'`);
+    }
+    return where.length > 0 ? `WHERE ${where.join(' AND ')}` : '';
+}
+//# sourceMappingURL=packageVersionCreateRequest.js.map

package/lib/package/packageVersionList.d.ts

@@ -1,29 +1,9 @@
-import { Connection, SfProject } from '@salesforce/core';
+import { SfProject } from '@salesforce/core';
 import { QueryResult } from 'jsforce';
-import { PackageVersionListResult } from '../interfaces';
+import { PackageVersionListResult, PackageVersionQueryOptions } from '../interfaces';
 export declare const DEFAULT_ORDER_BY_FIELDS = "Package2Id, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber";
-export declare function listPackageVersions(options: {
-    project: SfProject;
-    orderBy: string;
-    modifiedLastDays: number;
-    createdLastDays: number;
-    packages: string[];
-    connection: Connection;
-    verbose: boolean;
-    concise: boolean;
-    isReleased: boolean;
-}): Promise<QueryResult<PackageVersionListResult>>;
-export declare function _constructQuery(options: {
-    project: SfProject;
-    orderBy: string;
-    modifiedLastDays: number;
-    createdLastDays: number;
-    packages: string[];
-    connection: Connection;
-    verbose: boolean;
-    concise: boolean;
-    isReleased: boolean;
-}): string;
+export declare function listPackageVersions(options: PackageVersionQueryOptions): Promise<QueryResult<PackageVersionListResult>>;
+export declare function _constructQuery(options: PackageVersionQueryOptions): string;
 export declare function _assembleQueryParts(select: string, where: string[], orderBy?: string): string;
 export declare function _constructWhere(idsOrAliases: string[], createdLastDays: number, lastModLastDays: number, project: SfProject): string[];
 export declare function _getLastDays(paramName: string, lastDays: number): number;

package/lib/package/packageVersionList.js

@@ -7,12 +7,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._getLastDays = exports._constructWhere = exports._assembleQueryParts = exports._constructQuery = exports.listPackageVersions = exports.DEFAULT_ORDER_BY_FIELDS = void 0;
-const _ = require("lodash");
 const core_1 = require("@salesforce/core");
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
 const ts_types_1 = require("@salesforce/ts-types");
 const utils_1 = require("../utils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
 // Stripping CodeCoverage, HasPassedCodeCoverageCheck as they are causing a perf issue in 47.0+ W-6997762
 const DEFAULT_SELECT = 'SELECT Id, Package2Id, SubscriberPackageVersionId, Name, Package2.Name, Package2.NamespacePrefix, ' +
     'Description, Tag, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber, IsReleased, ' +
@@ -54,9 +53,9 @@ function _constructWhere(idsOrAliases, createdLastDays, lastModLastDays, project
     // filter on given package ids
     if ((idsOrAliases === null || idsOrAliases === void 0 ? void 0 : idsOrAliases.length) > 0) {
         // remove dups
-        idsOrAliases = _.uniq(idsOrAliases);
+        const aliasesOrIds = [...new Set(idsOrAliases)];
         // resolve any aliases
-        const packageIds = idsOrAliases.map((idOrAlias) => (0, utils_1.getPackageIdFromAlias)(idOrAlias, project));
+        const packageIds = aliasesOrIds.map((idOrAlias) => (0, utils_1.getPackageIdFromAlias)(idOrAlias, project));
         // validate ids
         packageIds.forEach((packageId) => {
             (0, utils_1.validateId)(utils_1.BY_LABEL.PACKAGE_ID, packageId);

package/lib/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './packageUtils';
+export * from './srcDevUtils';

package/lib/utils/index.js

@@ -21,4 +21,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 __exportStar(require("./packageUtils"), exports);
+__exportStar(require("./srcDevUtils"), exports);
 //# sourceMappingURL=index.js.map

package/lib/utils/packageUtils.d.ts

@@ -1,8 +1,8 @@
-import { Connection, NamedPackageDir, PackageDir, SfProject } from '@salesforce/core';
+import { Connection, NamedPackageDir, PackageDir, SfError, SfProject } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { Many } from '@salesforce/ts-types';
-import { PackagingSObjects, Package2VersionCreateRequestResult } from '../interfaces';
-import { PackageVersionCreateRequestApi } from '../package/packageVersionCreateRequestApi';
+import { SaveError } from 'jsforce';
+import { PackagingSObjects, PackageVersionCreateRequestResult, PackageVersionCreateOptions } from '../interfaces';
 export declare const VERSION_NUMBER_SEP = ".";
 export declare type IdRegistryValue = {
     prefix: string;
@@ -42,20 +42,20 @@ export declare function getPackageVersionId(versionId: string, connection: Conne
 /**
  * Given 0Ho the package type type (Managed, Unlocked, Locked(deprecated?))
  *
- * @param package2Id the 0Ho
+ * @param packageId the 0Ho
  * @param connection For tooling query
  * @throws Error with message when package2 cannot be found
  */
-export declare function getPackage2Type(package2Id: string, connection: Connection): Promise<string>;
+export declare function getPackageType(packageId: string, connection: Connection): Promise<string>;
 /**
  * Given 04t the package type type (Managed, Unlocked, Locked(deprecated?))
  *
- * @param package2VersionId the 04t
+ * @param packageVersionId the 04t
  * @param connection For tooling query
  * @param installKey For tooling query, if an installation key is applicable to the package version it must be passed in the queries
  * @throws Error with message when package2 cannot be found
  */
-export declare function getPackage2TypeBy04t(package2VersionId: string, connection: Connection, installKey: string): Promise<string>;
+export declare function getPackageTypeBy04t(packageVersionId: string, connection: Connection, installKey: string): Promise<string>;
 /**
  * Given a package version ID (05i) or subscriber package version ID (04t), return the subscriber package version ID (04t)
  *
@@ -67,10 +67,10 @@ export declare function getSubscriberPackageVersionId(versionId: string, connect
  * Get the ContainerOptions for the specified Package2 (0Ho) IDs.
  *
  * @return Map of 0Ho id to container option api value
- * @param package2Ids The list of package IDs
+ * @param packageIds The list of package IDs
  * @param connection For tooling query
  */
-export declare function getContainerOptions(package2Ids: string[], connection: Connection): Promise<Map<string, string>>;
+export declare function getContainerOptions(packageIds: string[], connection: Connection): Promise<Map<string, string>>;
 /**
  * Return the Package2Version.HasMetadataRemoved field value for the given Id (05i)
  *
@@ -121,9 +121,9 @@ export declare function getAncestorIdHighestRelease(connection: Connection, pack
  * Return a version string in Major.Minor.Patch.Build format, using 0 for any empty part
  */
 export declare function concatVersion(major: string | number, minor: string | number, patch: string | number, build: string | number): string;
-export declare function getPackage2VersionNumber(package2VersionObj: PackagingSObjects.Package2Version): string;
+export declare function getPackageVersionNumber(package2VersionObj: PackagingSObjects.Package2Version): string;
 export declare function getConfigPackageDirectories(project: SfProject): PackageDir[];
-export declare function getConfigPackageDirectory(packageDirs: NamedPackageDir[], lookupProperty: string, lookupValue: unknown): NamedPackageDir | undefined;
+export declare function getConfigPackageDirectory(packageDirs: NamedPackageDir[] | PackageDir[], lookupProperty: string, lookupValue: unknown): NamedPackageDir | PackageDir | undefined;
 /**
  * Given a packageAlias, attempt to return the associated id from the config
  *
@@ -145,8 +145,9 @@ export declare function convertCamelCaseStringToSentence(stringIn: string): stri
  * @returns an array of alias for the given id.
  */
 export declare function getPackageAliasesFromId(packageId: string, project: SfProject): string[];
-export declare function findOrCreatePackage2(seedPackage: string, connection: Connection): Promise<string>;
-export declare function _getPackageVersionCreateRequestApi(connection: Connection): PackageVersionCreateRequestApi;
-export declare function pollForStatusWithInterval(context: any, id: string, retries: number, packageId: string, branch: string, withProject: SfProject, connection: Connection, interval: Duration): Promise<Package2VersionCreateRequestResult>;
+export declare function findOrCreatePackage(seedPackage: string, connection: Connection): Promise<string>;
+export declare function pollForStatusWithInterval(id: string, retries: number, packageId: string, branch: string, withProject: SfProject, connection: Connection, interval: Duration): Promise<PackageVersionCreateRequestResult>;
 export declare function getSoqlWhereClauseMaxLength(): number;
 export declare function formatDate(date: Date): string;
+export declare function combineSaveErrors(sObject: string, crudOperation: string, errors: SaveError[]): SfError;
+export declare function resolveCanonicalPackageProperty(options: PackageVersionCreateOptions): "id" | "package";

package/lib/utils/packageUtils.js

@@ -1,16 +1,17 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveCanonicalPackageProperty = exports.combineSaveErrors = exports.formatDate = exports.getSoqlWhereClauseMaxLength = exports.pollForStatusWithInterval = exports.findOrCreatePackage = exports.getPackageAliasesFromId = exports.convertCamelCaseStringToSentence = exports.getPackageIdFromAlias = exports.getConfigPackageDirectory = exports.getConfigPackageDirectories = exports.getPackageVersionNumber = exports.concatVersion = exports.getAncestorIdHighestRelease = exports.validateAncestorId = exports.getAncestorId = exports.getInClauseItemsCount = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getHasMetadataRemoved = exports.getContainerOptions = exports.getSubscriberPackageVersionId = exports.getPackageTypeBy04t = exports.getPackageType = exports.getPackageVersionId = exports.applyErrorAction = exports.massageErrorMessage = exports.isErrorPackageNotAvailable = exports.isErrorFromSPVQueryRestriction = exports.validUrl = exports.validatePatchVersion = exports.validateVersionNumber = exports.validateIdNoThrow = exports.validateId = exports.BY_LABEL = exports.BY_PREFIX = exports.DEFAULT_PACKAGE_DIR = exports.POLL_INTERVAL_SECONDS = exports.SOQL_WHERE_CLAUSE_MAX_LENGTH = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDate = exports.getSoqlWhereClauseMaxLength = exports.pollForStatusWithInterval = exports._getPackageVersionCreateRequestApi = exports.findOrCreatePackage2 = exports.getPackageAliasesFromId = exports.convertCamelCaseStringToSentence = exports.getPackageIdFromAlias = exports.getConfigPackageDirectory = exports.getConfigPackageDirectories = exports.getPackage2VersionNumber = exports.concatVersion = exports.getAncestorIdHighestRelease = exports.validateAncestorId = exports.getAncestorId = exports.getInClauseItemsCount = exports.queryWithInConditionChunking = exports.getPackageVersionStrings = exports.getHasMetadataRemoved = exports.getContainerOptions = exports.getSubscriberPackageVersionId = exports.getPackage2TypeBy04t = exports.getPackage2Type = exports.getPackageVersionId = exports.applyErrorAction = exports.massageErrorMessage = exports.isErrorPackageNotAvailable = exports.isErrorFromSPVQueryRestriction = exports.validUrl = exports.validatePatchVersion = exports.validateVersionNumber = exports.validateIdNoThrow = exports.validateId = exports.BY_LABEL = exports.BY_PREFIX = exports.DEFAULT_PACKAGE_DIR = exports.POLL_INTERVAL_SECONDS = exports.SOQL_WHERE_CLAUSE_MAX_LENGTH = exports.INSTALL_URL_BASE = exports.VERSION_NUMBER_SEP = void 0;
+const os = require("os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");
-const packageVersionCreateRequestApi_1 = require("../package/packageVersionCreateRequestApi");
+const pvcr = require("../package/packageVersionCreateRequest");
 const versionNumber_1 = require("./versionNumber");
 var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
 core_1.Messages.importMessagesDirectory(__dirname);
@@ -213,40 +214,40 @@ exports.getPackageVersionId = getPackageVersionId;
 /**
  * Given 0Ho the package type type (Managed, Unlocked, Locked(deprecated?))
  *
- * @param package2Id the 0Ho
+ * @param packageId the 0Ho
  * @param connection For tooling query
  * @throws Error with message when package2 cannot be found
  */
-async function getPackage2Type(package2Id, connection) {
-    const query = `SELECT ContainerOptions FROM Package2 WHERE id ='${package2Id}'`;
+async function getPackageType(packageId, connection) {
+    const query = `SELECT ContainerOptions FROM Package2 WHERE id ='${packageId}'`;
     const queryResult = await connection.tooling.query(query);
     if (!queryResult || queryResult.records === null || queryResult.records.length === 0) {
-        throw messages.createError('errorInvalidPackageId', [package2Id]);
+        throw messages.createError('errorInvalidPackageId', [packageId]);
     }
     return queryResult.records[0].ContainerOptions;
 }
-exports.getPackage2Type = getPackage2Type;
+exports.getPackageType = getPackageType;
 /**
  * Given 04t the package type type (Managed, Unlocked, Locked(deprecated?))
  *
- * @param package2VersionId the 04t
+ * @param packageVersionId the 04t
  * @param connection For tooling query
  * @param installKey For tooling query, if an installation key is applicable to the package version it must be passed in the queries
  * @throws Error with message when package2 cannot be found
  */
-async function getPackage2TypeBy04t(package2VersionId, connection, installKey) {
-    let query = `SELECT Package2ContainerOptions FROM SubscriberPackageVersion WHERE id ='${package2VersionId}'`;
+async function getPackageTypeBy04t(packageVersionId, connection, installKey) {
+    let query = `SELECT Package2ContainerOptions FROM SubscriberPackageVersion WHERE id ='${packageVersionId}'`;
     if (installKey) {
         const escapedInstallationKey = installKey.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
         query += ` AND InstallationKey ='${escapedInstallationKey}'`;
     }
     const queryResult = await connection.tooling.query(query);
     if (!queryResult || queryResult.records === null || queryResult.records.length === 0) {
-        throw messages.createError('errorInvalidPackageId', [package2VersionId]);
+        throw messages.createError('errorInvalidPackageId', [packageVersionId]);
     }
     return queryResult.records[0].Package2ContainerOptions;
 }
-exports.getPackage2TypeBy04t = getPackage2TypeBy04t;
+exports.getPackageTypeBy04t = getPackageTypeBy04t;
 /**
  * Given a package version ID (05i) or subscriber package version ID (04t), return the subscriber package version ID (04t)
  *
@@ -274,16 +275,16 @@ exports.getSubscriberPackageVersionId = getSubscriberPackageVersionId;
  * Get the ContainerOptions for the specified Package2 (0Ho) IDs.
  *
  * @return Map of 0Ho id to container option api value
- * @param package2Ids The list of package IDs
+ * @param packageIds The list of package IDs
  * @param connection For tooling query
  */
 // eslint-disable-next-line @typescript-eslint/require-await
-async function getContainerOptions(package2Ids, connection) {
-    if (!package2Ids || package2Ids.length === 0) {
+async function getContainerOptions(packageIds, connection) {
+    if (!packageIds || packageIds.length === 0) {
         return new Map();
     }
     const query = "SELECT Id, ContainerOptions FROM Package2 WHERE Id IN ('%IDS%')";
-    const records = await queryWithInConditionChunking(query, package2Ids, '%IDS%', connection);
+    const records = await queryWithInConditionChunking(query, packageIds, '%IDS%', connection);
     if (records && records.length > 0) {
         return new Map(records.map((record) => [record.Id, record.ContainerOptions]));
     }
@@ -413,7 +414,7 @@ async function getAncestorId(packageDescriptorJson, connection, project, version
         // If an id property is present, use it.  Otherwise, look up the package id from the package property.
         const packageId = (_a = packageDescriptorJson['id']) !== null && _a !== void 0 ? _a : getPackageIdFromAlias(packageDescriptorJson.package, project);
         // No need to proceed if Unlocked
-        const packageType = await getPackage2Type(packageId, connection);
+        const packageType = await getPackageType(packageId, connection);
         if (packageType === 'Unlocked') {
             return '';
         }
@@ -504,7 +505,7 @@ function validateAncestorId(ancestorId, highestReleasedVersion, explicitUseNoAnc
         }
         else {
             // the explicitUseNoAncestor && skipAncestorCheck case is handled above
-            throw messages.createError('errorAncestorNoneNotAllowed', [getPackage2VersionNumber(highestReleasedVersion)]);
+            throw messages.createError('errorAncestorNoneNotAllowed', [getPackageVersionNumber(highestReleasedVersion)]);
         }
     }
     if (!isPatch && !skipAncestorCheck) {
@@ -512,7 +513,7 @@ function validateAncestorId(ancestorId, highestReleasedVersion, explicitUseNoAnc
             if (highestReleasedVersion.Id !== ancestorId) {
                 throw messages.createError('errorAncestorNotHighest', [
                     origSpecifiedAncestor,
-                    getPackage2VersionNumber(highestReleasedVersion),
+                    getPackageVersionNumber(highestReleasedVersion),
                 ]);
             }
         }
@@ -562,7 +563,7 @@ async function getAncestorIdHighestRelease(connection, packageId, versionNumberS
         }
         else if (explicitUseHighestRelease) {
             // there is no eligible ancestor version
-            throw new Error(messages.getMessage('errorNoMatchingAncestor', [versionNumberString, packageId]));
+            throw messages.createError('errorNoMatchingAncestor', [versionNumberString, packageId]);
         }
     }
     return result;
@@ -575,11 +576,11 @@ function concatVersion(major, minor, patch, build) {
     return [major, minor, patch, build].map((part) => (part ? `${part}` : '0')).join('.');
 }
 exports.concatVersion = concatVersion;
-function getPackage2VersionNumber(package2VersionObj) {
+function getPackageVersionNumber(package2VersionObj) {
     const version = concatVersion(package2VersionObj.MajorVersion, package2VersionObj.MinorVersion, package2VersionObj.PatchVersion, undefined);
     return version.slice(0, version.lastIndexOf('.'));
 }
-exports.getPackage2VersionNumber = getPackage2VersionNumber;
+exports.getPackageVersionNumber = getPackageVersionNumber;
 // TODO: get rid of this function if possible.
 function getConfigPackageDirectories(project) {
     return project.getPackageDirectories();
@@ -625,13 +626,14 @@ function getPackageAliasesFromId(packageId, project) {
         .map((alias) => alias[0]);
 }
 exports.getPackageAliasesFromId = getPackageAliasesFromId;
-async function findOrCreatePackage2(seedPackage, connection) {
+// probably used by convert.
+async function findOrCreatePackage(seedPackage, connection) {
     const query = `SELECT Id FROM Package2 WHERE ConvertedFromPackageId = '${seedPackage}'`;
     const queryResult = await connection.tooling.query(query);
     const records = queryResult.records;
     if (records && records.length > 1) {
         const ids = records.map((r) => r.Id);
-        throw new Error(messages.getMessage('errorMoreThanOnePackage2WithSeed', [ids.join(', ')]));
+        throw messages.createError('errorMoreThanOnePackage2WithSeed', [ids.join(', ')]);
     }
     if (records && records.length === 1) {
         // return the package2 object
@@ -642,7 +644,7 @@ async function findOrCreatePackage2(seedPackage, connection) {
     const subscriberResult = await connection.tooling.query(subQuery);
     const subscriberRecords = subscriberResult.records;
     if (!subscriberRecords || subscriberRecords.length <= 0) {
-        throw new Error(messages.getMessage('errorNoSubscriberPackageRecord', [seedPackage]));
+        throw messages.createError('errorNoSubscriberPackageRecord', [seedPackage]);
     }
     const request = {
         Name: subscriberRecords[0].Name,
@@ -653,22 +655,17 @@ async function findOrCreatePackage2(seedPackage, connection) {
     };
     const createResult = await connection.tooling.create('Package2', request);
     if (!createResult.success) {
-        throw new Error(createResult.errors.map((e) => e.message).join('\n'));
+        throw combineSaveErrors('Package2', 'create', createResult.errors);
     }
     return createResult.id;
 }
-exports.findOrCreatePackage2 = findOrCreatePackage2;
-function _getPackageVersionCreateRequestApi(connection) {
-    return new packageVersionCreateRequestApi_1.PackageVersionCreateRequestApi({ connection });
-}
-exports._getPackageVersionCreateRequestApi = _getPackageVersionCreateRequestApi;
-async function pollForStatusWithInterval(context, id, retries, packageId, branch, withProject, connection, interval) {
+exports.findOrCreatePackage = findOrCreatePackage;
+async function pollForStatusWithInterval(id, retries, packageId, branch, withProject, connection, interval) {
     let remainingRetries = retries;
     const pollingClient = await core_1.PollingClient.create({
         poll: async () => {
             var _a;
-            const pvcrApi = new packageVersionCreateRequestApi_1.PackageVersionCreateRequestApi({ connection });
-            const results = await pvcrApi.byId(id);
+            const results = await pvcr.byId(id, connection);
             if (_isStatusEqualTo(results, [Package2VersionStatus.success, Package2VersionStatus.error])) {
                 // complete
                 if (_isStatusEqualTo(results, [Package2VersionStatus.success])) {
@@ -677,19 +674,19 @@ async function pollForStatusWithInterval(context, id, retries, packageId, branch
                     if (withProject && !process.env.SFDX_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE) {
                         projectUpdated = true;
                         const query = `SELECT MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version WHERE Id = '${results[0].Package2VersionId}'`;
-                        const package2VersionVersionString = await connection.tooling
+                        const packageVersionVersionString = await connection.tooling
                             .query(query)
                             .then((pkgQueryResult) => {
                             const record = pkgQueryResult.records[0];
                             return `${record.MajorVersion}.${record.MinorVersion}.${record.PatchVersion}-${record.BuildNumber}`;
                         });
-                        const newConfig = await _generatePackageAliasEntry(connection, withProject, results[0].SubscriberPackageVersionId, package2VersionVersionString, branch, packageId);
+                        const newConfig = await _generatePackageAliasEntry(connection, withProject, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
                         withProject.getSfProjectJson().set('packageAliases', newConfig);
                         await withProject.getSfProjectJson().write();
                     }
                     core_1.Lifecycle.getInstance().emit(Package2VersionStatus.success, {
                         id,
-                        package2VersionCreateRequestResult: results[0],
+                        packageVersionCreateRequestResult: results[0],
                         projectUpdated,
                     });
                     return { completed: true, payload: results[0] };
@@ -715,7 +712,7 @@ async function pollForStatusWithInterval(context, id, retries, packageId, branch
                 const remainingTime = kit_1.Duration.milliseconds(interval.milliseconds * remainingRetries);
                 core_1.Lifecycle.getInstance().emit(Package2VersionStatus.inProgress, {
                     id,
-                    package2VersionCreateRequestResult: results[0],
+                    packageVersionCreateRequestResult: results[0],
                     message: '',
                     remainingTime,
                 });
@@ -783,4 +780,45 @@ function formatDate(date) {
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
 exports.formatDate = formatDate;
+function combineSaveErrors(sObject, crudOperation, errors) {
+    const errorMessages = errors.map((error) => {
+        var _a;
+        const fieldsString = ((_a = error.fields) === null || _a === void 0 ? void 0 : _a.length) > 0 ? `Fields: [${error.fields.join(', ')}]` : '';
+        return `Error: ${error.errorCode} Message: ${error.message} ${fieldsString}`;
+    });
+    const sfError = messages.createError('errorDuringSObjectCRUDOperation', [
+        crudOperation,
+        sObject,
+        errorMessages.join(os.EOL),
+    ]);
+    return sfError;
+}
+exports.combineSaveErrors = combineSaveErrors;
+function resolveCanonicalPackageProperty(options) {
+    let canonicalPackageProperty;
+    if (!options.package) {
+        const packageValProp = this.getPackageValuePropertyFromDirectory(options.path, options);
+        options.package = packageValProp.packageValue;
+        canonicalPackageProperty = packageValProp.packageProperty;
+    }
+    else if (!options.path) {
+        canonicalPackageProperty = this.getPackagePropertyFromPackage(this.project.getPackageDirectories(), options);
+        options.path = this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 'path', canonicalPackageProperty, options.package, 'package', options);
+    }
+    else {
+        canonicalPackageProperty = this.getPackagePropertyFromPackage(this.project.getPackageDirectories(), options);
+        this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), canonicalPackageProperty, 'path', options.path, 'path', options);
+        const expectedPackageId = this.getConfigPackageDirectoriesValue(this.packageDirs, canonicalPackageProperty, 'path', options.path, 'path', options);
+        // This will throw an error if the package id flag value doesn't match
+        // any of the :id values in the package dirs.
+        this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 'path', canonicalPackageProperty, options.package, 'package', options);
+        // This will throw an error if the package id flag value doesn't match
+        // the correct corresponding directory with that packageId.
+        if (options.package !== expectedPackageId) {
+            throw messages.createError('errorDirectoryIdMismatch', ['--path', options.path, '--package', options.package]);
+        }
+    }
+    return canonicalPackageProperty;
+}
+exports.resolveCanonicalPackageProperty = resolveCanonicalPackageProperty;
 //# sourceMappingURL=packageUtils.js.map

package/lib/utils/srcDevUtils.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Zips directory to given zipfile.
+ *
+ * https://github.com/archiverjs/node-archiver
+ *
+ * @param dir to zip
+ * @param zipfile
+ * @param options
+ */
+export declare function zipDir(dir: string, zipfile: string, options?: {}): Promise<void>;
+export declare function getElapsedTime(timer: [number, number]): string;
+export declare function copyDir(src: string, dest: string): void;

package/lib/utils/srcDevUtils.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.copyDir = exports.getElapsedTime = exports.zipDir = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const fs = require("fs");
+const path_1 = require("path");
+const stream_1 = require("stream");
+const util_1 = require("util");
+const core_1 = require("@salesforce/core");
+const globby = require("globby");
+const JSZIP = require("jszip");
+const pipeline = (0, util_1.promisify)(stream_1.pipeline);
+/**
+ * Zips directory to given zipfile.
+ *
+ * https://github.com/archiverjs/node-archiver
+ *
+ * @param dir to zip
+ * @param zipfile
+ * @param options
+ */
+async function zipDir(dir, zipfile, options = {}) {
+    const logger = core_1.Logger.childFromRoot('srcDevUtils#zipDir');
+    const timer = process.hrtime();
+    const globbyResult = await globby('**/*', { expandDirectories: true, cwd: dir });
+    const zip = new JSZIP();
+    // add files tp zip
+    for (const file of globbyResult) {
+        zip.file(file, fs.readFileSync((0, path_1.join)(dir, file)));
+    }
+    // write zip to file
+    const zipStream = zip.generateNodeStream({
+        type: 'nodebuffer',
+        streamFiles: true,
+        compression: 'DEFLATE',
+        compressionOptions: {
+            level: 3,
+        },
+    });
+    await pipeline(zipStream, fs.createWriteStream(zipfile));
+    const stat = fs.statSync(zipfile);
+    logger.debug(`${stat.size} bytes written to ${zipfile} in ${getElapsedTime(timer)}ms`);
+    return;
+}
+exports.zipDir = zipDir;
+function getElapsedTime(timer) {
+    const elapsed = process.hrtime(timer);
+    return (elapsed[0] * 1000 + elapsed[1] / 1000000).toFixed(3);
+}
+exports.getElapsedTime = getElapsedTime;
+function copyDir(src, dest) {
+    fs.mkdirSync(dest, { recursive: true });
+    const entries = fs.readdirSync(src, { withFileTypes: true });
+    entries.map((entry) => {
+        const srcPath = (0, path_1.join)(src, entry.name);
+        const destPath = (0, path_1.join)(dest, entry.name);
+        return entry.isDirectory() ? copyDir(srcPath, destPath) : fs.copyFileSync(srcPath, destPath);
+    });
+}
+exports.copyDir = copyDir;
+//# sourceMappingURL=srcDevUtils.js.map

package/lib/utils/versionNumber.d.ts

@@ -13,4 +13,5 @@ export declare class VersionNumber {
     private constructor();
     static from(versionString: string): VersionNumber;
     toString(): string;
+    isbuildKeyword(): boolean;
 }

package/lib/utils/versionNumber.js

@@ -27,30 +27,35 @@ class VersionNumber {
     }
     static from(versionString) {
         if (!versionString) {
-            throw new Error(messages.getMessage('errorMissingVersionNumber'));
+            throw messages.createError('errorMissingVersionNumber');
         }
         const version = versionString.split('.');
         if ((version === null || version === void 0 ? void 0 : version.length) === 4) {
             const [major, minor, patch, build] = version;
             const asNumbers = [major, minor, patch, build].map((v) => parseInt(v, 10));
             if (asNumbers.slice(0, 3).some((v) => isNaN(v))) {
-                throw new Error(messages.getMessage('errorInvalidMajorMinorPatchNumber', [versionString]));
+                throw messages.createError('errorInvalidMajorMinorPatchNumber', [versionString]);
             }
             if (isNaN(asNumbers[3]) && !Object.values(BuildNumberToken).includes(build)) {
-                throw new Error(messages.getMessage('errorInvalidBuildNumberToken', [
+                throw messages.createError('errorInvalidBuildNumberToken', [
                     versionString,
                     Object.values(BuildNumberToken).join(', '),
-                ]));
+                ]);
             }
             return new VersionNumber(major, minor, patch, build);
         }
-        throw new Error(messages.getMessage('errorInvalidVersionNumber', [versionString]));
+        throw messages.createError('errorInvalidVersionNumber', [versionString]);
     }
     toString() {
         {
             return `${this.major || '0'}.${this.minor || '0'}.${this.patch || '0'}.${this.build ? `${this.build}` : '0'}`;
         }
     }
+    isbuildKeyword() {
+        return Object.values(BuildNumberToken)
+            .map((v) => v.toString())
+            .includes(this.build.toLowerCase());
+    }
 }
 exports.VersionNumber = VersionNumber;
 //# sourceMappingURL=versionNumber.js.map