From 1f7eb9c029277726e4ea32551569454e2ace9d0f Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 29 Nov 2023 11:51:43 +0300
Subject: [PATCH] improve validate version message

---
 npm/scripts/validate-versions.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/npm/scripts/validate-versions.ts b/npm/scripts/validate-versions.ts
index 98f636351ac..4583c620e21 100644
--- a/npm/scripts/validate-versions.ts
+++ b/npm/scripts/validate-versions.ts
@@ -43,7 +43,7 @@ async function compare() {
       !excludedPackages.includes(pkgJson.name) &&
       pkgJson.version !== compareVersion
     ) {
-      throwError(pkgJsonPath, pkgJson.name);
+      throwError(pkgJsonPath, pkgJson.name, pkgJson.version);
     }
 
     const { dependencies, peerDependencies } = pkgJson;
@@ -63,13 +63,15 @@ async function compareDependencies(
 
   for (let i = 0; i < entries.length; i++) {
     const entry = entries[i];
-
+    const packageName = entry[0];
+    const version = getCleanVersionName(entry[1]);
+    const cleanCompareVersion = getCleanVersionName(compareVersion);
     if (
       !excludedPackages.includes(entry[0]) &&
-      entry[0].match(/@(abp|volo)/)?.length &&
-      entry[1] !== `~${compareVersion}`
+      packageName.match(/@(abp|volo)/)?.length &&
+      version !== cleanCompareVersion
     ) {
-      throwError(filePath, entry[0], `~${compareVersion}`);
+      throwError(filePath, entry[0], cleanCompareVersion);
     }
   }
 }
@@ -77,6 +79,11 @@ async function compareDependencies(
 function throwError(filePath: string, pkg: string, version?: string) {
   const { compareVersion } = program.opts();
 
-  log.error(`${filePath}: ${pkg} version is not ${version || compareVersion}`);
+  log.error(`${filePath}: ${pkg} version is not ${compareVersion}. it is ${version}`);
   process.exit(1);
 }
+
+function getCleanVersionName(version) {
+  // Remove caret (^) or tilde (~) from the beginning of the version number
+  return version.replace(/^[\^~]+/, '');
+}
\ No newline at end of file