qase-javascript-commons 2.5.4 → 2.5.6

package/dist/utils/hostData.js

@@ -33,13 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimalHostData = getMinimalHostData;
 exports.getHostInfo = getHostInfo;
 const os = __importStar(require("os"));
 const cp = __importStar(require("child_process"));
 const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const child_process_1 = require("child_process");
+const get_package_version_1 = require("./get-package-version");
 /**
  * Gets detailed OS information based on the platform
  * @returns {string} Detailed OS information
@@ -76,110 +74,24 @@ function getDetailedOSInfo() {
     }
 }
 /**
- * Executes a command and returns its trimmed output
- * @param {string} command Command to execute
- * @param {string} defaultValue Default value if command fails
- * @returns {string} Command output or default value
+ * Gets npm version from environment or by executing npm command
+ * @returns {string} npm version string
  */
-function execCommand(command, defaultValue = '') {
-    try {
-        return cp.execSync(command).toString().trim();
-    }
-    catch (error) {
-        console.error(`Error executing command '${command}':`, error);
-        return defaultValue;
-    }
-}
-/**
- * Recursively searches for a package in dependencies tree
- * @param {Record<string, PackageInfo>} dependencies The dependencies object to search in
- * @param {string} packageName The name of the package to find
- * @returns {string | null} The package version or null if not found
- */
-function findPackageInDependencies(dependencies, packageName) {
-    // If no dependencies, return null
-    if (!dependencies)
-        return null;
-    // Check if the package exists at the current level
-    if (packageName in dependencies) {
-        return dependencies[packageName]?.version ?? null;
-    }
-    // Recursively search in nested dependencies
-    for (const dep of Object.values(dependencies)) {
-        if (dep.dependencies) {
-            const foundVersion = findPackageInDependencies(dep.dependencies, packageName);
-            if (foundVersion) {
-                return foundVersion;
-            }
+function getNpmVersion() {
+    const userAgent = process.env['npm_config_user_agent'];
+    if (userAgent) {
+        const match = userAgent.match(/^npm\/(\S+)/);
+        if (match?.[1]) {
+            return match[1];
         }
     }
-    return null;
-}
-/**
- * Gets the version of a Node.js package
- * @param {string} packageName The name of the package
- * @returns {string | null} The package version or null if not found
- */
-function getPackageVersion(packageName) {
-    if (!packageName)
-        return null;
     try {
-        // First try to get from node_modules
-        const packagePath = path.resolve(process.cwd(), 'node_modules', packageName, 'package.json');
-        if (fs.existsSync(packagePath)) {
-            const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-            return packageJson.version;
-        }
-        // Try using npm list as fallback with recursive search
-        let output = null;
-        try {
-            output = (0, child_process_1.execSync)(`npm list --depth=10 --json`, { stdio: "pipe" }).toString();
-            if (!output)
-                return null;
-        }
-        catch (error) {
-            return null;
-        }
-        try {
-            const npmList = JSON.parse(output);
-            // Try direct dependency
-            const directVersion = npmList.dependencies?.[packageName]?.version;
-            if (directVersion)
-                return directVersion;
-            // Try recursive search
-            return findPackageInDependencies(npmList.dependencies, packageName);
-        }
-        catch (parseError) {
-            console.error('Error parsing npm list output:', parseError);
-            return null;
-        }
+        return cp.execSync('npm --version', { stdio: 'pipe' }).toString().trim();
     }
-    catch (error) {
-        console.error(`Error getting version for package ${packageName}:`, error);
-        return null;
+    catch {
+        return '';
     }
 }
-/**
- * Returns minimal host data without slow operations (no npm list, no execSync for node/npm).
- * Use when reporter mode is "off" to avoid startup delay.
- * @returns {HostData} Minimal host information object
- */
-function getMinimalHostData() {
-    return {
-        system: os.platform(),
-        machineName: os.hostname(),
-        release: os.release(),
-        version: '',
-        arch: os.arch(),
-        node: '',
-        npm: '',
-        framework: '',
-        reporter: '',
-        commons: '',
-        apiClientV1: '',
-        apiClientV2: '',
-    };
-}
 /**
  * Gets information about the current host environment
  * @param {string} framework The framework name to check version for
@@ -194,13 +106,13 @@ function getHostInfo(framework, reporterName) {
             release: os.release(),
             version: getDetailedOSInfo(),
             arch: os.arch(),
-            node: execCommand('node --version'),
-            npm: execCommand('npm --version'),
-            framework: getPackageVersion(framework) ?? '',
-            reporter: getPackageVersion(reporterName) ?? '',
-            commons: getPackageVersion('qase-javascript-commons') ?? '',
-            apiClientV1: getPackageVersion('qase-api-client') ?? '',
-            apiClientV2: getPackageVersion('qase-api-v2-client') ?? '',
+            node: process.version,
+            npm: getNpmVersion(),
+            framework: (0, get_package_version_1.getPackageVersion)(framework) ?? '',
+            reporter: (0, get_package_version_1.getPackageVersion)(reporterName) ?? '',
+            commons: (0, get_package_version_1.getPackageVersion)('qase-javascript-commons') ?? '',
+            apiClientV1: (0, get_package_version_1.getPackageVersion)('qase-api-client') ?? '',
+            apiClientV2: (0, get_package_version_1.getPackageVersion)('qase-api-v2-client') ?? '',
         };
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qase-javascript-commons",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "Qase JS Reporters",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",