From f457dc7d2f401e70022e335e61348d08d7beaad4 Mon Sep 17 00:00:00 2001 From: Meisam Seyed Aliroteh Date: Thu, 15 May 2025 08:53:26 -0700 Subject: [PATCH 1/2] fix: update version recommendation logic --- package.json | 4 +++- src/shared/orgUtils.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c529a69c..1ce62de5 100644 --- a/package.json +++ b/package.json @@ -219,11 +219,13 @@ } }, "apiVersionMetadata": { - "comment": "Refer to ApiVersionMetadata in orgUtils.ts for details", + "comment1": "Refer to ApiVersionMetadata in orgUtils.ts for more details.", + "comment2": "target section defines the dev server version (matchingDevServerVersion) and the API version that it can support (versionNumber).", "target": { "versionNumber": "64.0", "matchingDevServerVersion": "~11.5.0" }, + "comment3": "versionToTagMappings section defines the mapping between released tags for our CLI plugin and the org version that each tag supports.", "versionToTagMappings": [ { "versionNumber": "62.0", diff --git a/src/shared/orgUtils.ts b/src/shared/orgUtils.ts index 4dce6e68..c2caca4a 100644 --- a/src/shared/orgUtils.ts +++ b/src/shared/orgUtils.ts @@ -177,8 +177,9 @@ export class OrgUtils { if (Version.same(orgVersion, targetVersion) === false) { let errorMessage = messages.getMessage('error.org.api-mismatch.message', [orgVersion, targetVersion]); + // Find the tag (if any) that can support this org version const tagName = pkg.apiVersionMetadata.versionToTagMappings.find( - (info) => info.versionNumber === targetVersion + (info) => info.versionNumber === orgVersion )?.tagName; if (tagName) { const remediation = messages.getMessage('error.org.api-mismatch.remediation', [ From 22f5a6bb72f0def21ab310165ee955ce4ef9cddf Mon Sep 17 00:00:00 2001 From: Meisam Seyed Aliroteh Date: Thu, 15 May 2025 09:52:58 -0700 Subject: [PATCH 2/2] chore: address feedback --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1ce62de5..5971c4c2 100644 --- a/package.json +++ b/package.json @@ -219,13 +219,15 @@ } }, "apiVersionMetadata": { - "comment1": "Refer to ApiVersionMetadata in orgUtils.ts for more details.", - "comment2": "target section defines the dev server version (matchingDevServerVersion) and the API version that it can support (versionNumber).", + "x-apiVersionMetadata-comments": [ + "Refer to ApiVersionMetadata in orgUtils.ts for more details.", + "The 'target' section defines the dev server version (matchingDevServerVersion) and the API version that it can support (versionNumber).", + "The 'versionToTagMappings' section defines the mapping between released tags for our CLI plugin and the org version that each tag supports." + ], "target": { "versionNumber": "64.0", "matchingDevServerVersion": "~11.5.0" }, - "comment3": "versionToTagMappings section defines the mapping between released tags for our CLI plugin and the org version that each tag supports.", "versionToTagMappings": [ { "versionNumber": "62.0",