@salesforce/packaging 0.0.6 → 0.0.7

package/lib/package/packageVersionCreate.js

@@ -1,13 +1,12 @@
 "use strict";
 /*
- * Copyright (c) 2020, salesforce.com, inc.
+ * 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.PackageVersionCreate = void 0;
-const util = require("util");
 const path = require("path");
 const os = require("os");
 const fs = require("fs");
@@ -21,7 +20,7 @@ const pkgUtils = require("../utils/packageUtils");
 const constants_1 = require("../constants");
 const utils_1 = require("../utils");
 const versionNumber_1 = require("../utils/versionNumber");
-const profileApi_1 = require("./profileApi");
+const packageProfileApi_1 = require("./packageProfileApi");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'messages');
@@ -31,12 +30,11 @@ const POLL_INTERVAL_WITHOUT_VALIDATION_SECONDS = 5;
 class PackageVersionCreate {
     constructor(options) {
         this.options = options;
-        this.packageDirs = [];
         this.connection = this.options.connection;
         this.project = this.options.project;
     }
-    createPackageVersion(options) {
-        return this.packageVersionCreate(options).catch((err) => {
+    createPackageVersion() {
+        return this.packageVersionCreate(this.options).catch((err) => {
             // TODO: until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
             err = pkgUtils.massageErrorMessage(err);
             throw pkgUtils.applyErrorAction(err);
@@ -48,32 +46,16 @@ class PackageVersionCreate {
     async listRequestById(id, connection) {
         return (0, packageVersionCreateRequest_1.byId)(id, connection);
     }
-    rejectWithInstallKeyError() {
-        // This command also requires either the installationkey flag or installationkeybypass flag
-        const errorString = messages.getMessage('errorMissingFlagsInstallationKey', [
-            '--installationkey',
-            '--installationkeybypass',
-        ]);
-        const error = new Error(errorString);
-        error['name'] = 'requiredFlagMissing';
-        return Promise.reject(error);
-    }
     // convert source to mdapi format and copy to tmp dir packaging up
     async generateMDFolderForArtifact(options) {
+        var _a;
+        const sourcepath = (_a = options.sourcePaths) !== null && _a !== void 0 ? _a : [options.sourceDir];
         const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
             sourceapiversion: this.project.getSfProjectJson().get('sourceApiVersion'),
-            sourcepath: options.sourcePaths,
-            manifest: {
-                manifestPath: options.manifest,
-                directoryPaths: this.project.getPackageDirectories().map((dir) => dir.path),
-            },
-            metadata: {
-                metadataEntries: options.metadataPaths,
-                directoryPaths: this.project.getPackageDirectories().map((dir) => dir.path),
-            },
+            sourcepath,
         });
         const packageName = options.packageName;
-        const outputDirectory = path.resolve(options.outputDir);
+        const outputDirectory = path.resolve(options.deploydir);
         const converter = new source_deploy_retrieve_1.MetadataConverter();
         const convertResult = await converter.convert(componentSet, 'metadata', {
             type: 'directory',
@@ -161,7 +143,12 @@ class PackageVersionCreate {
         const pkgVerQueryResult = await this.connection.tooling.query(query);
         const subRecords = pkgVerQueryResult.records;
         if (!subRecords || subRecords.length !== 1) {
-            throw new Error(`No version number was found in Dev Hub for package id ${dependency.packageId} and branch ${branchString} and version number ${versionNumber.toString()} that resolved to build number ${resolvedBuildNumber}`);
+            throw messages.createError('versionNumberNotFoundInDevHub', [
+                dependency.packageId,
+                branchString,
+                versionNumber.toString(),
+                resolvedBuildNumber,
+            ]);
         }
         dependency.subscriberPackageVersionId = pkgVerQueryResult.records[0].SubscriberPackageVersionId;
         // warn user of the resolved build number when LATEST and RELEASED keywords are used
@@ -210,10 +197,10 @@ class PackageVersionCreate {
         const records = results.records;
         if (!records || records.length === 0 || records[0].expr0 == null) {
             if (versionNumber.build === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
-                throw new Error(`No released version was found in Dev Hub for package id ${packageId} and version number ${versionNumber.toString()}`);
+                throw messages.createError('noReleaseVersionFound', [packageId, versionNumber.toString()]);
             }
             else {
-                throw new Error(`No version number was found in Dev Hub for package id ${packageId} and branch ${branch} and version number ${versionNumber.toString()}`);
+                throw messages.createError('noReleaseVersionFoundForBranch', [packageId, branch, versionNumber.toString()]);
             }
         }
         return `${results.records[0].expr0}`;
@@ -228,25 +215,25 @@ class PackageVersionCreate {
             InstallKey: options.installationkey,
             Instance: options.buildinstance,
             SourceOrg: options.sourceorg,
-            CalculateCodeCoverage: options.codecoverage,
-            SkipValidation: options.skipvalidation,
+            CalculateCodeCoverage: options.codecoverage || false,
+            SkipValidation: options.skipvalidation || false,
         };
         if (preserveFiles) {
             logger.info(messages.getMessage('tempFileLocation', [packageVersTmpRoot]));
             return requestObject;
         }
         else {
-            return fs.promises.unlink(packageVersTmpRoot).then(() => requestObject);
+            return fs.promises.rm(packageVersTmpRoot, { recursive: true, force: true }).then(() => requestObject);
         }
     }
-    getPackageDescriptorJsonFromPackageId(packageId, flags) {
-        const artDir = flags.path;
-        const packageDescriptorJson = this.packageDirs.find((packageDir) => {
+    getPackageDescriptorJsonFromPackageId(packageId, options) {
+        const artDir = options.path;
+        const packageDescriptorJson = this.project.getPackageDirectories().find((packageDir) => {
             const packageDirPackageId = pkgUtils.getPackageIdFromAlias(packageDir.package, this.project);
             return !!packageDirPackageId && packageDirPackageId === packageId ? packageDir : null;
         });
         if (!packageDescriptorJson) {
-            throw new Error(`${constants_1.consts.WORKSPACE_CONFIG_FILENAME} does not contain a packaging directory for ${artDir}`);
+            throw messages.createError('packagingDirNotFoundInConfigFile', [constants_1.consts.WORKSPACE_CONFIG_FILENAME, artDir]);
         }
         return packageDescriptorJson;
     }
@@ -261,7 +248,7 @@ class PackageVersionCreate {
      */
     async createPackageVersionCreateRequestFromOptions(options, packageId, versionNumberString) {
         const artDir = options.path;
-        const preserveFiles = !util.isNullOrUndefined(options.preserve || process.env.SFDX_PACKAGE2_VERSION_CREATE_PRESERVE);
+        const preserveFiles = !!(options.preserve || process.env.SFDX_PACKAGE2_VERSION_CREATE_PRESERVE);
         const uniqueHash = (0, testSetup_1.uniqid)({ template: `${packageId}-%s` });
         const packageVersTmpRoot = path.join(os.tmpdir(), `${uniqueHash}`);
         const packageVersMetadataFolder = path.join(packageVersTmpRoot, 'md-files');
@@ -275,11 +262,12 @@ class PackageVersionCreate {
         const sourceBaseDir = path.join(this.project.getPath(), artDir);
         const mdOptions = {
             deploydir: packageVersMetadataFolder,
-            sourcedir: sourceBaseDir,
+            sourceDir: sourceBaseDir,
         };
         // Stores any additional client side info that might be needed later on in the process
         const clientSideInfo = new Map();
-        const settingsGenerator = new scratchOrgSettingsGenerator_1.default();
+        await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
+        const settingsGenerator = new scratchOrgSettingsGenerator_1.default({ asDirectory: true });
         // Copy all of the metadata from the workspace to a tmp folder
         await this.generateMDFolderForArtifact(mdOptions);
         const packageDescriptorJson = this.getPackageDescriptorJsonFromPackageId(packageId, options);
@@ -320,15 +308,14 @@ class PackageVersionCreate {
                 }
             });
         }
-        // @ts-ignore
-        const [hasUnpackagedMetadata, unpackagedPromise] = await this.resolveUnpackagedMetadata(packageDescriptorJson, unpackagedMetadataFolder, clientSideInfo, options.codecoverage);
+        const hasUnpackagedMetadata = await this.resolveUnpackagedMetadata(packageDescriptorJson, unpackagedMetadataFolder, clientSideInfo, options.codecoverage);
         this.resolveApexTestPermissions(packageDescriptorJson, options);
         // All dependencies for the packaging dir should be resolved to an 04t id to be passed to the server.
         // (see _retrieveSubscriberPackageVersionId for details)
         const dependencies = packageDescriptorJson.dependencies;
         // branch can be set via flag or descriptor; flag takes precedence
         options.branch = options.branch ? options.branch : packageDescriptorJson.branch;
-        const resultValues = await Promise.all(dependencies
+        const resultValues = await Promise.all(!dependencies
             ? []
             : dependencies.map((dependency) => this.retrieveSubscriberPackageVersionId(dependency, options.branch)));
         const ancestorId = await pkgUtils.getAncestorId(packageDescriptorJson, this.connection, this.project, versionNumberString, options.skipancestorcheck);
@@ -341,19 +328,19 @@ class PackageVersionCreate {
         this.setPackageDescriptorJsonValues(packageDescriptorJson, options);
         await fs.promises.mkdir(packageVersTmpRoot, { recursive: true });
         await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
-        if (Object.prototype.hasOwnProperty.call(packageDescriptorJson, 'ancestorVersion')) {
+        if (Reflect.has(packageDescriptorJson, 'ancestorVersion')) {
             delete packageDescriptorJson.ancestorVersion;
         }
         packageDescriptorJson.ancestorId = ancestorId;
         await fs.promises.writeFile(path.join(packageVersBlobDirectory, DESCRIPTOR_FILE), 
         // TODO: need to make sure packageDescriptorJson contains the right values for the descriptor
-        JSON.stringify(packageDescriptorJson, undefined, 2), 'utf-8');
+        JSON.stringify(packageDescriptorJson), 'utf-8');
         // As part of the source convert process, the package.xml has been written into the tmp metadata directory.
         // The package.xml may need to be manipulated due to processing profiles in the workspace or additional
         // metadata exclusions. If necessary, read the existing package.xml and then re-write it.
         const currentPackageXml = await fs.promises.readFile(path.join(packageVersMetadataFolder, 'package.xml'), 'utf8');
         // convert to json
-        const packageJson = xml2js.parseStringAsync(currentPackageXml);
+        const packageJson = await xml2js.parseStringPromise(currentPackageXml);
         fs.mkdirSync(packageVersMetadataFolder, { recursive: true });
         fs.mkdirSync(packageVersProfileFolder, { recursive: true });
         // Apply any necessary exclusions to typesArr.
@@ -396,7 +383,7 @@ class PackageVersionCreate {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         await fs.promises.writeFile(path.join(packageVersMetadataFolder, 'package.xml'), xml, 'utf-8');
         // Zip the packageVersMetadataFolder folder and put the zip in {packageVersBlobDirectory}/package.zip
-        (0, utils_1.zipDir)(packageVersMetadataFolder, metadataZipFile);
+        await (0, utils_1.zipDir)(packageVersMetadataFolder, metadataZipFile);
         if (hasUnpackagedMetadata) {
             // Zip the unpackagedMetadataFolder folder and put the zip in {packageVersBlobDirectory}/{unpackagedMetadataZipFile}
             await (0, utils_1.zipDir)(unpackagedMetadataFolder, unpackagedMetadataZipFile);
@@ -404,22 +391,11 @@ class PackageVersionCreate {
         // Zip up the expanded settings (if present)
         if (settingsGenerator.hasSettings()) {
             await settingsGenerator.createDeploy();
-            const settingsRoot = settingsGenerator.getShapeDirName();
-            // The SettingsGenerator now generates md files in source format, not mdapi format,
-            // so we need to convert to mdapi format here.
-            const compSet = source_deploy_retrieve_1.ComponentSet.fromSource(settingsRoot);
-            compSet.apiVersion = this.apiVersionFromPackageXml;
-            compSet.sourceApiVersion = this.apiVersionFromPackageXml;
-            const mdConverter = new source_deploy_retrieve_1.MetadataConverter();
-            const convertResult = await mdConverter.convert(compSet, 'metadata', {
-                type: 'directory',
-                outputDirectory: path.join(settingsRoot, 'pkgMdSettings'),
-                genUniqueDir: false,
-            });
-            (0, utils_1.zipDir)(convertResult.packagePath, settingsZipFile);
+            await settingsGenerator.createDeployPackageContents(this.apiVersionFromPackageXml);
+            await (0, utils_1.zipDir)(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
         }
         // Zip the Version Info and package.zip files into another zip
-        (0, utils_1.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
+        await (0, utils_1.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
         return this.createRequestObject(packageId, options, preserveFiles, packageVersTmpRoot, packageVersBlobZipFile);
     }
     resolveApexTestPermissions(packageDescriptorJson, options) {
@@ -445,7 +421,6 @@ class PackageVersionCreate {
         delete packageDescriptorJson.apexTestAccess;
     }
     async resolveUnpackagedMetadata(packageDescriptorJson, unpackagedMetadataFolder, clientSideInfo, codeCoverage) {
-        let unpackagedPromise = null;
         let hasUnpackagedMetadata = false;
         // Add the Unpackaged Metadata, if any, to the output directory, only when code coverage is specified
         if (codeCoverage && packageDescriptorJson.unpackagedMetadata && packageDescriptorJson.unpackagedMetadata.path) {
@@ -455,17 +430,19 @@ class PackageVersionCreate {
                 fs.statSync(unpackagedPath);
             }
             catch (err) {
-                throw new Error(`Unpackaged metadata directory '${packageDescriptorJson.unpackagedMetadata.path}' was specified but does not exist`);
+                throw messages.createError('unpackagedMDDirectoryDoesNotExist', [
+                    packageDescriptorJson.unpackagedMetadata.path,
+                ]);
             }
             fs.mkdirSync(unpackagedMetadataFolder, { recursive: true });
-            unpackagedPromise = this.generateMDFolderForArtifact({
+            await this.generateMDFolderForArtifact({
                 deploydir: unpackagedMetadataFolder,
                 sourceDir: unpackagedPath,
             });
             // Set which package is the "unpackaged" package
             clientSideInfo.set('UnpackagedMetadataPath', packageDescriptorJson.unpackagedMetadata.path);
         }
-        return [hasUnpackagedMetadata, unpackagedPromise];
+        return hasUnpackagedMetadata;
     }
     getPackagePropertyFromPackage(packageDirs, options) {
         let foundByPackage = packageDirs.some((x) => x['package'] === options.package);
@@ -580,12 +557,11 @@ class PackageVersionCreate {
         }
         return value;
     }
-    // eslint-disable-next-line complexity
     async packageVersionCreate(options) {
-        var _a;
+        var _a, _b;
         let pollInterval = kit_1.Duration.seconds(pkgUtils.POLL_INTERVAL_SECONDS);
         let maxRetries = 0;
-        if (options.wait.milliseconds > 0) {
+        if (((_a = options.wait) === null || _a === void 0 ? void 0 : _a.milliseconds) > 0) {
             if (options.skipvalidation === true) {
                 pollInterval = kit_1.Duration.seconds(POLL_INTERVAL_WITHOUT_VALIDATION_SECONDS);
             }
@@ -597,7 +573,7 @@ class PackageVersionCreate {
             await this.project.getSfProjectJson().schemaValidate();
         }
         // Check for empty packageDirectories
-        if (((_a = this.project.getSfProjectJson().getContents().packageDirectories) === null || _a === void 0 ? void 0 : _a.length) === 0) {
+        if (((_b = this.project.getPackageDirectories()) === null || _b === void 0 ? void 0 : _b.length) === 0) {
             throw messages.createError('errorEmptyPackageDirs');
         }
         const canonicalPackageProperty = this.resolveCanonicalPackageProperty(options);
@@ -611,15 +587,18 @@ class PackageVersionCreate {
             fs.statSync(path.join(process.cwd(), options.path));
         }
         catch (err) {
-            throw new Error(`Directory '${options.path}' does not exist`);
+            throw messages.createError('directoryDoesNotExist', [options.path]);
         }
-        options.profileApi = this.resolveUserLicenses(canonicalPackageProperty, options);
+        options.profileApi = await this.resolveUserLicenses(canonicalPackageProperty, options);
         [pollInterval, maxRetries] = await this.resolveOrgDependentPollingTime(resolvedPackageId, options, pollInterval, maxRetries);
         const request = await this.createPackageVersionCreateRequestFromOptions(options, resolvedPackageId, versionNumberString);
         const createResult = await this.connection.tooling.create('Package2VersionCreateRequest', request);
         if (!createResult.success) {
             const errStr = createResult.errors && createResult.errors.length ? createResult.errors.join(', ') : createResult.errors;
-            throw new Error(`Failed to create request${createResult.id ? ` [${createResult.id}]` : ''}: ${errStr}`);
+            throw messages.createError('failedToCreatePVCRequest', [
+                createResult.id ? ` [${createResult.id}]` : '',
+                errStr.toString(),
+            ]);
         }
         let result;
         if (options.wait && options.wait.milliseconds > 0) {
@@ -629,11 +608,10 @@ class PackageVersionCreate {
             }
         }
         else {
-            result = await this.listRequestById(createResult.id, this.connection);
+            result = (await this.listRequestById(createResult.id, this.connection))[0];
         }
         return result;
     }
-    // TODO: should be in pkg utils
     resolveCanonicalPackageProperty(options) {
         let canonicalPackageProperty;
         if (!options.package) {
@@ -648,7 +626,7 @@ class PackageVersionCreate {
         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);
+            const expectedPackageId = this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 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);
@@ -665,21 +643,25 @@ class PackageVersionCreate {
         // validate the versionNumber flag value if specified, otherwise the descriptor value
         const versionNumberString = options.versionnumber
             ? options.versionnumber
-            : this.getConfigPackageDirectoriesValue(this.packageDirs, 'versionNumber', canonicalPackageProperty, options.package, 'package', options);
+            : this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 'versionNumber', canonicalPackageProperty, options.package, 'package', options);
         pkgUtils.validateVersionNumber(versionNumberString, versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN, null);
         await pkgUtils.validatePatchVersion(this.connection, versionNumberString, resolvedPackageId);
         return versionNumberString;
     }
-    resolveUserLicenses(canonicalPackageProperty, options) {
+    async resolveUserLicenses(canonicalPackageProperty, options) {
         // Check for an includeProfileUserLiceneses flag in the packageDirectory
-        const includeProfileUserLicenses = this.getConfigPackageDirectoriesValue(this.packageDirs, 'includeProfileUserLicenses', canonicalPackageProperty, options.package, 'package', options);
+        const includeProfileUserLicenses = this.getConfigPackageDirectoriesValue(this.project.getPackageDirectories(), 'includeProfileUserLicenses', canonicalPackageProperty, options.package, 'package', options);
         if (includeProfileUserLicenses !== undefined &&
             includeProfileUserLicenses !== true &&
             includeProfileUserLicenses !== false) {
             throw messages.createError('errorProfileUserLicensesInvalidValue', [includeProfileUserLicenses]);
         }
         const shouldGenerateProfileInformation = logger.shouldLog(core_1.LoggerLevel.INFO) || logger.shouldLog(core_1.LoggerLevel.DEBUG);
-        return new profileApi_1.ProfileApi(this.project, includeProfileUserLicenses, shouldGenerateProfileInformation);
+        return packageProfileApi_1.PackageProfileApi.create({
+            project: this.project,
+            includeUserLicenses: includeProfileUserLicenses,
+            generateProfileInformation: shouldGenerateProfileInformation,
+        });
     }
     async resolveOrgDependentPollingTime(resolvedPackageId, options, pollInterval, maxRetries) {
         let pi = pollInterval;
@@ -703,7 +685,7 @@ class PackageVersionCreate {
         return [pi, mr];
     }
     async validateFlagsForPackageType(packageId, options) {
-        const packageType = await pkgUtils.getPackage2Type(packageId, this.connection);
+        const packageType = await pkgUtils.getPackageType(packageId, this.connection);
         if (packageType === 'Unlocked') {
             if (options.postinstallscript || options.uninstallscript) {
                 // migrate coreMessages to messages
@@ -722,18 +704,13 @@ class PackageVersionCreate {
      * Cleans invalid attribute(s) from the packageDescriptorJSON
      */
     cleanPackageDescriptorJson(packageDescriptorJson) {
-        if (typeof packageDescriptorJson.default !== 'undefined') {
-            delete packageDescriptorJson.default; // for client-side use only, not needed
-        }
-        if (typeof packageDescriptorJson.includeProfileUserLicenses !== 'undefined') {
-            delete packageDescriptorJson.includeProfileUserLicenses; // for client-side use only, not needed
-        }
-        if (typeof packageDescriptorJson.unpackagedMetadata !== 'undefined') {
-            delete packageDescriptorJson.unpackagedMetadata; // for client-side use only, not needed
-        }
-        if (typeof packageDescriptorJson.branch !== 'undefined') {
-            delete packageDescriptorJson.branch; // for client-side use only, not needed
-        }
+        delete packageDescriptorJson.default; // for client-side use only, not needed
+        delete packageDescriptorJson.includeProfileUserLicenses; // for client-side use only, not needed
+        delete packageDescriptorJson.unpackagedMetadata; // for client-side use only, not needed
+        delete packageDescriptorJson.branch; // for client-side use only, not needed
+        delete packageDescriptorJson.fullPath; // for client-side use only, not needed
+        delete packageDescriptorJson.name; // for client-side use only, not needed
+        return packageDescriptorJson;
     }
     /**
      * Sets default or override values for packageDescriptorJSON attribs
@@ -761,13 +738,13 @@ class PackageVersionCreate {
             packageDescriptorJson.releaseNotesUrl = options.releasenotesurl;
         }
         if (packageDescriptorJson.releaseNotesUrl && !pkgUtils.validUrl(packageDescriptorJson.releaseNotesUrl)) {
-            throw new Error(messages.getMessage('malformedUrl', ['releaseNotesUrl', packageDescriptorJson.releaseNotesUrl]));
+            throw messages.createError('malformedUrl', ['releaseNotesUrl', packageDescriptorJson.releaseNotesUrl]);
         }
         if (options.postinstallurl) {
             packageDescriptorJson.postInstallUrl = options.postinstallurl;
         }
         if (packageDescriptorJson.postInstallUrl && !pkgUtils.validUrl(packageDescriptorJson.postInstallUrl)) {
-            throw new Error(messages.getMessage('malformedUrl', ['postInstallUrl', packageDescriptorJson.postInstallUrl]));
+            throw messages.createError('malformedUrl', ['postInstallUrl', packageDescriptorJson.postInstallUrl]);
         }
         if (options.postinstallscript) {
             packageDescriptorJson.postInstallScript = options.postinstallscript;

package/lib/package/packageVersionCreateRequest.d.ts

@@ -1,4 +1,4 @@
 import { Connection } from '@salesforce/core';
-import { Package2VersionCreateRequestResult, PackageVersionCreateRequestQueryOptions } from '../interfaces';
-export declare function list(options?: PackageVersionCreateRequestQueryOptions): Promise<Package2VersionCreateRequestResult[]>;
-export declare function byId(package2VersionCreateRequestId: any, connection: Connection): Promise<Package2VersionCreateRequestResult[]>;
+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

@@ -25,10 +25,10 @@ async function list(options = {}) {
     return _query(util.format(QUERY, whereClause), options.connection);
 }
 exports.list = list;
-async function byId(package2VersionCreateRequestId, connection) {
-    const results = await _query(util.format(QUERY, `WHERE Id = '${package2VersionCreateRequestId}' `), connection);
+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(package2VersionCreateRequestId, connection);
+        results[0].Error = await _queryErrors(packageVersionCreateRequestId, connection);
     }
     return results;
 }
@@ -49,9 +49,9 @@ async function _query(query, connection) {
         CreatedBy: record.CreatedById,
     }));
 }
-async function _queryErrors(package2VersionCreateRequestId, connection) {
+async function _queryErrors(packageVersionCreateRequestId, connection) {
     const errorResults = [];
-    const queryResult = connection.tooling.query(util.format(ERROR_QUERY, package2VersionCreateRequestId));
+    const queryResult = connection.tooling.query(util.format(ERROR_QUERY, packageVersionCreateRequestId));
     if (queryResult.records) {
         queryResult.records.forEach((record) => {
             errorResults.push(record.Message);
@@ -64,7 +64,7 @@ function _constructWhere(options) {
     // filter on created date, days ago: 0 for today, etc
     if (!util.isNullOrUndefined(this.options.createdlastdays)) {
         if (options.createdlastdays < 0) {
-            throw new Error(messages.getMessage('invalidDaysNumber', ['createdlastdays', options.createdlastdays]));
+            throw messages.createError('invalidDaysNumber', ['createdlastdays', options.createdlastdays]);
         }
         where.push(`CreatedDate = LAST_N_DAYS:${this.options.createdlastdays}`);
     }
@@ -76,7 +76,7 @@ function _constructWhere(options) {
             STATUSES.forEach((status) => {
                 args.push(status);
             });
-            throw new Error(messages.getMessage('invalidStatus', args));
+            throw messages.createError('invalidStatus', args);
         }
         where.push(`Status = '${foundStatus}'`);
     }

package/lib/utils/packageUtils.d.ts

@@ -2,7 +2,7 @@ import { Connection, NamedPackageDir, PackageDir, SfError, SfProject } from '@sa
 import { Duration } from '@salesforce/kit';
 import { Many } from '@salesforce/ts-types';
 import { SaveError } from 'jsforce';
-import { PackagingSObjects, Package2VersionCreateRequestResult, PackageVersionCreateOptions } from '../interfaces';
+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,7 +121,7 @@ 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[] | PackageDir[], lookupProperty: string, lookupValue: unknown): NamedPackageDir | PackageDir | undefined;
 /**
@@ -145,8 +145,8 @@ 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 pollForStatusWithInterval(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;