@iamsergio/qttest-utils 2.0.0 → 2.1.1

package/CONTRIBUTING.md

@@ -26,10 +26,9 @@ cargo install git-cliff
 ## Releasing
 
 (Replace 1.0.0 with actual version used)
-
-export NEW_VERSION=v1.0.0
+- Get a version compatible with semver, run ` git cliff --bump | head -n 5`, replace NEW_VERSION
+- export NEW_VERSION=v1.0.0
 - Make sure Github Actions CI is green
-- Optional: To get a version compatible with semver, run `git cliff --bump`
-- Increase version in package.json and package-lock.json.
+- npm version $NEW_VERSION # ignore the error
 - git cliff --tag $NEW_VERSION > Changelog
 - git add Changelog package.json package-lock.json && git commit -m "chore: bump version" && git tag -a ${NEW_VERSION} -m "${NEW_VERSION}" && git push && git push --tags && npm publish

package/Changelog

@@ -2,12 +2,44 @@
 
 
 
+## [2.1.1] - 2024-04-25
+
+### 🐛 Bug Fixes
+
+- Allow for backslashes in the cmake codemodel
+
+### ⚙️ Miscellaneous Tasks
+
+- Improve CONTRIBUTING.md
+
+## [2.1.0] - 2024-04-25
+
+### 🚀 Features
+
+- Add targetNameForExecutable()
+
+### 🐛 Bug Fixes
+
+- Ignore non-executable targets
+
+### ⚙️ Miscellaneous Tasks
+
+- Coding style improvement
+- Update CONTRIBUTING.md file
+- Fix build on macOS
+- Improve CONTRIBUTING.md
+- Bump version
+
 ## [2.0.0] - 2024-04-24
 
 ### 🚀 Features
 
 - [**breaking**] Use a member to hold the output function
 
+### ⚙️ Miscellaneous Tasks
+
+- Bump version
+
 ## [1.4.0] - 2024-04-24
 
 ### 🚀 Features

package/out/cmake.d.ts

@@ -13,6 +13,7 @@ export declare class CMakeTests {
      */
     tests(): Promise<CMakeTest[] | undefined>;
     private ctestJsonToList;
+    targetNameForExecutable(executable: string, codemodel: any): string | undefined;
     cppFilesForExecutable(executable: string, codemodel: any): string[];
 }
 export declare class CMakeTest {

package/out/cmake.js

@@ -72,45 +72,85 @@ class CMakeTests {
         });
         return tests;
     }
-    // Returns the list of .cpp files for the specified executable
-    // codemodel is the CMake codemodel JSON object
+    /// Returns the cmake target name for the specified executable
+    /// codemodel should have a "projects" key at root.
+    targetNameForExecutable(executable, codemodel) {
+        // simplify:
+        if (executable.endsWith(".exe")) {
+            executable = executable.substring(0, executable.length - 4);
+        }
+        // replace backslashes with forward slashes
+        executable = executable.replace(/\\/g, "/");
+        let projects = codemodel["projects"];
+        if (!projects)
+            return undefined;
+        for (let project of projects) {
+            let targets = project["targets"];
+            if (!targets)
+                continue;
+            for (let target of targets) {
+                let artifacts = target["artifacts"];
+                if (!artifacts)
+                    continue;
+                for (let artifact of artifacts) {
+                    if (artifact.endsWith(".exe")) {
+                        artifact = artifact.substring(0, artifact.length - 4);
+                    }
+                    // replace backslashes with forward slashes
+                    artifact = artifact.replace(/\\/g, "/");
+                    if (artifact == executable) {
+                        let name = target["name"];
+                        if (name) {
+                            // We found the target name
+                            return name;
+                        }
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+    /// Returns the list of .cpp files for the specified executable
+    /// codemodel is the CMake codemodel JSON object
+    /// codemodel should have a "projects" key at root.
     cppFilesForExecutable(executable, codemodel) {
         // simplify:
         if (executable.endsWith(".exe")) {
             executable = executable.substring(0, executable.length - 4);
         }
+        // replace backslashes with forward slashes
+        executable = executable.replace(/\\/g, "/");
         let projects = codemodel["projects"];
-        if (!projects) {
+        if (!projects)
             return [];
-        }
         for (let project of projects) {
             let targets = project["targets"];
-            if (!targets) {
+            if (!targets)
                 continue;
-            }
             for (let target of targets) {
                 let sourceDir = target["sourceDirectory"];
                 let artifacts = target["artifacts"];
-                if (!artifacts || !sourceDir) {
+                if (!artifacts || !sourceDir)
+                    continue;
+                let targetType = target["type"];
+                if (targetType != "EXECUTABLE")
                     continue;
-                }
                 for (let artifact of artifacts) {
                     if (artifact.endsWith(".exe")) {
                         artifact = artifact.substring(0, artifact.length - 4);
                     }
+                    // replace backslashes with forward slashes
+                    artifact = artifact.replace(/\\/g, "/");
                     if (artifact == executable) {
                         let fileGroups = target["fileGroups"];
-                        if (!fileGroups) {
+                        if (!fileGroups)
                             continue;
-                        }
                         for (let fileGroup of fileGroups) {
-                            if (fileGroup["language"] != "CXX" || fileGroup["isGenerated"]) {
+                            if (fileGroup["language"] != "CXX" || fileGroup["isGenerated"])
                                 continue;
-                            }
                             let sources = fileGroup["sources"];
-                            if (!sources) {
+                            if (!sources)
                                 continue;
-                            }
                             let cppFiles = [];
                             for (let source of sources) {
                                 if (!source.endsWith("mocs_compilation.cpp")) {

package/out/test.js

@@ -127,6 +127,22 @@ function runCodeModelTests(codeModelFile) {
             console.error("Expected " + expected + ", got " + got);
             process.exit(1);
         }
+        let targetName = cmake.targetNameForExecutable("/vscode-qttest/test/qt_test/build-dev/test1", codemodelJson);
+        if (targetName != "test1") {
+            console.error("Expected test1, got " + targetName);
+            process.exit(1);
+        }
+        // test windows back slashes:
+        files = cmake.cppFilesForExecutable("/vscode-qttest/test/qt_test/build-dev/test2", codemodelJson);
+        if (files.length != 1) {
+            console.error("Expected 1 file, got " + files.length);
+            process.exit(1);
+        }
+        targetName = cmake.targetNameForExecutable("/vscode-qttest/test/qt_test/build-dev/test2", codemodelJson);
+        if (targetName != "test2") {
+            console.error("Expected test2, got " + targetName);
+            process.exit(1);
+        }
     });
 }
 runTests("test/qt_test/build-dev/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsergio/qttest-utils",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "API for listing QtTest executables from a build directory and which individual test slots each executable contains. Useful for a Text Explorer VSCode extension.",
   "repository": {
     "type": "git",