Refactoring

Author: edvilme

src/common/pythonVersion.ts

@@ -1,16 +1,26 @@
-export type PythonReleaseLevel = 'alpha' | 'beta' | 'candidate' | 'final';
+type PythonReleaseLevel = 'alpha' | 'beta' | 'candidate' | 'final';
 
-const VERSION_PATTERN =
-    /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:(?:\.(alpha|beta|candidate|final)\.(\d+))|(?:(a|b|rc)(\d+)))?$/i;
+export class PythonVersion {
+    private static readonly VERSION_PATTERN =
+        /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:(?:\.(alpha|beta|candidate|final)\.(\d+))|(?:(a|b|rc)(\d+)))?$/i;
 
-const releaseLevelOrder: Record<PythonReleaseLevel, number> = {
-    alpha: 0,
-    beta: 1,
-    candidate: 2,
-    final: 3,
-};
+    private static readonly RELEASE_LEVEL_ALIASES: Readonly<Record<string, PythonReleaseLevel>> = {
+        a: 'alpha',
+        alpha: 'alpha',
+        b: 'beta',
+        beta: 'beta',
+        rc: 'candidate',
+        candidate: 'candidate',
+        final: 'final',
+    };
+
+    private static readonly RELEASE_LEVEL_ORDER: Readonly<Record<PythonReleaseLevel, number>> = {
+        alpha: 0,
+        beta: 1,
+        candidate: 2,
+        final: 3,
+    };
 
-export class PythonVersion {
     /**
      * Creates a normalized Python release version.
      *
@@ -22,15 +32,15 @@ export class PythonVersion {
      * @param version A Python release version.
      */
     constructor(version: string) {
-        const match = VERSION_PATTERN.exec(version.trim());
+        const match = PythonVersion.VERSION_PATTERN.exec(version.trim());
         if (!match) {
             throw new TypeError(`Invalid Python version: ${version}`);
         }
 
         this.major = parseNumericComponent(match[1], version);
         this.minor = parseNumericComponent(match[2], version);
         this.patch = parseNumericComponent(match[3], version);
-        this.releaseLevel = normalizeReleaseLevel(match[4] ?? match[6]);
+        this.releaseLevel = PythonVersion.normalizeReleaseLevel(match[4] ?? match[6]);
         this.releaseSerial = parseNumericComponent(match[5] ?? match[7], version);
     }
 
@@ -70,7 +80,10 @@ export class PythonVersion {
             compareNumbers(this.major, other.major) ||
             compareNumbers(this.minor, other.minor) ||
             compareNumbers(this.patch, other.patch) ||
-            compareNumbers(releaseLevelOrder[this.releaseLevel], releaseLevelOrder[other.releaseLevel]) ||
+            compareNumbers(
+                PythonVersion.RELEASE_LEVEL_ORDER[this.releaseLevel],
+                PythonVersion.RELEASE_LEVEL_ORDER[other.releaseLevel],
+            ) ||
             compareNumbers(this.releaseSerial, other.releaseSerial)
         );
     }
@@ -89,6 +102,10 @@ export class PythonVersion {
                 return release;
         }
     }
+
+    private static normalizeReleaseLevel(value: string | undefined): PythonReleaseLevel {
+        return value ? (PythonVersion.RELEASE_LEVEL_ALIASES[value.toLowerCase()] ?? 'final') : 'final';
+    }
 }
 
 function parseNumericComponent(value: string | undefined, version: string): number {
@@ -102,19 +119,3 @@ function parseNumericComponent(value: string | undefined, version: string): numb
 function compareNumbers(left: number, right: number): number {
     return left === right ? 0 : left < right ? -1 : 1;
 }
-
-function normalizeReleaseLevel(value: string | undefined): PythonReleaseLevel {
-    switch (value?.toLowerCase()) {
-        case 'a':
-        case 'alpha':
-            return 'alpha';
-        case 'b':
-        case 'beta':
-            return 'beta';
-        case 'rc':
-        case 'candidate':
-            return 'candidate';
-        default:
-            return 'final';
-    }
-}