use version instead of string

Author: guillaume-kotulski

editor/src/ctx.ts

@@ -286,8 +286,8 @@ export class Ctx {
             const parsed = vscode.Uri.parse(params.uri).fsPath;
             const packageFolder = path.dirname(path.dirname(parsed));
 
-            const packageManager = new PackageManager(packageFolder, undefined, session.accessToken,
-                this.get4DVersion().toString(false).replace("R", "."));
+            const packageManager = new PackageManager(packageFolder, session.accessToken,
+                this.get4DVersion().toString(false), undefined);
             await packageManager.initialize();
             let options: FetchOptions = {};
             packageManager.fetch(options).then(() => {

packageManager/src/PackageManager.test.ts

@@ -9,7 +9,7 @@ import { GitHubDependency } from './dependency/GithubDependency';
 // Cross-platform test paths
 const TEST_PROJECT_PATH = path.resolve('/tmp/test-project');
 const TEST_CACHE_PATH = path.resolve('/tmp/test-cache');
-
+const TEST_IDE_VERSION = "21.2.0";
 // Mock dependencies
 vi.mock('./config/ConfigReader');
 vi.mock('./cache/CacheManager');
@@ -70,7 +70,7 @@ describe('PackageManager', () => {
             checkOutdated: vi.fn()
         }) as unknown as GitHubDependency);
 
-        packageManager = new PackageManager(TEST_PROJECT_PATH);
+        packageManager = new PackageManager(TEST_PROJECT_PATH, TEST_IDE_VERSION);
     });
 
     describe('fetchRecursively', () => {
@@ -100,7 +100,7 @@ describe('PackageManager', () => {
                 compare: vi.fn()
             }) as unknown as GitHubDependency);
 
-            packageManager = new PackageManager(TEST_PROJECT_PATH);
+            packageManager = new PackageManager(TEST_PROJECT_PATH, TEST_IDE_VERSION);
             await packageManager.initialize();
             const result = await packageManager.fetch();
 
@@ -136,7 +136,7 @@ describe('PackageManager', () => {
                 } as unknown as GitHubDependency;
             });
 
-            packageManager = new PackageManager(TEST_PROJECT_PATH);
+            packageManager = new PackageManager(TEST_PROJECT_PATH, TEST_IDE_VERSION);
             await packageManager.initialize();
             const result = await packageManager.fetch();
 
@@ -188,7 +188,7 @@ describe('PackageManager', () => {
                 } as unknown as GitHubDependency;
             });
 
-            packageManager = new PackageManager(TEST_PROJECT_PATH);
+            packageManager = new PackageManager(TEST_PROJECT_PATH, TEST_IDE_VERSION);
             await packageManager.initialize();
             const result = await packageManager.fetch();
 
@@ -217,7 +217,7 @@ describe('PackageManager', () => {
                 } as unknown as GitHubDependency;
             });
 
-            packageManager = new PackageManager(TEST_PROJECT_PATH);
+            packageManager = new PackageManager(TEST_PROJECT_PATH, TEST_IDE_VERSION);
             await packageManager.initialize();
             const result = await packageManager.fetch({ filter: ['dep1'] });
 
@@ -253,7 +253,7 @@ describe('PackageManager', () => {
                 } as unknown as GitHubDependency;
             });
 
-            packageManager = new PackageManager(TEST_PROJECT_PATH);
+            packageManager = new PackageManager(TEST_PROJECT_PATH, TEST_IDE_VERSION);
             await packageManager.initialize();
             await packageManager.fetch();
 

packageManager/src/PackageManager.ts

@@ -12,6 +12,7 @@ import {
     FetchResult
 } from './types';
 import { GithubFetcher } from './dependency/GithubFetcher';
+import { Version } from './version/Version';
 
 /**
  * Main package manager orchestrator
@@ -25,9 +26,9 @@ export class PackageManager {
     private dependencies: DependenciesFile | null = null;
     private lock: LockFile | null = null;
     private reconciled: Map<string, GitHubDependency> = new Map();
-    private ideVersion: string | null = null;
+    private ideVersion: Version;
 
-    constructor(projectPath: string, cacheFolder?: string, authToken?: string, ideVersion?: string) {
+    constructor(projectPath: string, ideVersion: string, authToken?: string, cacheFolder?: string) {
         // Validate inputs
         if (!projectPath || typeof projectPath !== 'string') {
             throw new Error('Project path is required and must be a string');
@@ -42,7 +43,7 @@ export class PackageManager {
         this.configReader = new ConfigReader(projectPath);
         this.cacheManager = new CacheManager(cacheFolder);
         this.fetcher = new GithubFetcher(authToken);
-        this.ideVersion = ideVersion || null;
+        this.ideVersion = new Version(ideVersion);
     }
 
     /**
@@ -199,7 +200,7 @@ export class PackageManager {
 
                 const lockEntry = this.lock!.dependencies[name];
                 const fetched = await dep.fetch(
-                    this.ideVersion || '',
+                    this.ideVersion,
                     this.environment!,
                     lockEntry,
                     this.fetcher!,
@@ -333,7 +334,7 @@ export class PackageManager {
             if (lockEntry) {
                 await dep.checkOutdated(
                     this.fetcher,
-                    this.ideVersion || '',
+                    this.ideVersion,
                     lockEntry,
                     this.cacheManager
                 );

packageManager/src/dependency/Dependency.ts

@@ -3,6 +3,7 @@ import { Fetcher } from "./Fetcher";
 import { Range } from "../version/Range";
 import { assert } from "console";
 import { Package } from "./Package";
+import { Version } from "../version/Version";
 
 export class Dependency {
 
@@ -129,7 +130,7 @@ export class Dependency {
      */
     protected async resolveVersion(
         fetcher: Fetcher,
-        ideVersion: string
+        ideVersion: Version
     ): Promise<string | null> {
 
         const owner = this._owner;
@@ -146,7 +147,7 @@ export class Dependency {
 
         // If "4d" keyword, match IDE version
         if (this._version.toLowerCase() === '4d') {
-            const range = new Range(`^${ideVersion}`);
+            const range = new Range(this._version, ideVersion);
             return await this.resolveRange(fetcher, owner, repo, range);
 
         }

packageManager/src/dependency/GithubDependency.ts

@@ -10,6 +10,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs/promises';
 import { Dependency } from './Dependency';
+import { Version } from '../version/Version';
 
 /**
  * GitHub-based dependency implementation
@@ -34,7 +35,7 @@ export class GitHubDependency extends Dependency {
    * Fetch this dependency
    */
   async fetch(
-    ideVersion: string,
+    ideVersion: Version,
     env: Environment,
     lock: LockEntry,
     fetcher: Fetcher,
@@ -132,7 +133,7 @@ export class GitHubDependency extends Dependency {
    */
   async checkOutdated(
     fetcher: Fetcher,
-    ideVersion: string,
+    ideVersion: Version,
     lock: LockEntry,
     cacheManager: CacheManager
   ): Promise<void> {
@@ -146,9 +147,7 @@ export class GitHubDependency extends Dependency {
 
       // Get current range
       const rangeSpec = this.version || 'latest';
-      const range = rangeSpec.toLowerCase() === '4d'
-        ? new Range(`^${ideVersion}`)
-        : new Range(rangeSpec);
+      const range = new Range(rangeSpec, ideVersion)
 
       // Get available versions
       const releases = await fetcher.getReleases(owner, repo);

packageManager/src/version/Range.ts

@@ -9,15 +9,15 @@ export class Range {
   private range: semver.Range;
   private rangeSpec: string;
 
-  constructor(rangeSpec: string, ideVersion?: string) {
+  constructor(rangeSpec: string, ideVersion?: Version) {
     this.rangeSpec = rangeSpec;
 
     // Handle special keywords
     if (rangeSpec === 'latest' || rangeSpec === '*' || !rangeSpec) {
       this.range = new semver.Range('*');
     } else if (rangeSpec.toLowerCase() === '4d') {
       // Match IDE version
-      const version = ideVersion || this.getIDEVersion();
+      const version = ideVersion?.toIDEString();
       this.range = new semver.Range(`^${version}`);
     } else {
       // Parse as semver range
@@ -119,23 +119,12 @@ export class Range {
     return this.rangeSpec;
   }
 
-  /**
-   * Get IDE version from environment or use default
-   */
-  private getIDEVersion(): string {
-    // Check environment variable
-    if (process.env.IDE_VERSION) {
-      return process.env.IDE_VERSION;
-    }
 
-    // Default to 21.2.0 (2-digit year format)
-    return '21.2.0';
-  }
 
   /**
    * Static factory method
    */
-  static parse(rangeSpec: string, ideVersion?: string): Range | null {
+  static parse(rangeSpec: string, ideVersion?: Version): Range | null {
     try {
       return new Range(rangeSpec, ideVersion);
     } catch {
@@ -153,23 +142,23 @@ export class Range {
   /**
    * Check if a version satisfies a range (static helper)
    */
-  static satisfies(version: string, rangeSpec: string, ideVersion?: string): boolean {
+  static satisfies(version: string, rangeSpec: string, ideVersion?: Version): boolean {
     const range = new Range(rangeSpec, ideVersion);
     return range.satisfiedBy(version);
   }
 
   /**
    * Find max satisfying version (static helper)
    */
-  static maxSatisfying(versions: string[], rangeSpec: string, ideVersion?: string): string | null {
+  static maxSatisfying(versions: string[], rangeSpec: string, ideVersion?: Version): string | null {
     const range = new Range(rangeSpec, ideVersion);
     return range.maxSatisfying(versions);
   }
 
   /**
    * Find min satisfying version (static helper)
    */
-  static minSatisfying(versions: string[], rangeSpec: string, ideVersion?: string): string | null {
+  static minSatisfying(versions: string[], rangeSpec: string, ideVersion?: Version): string | null {
     const range = new Range(rangeSpec, ideVersion);
     return range.minSatisfying(versions);
   }

packageManager/src/version/Version.ts

@@ -8,6 +8,7 @@ import { VersionInfo } from '../types';
 export class Version {
   private semver: semver.SemVer;
   public isR: boolean = false;
+  public isMain: boolean = false;
   public raw: string;
 
   constructor(versionString: string) {
@@ -36,6 +37,7 @@ export class Version {
       throw new Error(`Invalid version: ${versionString}`);
     }
     this.semver = parsed;
+    this.isMain = this.semver.major == 0;
   }
 
   /**
@@ -127,7 +129,7 @@ export class Version {
    * Convert to 4D IDE version string (e.g., "21.2")
    */
   toIDEString(): string {
-    return `${this.major}.${this.minor}`;
+    return `${this.major}.${this.minor}.${this.patch}`;
   }
 
   /**

packageManager/test/github-dependency.test.ts

@@ -4,6 +4,7 @@ import type { DependencySpec, LockEntry, Environment } from '../src/types';
 import type { Fetcher } from '../src/dependency/Fetcher';
 import type { CacheManager } from '../src/cache/CacheManager';
 import * as fs from 'fs/promises';
+import { Version } from '../src/version/Version';
 
 describe('GitHubDependency', () => {
 
@@ -157,7 +158,7 @@ describe('GitHubDependency', () => {
       const spec: DependencySpec = { github: 'invalid', version: '^1.0.0' };
       const dep = new GitHubDependency(spec, true);
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(result).toBe(false);
       expect(mockFetcher.downloadReleaseAsset).not.toHaveBeenCalled();
@@ -172,7 +173,7 @@ describe('GitHubDependency', () => {
         { id: 1, tag_name: 'v1.0.0', name: 'v1.0.0', draft: false, prerelease: false },
       ]);
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(result).toBe(false);
       expect(lock.update?.errors).toBeDefined();
@@ -188,7 +189,7 @@ describe('GitHubDependency', () => {
         getListDependencies: vi.fn().mockResolvedValue({ dependencies: {} }),
       });
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager, false);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager, false);
 
       expect(result).toBe(false); // Skipped, already cached
       expect(lock.found).toBe(true);
@@ -203,7 +204,7 @@ describe('GitHubDependency', () => {
       // Mock getPackage to return null (not cached)
       vi.spyOn(dep, 'getPackage' as any).mockResolvedValue(null);
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(result).toBe(true);
       expect(mockFetcher.downloadReleaseAsset).toHaveBeenCalledWith('owner', 'repo', 'v1.1.0');
@@ -223,7 +224,7 @@ describe('GitHubDependency', () => {
         getListDependencies: vi.fn().mockResolvedValue({ dependencies: {} }),
       });
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager, true);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager, true);
 
       expect(result).toBe(true);
       expect(mockFetcher.downloadReleaseAsset).toHaveBeenCalled();
@@ -236,7 +237,7 @@ describe('GitHubDependency', () => {
 
       vi.spyOn(dep, 'getPackage' as any).mockResolvedValue(null);
 
-      await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(lock.htmlURL).toBe('https://github.com/owner/repo/releases/tag/v1.1.0');
       expect(lock.archiveURL).toBe('https://github.com/owner/repo/releases/download/v1.1.0/repo.zip');
@@ -250,7 +251,7 @@ describe('GitHubDependency', () => {
 
       mockEnv.github.htmlURL = 'https://github.mycompany.com';
 
-      await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(lock.htmlURL).toBe('https://github.mycompany.com/owner/repo/releases/tag/v1.1.0');
     });
@@ -262,7 +263,7 @@ describe('GitHubDependency', () => {
       vi.spyOn(dep, 'getPackage' as any).mockResolvedValue(null);
       mockFetcher.downloadReleaseAsset = vi.fn().mockRejectedValue(new Error('Network error'));
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(result).toBe(false);
       expect(lock.found).toBe(false);
@@ -276,7 +277,7 @@ describe('GitHubDependency', () => {
       vi.spyOn(dep, 'getPackage' as any).mockResolvedValue(null);
       mockCacheManager.extractArchive = vi.fn().mockRejectedValue(new Error('Extraction failed'));
 
-      const result = await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      const result = await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(result).toBe(false);
       expect(lock.found).toBe(false);
@@ -295,7 +296,7 @@ describe('GitHubDependency', () => {
         }),
       });
 
-      await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager, false);
+      await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager, false);
 
       expect(lock.dependencies).toEqual({
         'subDep': { github: 'other/subdep', version: '^1.0.0' }
@@ -308,7 +309,7 @@ describe('GitHubDependency', () => {
 
       vi.spyOn(dep, 'getPackage' as any).mockResolvedValue(null);
 
-      await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(lock.tag).toBe('v2.0.0-beta');
       expect(mockFetcher.getReleases).not.toHaveBeenCalled();
@@ -322,7 +323,7 @@ describe('GitHubDependency', () => {
       vi.spyOn(dep, 'getPackage' as any).mockResolvedValue(null);
       mockFetcher.getLatestRelease = vi.fn().mockResolvedValue({ tag_name: 'v3.0.0' });
 
-      await dep.fetch('20.0.0', mockEnv, lock, mockFetcher, mockCacheManager);
+      await dep.fetch(new Version('20.0.0'), mockEnv, lock, mockFetcher, mockCacheManager);
 
       expect(lock.tag).toBe('v3.0.0');
       expect(mockFetcher.getLatestRelease).toHaveBeenCalledWith('owner', 'repo');