@salesforce/packaging 3.2.36 → 3.3.0

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -124,12 +124,18 @@ export type PackageDescriptorJson = Partial<NamedPackageDir> & Partial<{
     features: string[];
     orgPreferences: string[];
     snapshot: string;
+    packageMetadataAccess: {
+        permissionSets: string[] | string;
+        permissionSetLicenses: string[] | string;
+    };
     apexTestAccess: {
         permissionSets: string[] | string;
         permissionSetLicenses: string[] | string;
     };
     permissionSetNames: string[];
     permissionSetLicenseDeveloperNames: string[];
+    packageMetadataPermissionSetNames: string[];
+    packageMetadataPermissionSetLicenseNames: string[];
     branch: string;
     subscriberPackageVersionId: string;
     packageId: string;

package/lib/package/packageVersionCreate.d.ts

@@ -33,7 +33,7 @@ export declare class PackageVersionCreate {
     private createPackageVersionCreateRequestFromOptions;
     private verifyHasSource;
     private cleanGeneratedPackage;
-    private resolveApexTestPermissions;
+    private resolveBuildUserPermissions;
     private packageVersionCreate;
     private getPackageDirFromId;
     private getPackageType;

package/lib/package/packageVersionCreate.js

@@ -277,7 +277,7 @@ class PackageVersionCreate {
             }
             packageDescriptorJson = (0, packageUtils_1.copyDescriptorProperties)(packageDescriptorJson, definitionFileJson);
         }
-        this.resolveApexTestPermissions(packageDescriptorJson);
+        this.resolveBuildUserPermissions(packageDescriptorJson);
         // 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;
@@ -402,7 +402,7 @@ class PackageVersionCreate {
         // Zip the Version Info and package.zip files into another zip
         await (0, packageUtils_1.zipDir)(packageVersBlobDirectory, packageVersBlobZipFile);
     }
-    resolveApexTestPermissions(packageDescriptorJson) {
+    resolveBuildUserPermissions(packageDescriptorJson) {
         // Process permissionSet and permissionSetLicenses that should be enabled when running Apex tests
         // This only applies if code coverage is enabled
         if (this.options.codecoverage) {
@@ -422,7 +422,23 @@ class PackageVersionCreate {
                 packageDescriptorJson.permissionSetLicenseDeveloperNames = permissionSetLicenses.map((s) => s.trim());
             }
         }
+        // Process permissionSet and permissionsetLicenses that should be enabled for the package metadata deploy
+        if (packageDescriptorJson.packageMetadataAccess?.permissionSets) {
+            let permSets = packageDescriptorJson.packageMetadataAccess.permissionSets;
+            if (!Array.isArray(permSets)) {
+                permSets = permSets.split(',');
+            }
+            packageDescriptorJson.packageMetadataPermissionSetNames = permSets.map((s) => s.trim());
+        }
+        if (packageDescriptorJson.packageMetadataAccess?.permissionSetLicenses) {
+            let permissionSetLicenses = packageDescriptorJson.packageMetadataAccess.permissionSetLicenses;
+            if (!Array.isArray(permissionSetLicenses)) {
+                permissionSetLicenses = permissionSetLicenses.split(',');
+            }
+            packageDescriptorJson.packageMetadataPermissionSetLicenseNames = permissionSetLicenses.map((s) => s.trim());
+        }
         delete packageDescriptorJson.apexTestAccess;
+        delete packageDescriptorJson.packageMetadataAccess;
     }
     // eslint-disable-next-line complexity
     async packageVersionCreate() {

package/lib/utils/packageUtils.d.ts

@@ -107,6 +107,14 @@ export declare function numberToDuration(duration: number | Duration | undefined
  */
 export declare function zipDir(dir: string, zipfile: string): Promise<void>;
 export declare function copyDir(src: string, dest: string): void;
+/**
+ * Parse and copy properties from both of these arguments into a new object
+ *
+ * @param packageDescriptorJson
+ * @param definitionFileJson
+ * @returns the resulting object with specific properties
+ * overridden from definition file based on case-insensitive matches.
+ */
 export declare function copyDescriptorProperties(packageDescriptorJson: PackageDescriptorJson, definitionFileJson: ScratchOrgInfo): PackageDescriptorJson;
 export declare function replaceIfEmpty<T>(value: T, replacement: T): T;
 /**

package/lib/utils/packageUtils.js

@@ -398,10 +398,21 @@ function copyDir(src, dest) {
     });
 }
 exports.copyDir = copyDir;
+/**
+ * Parse and copy properties from both of these arguments into a new object
+ *
+ * @param packageDescriptorJson
+ * @param definitionFileJson
+ * @returns the resulting object with specific properties
+ * overridden from definition file based on case-insensitive matches.
+ */
 function copyDescriptorProperties(packageDescriptorJson, definitionFileJson) {
     const packageDescriptorJsonCopy = Object.assign({}, packageDescriptorJson);
     const definitionFileJsonCopy = Object.assign({}, definitionFileJson);
-    return Object.assign({}, packageDescriptorJsonCopy, Object.fromEntries(['country', 'edition', 'language', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].map((prop) => [[prop], definitionFileJsonCopy[prop]])));
+    return Object.assign({}, packageDescriptorJsonCopy, Object.fromEntries(['country', 'edition', 'language', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].map((prop) => {
+        const matchCase = Object.keys(definitionFileJsonCopy).find((key) => key.toLowerCase() === prop.toLowerCase());
+        return [[prop], matchCase ? definitionFileJsonCopy[matchCase] : undefined];
+    })));
 }
 exports.copyDescriptorProperties = copyDescriptorProperties;
 function replaceIfEmpty(value, replacement) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "3.2.36",
+  "version": "3.3.0",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -42,9 +42,9 @@
   ],
   "dependencies": {
     "@oclif/core": "^3",
-    "@salesforce/core": "^6.7.3",
+    "@salesforce/core": "^6.7.6",
     "@salesforce/kit": "^3.1.0",
-    "@salesforce/schemas": "^1.6.1",
+    "@salesforce/schemas": "^1.7.0",
     "@salesforce/source-deploy-retrieve": "^10.7.0",
     "@salesforce/ts-types": "^2.0.9",
     "fast-xml-parser": "^4.3.6",