fix: release

Co-authored-by: m.schnitzler <martin.wb.2015@gmail.com>
Co-committed-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,6 @@ coverage/
 .config/
 data/
 .aider*
+/dist/
+tsconfig.tsbuildinfo
+.twig-cs-fixer.cache

.gitleaks.toml

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

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/commit-msg

@@ -0,0 +1,9 @@
+
+if [ -z "$(cat "$1" | grep -E '(^fix:)|(^feature:)|(^up$)|^Merge branch .+$')" ] ; then
+    echo ""
+    echo respecte le format de commit ❤
+    echo "  fix: xxx"
+    echo "  feature: xxx"
+    echo ""
+    exit 1
+fi

.husky/post-merge

@@ -0,0 +1,7 @@
+
+if git diff --name-only HEAD@{1} HEAD | grep package-lock.json ; then
+    echo "📦 package-lock.json changed. Running npm ci to update your dependencies..."
+    npm ci
+else
+    echo "📦 no need to update dependencies"
+fi

.husky/pre-commit

@@ -0,0 +1,13 @@
+
+# prevent commits on master
+branch="$(git rev-parse --abbrev-ref HEAD)"
+if [ "$branch" = "master" ]; then
+  echo ""
+  echo "You can't commit directly to master branch"
+  echo "please create a pull request"
+  echo ""
+  exit 1
+fi
+
+# run linters
+npx lint-staged

.lintstagedrc

@@ -0,0 +1,12 @@
+{
+    "*.js": ["eslint --fix", "prettier --write"],
+    "*.ts": ["eslint --fix", "prettier --write"],
+    "*.css": ["prettier --write"],
+    "*.jsx": ["prettier --write"],
+    "*.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"],
+    "*openapi.json": ["spectral lint"],
+    "*.tf": ["tflint"]
+}

.npmrc

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

.prettierignore

@@ -0,0 +1,10 @@
+web/*
+views/*
+log/*
+node_modules/*
+coverage/*
+data/*
+.vscode-test/
+/dist/
+tsconfig.tsbuildinfo
+legacy/*

.prettierrc.js

@@ -0,0 +1,7 @@
+export default {
+    tabWidth: 4,
+    singleQuote: true,
+    trailingComma: 'es5',
+    printWidth: 150,
+    arrowParens: 'always',
+};

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'],
@@ -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.150",
+    "version": "1.6.2",
     "description": "",
     "categories": [
         "Other"
@@ -17,6 +17,7 @@
     "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",
@@ -24,10 +25,6 @@
     },
     "contributes": {
         "commands": [
-            {
-                "command": "vscodestat.helloWorld",
-                "title": "Hello World"
-            },
             {
                 "command": "vscodestat.setUrl",
                 "title": "setUrl"
@@ -52,19 +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.110.0",
+        "@types/vscode": "^1.125.0",
-        "@typescript-eslint/eslint-plugin": "^8.57.1",
+        "@typescript-eslint/eslint-plugin": "^8.62.1",
-        "@typescript-eslint/parser": "^8.57.1",
+        "@typescript-eslint/parser": "^8.62.1",
-        "@vscode/test-cli": "^0.0.12",
+        "@vscode/test-cli": "^0.0.15",
-        "@vscode/test-electron": "^2.5.2",
+        "@vscode/test-electron": "^3.0.0",
         "eslint": "^10.1.0",
+        "globals": "^17.7.0",
+        "husky": "^9.1.7",
+        "lint-staged": "^17.0.8",
+        "prettier": "^3.9.4",
         "ts-api-utils": "^2.5.0",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.3"
     },
     "engines": {
-        "vscode": "^1.110.0"
+        "vscode": "^1.125.0"
     },
     "icon": "icon.png",
     "extensionKind": [

src/extension.ts

@@ -3,12 +3,6 @@ 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({
@@ -42,7 +36,7 @@ export function activate(context: vscode.ExtensionContext) {
             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' });
         }
     });
 
@@ -52,13 +46,13 @@ export function activate(context: vscode.ExtensionContext) {
         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 => {
         console.log('Window state changed:', event.focused);
-        await makeHttpRequest({ focus: event.focused });
+        await makeHttpRequest({ event: 'focus', focused: event.focused });
     });
 }
 
@@ -69,7 +63,7 @@ export function deactivate() { }
 * /root/docker/monitoringserver/controller/homeController.js
 * => 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

src/test/extension.test.ts

@@ -1,15 +1,40 @@
 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(
-// import * as myExtension from '../../extension';
+            extractProjectName('/root/docker/vscodestat/src/extension.ts'),
+            'vscodestat'
+        );
+    });
 
-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

@@ -6,12 +6,13 @@
 		"lib": [
 			"ES2022"
 		],
+		"types": [
+			"node",
+			"mocha",
+			"vscode"
+		],
 		"sourceMap": true,
 		"rootDir": "src",
-		"strict": true   /* enable all strict type-checking options */
+		"strict": true
-		/* 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. */
 	}
 }