@salesforce/packaging 5.0.7 → 5.0.9-spi-dev.0

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -38,6 +38,27 @@ export type PackageUpdateOptions = {
     AppAnalyticsEnabled?: boolean;
     RecommendedVersionId?: string;
 };
+export type PackageAuthorizationOptions = {
+    connection: Connection;
+    subscriberPackageId?: string;
+};
+export type PackageAuthorizationRecord = {
+    Id: string;
+    SubscriberOrg: string;
+    SubscriberPackageId: string | null;
+    Status: 'Active' | 'Revoked';
+    CreatedDate: string;
+    CreatedById: string;
+    CreatedByUsername: string;
+};
+export type PackageAuthorizationAddResult = {
+    Id: string;
+    SubscriberOrg: string;
+};
+export type PackageAuthorizationRemoveResult = {
+    SubscriberOrg: string;
+    removed: boolean;
+};
 export type PackageIdType = 'PackageId' | 'SubscriberPackageVersionId' | 'PackageInstallRequestId' | 'PackageUninstallRequestId';
 export type PackageVersionOptions1GP = Record<string, unknown>;
 export type PackageVersionCreateRequestResult = {
@@ -141,6 +162,14 @@ export type PackagePushScheduleResult = {
     ScheduledStartTime: string | undefined;
     Status: string;
 };
+export type PackageTrustLinkRequestOptions = {
+    verifiedOrgId: string;
+};
+export type PackageTrustLinkRequestResult = {
+    LinkRequestId: string;
+    VerifiedOrgId: string;
+    Status: string;
+};
 export type PackagePushRequestReportQueryOptions = {
     packagePushRequestId: string;
 };

package/lib/package/index.d.ts

@@ -1,7 +1,9 @@
 export * from './package';
+export * from './packageAuthorization';
 export * from './packageVersion';
 export * from './subscriberPackageVersion';
 export * from './packagePushUpgrade';
+export * from './packageTrustLink';
 export { VersionNumber } from './versionNumber';
 export * from './packageBundle';
 export * from './packageBundleVersion';

package/lib/package/index.js

@@ -31,9 +31,11 @@ exports.VersionNumber = void 0;
  * limitations under the License.
  */
 __exportStar(require("./package"), exports);
+__exportStar(require("./packageAuthorization"), exports);
 __exportStar(require("./packageVersion"), exports);
 __exportStar(require("./subscriberPackageVersion"), exports);
 __exportStar(require("./packagePushUpgrade"), exports);
+__exportStar(require("./packageTrustLink"), exports);
 var versionNumber_1 = require("./versionNumber");
 Object.defineProperty(exports, "VersionNumber", { enumerable: true, get: function () { return versionNumber_1.VersionNumber; } });
 __exportStar(require("./packageBundle"), exports);

package/lib/package/package.d.ts

@@ -100,6 +100,12 @@ export declare class Package {
      * @returns {string} package ID (0Ho)
      */
     getId(): string;
+    /**
+     * Returns the subscriber package ID associated with this package.
+     *
+     * @returns the subscriber package ID
+     */
+    getSubscriberPackageId(): Promise<string>;
     /**
      * Returns the package type of the package.
      *

package/lib/package/package.js

@@ -194,6 +194,18 @@ class Package {
     getId() {
         return this.packageId;
     }
+    /**
+     * Returns the subscriber package ID associated with this package.
+     *
+     * @returns the subscriber package ID
+     */
+    async getSubscriberPackageId() {
+        const packageData = await this.getPackageData();
+        if (!packageData?.SubscriberPackageId) {
+            throw messages.createError('subscriberPackageIdNotFound', [this.packageId]);
+        }
+        return packageData.SubscriberPackageId;
+    }
     /**
      * Returns the package type of the package.
      *

package/lib/package/packageAncestry.js

@@ -317,7 +317,6 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     async buildAncestryTreeFromRoots(roots) {
         while (roots.length > 0) {
             const subscriberPackageVersion = roots.shift();
-            // eslint-disable-next-line no-await-in-loop
             if (subscriberPackageVersion) {
                 // eslint-disable-next-line no-await-in-loop
                 const descendants = await this.addDescendantsFromPackageVersion(subscriberPackageVersion);

package/lib/package/packageAuthorization.d.ts

@@ -0,0 +1,10 @@
+import { PackageAuthorizationAddResult, PackageAuthorizationOptions, PackageAuthorizationRecord, PackageAuthorizationRemoveResult } from '../interfaces';
+export declare class PackageAuthorization {
+    private readonly connection;
+    private readonly subscriberPackageId?;
+    constructor(options: PackageAuthorizationOptions);
+    add(subscriberOrgs: string[]): Promise<PackageAuthorizationAddResult[]>;
+    remove(subscriberOrg: string): Promise<PackageAuthorizationRemoveResult>;
+    list(): Promise<PackageAuthorizationRecord[]>;
+    private query;
+}

package/lib/package/packageAuthorization.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageAuthorization = void 0;
+const core_1 = require("@salesforce/core");
+const packageUtils_1 = require("../utils/packageUtils");
+const PACKAGE_AUTHORIZATION_SOBJECT = 'PkgAuthOrgSbscrbTrustRela';
+const MINIMUM_API_VERSION = '68.0';
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_authorize');
+const normalizeSubscriberOrg = (subscriberOrg) => {
+    if (!subscriberOrg.startsWith('00D') || !(0, core_1.validateSalesforceId)(subscriberOrg)) {
+        throw messages.createError('invalidSubscriberOrg', [subscriberOrg]);
+    }
+    return (0, core_1.trimTo15)(subscriberOrg);
+};
+class PackageAuthorization {
+    connection;
+    subscriberPackageId;
+    constructor(options) {
+        if (Number(options.connection.getApiVersion()) < Number(MINIMUM_API_VERSION)) {
+            throw messages.createError('apiVersionTooLow', [MINIMUM_API_VERSION]);
+        }
+        if (options.subscriberPackageId &&
+            (!options.subscriberPackageId.startsWith('033') || !(0, core_1.validateSalesforceId)(options.subscriberPackageId))) {
+            throw messages.createError('invalidSubscriberPackage', [options.subscriberPackageId]);
+        }
+        this.connection = options.connection;
+        this.subscriberPackageId = options.subscriberPackageId;
+    }
+    async add(subscriberOrgs) {
+        if (subscriberOrgs.length === 0) {
+            throw messages.createError('noSubscriberOrgs');
+        }
+        const normalizedSubscriberOrgs = subscriberOrgs.map(normalizeSubscriberOrg);
+        return normalizedSubscriberOrgs.reduce(async (resultsPromise, subscriberOrg) => {
+            const results = await resultsPromise;
+            const result = await this.connection.tooling.create(PACKAGE_AUTHORIZATION_SOBJECT, {
+                SubscriberOrg: subscriberOrg,
+                ...(this.subscriberPackageId ? { SubscriberPackageId: this.subscriberPackageId } : {}),
+                Status: 'Active',
+            });
+            if (!result.success || !result.id) {
+                throw (0, packageUtils_1.combineSaveErrors)(PACKAGE_AUTHORIZATION_SOBJECT, 'create', result.errors);
+            }
+            results.push({ Id: result.id, SubscriberOrg: subscriberOrg });
+            return results;
+        }, Promise.resolve([]));
+    }
+    async remove(subscriberOrg) {
+        const normalizedSubscriberOrg = normalizeSubscriberOrg(subscriberOrg);
+        const subscriberPackageFilter = this.subscriberPackageId
+            ? `SubscriberPackageId = '${this.subscriberPackageId}'`
+            : 'SubscriberPackageId = NULL';
+        const records = await this.query(`WHERE SubscriberOrg = '${normalizedSubscriberOrg}' AND ${subscriberPackageFilter} LIMIT 1`);
+        const record = records[0];
+        if (!record) {
+            return { SubscriberOrg: normalizedSubscriberOrg, removed: false };
+        }
+        const result = await this.connection.tooling.sobject(PACKAGE_AUTHORIZATION_SOBJECT).destroy(record.Id);
+        if (!result.success) {
+            throw (0, packageUtils_1.combineSaveErrors)(PACKAGE_AUTHORIZATION_SOBJECT, 'delete', result.errors);
+        }
+        return { SubscriberOrg: normalizedSubscriberOrg, removed: true };
+    }
+    async list() {
+        const packageFilter = this.subscriberPackageId ? `WHERE SubscriberPackageId = '${this.subscriberPackageId}' ` : '';
+        return this.query(`${packageFilter}ORDER BY SubscriberOrg`);
+    }
+    async query(whereClause) {
+        const query = 'SELECT Id, SubscriberOrg, SubscriberPackageId, Status, CreatedDate, CreatedById, CreatedBy.Username FROM ' +
+            `${PACKAGE_AUTHORIZATION_SOBJECT} ${whereClause}`;
+        const result = await this.connection.autoFetchQuery(query, { tooling: true });
+        return (result.records ?? []).map(({ Id, SubscriberOrg, SubscriberPackageId, Status, CreatedDate, CreatedById, CreatedBy }) => ({
+            Id,
+            SubscriberOrg,
+            SubscriberPackageId,
+            Status,
+            CreatedDate,
+            CreatedById,
+            CreatedByUsername: CreatedBy?.Username ?? CreatedById,
+        }));
+    }
+}
+exports.PackageAuthorization = PackageAuthorization;
+//# sourceMappingURL=packageAuthorization.js.map

package/lib/package/packageBundle.js

@@ -66,7 +66,6 @@ class PackageBundle {
         if (!project) {
             throw new core_1.SfError('Project instance is required when deleting package bundle by alias');
         }
-        // eslint-disable-next-line no-param-reassign
         idOrAlias = project.getPackageBundleIdFromAlias(idOrAlias) ?? idOrAlias;
         return connection.tooling.sobject('PackageBundle').delete(idOrAlias);
     }

package/lib/package/packageConvert.js

@@ -305,7 +305,6 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, project
                         // for multiple errors, display one per line prefixed with (x)
                         if (results[0].Error.length > 1) {
                             results[0].Error.forEach((error) => {
-                                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                                 errors.push(`(${errors.length + 1}) ${error}`);
                             });
                             errors.unshift(messages.getMessage('versionCreateFailedWithMultipleErrors'));

package/lib/package/packageProfileApi.js

@@ -41,7 +41,7 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
         this.project = options.project;
         this.includeUserLicenses = options.includeUserLicenses ?? false;
     }
-    // eslint-disable-next-line class-methods-use-this,@typescript-eslint/no-empty-function
+    // eslint-disable-next-line class-methods-use-this
     async init() { }
     /**
      * For any profile present in the project package directories, this function generates a subset of data that only

package/lib/package/packageTrustLink.d.ts

@@ -0,0 +1,17 @@
+import { Connection } from '@salesforce/core';
+import { PackageTrustLinkRequestOptions, PackageTrustLinkRequestResult } from '../interfaces';
+export declare class PackageTrustLink {
+    constructor();
+    /**
+     * Request a Public Secure (VerifiedDev) trust link from the connected authoring org to a Verified PBO.
+     *
+     * Establishes the developer/authoring-org side of the two-way trust handshake by creating a
+     * `Pending` trust relationship. A PBO admin approves it separately. This does not change any
+     * package's distribution type — trust and enforcement are decoupled.
+     *
+     * @param connection - Connection to the authoring org (the 1GP namespace org or 2GP Dev Hub).
+     * @param options - the verified org (PBO) ID to request a trust link to.
+     * @returns the created trust relationship Id, verified org ID, and status.
+     */
+    static request(connection: Connection, options: PackageTrustLinkRequestOptions): Promise<PackageTrustLinkRequestResult>;
+}

package/lib/package/packageTrustLink.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageTrustLink = void 0;
+const core_1 = require("@salesforce/core");
+const packageUtils_1 = require("../utils/packageUtils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_trust_link');
+// Tooling API SObject backing the VerifiedDev (Public Secure) org-level trust relationship
+// between the connected authoring org and a Verified PBO. See W-23970567 / SPI CLI design doc.
+const TRUST_LINK_SOBJECT = 'PkgVrfyAuthOrgTrustRela';
+class PackageTrustLink {
+    constructor() { }
+    /**
+     * Request a Public Secure (VerifiedDev) trust link from the connected authoring org to a Verified PBO.
+     *
+     * Establishes the developer/authoring-org side of the two-way trust handshake by creating a
+     * `Pending` trust relationship. A PBO admin approves it separately. This does not change any
+     * package's distribution type — trust and enforcement are decoupled.
+     *
+     * @param connection - Connection to the authoring org (the 1GP namespace org or 2GP Dev Hub).
+     * @param options - the verified org (PBO) ID to request a trust link to.
+     * @returns the created trust relationship Id, verified org ID, and status.
+     */
+    static async request(connection, options) {
+        if (!options.verifiedOrgId.startsWith('00D') || !(0, core_1.validateSalesforceId)(options.verifiedOrgId)) {
+            throw messages.createError('invalidVerifiedOrgId', [options.verifiedOrgId]);
+        }
+        // VerifiedOrg is a TEXT field that core stores as a 15-char ID, so normalize before
+        // insert to avoid 18-char mismatches.
+        const verifiedOrgId = (0, core_1.trimTo15)(options.verifiedOrgId);
+        // An authoring org can hold at most one trust relationship at a time. The Tooling API
+        // query below runs against the connected authoring org and only returns that org's own
+        // rows (AuthoringOrg is server-set), so any existing row (in any status, to any verified
+        // org) blocks a new request until it's deleted (unlinked).
+        const existing = await queryExistingTrustLink(connection);
+        if (existing) {
+            throw messages.createError('trustLinkAlreadyExists', [existing.VerifiedOrg, existing.Status]);
+        }
+        // Create the trust relationship via the Tooling API. Status is required and must be
+        // 'Pending' on create; the PBO admin advances it during the approval handshake.
+        const createResult = await connection.tooling.create(TRUST_LINK_SOBJECT, {
+            VerifiedOrg: verifiedOrgId,
+            Status: 'Pending',
+        });
+        if (!createResult.success || !createResult.id) {
+            throw (0, packageUtils_1.combineSaveErrors)(TRUST_LINK_SOBJECT, 'create', createResult.errors);
+        }
+        return {
+            LinkRequestId: createResult.id,
+            VerifiedOrgId: verifiedOrgId,
+            Status: 'Pending',
+        };
+    }
+}
+exports.PackageTrustLink = PackageTrustLink;
+async function queryExistingTrustLink(connection) {
+    const query = `SELECT Id, VerifiedOrg, Status FROM ${TRUST_LINK_SOBJECT} LIMIT 1`;
+    const result = await connection.autoFetchQuery(query, { tooling: true });
+    return result.records?.[0];
+}
+//# sourceMappingURL=packageTrustLink.js.map

package/lib/package/packageVersion.js

@@ -285,7 +285,6 @@ class PackageVersion {
                     case Package2VersionStatus.success:
                         await core_1.Lifecycle.getInstance().emit(interfaces_1.PackageVersionEvents.create.success, report);
                         await new PackageVersion({
-                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                             idOrAlias: report.SubscriberPackageVersionId,
                             project,
                             connection,

package/lib/package/packageVersionCreate.js

@@ -255,7 +255,6 @@ class PackageVersionCreate {
                 throw messages.createError('noReleaseVersionFoundForBranch', [packageId, branch, versionNumber.toString()]);
             }
         }
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         return `${results.records[0].expr0}`;
     }
     async createRequestObject(preserveFiles, packageVersTmpRoot, packageVersBlobZipFile) {
@@ -851,7 +850,6 @@ const packageXmlStringToPackageXmlJson = (rawXml) => {
         // make sure types and members is always an array
         isArray: (name) => ['types', 'members'].includes(name),
     });
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     return parser.parse(rawXml).Package;
 };
 exports.packageXmlStringToPackageXmlJson = packageXmlStringToPackageXmlJson;

package/lib/package/profileRewriter.js

@@ -83,7 +83,6 @@ const profileStringToProfile = (profileString) => {
         },
         isArray: (name) => rewriteProps.includes(name),
     });
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     return parser.parse(profileString).Profile;
 };
 exports.profileStringToProfile = profileStringToProfile;

package/lib/package/subscriberPackageVersion.d.ts

@@ -36,7 +36,7 @@ export declare class SubscriberPackageVersion {
      * @param installationKey
      * @param options
      */
-    static installStatus(connection: Connection, packageInstallRequestOrId: string | PackagingSObjects.PackageInstallRequest, installationKey?: string | undefined | Nullable<string>, options?: PackageInstallOptions): Promise<PackagingSObjects.PackageInstallRequest>;
+    static installStatus(connection: Connection, packageInstallRequestOrId: string | PackagingSObjects.PackageInstallRequest, installationKey?: string | Nullable<string>, options?: PackageInstallOptions): Promise<PackagingSObjects.PackageInstallRequest>;
     /**
      * list the packages installed in the org
      *

package/lib/utils/packageUtils.js

@@ -244,7 +244,6 @@ function escapeInstallationKey(key) {
  * @param packageIds The list of package IDs
  * @param connection For tooling query
  */
-// eslint-disable-next-line @typescript-eslint/require-await
 async function getContainerOptions(packageIds, connection) {
     const ids = (0, kit_1.ensureArray)(packageIds).filter(ts_types_1.isString);
     if (ids.length === 0) {
@@ -264,7 +263,6 @@ async function getContainerOptions(packageIds, connection) {
  * @param subscriberPackageVersionIds
  * @param connection For tooling query
  */
-// eslint-disable-next-line @typescript-eslint/require-await
 async function getPackageVersionStrings(subscriberPackageVersionIds, connection) {
     let results = new Map();
     if (!subscriberPackageVersionIds || subscriberPackageVersionIds.length === 0) {

package/messages/package.md

@@ -22,6 +22,10 @@ Package alias %s not found in project.
 
 A package with id %s was not found.
 
+# subscriberPackageIdNotFound
+
+The subscriber package ID for package %s was not found.
+
 # appAnalyticsEnabledApiPriorTo59Error
 
 Enabling App Analytics is only possible with API version 59.0 or higher.

package/messages/package_authorize.md

@@ -0,0 +1,15 @@
+# invalidSubscriberOrg
+
+The subscriber org ID %s is invalid. It must be a 15- or 18-character ID that starts with "00D".
+
+# invalidSubscriberPackage
+
+The subscriber package ID %s is invalid. It must be a 15- or 18-character ID that starts with "033".
+
+# noSubscriberOrgs
+
+Provide at least one subscriber org ID.
+
+# apiVersionTooLow
+
+Package authorization requires API version %s or later.

package/messages/package_trust_link.md

@@ -0,0 +1,7 @@
+# invalidVerifiedOrgId
+
+The Verified Org ID %s isn't valid. Specify a valid organization ID (starts with 00D and is 15 or 18 characters) for the Verified Partner Business Org and retry the command.
+
+# trustLinkAlreadyExists
+
+This org already has a trust link to Verified Org %s with status '%s'. An org can have only one trust link at a time; delete the existing trust link before requesting a new one.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "5.0.7",
+  "version": "5.0.9-spi-dev.0",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -59,10 +59,16 @@
   },
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^5.3.64",
-    "@salesforce/dev-scripts": "^11.0.4",
+    "@salesforce/dev-scripts": "^13.0.2",
+    "@types/chai": "^4.3.17",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",
-    "eslint-plugin-sf-plugin": "^1.20.33",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^18",
+    "@types/sinon": "^10.0.20",
+    "eslint": "^10.4.0",
+    "eslint-config-salesforce-typescript": "^6.0.0",
+    "eslint-plugin-sf-plugin": "^3.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   },
@@ -110,6 +116,7 @@
         "src/**/*.ts",
         "test/**/*.ts",
         "messages/**",
+        "**/eslint.config.*",
         "**/.eslint*",
         "**/tsconfig.json"
       ],