@salesforce/packaging 4.17.0 → 4.17.1

package/lib/package/package.js

@@ -247,6 +247,12 @@ class Package {
             if (opts.RecommendedVersionId !== undefined && this.options.connection.getApiVersion() < '66.0') {
                 throw messages.createError('recommendedVersionIdApiPriorTo66Error');
             }
+            if (opts.RecommendedVersionId !== undefined) {
+                const trimmedId = opts.RecommendedVersionId.trim();
+                if (trimmedId === '' || !trimmedId.startsWith('04t') || (trimmedId.length !== 15 && trimmedId.length !== 18)) {
+                    throw messages.createError('invalidRecommendedVersionError');
+                }
+            }
             if (skipAncestorCheck === true && opts.RecommendedVersionId === undefined) {
                 throw messages.createError('skipAncestorCheckRequiresRecommendedVersionIdError');
             }
@@ -305,23 +311,30 @@ class Package {
             return;
         }
         const graph = new graphology_1.DirectedGraph();
-        const stack = [opts.RecommendedVersionId];
-        const visited = new Set([opts.RecommendedVersionId]);
+        const truncatedRecommendedVersionId = opts.RecommendedVersionId.substring(0, 15);
+        const stack = [truncatedRecommendedVersionId];
+        const visited = new Set([truncatedRecommendedVersionId]);
         result.records.forEach((record) => {
-            graph.addNode(record.SubscriberPackageVersionId);
+            const truncatedSubscriberId = record.SubscriberPackageVersionId.substring(0, 15);
+            graph.addNode(truncatedSubscriberId);
             if (record.AncestorId) {
-                if (!graph.hasNode(record.AncestorId)) {
-                    graph.addNode(record.AncestorId);
+                const truncatedAncestorId = record.AncestorId.substring(0, 15);
+                if (!graph.hasNode(truncatedAncestorId)) {
+                    graph.addNode(truncatedAncestorId);
                 }
-                graph.addEdge(record.SubscriberPackageVersionId, record.AncestorId);
+                graph.addEdge(truncatedSubscriberId, truncatedAncestorId);
             }
         });
-        if (graph.outDegree(opts.RecommendedVersionId) > 0 &&
-            result.records.some((record) => record.SubscriberPackageVersionId === priorRecommendedVersionId)) {
+        if (!graph.hasNode(truncatedRecommendedVersionId)) {
+            throw messages.createError('unassociatedRecommendedVersionError');
+        }
+        const truncatedPriorRecommendedVersionId = priorRecommendedVersionId?.substring(0, 15);
+        if (graph.outDegree(truncatedRecommendedVersionId) > 0 &&
+            result.records.some((record) => record.SubscriberPackageVersionId.substring(0, 15) === truncatedPriorRecommendedVersionId)) {
             while (stack.length > 0) {
                 const node = stack.pop();
                 for (const neighbor of graph.neighbors(node)) {
-                    if (neighbor === priorRecommendedVersionId) {
+                    if (neighbor === truncatedPriorRecommendedVersionId) {
                         return;
                     }
                     if (!visited.has(neighbor)) {
@@ -331,7 +344,7 @@ class Package {
                 }
             }
         }
-        else if (graph.outDegree(opts.RecommendedVersionId) === 0 && result.records.length === 1) {
+        else if (graph.outDegree(truncatedRecommendedVersionId) === 0 && result.records.length === 1) {
             return;
         }
         throw messages.createError('recommendedVersionNotAncestorOfPriorVersionError');

package/messages/package.md

@@ -61,3 +61,11 @@ No package versions were found for the given Package 2 ID (0Ho). At least one re
 # recommendedVersionNotAncestorOfPriorVersionError
 
 The new recommended version is not a descendant of the previous recommended version. To bypass this check, use the --skip-ancestor-check CLI flag.
+
+# invalidRecommendedVersionError
+
+Provide a valid subscriber package version (04t) for the recommended version.
+
+# unassociatedRecommendedVersionError
+
+The provided recommended version isn't associated with this package.

package/messages/package_version_create.md

@@ -92,11 +92,11 @@ Provide a valid positive number for %s. %d
 
 # errorAncestorNoneNotAllowed
 
-Can’t create package version because you didn’t specify a package ancestor. Set the ancestor version to %s, and try creating the package version. You can also specify --skipancestorcheck to override the ancestry requirement.
+Can’t create package version because you didn’t specify a package ancestor. Set the ancestor version to %s and try creating the package version again. You can also specify --skip-ancestor-check to override the ancestry requirement.
 
 # errorAncestorNotHighest
 
-Can’t create package version. The ancestor version [%s] you specified isn’t the highest released package version. Set the ancestor version to %s, and try creating the package version again. You can also specify --skipancestorcheck to override the ancestry requirement.
+Can’t create package version. The ancestor version [%s] you specified isn’t the highest released package version. Set the ancestor version to %s and try creating the package version again. You can also specify --skip-ancestor-check to override the ancestry requirement.
 
 # errorInvalidBuildNumberForKeywords
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "4.17.0",
+  "version": "4.17.1",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",