@salesforce/packaging 2.4.18 → 2.4.20

package/lib/interfaces/packagingSObjects.js

@@ -15,5 +15,5 @@ var PackagingSObjects;
         Package2VersionStatus["verifyingMetadata"] = "VerifyingMetadata";
         Package2VersionStatus["finalizingPackageVersion"] = "FinalizingPackageVersion";
     })(Package2VersionStatus = PackagingSObjects.Package2VersionStatus || (PackagingSObjects.Package2VersionStatus = {}));
-})(PackagingSObjects = exports.PackagingSObjects || (exports.PackagingSObjects = {}));
+})(PackagingSObjects || (exports.PackagingSObjects = PackagingSObjects = {}));
 //# sourceMappingURL=packagingSObjects.js.map

package/lib/package/packageAncestry.js

@@ -7,7 +7,7 @@ exports.PackageAncestryNode = exports.AncestryDotProducer = exports.AncestryJson
  * 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
  */
-const os_1 = require("os");
+const node_os_1 = require("node:os");
 const core_1 = require("@salesforce/core");
 const graphology_1 = require("graphology");
 const kit_1 = require("@salesforce/kit");
@@ -433,7 +433,7 @@ class AncestryDotProducer {
                 producers.push(...producer.children);
             }
         }
-        return `strict graph G {${os_1.EOL}${dotLines.join(os_1.EOL)}${os_1.EOL}}`;
+        return `strict graph G {${node_os_1.EOL}${dotLines.join(node_os_1.EOL)}${node_os_1.EOL}}`;
     }
 }
 exports.AncestryDotProducer = AncestryDotProducer;

package/lib/package/packageConvert.js

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageVersionCreateRequest = exports.convertPackage = exports.findOrCreatePackage2 = void 0;
-const path = require("path");
-const os = require("os");
-const fs = require("fs");
+const path = require("node:path");
+const os = require("node:os");
+const fs = require("node:fs");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchOrgSettingsGenerator");

package/lib/package/packageProfileApi.js

@@ -7,8 +7,8 @@ exports.PackageProfileApi = void 0;
  * 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
  */
-const path = require("path");
-const fs = require("fs");
+const path = require("node:path");
+const fs = require("node:fs");
 const glob = require("glob");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
@@ -57,7 +57,7 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
             // side effect: modify profiles in place
             .filter(({ hasContent, profileName, removedSettings, profilePath, xmlFileLocation, adjustedProfile }) => {
             if (!hasContent) {
-                logger.warn(`Profile ${profileName} has no content after filtering. It will still be part of the package but you can remove if it it's not needed.`);
+                logger.warn(`Profile ${profileName} has no content after filtering. It will still be part of the package but you can remove it if it's not needed.`);
                 return true;
             }
             else {

package/lib/package/packageUninstall.js

@@ -7,7 +7,7 @@ exports.uninstallPackage = exports.pollUninstall = exports.getUninstallErrors =
  * 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
  */
-const os = require("os");
+const os = require("node:os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");

package/lib/package/packageVersionCreate.d.ts

@@ -37,7 +37,6 @@ export declare class PackageVersionCreate {
     private packageVersionCreate;
     private getPackageDirFromId;
     private getPackageType;
-    private resolveUserLicenses;
     private validateOptionsForPackageType;
     /**
      * Cleans invalid attribute(s) from the packageDescriptorJSON

package/lib/package/packageVersionCreate.js

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageXmlJsonToXmlString = exports.packageXmlStringToPackageXmlJson = exports.MetadataResolver = exports.PackageVersionCreate = void 0;
-const path = require("path");
-const os = require("os");
-const fs = require("fs");
+const path = require("node:path");
+const os = require("node:os");
+const fs = require("node:fs");
 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");
@@ -346,11 +346,31 @@ class PackageVersionCreate {
         if (this.options.codecoverage) {
             hasUnpackagedMetadata = await this.metadataResolver.resolveMetadata(unpackagedMetadataPath, unpackagedMetadataFolder, 'unpackagedMDDirectoryDoesNotExist', sourceApiVersion);
         }
-        // don't package the profiles from any un-packagedMetadata dir in the project
-        const profileExcludeDirs = this.project
-            .getPackageDirectories()
-            .map((packageDir) => packageDir.unpackagedMetadata?.path)
-            .filter((packageDirPath) => packageDirPath);
+        let profileExcludeDirs = [];
+        if (this.packageObject.scopeProfiles) {
+            this.logger.debug(`packageDirectory: ${this.packageObject.name} has 'scopeProfiles' set, so only including profiles from within this directory`);
+            // exclude all package dirs except the one being packaged
+            profileExcludeDirs = this.project
+                .getPackageDirectories()
+                .map((packageDir) => {
+                if (packageDir.path !== this.packageObject.path) {
+                    return packageDir.path;
+                }
+            })
+                .filter((packageDirPath) => packageDirPath);
+        }
+        else {
+            // don't package the profiles from any un-packagedMetadata dir in the project
+            profileExcludeDirs = this.project
+                .getPackageDirectories()
+                .map((packageDir) => packageDir.unpackagedMetadata?.path)
+                .filter((packageDirPath) => packageDirPath);
+            let debugMsg = 'Searching for profiles to include from all packageDirectories';
+            if (profileExcludeDirs?.length) {
+                debugMsg += ` excluding these unpackagedMetadata dirs: ${profileExcludeDirs.toString()}`;
+            }
+            this.logger.debug(debugMsg);
+        }
         const typesArr = this.options?.profileApi?.filterAndGenerateProfilesForManifest(packageXmlAsJson.types, profileExcludeDirs) ??
             packageXmlAsJson.types;
         // Next generate profiles and retrieve any profiles that were excluded because they had no matching nodes.
@@ -452,7 +472,10 @@ class PackageVersionCreate {
             this.packageObject = packageObject;
         }
         this.packageId = this.project.getPackageIdFromAlias(packageName) ?? packageName;
-        this.options.profileApi = await this.resolveUserLicenses(!!this.packageObject.includeProfileUserLicenses);
+        this.options.profileApi = await packageProfileApi_1.PackageProfileApi.create({
+            project: this.project,
+            includeUserLicenses: !!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.
         pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, this.packageId);
@@ -505,12 +528,6 @@ class PackageVersionCreate {
         }
         return this.pkg.getType();
     }
-    async resolveUserLicenses(includeUserLicenses) {
-        return packageProfileApi_1.PackageProfileApi.create({
-            project: this.project,
-            includeUserLicenses,
-        });
-    }
     async validateOptionsForPackageType() {
         if ((await this.getPackageType()) === 'Unlocked') {
             // Don't allow scripts in unlocked packages
@@ -535,6 +552,7 @@ class PackageVersionCreate {
         delete packageDescriptorJson.branch; // for client-side use only, not needed
         delete packageDescriptorJson.fullPath; // for client-side use only, not needed
         delete packageDescriptorJson.name; // for client-side use only, not needed
+        delete packageDescriptorJson.scopeProfiles; // for client-side use only, not needed
         return packageDescriptorJson;
     }
     /**

package/lib/package/packageVersionCreateRequest.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.byId = exports.list = void 0;
-const util = require("util");
+const util = require("node:util");
 const core_1 = require("@salesforce/core");
 const packageUtils_1 = require("../utils/packageUtils");
 core_1.Messages.importMessagesDirectory(__dirname);

package/lib/package/packageVersionReport.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageVersionReport = void 0;
 // Node
-const util = require("util");
+const util = require("node:util");
 // Local
 const core_1 = require("@salesforce/core");
 const pkgUtils = require("../utils/packageUtils");

package/lib/package/packageVersionRetrieve.js

@@ -7,8 +7,8 @@ exports.retrievePackageVersionMetadata = void 0;
  * 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
  */
-const path = require("path");
-const fs = require("fs");
+const path = require("node:path");
+const fs = require("node:fs");
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const kit_1 = require("@salesforce/kit");

package/lib/package/versionNumber.js

@@ -17,7 +17,7 @@ var BuildNumberToken;
     BuildNumberToken["RELEASED_BUILD_NUMBER_TOKEN"] = "RELEASED";
     BuildNumberToken["HIGHEST_VERSION_NUMBER_TOKEN"] = "HIGHEST";
     BuildNumberToken["NONE_VERSION_NUMBER_TOKEN"] = "NONE";
-})(BuildNumberToken = exports.BuildNumberToken || (exports.BuildNumberToken = {}));
+})(BuildNumberToken || (exports.BuildNumberToken = BuildNumberToken = {}));
 class VersionNumber {
     constructor(major, minor, patch, build) {
         this.major = major;

package/lib/package1/package1Version.js

@@ -7,7 +7,7 @@ exports.Package1Version = void 0;
  * 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
  */
-const os = require("os");
+const os = require("node:os");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const interfaces_1 = require("../interfaces");

package/lib/utils/packageUtils.js

@@ -7,13 +7,13 @@ exports.isPackageDirectoryEffectivelyEmpty = exports.replaceIfEmpty = exports.co
  * 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
  */
-const os = require("os");
-const fs = require("fs");
-const path_1 = require("path");
-const stream_1 = require("stream");
-const util = require("util");
-const util_1 = require("util");
-const crypto_1 = require("crypto");
+const os = require("node:os");
+const fs = require("node:fs");
+const node_path_1 = require("node:path");
+const node_stream_1 = require("node:stream");
+const util = require("node:util");
+const node_util_1 = require("node:util");
+const node_crypto_1 = require("node:crypto");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
@@ -64,7 +64,7 @@ exports.BY_LABEL = (() => Object.fromEntries(ID_REGISTRY.map((id) => [id.label.r
  * - length: the length of the unique id as presented in hexadecimal.
  */
 function uniqid(options) {
-    const uniqueString = (0, crypto_1.randomBytes)(Math.ceil((options?.length ?? 32) / 2.0))
+    const uniqueString = (0, node_crypto_1.randomBytes)(Math.ceil((options?.length ?? 32) / 2.0))
         .toString('hex')
         .slice(0, options?.length ?? 32);
     if (!options?.template) {
@@ -351,7 +351,7 @@ function numberToDuration(duration, unit = kit_1.Duration.Unit.MILLISECONDS) {
     return (0, ts_types_1.isNumber)(duration) ? new kit_1.Duration(duration, unit) : duration;
 }
 exports.numberToDuration = numberToDuration;
-const pipeline = (0, util_1.promisify)(stream_1.pipeline);
+const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
 /**
  * Zips directory to given zipfile.
  *
@@ -367,7 +367,7 @@ async function zipDir(dir, zipfile) {
     const zip = new JSZIP();
     // add files tp zip
     for (const file of globbyResult) {
-        zip.file(file, fs.readFileSync((0, path_1.join)(dir, file)));
+        zip.file(file, fs.readFileSync((0, node_path_1.join)(dir, file)));
     }
     // write zip to file
     const zipStream = zip.generateNodeStream({
@@ -392,8 +392,8 @@ function copyDir(src, dest) {
     fs.mkdirSync(dest, { recursive: true });
     const entries = fs.readdirSync(src, { withFileTypes: true });
     entries.map((entry) => {
-        const srcPath = (0, path_1.join)(src, entry.name);
-        const destPath = (0, path_1.join)(dest, entry.name);
+        const srcPath = (0, node_path_1.join)(src, entry.name);
+        const destPath = (0, node_path_1.join)(dest, entry.name);
         return entry.isDirectory() ? copyDir(srcPath, destPath) : fs.copyFileSync(srcPath, destPath);
     });
 }
@@ -423,7 +423,7 @@ function isPackageDirectoryEffectivelyEmpty(directory) {
     }
     const entries = fs.readdirSync(directory, { withFileTypes: true });
     return entries.every((entry) => entry.isDirectory()
-        ? isPackageDirectoryEffectivelyEmpty((0, path_1.join)(directory, entry.name))
+        ? isPackageDirectoryEffectivelyEmpty((0, node_path_1.join)(directory, entry.name))
         : entry.name === '.eslintrc.json');
 }
 exports.isPackageDirectoryEffectivelyEmpty = isPackageDirectoryEffectivelyEmpty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "2.4.18",
+  "version": "2.4.20",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -42,10 +42,10 @@
   ],
   "dependencies": {
     "@oclif/core": "^2.15.0",
-    "@salesforce/core": "^5.3.9",
+    "@salesforce/core": "^5.3.14",
     "@salesforce/kit": "^3.0.15",
-    "@salesforce/schemas": "^1.6.0",
-    "@salesforce/source-deploy-retrieve": "^9.7.28",
+    "@salesforce/schemas": "^1.6.1",
+    "@salesforce/source-deploy-retrieve": "^9.8.3",
     "@salesforce/ts-types": "^2.0.9",
     "fast-xml-parser": "^4.3.1",
     "globby": "^11",
@@ -58,23 +58,23 @@
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^4.4.8",
     "@salesforce/dev-config": "^4.1.0",
-    "@salesforce/dev-scripts": "^5.11.0",
+    "@salesforce/dev-scripts": "^5.12.2",
     "@salesforce/prettier-config": "^0.0.3",
-    "@salesforce/ts-sinon": "^1.4.18",
+    "@salesforce/ts-sinon": "^1.4.19",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.10",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-config-salesforce": "^2.0.2",
     "eslint-config-salesforce-license": "^0.2.0",
-    "eslint-config-salesforce-typescript": "^1.1.2",
+    "eslint-config-salesforce-typescript": "^2.0.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsdoc": "^44.2.7",
-    "eslint-plugin-sf-plugin": "^1.16.9",
+    "eslint-plugin-jsdoc": "^46.8.2",
+    "eslint-plugin-sf-plugin": "^1.16.13",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
@@ -83,7 +83,7 @@
     "shelljs": "0.8.5",
     "sinon": "14.0.2",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.5",
+    "typescript": "^5.2.2",
     "wireit": "^0.14.1"
   },
   "publishConfig": {