fix: release

Co-authored-by: m.schnitzler <martin.wb.2015@gmail.com>

.drone.yml

@@ -18,6 +18,7 @@ steps:
       commands:
           - npm install -g vsce
           - npm ci
+          - xvfb-run -a npm test
           - vsce package
 
     - name: gitea_release

.gitignore

@@ -1,5 +1,4 @@
 out
-dist
 node_modules
 .vscode-test/
 *.vsix
@@ -31,3 +30,7 @@ coverage/
 .config/
 data/
 .aider*
+/dist/
+tsconfig.tsbuildinfo
+.twig-cs-fixer.cache
+testfront-screenshots/

.gitleaks.toml

@@ -0,0 +1,5 @@
+[extend]
+useDefault = true
+
+[allowlist]
+paths = ['''\.vscode-test/''']

.lintstagedrc

@@ -1,8 +1,9 @@
 {
     "*.js": ["eslint --fix", "prettier --write"],
+    "*.ts": ["eslint --fix", "prettier --write"],
     "*.css": ["prettier --write"],
     "*.jsx": ["prettier --write"],
-    "*.html.twig": ["twig-cs-fixer lint --fix", "myhtmlvalidate -q"],
+    "*.tsx": ["prettier --write"],
     "*.php": ["php-cs-fixer fix --config .php-cs-fixer.php"],
     "Dockerfile": ["hadolint --ignore DL3002 --ignore DL3003 --ignore DL3008 --ignore DL3013 --ignore DL3016 --ignore DL3022"],
     "*.md": ["markdownlint --fix"],

.npmrc

@@ -1 +1,3 @@
 min-release-age=1
+fund=false
+audit=false

.prettierignore

@@ -4,3 +4,7 @@ log/*
 node_modules/*
 coverage/*
 data/*
+.vscode-test/
+/dist/
+tsconfig.tsbuildinfo
+legacy/*

README.md

@@ -5,14 +5,15 @@ collect stats about a user's activity in vscode
 ## Features
 
 it can track :
+
 - file opening
 - file saving
 - window focus
 
 ## Extension Settings
 
-* `vscodestat.setUrl`: function to set the remote server's url
+- `vscodestat.setUrl`: function to set the remote server's url
-this will set the variable vscodestat.url
+  this will set the variable vscodestat.url
-* `vscodestat.callUrl`: funciton to test if it works
+- `vscodestat.callUrl`: funciton to test if it works
 
 Sample url : https://xxxxxx/vscodestat?userName=raf

eslint.config.js

@@ -4,6 +4,8 @@ import tsplugin from '@typescript-eslint/eslint-plugin';
 import globals from 'globals';
 
 export default [
+    // remonte (et --fix supprime) tout eslint-disable inutile : regle deja off, inactive, ou qui ne tire pas
+    { linterOptions: { reportUnusedDisableDirectives: 'error' } },
     js.configs.recommended,
     {
         files: ['**/*.ts'],
@@ -30,10 +32,10 @@ export default [
                     format: ['camelCase', 'PascalCase'],
                 },
             ],
-            'curly': 'warn',
+            curly: 'warn',
-            'eqeqeq': 'warn',
+            eqeqeq: 'warn',
             'no-throw-literal': 'warn',
-            'semi': 'off',
+            semi: 'off',
             // Règles générales réutilisées de flatbay
             'prefer-const': ['error', { destructuring: 'all' }],
             'no-var': 'error',
@@ -45,7 +47,7 @@ export default [
             'one-var-declaration-per-line': ['error', 'always'],
             'one-var': ['error', 'never'],
             'vars-on-top': 'error',
-            'yoda': 'error',
+            yoda: 'error',
             'prefer-arrow-callback': 'error',
             'no-implicit-globals': 'error',
             'no-labels': 'error',
@@ -61,6 +63,6 @@ export default [
         },
     },
     {
-        ignores: ['out/', 'dist/', '**/*.d.ts'],
+        ignores: ['legacy/', 'out/', 'dist/', '.vscode-test/', '**/*.d.ts'],
     },
 ];

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vscodestat",
     "displayName": "vscodestat",
-    "version": "1.1.153",
+    "version": "1.8.6",
     "description": "",
     "categories": [
         "Other"
@@ -17,18 +17,14 @@
     "scripts": {
         "compile": "tsc -p ./",
         "lint": "eslint src --ext ts",
+        "prepare": "husky",
         "pretest": "npm run compile && npm run lint",
         "test": "vscode-test",
         "vscode:prepublish": "npm run compile",
-        "watch": "tsc -watch -p ./",
+        "watch": "tsc -watch -p ./"
-        "prepare": "husky"
     },
     "contributes": {
         "commands": [
-            {
-                "command": "vscodestat.helloWorld",
-                "title": "Hello World"
-            },
             {
                 "command": "vscodestat.setUrl",
                 "title": "setUrl"
@@ -53,22 +49,24 @@
         "onStartupFinished"
     ],
     "devDependencies": {
+        "@eslint/js": "^10.0.1",
         "@types/mocha": "^10.0.10",
-        "@types/node": "25.x",
+        "@types/node": "26.x",
-        "@types/vscode": "^1.115.0",
+        "@types/vscode": "^1.125.0",
-        "@typescript-eslint/eslint-plugin": "^8.58.1",
+        "@typescript-eslint/eslint-plugin": "^8.65.0",
-        "@typescript-eslint/parser": "^8.58.1",
+        "@typescript-eslint/parser": "^8.65.0",
-        "@vscode/test-cli": "^0.0.12",
+        "@vscode/test-cli": "^0.0.15",
-        "@vscode/test-electron": "^2.5.2",
+        "@vscode/test-electron": "^3.1.0",
         "eslint": "^10.1.0",
+        "globals": "^17.7.0",
         "husky": "^9.1.7",
-        "lint-staged": "^16.4.0",
+        "lint-staged": "^17.2.0",
-        "prettier": "^3.8.1",
+        "prettier": "^3.9.6",
         "ts-api-utils": "^2.5.0",
-        "typescript": "^6.0.2"
+        "typescript": "^6.0.3"
     },
     "engines": {
-        "vscode": "^1.115.0"
+        "vscode": "^1.125.0"
     },
     "icon": "icon.png",
     "extensionKind": [

src/extension.ts

@@ -3,17 +3,11 @@ import * as vscode from 'vscode';
 export function activate(context: vscode.ExtensionContext) {
     console.log('Congratulations, your extension "vscodestat" is now active!');
 
-    // crée une commande de test
-    const disposable = vscode.commands.registerCommand('vscodestat.helloWorld', () => {
-        vscode.window.showInformationMessage('Hello World from vscodestat!');
-    });
-    context.subscriptions.push(disposable);
-
     // commande pour definir l'url
     const disposable2 = vscode.commands.registerCommand('vscodestat.setUrl', async () => {
         const url = await vscode.window.showInputBox({
             prompt: 'Enter the URL:',
-            placeHolder: ''
+            placeHolder: '',
         });
 
         if (url) {
@@ -30,51 +24,51 @@ export function activate(context: vscode.ExtensionContext) {
             vscode.window.showWarningMessage('URL is not set. Please set the URL first.');
             return;
         }
-        await makeHttpRequest({ event: 'ping'});
+        await makeHttpRequest({ event: 'ping' });
         vscode.window.showInformationMessage('callUrl done');
     });
     context.subscriptions.push(disposable3);
 
     // detecte une ouverture de fichier / nouvel onglet
-    vscode.window.onDidChangeActiveTextEditor(async editor => {
+    vscode.window.onDidChangeActiveTextEditor(async (editor) => {
         if (editor) {
             const filePath = editor.document.fileName;
             console.log('Opened file:', filePath);
 
             // vscode.window.showInformationMessage(`Opened file: ${filePath}`);
-            await makeHttpRequest({ event: 'open', project: extractProjectName(filePath) });
+            await makeHttpRequest({ event: 'open', project: extractProjectName(filePath), source: 'vscode' });
         }
     });
 
     // detecte une sauvegarde de fichier
-    vscode.workspace.onDidSaveTextDocument(async document => {
+    vscode.workspace.onDidSaveTextDocument(async (document) => {
         const filePath = document.fileName;
         console.log('Saved file:', filePath);
 
         // vscode.window.showInformationMessage(`Saved file: ${filePath}`);
-        await makeHttpRequest({ event: 'save', project: extractProjectName(filePath) });
+        await makeHttpRequest({ event: 'save', project: extractProjectName(filePath), source: 'vscode' });
     });
 
     // detecte un focus / blur de la fenetre vscode
-    vscode.window.onDidChangeWindowState(async event => {
+    vscode.window.onDidChangeWindowState(async (event) => {
         console.log('Window state changed:', event.focused);
-        await makeHttpRequest({ focus: event.focused });
+        await makeHttpRequest({ event: 'focus', focused: event.focused });
     });
 }
 
-export function deactivate() { }
+export function deactivate() {}
 
 /*
-* extractProjectName will extract a project name from a path
+ * extractProjectName will extract a project name from a path
-* /root/docker/monitoringserver/controller/homeController.js
+ * /root/docker/monitoringserver/controller/homeController.js
-* => monitoringserver
+ * => monitoringserver
-*/
+ */
-function extractProjectName(path: string) {
+export function extractProjectName(path: string) {
     // des c'est l'un des fois l'autre ?
     // /root/docker/vscodestat/src/extension.ts
     // \root\docker\vscodestat\src\extension.ts
     path = path.replace(/\\/g, '/');
-    
+
     const match = path.match(/\/docker\/([^/]+)/);
     if (match) {
         return match[1];
@@ -84,8 +78,8 @@ function extractProjectName(path: string) {
 }
 
 /*
-* fonction qui envoie un event au serveur
+ * fonction qui envoie un event au serveur
-*/
+ */
 async function makeHttpRequest(json: Object) {
     try {
         const url = vscode.workspace.getConfiguration().get('vscodestat.url') as string;
@@ -97,16 +91,16 @@ async function makeHttpRequest(json: Object) {
         const rawResponse = await fetch(url, {
             method: 'POST',
             headers: {
-                'Accept': 'application/json',
+                Accept: 'application/json',
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
             },
-            body: JSON.stringify(json)
+            body: JSON.stringify(json),
         });
         const content = await rawResponse.json();
 
         console.log(content);
         // vscode.window.showInformationMessage('HTTP request successful.');
-    } catch (error:any) {
+    } catch (error: any) {
         console.error('Error making HTTP request:', error);
         // vscode.window.showErrorMessage('Error making HTTP request: ' + error.message);
     }

src/test/extension.test.ts

@@ -1,15 +1,28 @@
 import * as assert from 'assert';
+import { extractProjectName } from '../extension.js';
 
-// You can import and use all API from the 'vscode' module
+suite('extractProjectName', () => {
-// as well as import your extension to test it
+    test('extrait le nom de projet depuis un path Linux /root/docker/X', () => {
-import * as vscode from 'vscode';
+        assert.strictEqual(extractProjectName('/root/docker/vscodestat/src/extension.ts'), 'vscodestat');
-// import * as myExtension from '../../extension';
+    });
 
-suite('Extension Test Suite', () => {
+    test('extrait le nom de projet depuis un path Windows \\root\\docker\\X', () => {
-	vscode.window.showInformationMessage('Start all tests.');
+        assert.strictEqual(extractProjectName('C:\\root\\docker\\monitoringserver\\controller\\homeController.js'), 'monitoringserver');
+    });
 
-	test('Sample test', () => {
+    test('retourne null pour un path hors /docker/', () => {
-		assert.strictEqual(-1, [1, 2, 3].indexOf(5));
+        assert.strictEqual(extractProjectName('/home/user/projet/file.js'), null);
-		assert.strictEqual(-1, [1, 2, 3].indexOf(0));
+    });
-	});
+
+    test('retourne null pour un path vide', () => {
+        assert.strictEqual(extractProjectName(''), null);
+    });
+
+    test('extrait correctement quand le chemin contient docker plusieurs fois', () => {
+        assert.strictEqual(extractProjectName('/root/docker/flatbay/lib/docker/foo.js'), 'flatbay');
+    });
+
+    test('gere les paths avec tirets et chiffres', () => {
+        assert.strictEqual(extractProjectName('/root/docker/gextra6/bin/console'), 'gextra6');
+    });
 });

tsconfig.json

@@ -1,17 +1,12 @@
 {
-	"compilerOptions": {
+    "compilerOptions": {
-		"module": "Node16",
+        "module": "Node16",
-		"target": "ES2022",
+        "target": "ES2022",
-		"outDir": "out",
+        "outDir": "out",
-		"lib": [
+        "lib": ["ES2022"],
-			"ES2022"
+        "types": ["node", "mocha", "vscode"],
-		],
+        "sourceMap": true,
-		"sourceMap": true,
+        "rootDir": "src",
-		"rootDir": "src",
+        "strict": true
-		"strict": true   /* enable all strict type-checking options */
+    }
-		/* Additional Checks */
-		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
-		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
-		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-	}
 }