@salesforce/packaging 0.0.27 → 0.0.28

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.28](https://github.com/forcedotcom/packaging/compare/v0.0.27...v0.0.28) (2022-08-26)
+
+### Bug Fixes
+
+- finish pvl, implement a few missing things ([9bb825c](https://github.com/forcedotcom/packaging/commit/9bb825c97b6cb8c8b9522ddcb5e5fb32e5653995))
+
 ### [0.0.27](https://github.com/forcedotcom/packaging/compare/v0.0.26...v0.0.27) (2022-08-26)
 
 ### Bug Fixes

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -147,17 +147,18 @@ export declare type PackageVersionCreateRequest = {
     CalculateCodeCoverage: boolean;
     SkipValidation: boolean;
 };
-export declare type PackageVersionQueryOptions = {
-    project: SfProject;
+export declare type PackageVersionListOptions = {
     orderBy: string;
     modifiedLastDays: number;
     createdLastDays: number;
     packages: string[];
-    connection: Connection;
     verbose: boolean;
     concise: boolean;
     isReleased: boolean;
 };
+export declare type ListPackageVersionOptions = PackageVersionListOptions & {
+    connection: Connection;
+};
 export declare type PackageSaveResult = SaveResult;
 export declare type PackageVersionCreateRequestOptions = {
     path: string;

package/lib/package/packageVersion.d.ts

@@ -1,5 +1,5 @@
 import { Duration } from '@salesforce/kit';
-import { PackageSaveResult, PackageVersionCreateOptions, PackageVersionCreateRequestResult, PackageVersionOptions, PackageVersionReportResult } from '../interfaces';
+import { PackageSaveResult, PackageVersionCreateOptions, PackageVersionCreateRequestResult, PackageVersionListOptions, PackageVersionListResult, PackageVersionOptions, PackageVersionReportResult } from '../interfaces';
 export declare class PackageVersion {
     private options;
     private readonly project;
@@ -56,7 +56,7 @@ export declare class PackageVersion {
     }): Promise<PackageVersionCreateRequestResult>;
     convert(): Promise<void>;
     install(): Promise<void>;
-    list(): Promise<void>;
+    list(options: PackageVersionListOptions): Promise<PackageVersionListResult[]>;
     uninstall(): Promise<void>;
     promote(id: string): Promise<PackageSaveResult>;
     update(): Promise<void>;

package/lib/package/packageVersion.js

@@ -13,6 +13,7 @@ const utils_1 = require("../utils");
 const packageVersionCreate_1 = require("./packageVersionCreate");
 const packageVersionReport_1 = require("./packageVersionReport");
 const packageVersionCreateRequestReport_1 = require("./packageVersionCreateRequestReport");
+const packageVersionList_1 = require("./packageVersionList");
 core_1.Messages.importMessagesDirectory(__dirname);
 class PackageVersion {
     constructor(options) {
@@ -153,8 +154,8 @@ class PackageVersion {
     install() {
         return Promise.resolve(undefined);
     }
-    list() {
-        return Promise.resolve(undefined);
+    async list(options) {
+        return (await (0, packageVersionList_1.listPackageVersions)({ ...options, ...{ connection: this.connection } })).records;
     }
     uninstall() {
         return Promise.resolve(undefined);

package/lib/package/packageVersionList.d.ts

@@ -1,9 +1,7 @@
-import { SfProject } from '@salesforce/core';
 import { QueryResult } from 'jsforce';
-import { PackageVersionListResult, PackageVersionQueryOptions } from '../interfaces';
+import { PackageVersionListResult, ListPackageVersionOptions } from '../interfaces';
 export declare const DEFAULT_ORDER_BY_FIELDS = "Package2Id, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber";
-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;
+export declare function listPackageVersions(options: ListPackageVersionOptions): Promise<QueryResult<PackageVersionListResult>>;
+export declare function assembleQueryParts(select: string, where: string[], orderBy?: string): string;
+export declare function constructWhere(packageIds: string[], createdLastDays: number, lastModLastDays: number, isReleased: boolean): string[];
+export declare function validateDays(paramName: string, lastDays: number): number;

package/lib/package/packageVersionList.js

@@ -6,7 +6,7 @@
  * 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._getLastDays = exports._constructWhere = exports._assembleQueryParts = exports._constructQuery = exports.listPackageVersions = exports.DEFAULT_ORDER_BY_FIELDS = void 0;
+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");
@@ -25,67 +25,60 @@ const VERBOSE_SELECT = 'SELECT Id, Package2Id, SubscriberPackageVersionId, Name,
 exports.DEFAULT_ORDER_BY_FIELDS = 'Package2Id, Branch, MajorVersion, MinorVersion, PatchVersion, BuildNumber';
 const logger = core_1.Logger.childFromRoot('packageVersionList');
 async function listPackageVersions(options) {
-    return options.connection.tooling.query(_constructQuery(options));
+    return options.connection.tooling.query(constructQuery(options));
 }
 exports.listPackageVersions = listPackageVersions;
-function _constructQuery(options) {
+function constructQuery(options) {
     // construct custom WHERE clause, if applicable
-    const where = _constructWhere(options.packages, options.createdLastDays, options.modifiedLastDays, options.project);
-    if (options.isReleased) {
-        where.push('IsReleased = true');
-    }
-    return _assembleQueryParts(options.verbose === true ? VERBOSE_SELECT : DEFAULT_SELECT, where, options.orderBy);
+    const where = constructWhere(options.packages, options.createdLastDays, options.modifiedLastDays, options.isReleased);
+    return assembleQueryParts(options.verbose === true ? VERBOSE_SELECT : DEFAULT_SELECT, where, options.orderBy);
 }
-exports._constructQuery = _constructQuery;
-function _assembleQueryParts(select, where, orderBy = exports.DEFAULT_ORDER_BY_FIELDS) {
+function assembleQueryParts(select, where, orderBy) {
     // construct ORDER BY clause
-    // TODO: validate given fields
     const orderByPart = `ORDER BY ${orderBy ? orderBy : exports.DEFAULT_ORDER_BY_FIELDS}`;
     const wherePart = where.length > 0 ? `WHERE ${where.join(' AND ')}` : '';
     const query = `${select} ${wherePart} ${orderByPart}`;
     logger.debug(query);
     return query;
 }
-exports._assembleQueryParts = _assembleQueryParts;
+exports.assembleQueryParts = assembleQueryParts;
 // construct custom WHERE clause parts
-function _constructWhere(idsOrAliases, createdLastDays, lastModLastDays, project) {
+function constructWhere(packageIds, createdLastDays, lastModLastDays, isReleased) {
     const where = [];
     // filter on given package ids
-    if (idsOrAliases?.length > 0) {
+    if (packageIds?.length > 0) {
         // remove dups
-        const aliasesOrIds = [...new Set(idsOrAliases)];
-        // resolve any aliases
-        const packageIds = aliasesOrIds.map((idOrAlias) => (0, utils_1.getPackageIdFromAlias)(idOrAlias, project));
+        const uniquePackageIds = [...new Set(packageIds)];
         // validate ids
-        packageIds.forEach((packageId) => {
+        uniquePackageIds.forEach((packageId) => {
             (0, utils_1.validateId)(utils_1.BY_LABEL.PACKAGE_ID, packageId);
         });
         // stash where part
-        where.push(`Package2Id IN ('${packageIds.join("','")}')`);
+        where.push(`Package2Id IN ('${uniquePackageIds.join("','")}')`);
     }
     // filter on created date, days ago: 0 for today, etc
     if ((0, ts_types_1.isNumber)(createdLastDays)) {
-        createdLastDays = _getLastDays('createdlastdays', createdLastDays);
+        createdLastDays = validateDays('createdlastdays', createdLastDays);
         where.push(`CreatedDate = LAST_N_DAYS:${createdLastDays}`);
     }
     // filter on last mod date, days ago: 0 for today, etc
     if ((0, ts_types_1.isNumber)(lastModLastDays)) {
-        lastModLastDays = _getLastDays('modifiedlastdays', lastModLastDays);
+        lastModLastDays = validateDays('modifiedlastdays', lastModLastDays);
         where.push(`LastModifiedDate = LAST_N_DAYS:${lastModLastDays}`);
     }
+    if (isReleased) {
+        where.push('IsReleased = true');
+    }
     // exclude deleted
     where.push('IsDeprecated = false');
     return where;
 }
-exports._constructWhere = _constructWhere;
-function _getLastDays(paramName, lastDays) {
-    if (isNaN(lastDays)) {
-        return 0;
-    }
+exports.constructWhere = constructWhere;
+function validateDays(paramName, lastDays) {
     if (lastDays < 0) {
         throw messages.createError('invalidDaysNumber', [paramName, `${lastDays}`]);
     }
     return lastDays;
 }
-exports._getLastDays = _getLastDays;
+exports.validateDays = validateDays;
 //# sourceMappingURL=packageVersionList.js.map

package/lib/utils/packageUtils.js

@@ -324,7 +324,9 @@ async function getPackageVersionStrings(subscriberPackageVersionIds, connection)
     }
     // remove any duplicate Ids
     const ids = [...new Set(subscriberPackageVersionIds)];
-    const query = 'SELECT SubscriberPackageVersionId, MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version WHERE SubscriberPackageVersionId IN (%IDS%)';
+    const query = `SELECT SubscriberPackageVersionId, MajorVersion, MinorVersion, PatchVersion, BuildNumber FROM Package2Version WHERE SubscriberPackageVersionId IN (${ids
+        .map((id) => `'${id}'`)
+        .join(',')})`;
     const records = await queryWithInConditionChunking(query, ids, '%IDS%', connection);
     if (records && records.length > 0) {
         results = new Map(records.map((record) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "packing libraries to Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",