@salesforce/packaging 2.3.8 → 2.3.10

package/lib/package/packageProfileApi.d.ts

@@ -7,8 +7,8 @@ export declare class PackageProfileApi extends AsyncCreatable<ProfileApiOptions>
     constructor(options: ProfileApiOptions);
     init(): Promise<void>;
     /**
-     * For any profile present in the workspace, this function generates a subset of data that only contains references
-     * to items in the manifest.
+     * For any profile present in the project package directories, this function generates a subset of data that only
+     * contains references to items in the manifest.
      *
      * return a list of profile file locations that need to be removed from the package because they are empty
      *
@@ -18,10 +18,12 @@ export declare class PackageProfileApi extends AsyncCreatable<ProfileApiOptions>
      */
     generateProfiles(destPath: string, manifestTypes: PackageXml['types'], excludedDirectories?: string[]): string[];
     /**
-     * Filter out all profiles in the manifest and if any profiles exists in the workspace, add them to the manifest.
+     * Filter out all profiles in the manifest and if any profiles exist in the project package directories, add them to the manifest.
      *
      * @param typesArr array of objects { name[], members[] } that represent package types JSON.
      * @param excludedDirectories Direcotires not to generate profiles for
      */
     filterAndGenerateProfilesForManifest(typesArr: PackageXml['types'], excludedDirectories?: string[]): PackageXml['types'];
+    private findAllProfiles;
+    private getProfilesWithNamesAndPaths;
 }

package/lib/package/packageProfileApi.js

@@ -16,9 +16,9 @@ const profileRewriter_1 = require("./profileRewriter");
 core_1.Messages.importMessagesDirectory(__dirname);
 const profileApiMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'profile_api');
 /*
- * This class provides functions used to re-write .profiles in the workspace when creating a package2 version.
- * All profiles found in the workspaces are extracted out and then re-written to only include metadata in the profile
- * that is relevant to the source in the package directory being packaged.
+ * This class provides functions used to re-write .profiles in the project package directories when creating a package2 version.
+ * All profiles found in the project package directories are extracted out and then re-written to only include metadata in the
+ * profile that is relevant to the source in the package directory being packaged.
  */
 class PackageProfileApi extends kit_1.AsyncCreatable {
     constructor(options) {
@@ -30,8 +30,8 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
     // eslint-disable-next-line class-methods-use-this,@typescript-eslint/no-empty-function
     async init() { }
     /**
-     * For any profile present in the workspace, this function generates a subset of data that only contains references
-     * to items in the manifest.
+     * For any profile present in the project package directories, this function generates a subset of data that only
+     * contains references to items in the manifest.
      *
      * return a list of profile file locations that need to be removed from the package because they are empty
      *
@@ -41,10 +41,7 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
      */
     generateProfiles(destPath, manifestTypes, excludedDirectories = []) {
         const logger = core_1.Logger.childFromRoot('PackageProfileApi');
-        return (getProfilesWithNamesAndPaths({
-            projectPath: this.project.getPath(),
-            excludedDirectories,
-        })
+        return (this.getProfilesWithNamesAndPaths(excludedDirectories)
             .map(({ profilePath, name: profileName }) => {
             const originalProfile = (0, profileRewriter_1.profileStringToProfile)(fs.readFileSync(profilePath, 'utf-8'));
             const adjustedProfile = (0, profileRewriter_1.profileRewriter)(originalProfile, (0, profileRewriter_1.manifestTypesToMap)(manifestTypes), this.includeUserLicenses);
@@ -74,31 +71,36 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
             .map(({ xmlFileLocation }) => xmlFileLocation.replace(/(.*)(\.profile)/, '$1')));
     }
     /**
-     * Filter out all profiles in the manifest and if any profiles exists in the workspace, add them to the manifest.
+     * Filter out all profiles in the manifest and if any profiles exist in the project package directories, add them to the manifest.
      *
      * @param typesArr array of objects { name[], members[] } that represent package types JSON.
      * @param excludedDirectories Direcotires not to generate profiles for
      */
     filterAndGenerateProfilesForManifest(typesArr, excludedDirectories = []) {
-        const profilePathsWithNames = getProfilesWithNamesAndPaths({
-            projectPath: this.project.getPath(),
-            excludedDirectories,
-        });
+        const profilePathsWithNames = this.getProfilesWithNamesAndPaths(excludedDirectories);
         // Filter all profiles, and add back the ones we found names for
         return typesArr
             .filter((kvp) => kvp.name !== 'Profile')
             .concat([{ name: 'Profile', members: profilePathsWithNames.map((i) => i.name) }]);
     }
+    // Look for profiles in all package directories
+    findAllProfiles(excludedDirectories = []) {
+        const pkgDirs = this.project.getUniquePackageDirectories().map((pDir) => pDir.fullPath);
+        return pkgDirs
+            .map((pDir) => glob.sync(path.join(pDir, '**', '*.profile-meta.xml'), {
+            ignore: excludedDirectories.map((dir) => `**/${dir}/**`),
+        }))
+            .flat();
+    }
+    getProfilesWithNamesAndPaths(excludedDirectories) {
+        return this.findAllProfiles(excludedDirectories)
+            .map((profilePath) => ({ profilePath, name: profilePathToName(profilePath) }))
+            .filter(isProfilePathWithName);
+    }
 }
 exports.PackageProfileApi = PackageProfileApi;
-const findAllProfiles = ({ projectPath, excludedDirectories = [], }) => glob.sync(path.join(projectPath, '**', '*.profile-meta.xml'), {
-    ignore: excludedDirectories.map((dir) => `**/${dir}/**`),
-});
 const isProfilePathWithName = (profilePathWithName) => typeof profilePathWithName.name === 'string';
 const profilePathToName = (profilePath) => profilePath.match(/([^/]+)\.profile-meta.xml/)?.[1];
-const getProfilesWithNamesAndPaths = ({ projectPath, excludedDirectories, }) => findAllProfiles({ projectPath, excludedDirectories })
-    .map((profilePath) => ({ profilePath, name: profilePathToName(profilePath) }))
-    .filter(isProfilePathWithName);
 const getXmlFileLocation = (destPath, profilePath) => path.join(destPath, path.basename(profilePath).replace(/(.*)(-meta.xml)/, '$1'));
 const getRemovedSettings = (originalProfile, adjustedProfile) => {
     const originalProfileSettings = Object.keys(originalProfile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -45,7 +45,7 @@
     "@salesforce/core": "^5.2.5",
     "@salesforce/kit": "^3.0.9",
     "@salesforce/schemas": "^1.6.0",
-    "@salesforce/source-deploy-retrieve": "^9.7.10",
+    "@salesforce/source-deploy-retrieve": "^9.7.13",
     "@salesforce/ts-types": "^2.0.6",
     "fast-xml-parser": "^4.2.5",
     "globby": "^11",
@@ -65,7 +65,7 @@
     "@types/jszip": "^3.4.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "chai": "^4.3.7",
+    "chai": "^4.3.8",
     "eslint": "^8.49.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-config-salesforce": "^2.0.2",
@@ -74,7 +74,7 @@
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsdoc": "^44.2.7",
-    "eslint-plugin-sf-plugin": "^1.16.2",
+    "eslint-plugin-sf-plugin": "^1.16.5",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
@@ -84,7 +84,7 @@
     "sinon": "14.0.2",
     "ts-node": "^10.9.1",
     "typescript": "4.9.5",
-    "wireit": "^0.10.0"
+    "wireit": "^0.14.0"
   },
   "publishConfig": {
     "access": "public"