@salesforce/packaging 0.1.20 → 1.0.1

package/lib/package/packageVersionCreate.js

@@ -14,14 +14,13 @@ const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchOrgSettingsGenerator");
 const xml2js = require("xml2js");
-const uniqid_1 = require("../utils/uniqid");
 const pkgUtils = require("../utils/packageUtils");
-const utils_1 = require("../utils");
 const interfaces_1 = require("../interfaces");
-const utils_2 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 const packageProfileApi_1 = require("./packageProfileApi");
 const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 const package_1 = require("./package");
+const versionNumber_1 = require("./versionNumber");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 const DESCRIPTOR_FILE = 'package2-descriptor.json';
@@ -59,7 +58,7 @@ class PackageVersionCreate {
         if (packageName) {
             // SDR will build an output path like /output/directory/packageName/package.xml
             // this was breaking from toolbelt, so to revert it we copy the directory up a level and delete the original
-            (0, utils_2.copyDir)(convertResult.packagePath, outputDirectory);
+            (0, packageUtils_1.copyDir)(convertResult.packagePath, outputDirectory);
             try {
                 fs.rmSync(convertResult.packagePath, { recursive: true });
             }
@@ -81,7 +80,8 @@ class PackageVersionCreate {
         if (dependency.packageId && dependency.package) {
             throw messages.createError('errorPackageAndPackageIdCollision', []);
         }
-        const packageIdFromAlias = pkgUtils.getPackageIdFromAlias(dependency.packageId || dependency.package, this.project);
+        const packageIdFromAlias = this.project.getPackageIdFromAlias(dependency.packageId || dependency.package) ??
+            (dependency.packageId || dependency.package);
         // If valid 04t package, just return it to be used straight away.
         if (pkgUtils.validateIdNoThrow(pkgUtils.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, packageIdFromAlias)) {
             dependency.subscriberPackageVersionId = packageIdFromAlias;
@@ -93,7 +93,7 @@ class PackageVersionCreate {
         // Just override dependency.packageId value to the resolved alias.
         dependency.packageId = packageIdFromAlias;
         pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, dependency.packageId);
-        this.validateVersionNumber(dependency.versionNumber, utils_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN, utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN);
+        this.validateVersionNumber(dependency.versionNumber, versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN, versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN);
         await this.validatePatchVersion(dependency.versionNumber, dependency.packageId);
         // Validate that the Package2 id exists on the server
         const query = `SELECT Id FROM Package2 WHERE Id = '${dependency.packageId}'`;
@@ -117,7 +117,7 @@ class PackageVersionCreate {
             // if a 04t id is specified just use it.
             return dependency;
         }
-        const versionNumber = utils_1.VersionNumber.from(dependency.versionNumber);
+        const versionNumber = versionNumber_1.VersionNumber.from(dependency.versionNumber);
         const buildNumber = versionNumber.build;
         // use the dependency.branch if present otherwise use the branch of the version being created
         const branch = dependency.branch || dependency.branch === '' ? dependency.branch : this.options.branch;
@@ -127,7 +127,7 @@ class PackageVersionCreate {
         // now that we have a full build number, query for the associated 04t.
         // because the build number may not be unique across versions, add in conditionals for
         // the branch or the RELEASED token (if used)
-        const branchOrReleasedCondition = buildNumber === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN
+        const branchOrReleasedCondition = buildNumber === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN
             ? 'AND IsReleased = true'
             : `AND Branch = ${branchString}`;
         const query = `SELECT SubscriberPackageVersionId FROM Package2Version WHERE Package2Id = '${dependency.packageId}' AND MajorVersion = ${versionNumber.major} AND MinorVersion = ${versionNumber.minor} AND PatchVersion = ${versionNumber.patch} AND BuildNumber = ${resolvedBuildNumber} ${branchOrReleasedCondition}`;
@@ -145,7 +145,7 @@ class PackageVersionCreate {
         // warn user of the resolved build number when LATEST and RELEASED keywords are used
         if (versionNumber.isbuildKeyword()) {
             versionNumber.build = resolvedBuildNumber;
-            if (buildNumber === utils_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
+            if (buildNumber === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
                 this.logger.info(messages.getMessage('buildNumberResolvedForLatest', [
                     dependency.package,
                     versionNumber.toString(),
@@ -153,7 +153,7 @@ class PackageVersionCreate {
                     dependency.subscriberPackageVersionId,
                 ]));
             }
-            else if (buildNumber === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+            else if (buildNumber === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
                 this.logger.info(messages.getMessage('buildNumberResolvedForReleased', [
                     dependency.package,
                     versionNumber.toString(),
@@ -175,18 +175,18 @@ class PackageVersionCreate {
         // query for the LATEST or RELEASED build number (excluding deleted versions)
         let branchCondition = '';
         let releasedCondition = '';
-        if (versionNumber[3] === utils_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
+        if (versionNumber[3] === versionNumber_1.BuildNumberToken.LATEST_BUILD_NUMBER_TOKEN) {
             // respect the branch when querying for LATEST
             const branchString = !branch || branch === '' ? 'null' : `'${branch}'`;
             branchCondition = `AND Branch = ${branchString}`;
         }
-        else if (versionNumber[3] === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+        else if (versionNumber[3] === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
             releasedCondition = 'AND IsReleased = true';
         }
         const query = `SELECT MAX(BuildNumber) FROM Package2Version WHERE Package2Id = '${packageId}' AND IsDeprecated != true AND MajorVersion = ${versionNumber.major} AND MinorVersion = ${versionNumber.minor} AND PatchVersion = ${versionNumber.patch} ${branchCondition} ${releasedCondition}`;
         const results = await this.connection.tooling.query(query);
         if (results.records?.length === 0 || results.records[0].expr0 == null) {
-            if (versionNumber.build === utils_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
+            if (versionNumber.build === versionNumber_1.BuildNumberToken.RELEASED_BUILD_NUMBER_TOKEN) {
                 throw messages.createError('noReleaseVersionFound', [packageId, versionNumber.toString()]);
             }
             else {
@@ -230,7 +230,7 @@ class PackageVersionCreate {
      */
     async createPackageVersionCreateRequestFromOptions() {
         const preserveFiles = !!(this.options.preserve || process.env.SFDX_PACKAGE2_VERSION_CREATE_PRESERVE);
-        const uniqueHash = (0, uniqid_1.uniqid)({ template: `${this.packageId}-%s` });
+        const uniqueHash = (0, packageUtils_1.uniqid)({ template: `${this.packageId}-%s` });
         const packageVersTmpRoot = path.join(os.tmpdir(), `${uniqueHash}`);
         const packageVersMetadataFolder = path.join(packageVersTmpRoot, 'md-files');
         const unpackagedMetadataFolder = path.join(packageVersTmpRoot, 'unpackaged-md-files');
@@ -368,19 +368,19 @@ class PackageVersionCreate {
         });
         await fs.promises.writeFile(path.join(packageVersMetadataFolder, 'package.xml'), xml, 'utf-8');
         // Zip the packageVersMetadataFolder folder and put the zip in {packageVersBlobDirectory}/package.zip
-        await (0, utils_2.zipDir)(packageVersMetadataFolder, metadataZipFile);
+        await (0, packageUtils_1.zipDir)(packageVersMetadataFolder, metadataZipFile);
         if (hasUnpackagedMetadata) {
             // Zip the unpackagedMetadataFolder folder and put the zip in {packageVersBlobDirectory}/{unpackagedMetadataZipFile}
-            await (0, utils_2.zipDir)(unpackagedMetadataFolder, unpackagedMetadataZipFile);
+            await (0, packageUtils_1.zipDir)(unpackagedMetadataFolder, unpackagedMetadataZipFile);
         }
         // Zip up the expanded settings (if present)
         if (settingsGenerator.hasSettings()) {
             await settingsGenerator.createDeploy();
             await settingsGenerator.createDeployPackageContents(this.apiVersionFromPackageXml);
-            await (0, utils_2.zipDir)(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
+            await (0, packageUtils_1.zipDir)(`${settingsGenerator.getDestinationPath()}${path.sep}${settingsGenerator.getShapeDirName()}`, settingsZipFile);
         }
         // Zip the Version Info and package.zip files into another zip
-        await (0, utils_2.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
+        await (0, packageUtils_1.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
     }
     resolveApexTestPermissions(packageDescriptorJson) {
         // Process permissionSet and permissionSetLicenses that should be enabled when running Apex tests
@@ -460,7 +460,7 @@ class PackageVersionCreate {
                 this.options.packageId || this.options.path,
             ]);
         }
-        this.packageId = this.project.getPackageIdFromAlias(packageName) || packageName;
+        this.packageId = this.project.getPackageIdFromAlias(packageName) ?? packageName;
         this.options.profileApi = await this.resolveUserLicenses(this.packageObject.includeProfileUserLicenses);
         // At this point, the packageIdFromAlias should have been resolved to an Id.  Now, we
         // need to validate that the Id is correct.
@@ -549,8 +549,8 @@ class PackageVersionCreate {
         if (!packageDescriptorJson.versionName) {
             const versionNumber = packageDescriptorJson.versionNumber;
             packageDescriptorJson.versionName =
-                versionNumber.split(pkgUtils.VERSION_NUMBER_SEP)[3] === utils_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN
-                    ? versionNumber.substring(0, versionNumber.indexOf(pkgUtils.VERSION_NUMBER_SEP + utils_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN))
+                versionNumber.split(pkgUtils.VERSION_NUMBER_SEP)[3] === versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN
+                    ? versionNumber.substring(0, versionNumber.indexOf(pkgUtils.VERSION_NUMBER_SEP + versionNumber_1.BuildNumberToken.NEXT_BUILD_NUMBER_TOKEN))
                     : versionNumber;
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const { connection: c, project: p, profileApi: a, ...warnOptions } = options;
@@ -577,7 +577,7 @@ class PackageVersionCreate {
     }
     // eslint-disable-next-line class-methods-use-this
     validateVersionNumber(versionNumberString, supportedBuildNumberToken, supportedBuildNumberToken2) {
-        const versionNumber = utils_1.VersionNumber.from(versionNumberString);
+        const versionNumber = versionNumber_1.VersionNumber.from(versionNumberString);
         // build number can be a number or valid token
         if (Number.isNaN(parseInt(`${versionNumber.build}`, 10)) &&
             versionNumber.build !== supportedBuildNumberToken &&
@@ -603,7 +603,7 @@ class PackageVersionCreate {
         }
         // Enforce a patch version of zero (0) for Locked packages only
         if (queryResult.records[0].ContainerOptions === 'Locked') {
-            const versionNumber = utils_1.VersionNumber.from(versionNumberString);
+            const versionNumber = versionNumber_1.VersionNumber.from(versionNumberString);
             if (versionNumber.patch !== '0') {
                 throw messages.createError('errorInvalidPatchNumber', [versionNumberString]);
             }
@@ -612,7 +612,9 @@ class PackageVersionCreate {
     // 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);
+        const packageId = packageDescriptorJson.id ??
+            project.getPackageIdFromAlias(packageDescriptorJson.package) ??
+            packageDescriptorJson.package;
         // No need to proceed if Unlocked
         if ((await this.getPackageType()) === 'Unlocked') {
             return '';
@@ -620,13 +622,13 @@ class PackageVersionCreate {
         let ancestorId = '';
         // ancestorID can be alias, 05i, or 04t;
         // validate and convert to 05i, as needed
-        const versionNumber = utils_1.VersionNumber.from(versionNumberString);
+        const versionNumber = versionNumber_1.VersionNumber.from(versionNumberString);
         let origSpecifiedAncestor = packageDescriptorJson.ancestorId;
         let highestReleasedVersion = null;
-        const explicitUseHighestRelease = packageDescriptorJson.ancestorId === utils_1.BuildNumberToken.HIGHEST_VERSION_NUMBER_TOKEN ||
-            packageDescriptorJson.ancestorVersion === utils_1.BuildNumberToken.HIGHEST_VERSION_NUMBER_TOKEN;
-        const explicitUseNoAncestor = packageDescriptorJson.ancestorId === utils_1.BuildNumberToken.NONE_VERSION_NUMBER_TOKEN ||
-            packageDescriptorJson.ancestorVersion === utils_1.BuildNumberToken.NONE_VERSION_NUMBER_TOKEN;
+        const explicitUseHighestRelease = packageDescriptorJson.ancestorId === versionNumber_1.BuildNumberToken.HIGHEST_VERSION_NUMBER_TOKEN ||
+            packageDescriptorJson.ancestorVersion === versionNumber_1.BuildNumberToken.HIGHEST_VERSION_NUMBER_TOKEN;
+        const explicitUseNoAncestor = packageDescriptorJson.ancestorId === versionNumber_1.BuildNumberToken.NONE_VERSION_NUMBER_TOKEN ||
+            packageDescriptorJson.ancestorVersion === versionNumber_1.BuildNumberToken.NONE_VERSION_NUMBER_TOKEN;
         if ((explicitUseHighestRelease || explicitUseNoAncestor) &&
             packageDescriptorJson.ancestorId &&
             packageDescriptorJson.ancestorVersion) {
@@ -651,13 +653,13 @@ class PackageVersionCreate {
         // at this point if explicitUseHighestRelease=true, we have returned the ancestorId or thrown an error
         // highestReleasedVersion should be null only if skipAncestorCheck or if there is no existing released package version
         if (!explicitUseNoAncestor && packageDescriptorJson.ancestorId) {
-            ancestorId = (0, utils_2.getPackageIdFromAlias)(packageDescriptorJson.ancestorId, project);
-            (0, utils_2.validateId)([utils_2.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, utils_2.BY_LABEL.PACKAGE_VERSION_ID], ancestorId);
-            ancestorId = await (0, utils_2.getPackageVersionId)(ancestorId, this.connection);
+            ancestorId = project.getPackageIdFromAlias(packageDescriptorJson.ancestorId) ?? packageDescriptorJson.ancestorId;
+            (0, packageUtils_1.validateId)([packageUtils_1.BY_LABEL.SUBSCRIBER_PACKAGE_VERSION_ID, packageUtils_1.BY_LABEL.PACKAGE_VERSION_ID], ancestorId);
+            ancestorId = await (0, packageUtils_1.getPackageVersionId)(ancestorId, this.connection);
         }
         if (!explicitUseNoAncestor && packageDescriptorJson.ancestorVersion) {
             const regNumbers = new RegExp('^[0-9]+$');
-            const versionNumberSplit = packageDescriptorJson.ancestorVersion.split(utils_2.VERSION_NUMBER_SEP);
+            const versionNumberSplit = packageDescriptorJson.ancestorVersion.split(packageUtils_1.VERSION_NUMBER_SEP);
             if (versionNumberSplit.length < 3 ||
                 versionNumberSplit.length > 4 ||
                 !versionNumberSplit[0].match(regNumbers) ||
@@ -701,7 +703,7 @@ class PackageVersionCreate {
             }
             else {
                 // the explicitUseNoAncestor && skipAncestorCheck case is handled above
-                throw messages.createError('errorAncestorNoneNotAllowed', [(0, utils_2.getPackageVersionNumber)(highestReleasedVersion)]);
+                throw messages.createError('errorAncestorNoneNotAllowed', [(0, packageUtils_1.getPackageVersionNumber)(highestReleasedVersion)]);
             }
         }
         if (!isPatch && !skipAncestorCheck) {
@@ -709,7 +711,7 @@ class PackageVersionCreate {
                 if (highestReleasedVersion.Id !== ancestorId) {
                     throw messages.createError('errorAncestorNotHighest', [
                         origSpecifiedAncestor,
-                        (0, utils_2.getPackageVersionNumber)(highestReleasedVersion),
+                        (0, packageUtils_1.getPackageVersionNumber)(highestReleasedVersion),
                     ]);
                 }
             }
@@ -721,7 +723,7 @@ class PackageVersionCreate {
         return ancestorId;
     }
     async getAncestorIdHighestRelease(packageId, versionNumberString, explicitUseHighestRelease, skipAncestorCheck) {
-        const versionNumber = versionNumberString.split(utils_2.VERSION_NUMBER_SEP);
+        const versionNumber = versionNumberString.split(packageUtils_1.VERSION_NUMBER_SEP);
         const isPatch = versionNumber[2] !== '0';
         const result = {
             finalAncestorId: null,

package/lib/package/packageVersionCreateRequest.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.byId = exports.list = void 0;
 const util = require("util");
 const core_1 = require("@salesforce/core");
-const utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 const STATUS_ERROR = 'Error';
@@ -28,7 +28,7 @@ async function list(options) {
         return await query(util.format(QUERY, whereClause), options.connection);
     }
     catch (err) {
-        throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(err));
+        throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
     }
 }
 exports.list = list;

package/lib/package/packageVersionList.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDays = exports.constructWhere = exports.assembleQueryParts = exports.listPackageVersions = exports.DEFAULT_ORDER_BY_FIELDS = void 0;
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
-const utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_version_create');
 // Stripping CodeCoverage, HasPassedCodeCoverageCheck as they are causing a perf issue in 47.0+ W-6997762
@@ -59,7 +59,7 @@ function constructWhere(packageIds, createdLastDays, lastModLastDays, isReleased
         const uniquePackageIds = [...new Set(packageIds)];
         // validate ids
         uniquePackageIds.forEach((packageId) => {
-            (0, utils_1.validateId)(utils_1.BY_LABEL.PACKAGE_ID, packageId);
+            (0, packageUtils_1.validateId)(packageUtils_1.BY_LABEL.PACKAGE_ID, packageId);
         });
         // stash where part
         where.push(`Package2Id IN ('${uniquePackageIds.join("','")}')`);

package/lib/package/subscriberPackageVersion.d.ts

@@ -1,8 +1,8 @@
 import { Connection } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { Optional } from '@salesforce/ts-types';
-import { PackageInstallCreateRequest, PackageInstallOptions, PackageType, PackagingSObjects, SubscriberPackageVersionOptions } from '../interfaces';
-import { VersionNumber } from '../utils';
+import { InstalledPackages, PackageInstallCreateRequest, PackageInstallOptions, PackageType, PackagingSObjects, SubscriberPackageVersionOptions } from '../interfaces';
+import { VersionNumber } from './versionNumber';
 export declare const SubscriberPackageVersionFields: string[];
 /**
  * A class that represents a SubscriberPackageVersion
@@ -25,6 +25,12 @@ export declare class SubscriberPackageVersion {
      * @param options
      */
     static installStatus(connection: Connection, packageInstallRequestOrId: string | PackagingSObjects.PackageInstallRequest, installationKey?: string, options?: PackageInstallOptions): Promise<PackagingSObjects.PackageInstallRequest>;
+    /**
+     * list the packages installed in the org
+     *
+     * @param conn: Connection to the org
+     */
+    static installedList(conn: Connection): Promise<InstalledPackages[]>;
     /**
      * Reports on the progress of a package version uninstall.
      *

package/lib/package/subscriberPackageVersion.js

@@ -9,9 +9,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscriberPackageVersion = exports.SubscriberPackageVersionFields = void 0;
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
-const utils_1 = require("../utils");
+const packageUtils_1 = require("../utils/packageUtils");
 const packageInstall_1 = require("./packageInstall");
 const packageUninstall_1 = require("./packageUninstall");
+const versionNumber_1 = require("./versionNumber");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'subscriber_package_version');
 // these fields have been identified as requiring additional serverside resources in order to calculate their values
@@ -85,7 +86,7 @@ class SubscriberPackageVersion {
         }
         try {
             const project = core_1.SfProject.getInstance();
-            this.id = project.getPackageIdFromAlias(this.options.aliasOrId) || this.options.aliasOrId;
+            this.id = project.getPackageIdFromAlias(this.options.aliasOrId) ?? this.options.aliasOrId;
         }
         catch (error) {
             const err = error.message;
@@ -111,7 +112,7 @@ class SubscriberPackageVersion {
     static async installStatus(connection, packageInstallRequestOrId, installationKey, options) {
         const id = typeof packageInstallRequestOrId === 'string' ? packageInstallRequestOrId : packageInstallRequestOrId.Id;
         const packageInstallRequest = await (0, packageInstall_1.getStatus)(connection, id);
-        const pollingTimeout = (0, utils_1.numberToDuration)(options.pollingTimeout) ?? kit_1.Duration.milliseconds(0);
+        const pollingTimeout = (0, packageUtils_1.numberToDuration)(options.pollingTimeout) ?? kit_1.Duration.milliseconds(0);
         if (pollingTimeout.milliseconds <= 0) {
             return packageInstallRequest;
         }
@@ -120,6 +121,20 @@ class SubscriberPackageVersion {
             return (0, packageInstall_1.pollStatus)(connection, id, options);
         }
     }
+    /**
+     * list the packages installed in the org
+     *
+     * @param conn: Connection to the org
+     */
+    static async installedList(conn) {
+        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, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(err));
+        }
+    }
     /**
      * Reports on the progress of a package version uninstall.
      *
@@ -198,7 +213,7 @@ class SubscriberPackageVersion {
         const minorVersion = await this.getField('MinorVersion');
         const patchVersion = await this.getField('PatchVersion');
         const buildNumber = await this.getField('BuildNumber');
-        return new utils_1.VersionNumber(majorVersion, minorVersion, patchVersion, buildNumber);
+        return new versionNumber_1.VersionNumber(majorVersion, minorVersion, patchVersion, buildNumber);
     }
     /**
      * Is the package a managed package?
@@ -268,7 +283,7 @@ class SubscriberPackageVersion {
             }
             try {
                 const queryNoKey = `SELECT ${queryFields.toString()} FROM SubscriberPackageVersion WHERE Id ='${await this.getId()}'`;
-                const escapedInstallationKey = this.password ? (0, utils_1.escapeInstallationKey)(this.password) : null;
+                const escapedInstallationKey = this.password ? (0, packageUtils_1.escapeInstallationKey)(this.password) : null;
                 const queryWithKey = `${queryNoKey} AND InstallationKey ='${escapedInstallationKey}'`;
                 this.data = await this.connection.singleRecordQuery(queryWithKey, {
                     tooling: true,
@@ -300,7 +315,7 @@ class SubscriberPackageVersion {
             return await SubscriberPackageVersion.installStatus(this.connection, pkgVersionInstallRequest.Id, pkgInstallCreateRequest.Password, options);
         }
         catch (e) {
-            throw (0, utils_1.applyErrorAction)((0, utils_1.massageErrorMessage)(e));
+            throw (0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(e));
         }
     }
     /**

package/lib/package1/index.d.ts

@@ -1 +1 @@
-export * from './package1Version';
+export { Package1Version } from './package1Version';

package/lib/package1/index.js

@@ -1,24 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Package1Version = 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
  */
-__exportStar(require("./package1Version"), exports);
+var package1Version_1 = require("./package1Version");
+Object.defineProperty(exports, "Package1Version", { enumerable: true, get: function () { return package1Version_1.Package1Version; } });
 //# sourceMappingURL=index.js.map

package/lib/utils/index.d.ts

@@ -1,3 +1 @@
-export * from './packageUtils';
-export * from './srcDevUtils';
-export * from './versionNumber';
+export { INSTALL_URL_BASE, getContainerOptions, getPackageVersionStrings } from './packageUtils';

package/lib/utils/index.js

@@ -1,26 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageVersionStrings = exports.getContainerOptions = exports.INSTALL_URL_BASE = 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
  */
-__exportStar(require("./packageUtils"), exports);
-__exportStar(require("./srcDevUtils"), exports);
-__exportStar(require("./versionNumber"), exports);
+var packageUtils_1 = require("./packageUtils");
+Object.defineProperty(exports, "INSTALL_URL_BASE", { enumerable: true, get: function () { return packageUtils_1.INSTALL_URL_BASE; } });
+Object.defineProperty(exports, "getContainerOptions", { enumerable: true, get: function () { return packageUtils_1.getContainerOptions; } });
+Object.defineProperty(exports, "getPackageVersionStrings", { enumerable: true, get: function () { return packageUtils_1.getPackageVersionStrings; } });
 //# sourceMappingURL=index.js.map

package/lib/utils/packageUtils.d.ts

@@ -1,4 +1,4 @@
-import { Connection, NamedPackageDir, PackageDir, SfdcUrl, SfError, SfProject } from '@salesforce/core';
+import { Connection, SfdcUrl, SfError, SfProject } from '@salesforce/core';
 import { Many, Nullable } from '@salesforce/ts-types';
 import { SaveError } from 'jsforce';
 import { Duration } from '@salesforce/kit';
@@ -12,7 +12,6 @@ export declare type IdRegistry = {
     [key: string]: IdRegistryValue;
 };
 export declare const INSTALL_URL_BASE: SfdcUrl;
-export declare const SOQL_WHERE_CLAUSE_MAX_LENGTH = 4000;
 export declare const POLL_INTERVAL_SECONDS = 30;
 export declare const DEFAULT_PACKAGE_DIR: {
     path: string;
@@ -21,10 +20,22 @@ export declare const DEFAULT_PACKAGE_DIR: {
     versionNumber: string;
     default: boolean;
 };
-export declare const BY_PREFIX: IdRegistry;
 export declare const BY_LABEL: IdRegistry;
+/**
+ * A function to generate a unique id and return it in the context of a template, if supplied.
+ *
+ * A template is a string that can contain `${%s}` to be replaced with a unique id.
+ * If the template contains the "%s" placeholder, it will be replaced with the unique id otherwise the id will be appended to the template.
+ *
+ * @param options an object with the following properties:
+ * - template: a template string.
+ * - length: the length of the unique id as presented in hexadecimal.
+ */
+export declare function uniqid(options?: {
+    template?: string;
+    length?: number;
+}): string;
 export declare function validateId(idObj: Many<IdRegistryValue>, value: string): void;
-export declare function getSourceApiVersion(project: SfProject): string;
 export declare function validateIdNoThrow(idObj: Many<IdRegistryValue>, value: string): IdRegistryValue | boolean;
 export declare function applyErrorAction(err: Error): Error;
 export declare function massageErrorMessage(err: Error): Error;
@@ -44,13 +55,6 @@ export declare function escapeInstallationKey(key?: string): Nullable<string>;
  * @param connection For tooling query
  */
 export declare function getContainerOptions(packageIds: string[], connection: Connection): Promise<Map<string, PackageType>>;
-/**
- * Return the Package2Version.HasMetadataRemoved field value for the given Id (05i)
- *
- * @param packageVersionId package version ID (05i)
- * @param connection For tooling query
- */
-export declare function getHasMetadataRemoved(packageVersionId: string, connection: Connection): Promise<boolean>;
 /**
  * Given a list of subscriber package version IDs (04t), return the associated version strings (e.g., Major.Minor.Patch.Build)
  *
@@ -59,43 +63,7 @@ export declare function getHasMetadataRemoved(packageVersionId: string, connecti
  * @param connection For tooling query
  */
 export declare function getPackageVersionStrings(subscriberPackageVersionIds: string[], connection: Connection): Promise<Map<string, string>>;
-/**
- * For queries with an IN condition, determine if the WHERE clause will exceed
- * SOQL's 4000 character limit.  Perform multiple queries as needed to stay below the limit.
- *
- * @return concatenated array of records returned from the resulting query(ies)
- * @param query The full query to execute containing the replaceToken param in its IN clause
- * @param items The IN clause items.  A length-appropriate single-quoted comma-separated string chunk will be made from the items.
- * @param replaceToken A placeholder in the query's IN condition that will be replaced with the chunked items
- * @param connection For tooling query
- */
-export declare function queryWithInConditionChunking<T = Record<string, unknown>>(query: string, items: string[], replaceToken: string, connection: Connection): Promise<T[]>;
-/**
- * Returns the number of items that can be included in a quoted comma-separated string (e.g., "'item1','item2'") not exceeding maxLength
- */
-export declare function getInClauseItemsCount(items: string[], startIndex: number, maxLength: number): number;
-/**
- * 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 getPackageVersionNumber(package2VersionObj: PackagingSObjects.Package2Version): string;
-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
- *
- * @param packageAlias string representing a package alias
- * @param project for obtaining the project config
- * @returns the associated id or the arg given.
- */
-export declare function getPackageIdFromAlias(packageAlias: string, project: SfProject): string;
-/**
- * Given a package id, attempt to return the associated aliases from the config
- *
- * @param packageId string representing a package id
- * @param project for obtaining the project config
- * @returns an array of alias for the given id.
- */
-export declare function getPackageAliasesFromId(packageId: string, project: SfProject): string[];
 /**
  * Generate package alias json entry for this package version that can be written to sfdx-project.json
  *
@@ -108,7 +76,6 @@ export declare function getPackageAliasesFromId(packageId: string, project: SfPr
  * @private
  */
 export declare function generatePackageAliasEntry(connection: Connection, project: SfProject, packageVersionId: string, packageVersionNumber: string, branch: string, packageId: string): Promise<[string, string]>;
-export declare function formatDate(date: Date): string;
 export declare function combineSaveErrors(sObject: string, crudOperation: string, errors: SaveError[]): SfError;
 /**
  * Returns a Duration object from param duration when it is a number, otherwise return itself
@@ -117,3 +84,13 @@ export declare function combineSaveErrors(sObject: string, crudOperation: string
  * @param unit = (Default Duration.Unit.MILLISECONDS) Duration unit of number - See @link {Duration.Unit} for valid values
  */
 export declare function numberToDuration(duration: number | Duration, unit?: Duration.Unit): Duration;
+/**
+ * Zips directory to given zipfile.
+ *
+ * https://github.com/archiverjs/node-archiver
+ *
+ * @param dir to zip
+ * @param zipfile
+ */
+export declare function zipDir(dir: string, zipfile: string): Promise<void>;
+export declare function copyDir(src: string, dest: string): void;