fix: auto path for model.json on Windows, include server/node_modules

Author: Leoo-code

vscode-extension/.vscodeignore

@@ -4,7 +4,7 @@
 **/tsconfig.json
 **/jest.config*
 **/coverage/**
-server/node_modules/**
 client/node_modules/**
 node_modules/**
 **/.gitignore
+model.json

vscode-extension/client/src/extension.ts

@@ -5,7 +5,6 @@ import { ExtensionContext } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient/node';
 import { registerCommands } from './commands';
 import { FamixModelProvider } from './modelTreeProvider';
-import { ModelWebviewProvider } from './modelWebviewProvider';
 
 let client: LanguageClient;
 const extensionName = 'ts2famixExtension';
@@ -25,36 +24,24 @@ export async function activate(context: ExtensionContext) {
     await client.start();
 
     const modelProvider = new FamixModelProvider();
-    const webviewProvider = new ModelWebviewProvider();
     vscode.window.registerTreeDataProvider('ts2famixModel', modelProvider);
 
-    const getModelPath = () => {
+    const refreshModel = () => {
         const config = vscode.workspace.getConfiguration('ts2famix');
         let modelPath = config.get<string>('FamixModelOutputFilePath', '');
+    
         if (!modelPath) {
             const workspaceFolders = vscode.workspace.workspaceFolders;
             if (workspaceFolders && workspaceFolders.length > 0) {
                 modelPath = path.join(workspaceFolders[0].uri.fsPath, 'model.json');
             }
         }
-        return modelPath;
-    };
-
-    const refreshModel = () => {
-        const modelPath = getModelPath();
+    
         if (modelPath && fs.existsSync(modelPath)) {
             modelProvider.refresh(modelPath);
         }
     };
 
-    // Commande pour ouvrir la webview
-    context.subscriptions.push(
-        vscode.commands.registerCommand('ts2famix.showDiagram', () => {
-            const modelPath = getModelPath();
-            webviewProvider.show(modelPath, context);
-        })
-    );
-
     const modelWatcher = vscode.workspace.createFileSystemWatcher('**/*.json');
     modelWatcher.onDidChange(refreshModel);
     modelWatcher.onDidCreate(refreshModel);
@@ -68,4 +55,4 @@ export async function activate(context: ExtensionContext) {
 export function deactivate(): Thenable<void> | undefined {
     if (!client) { return undefined; }
     return client.stop();
-}
+}

vscode-extension/client/src/test/runTest.ts

@@ -1,18 +1,17 @@
 import * as path from 'path';
 import { runTests } from '@vscode/test-electron';
 
+// https://code.visualstudio.com/api/working-with-extensions/testing-extension#custom-setup-with-atvscodetestelectron
 async function main() {
     try {
         const extensionDevelopmentPath = path.resolve(__dirname, '../../../');
         const extensionTestsPath = path.resolve(__dirname, './suite/index');
-        const workspacePath = path.resolve(__dirname, '../../src/test/fixtures/project-with-tsconfig');
-        
+
         await runTests({
             extensionDevelopmentPath,
             extensionTestsPath,
             launchArgs: [
-                workspacePath,
-                '--disable-extensions'
+                '--disable-extensions' // Disable all other extensions
             ]
         });
     } catch {

vscode-extension/client/src/test/suite/smoke/smoke.test.ts

@@ -2,8 +2,7 @@ import { TestHelper } from '../../helper';
 import * as vscode from 'vscode';
 import * as assert from 'assert';
 
-suite('Smoke Tests', function() {
-    this.timeout(30000);
+suite('Smoke Tests', () => {  
     test('Extension loads and activates without errors', async () => {
         const extensionId = TestHelper.getExtensionId();
         const extension = vscode.extensions.getExtension(extensionId);
@@ -38,40 +37,10 @@ suite('Smoke Tests', function() {
             const response = await client.sendRequest<{result?: null; error?: string;}>('generateModelForProject', { filePath: mockFilePath });
 
             assert.ok(response, 'Should receive a response from the server');
-            assert.strictEqual(response.result, null, 'Response should indicate failure due to mock path');
-            //assert.ok(response.error, 'Response should include an error message');
+            assert.strictEqual(response.result, undefined, 'Response should indicate failure due to mock path');
+            assert.ok(response.error, 'Response should include an error message');
         } catch (error) {
             assert.fail(`Failed to communicate with the server: ${error}`);
         }
     });
-    test('Generates Famix model for a TypeScript project', async function() {
-        const fs = require('fs');
-        const path = require('path');
-
-        const fixturePath = path.resolve(__dirname, '../../../../src/test/fixtures/project-with-tsconfig');
-        const modelPath = path.join(fixturePath, 'model.json');
-
-        // S'assurer que model.json n'existe pas avant le test
-        if (fs.existsSync(modelPath)) {
-            fs.unlinkSync(modelPath);
-        }
-        assert.ok(!fs.existsSync(modelPath), 'model.json should not exist before the test');
-
-        // Configurer le chemin du modèle
-        const config = vscode.workspace.getConfiguration('ts2famix');
-        await config.update('FamixModelOutputFilePath', modelPath, vscode.ConfigurationTarget.Global);
-
-        // Invoquer la commande de génération
-        await vscode.commands.executeCommand('ts2famix.generateModelForProject');
-
-        // Attendre que le fichier soit généré
-        await new Promise(resolve => setTimeout(resolve, 8000));
-
-        // Vérifier que model.json existe
-        assert.ok(fs.existsSync(modelPath), 'model.json should exist after generation');
-
-        // Nettoyer
-        fs.unlinkSync(modelPath);
-        assert.ok(!fs.existsSync(modelPath), 'model.json should be deleted after the test');
-    });
 });