@hypertestco/node-sdk-v3 0.0.1-29 → 0.0.1-31

package/index.cjs

@@ -147439,7 +147439,7 @@ var opentelemetry = __toESM(require_src30());
 var import_register = __toESM(require_register());
 
 // ../../package.json
-var version = "0.0.1-29";
+var version = "0.0.1-31";
 
 // ../utils/syncSleep/index.ts
 function synchronousBlock(seconds) {
@@ -153294,7 +153294,7 @@ var MemoryStore = class _MemoryStore {
   }
   updateRequestCoverage(htRequestId, filePathAbs, lineNumber) {
     let executionCounter = this.getHtRequestIdExecutionCounter(htRequestId);
-    if (executionCounter) {
+    if (executionCounter && Number.isFinite(executionCounter)) {
       executionCounter += 1;
       this.htRequestIdExecutionCounterMap.set(htRequestId, executionCounter);
     } else {
@@ -155323,6 +155323,69 @@ function isPlatformIncorrect(coverage, platform) {
   }
   return true;
 }
+function getLinesCoveredWithExecutionOrder(coverage, platform, codeCoverageData) {
+  if (Object.keys(coverage).length === 0) {
+    return {};
+  }
+  if (isPlatformIncorrect(coverage, platform)) {
+    console.log(`Your application platform: ${platform} and the coverage is not compatible.
+Code coverage features will not work.
+
+How to rectify ?
+Please verify that your application platform type is correct.
+You need to go to hypertest dashboard to verify.
+Please contact hypertest team if the issue still persists.`);
+    return {};
+  }
+  if (platform === import_generatedClient4.Platform.Java) {
+    const unstretchedLinesCovered2 = coverage;
+    return normalizePaths(unstretchedLinesCovered2);
+  }
+  const projectRoot2 = getProjectRoot();
+  const unstretchedLinesCovered = {};
+  for (const [filePathAbs, fileCoverage] of Object.entries(coverage)) {
+    const linesCoveredPerFile = {};
+    const filePathRel = import_node_path.default.relative(projectRoot2, filePathAbs);
+    const statementMapWithChildStatements = getStatementMapWithChildStatements(
+      filePathRel,
+      fileCoverage.statementMap
+    );
+    for (const [statementNumber, count] of Object.entries(fileCoverage.s)) {
+      if (count) {
+        const {
+          start: { line: startLine },
+          end: { line: endLine },
+          topLevelChildStatements
+        } = statementMapWithChildStatements[statementNumber];
+        let currentExecutionOrderArr = [];
+        for (const orderArr of Object.values(codeCoverageData)) {
+          if (orderArr.includes(count)) {
+            currentExecutionOrderArr = orderArr;
+            break;
+          }
+        }
+        let currentLine = startLine;
+        let childStatementIdx = 0;
+        while (currentLine <= endLine) {
+          if (childStatementIdx === topLevelChildStatements.length) {
+            linesCoveredPerFile[currentLine.toString()] = currentExecutionOrderArr;
+            currentLine++;
+          } else if (currentLine < topLevelChildStatements[childStatementIdx].start.line) {
+            linesCoveredPerFile[currentLine.toString()] = currentExecutionOrderArr;
+            currentLine++;
+          } else {
+            currentLine = topLevelChildStatements[childStatementIdx].end.line + 1;
+            childStatementIdx++;
+          }
+        }
+        linesCoveredPerFile[startLine.toString()] = currentExecutionOrderArr;
+        linesCoveredPerFile[endLine.toString()] = currentExecutionOrderArr;
+      }
+    }
+    unstretchedLinesCovered[filePathRel] = linesCoveredPerFile;
+  }
+  return normalizePaths(unstretchedLinesCovered);
+}
 function getLinesCovered(coverage, platform) {
   if (Object.keys(coverage).length === 0) {
     return {
@@ -155360,7 +155423,7 @@ Please contact hypertest team if the issue still persists.`);
   const stretchedLinesCovered = {};
   const unstretchedLinesCovered = {};
   for (const [filePathAbs, fileCoverage] of Object.entries(coverage)) {
-    const linesCoveredPerFile = {};
+    const linesCoveredPerFile = /* @__PURE__ */ new Set();
     const filePathRel = import_node_path.default.relative(projectRoot2, filePathAbs);
     const statementMapWithChildStatements = getStatementMapWithChildStatements(
       filePathRel,
@@ -155371,35 +155434,29 @@ Please contact hypertest team if the issue still persists.`);
         const {
           start: { line: startLine },
           end: { line: endLine },
-          topLevelChildStatements = []
+          topLevelChildStatements
         } = statementMapWithChildStatements[statementNumber];
-        const executionOrders = fileCoverage.s[statementNumber].split(",");
-        if (startLine === endLine) {
-          linesCoveredPerFile[startLine.toString()] = executionOrders;
-        } else {
-          linesCoveredPerFile[startLine.toString()] = executionOrders;
-          linesCoveredPerFile[endLine.toString()] = executionOrders;
-          let currentLine = startLine + 1;
-          const sortedChildren = [...topLevelChildStatements].sort((a, b2) => a.start.line - b2.start.line);
-          while (currentLine < endLine) {
-            let lineIsCoveredByChild = false;
-            for (const child of sortedChildren) {
-              if (currentLine >= child.start.line && currentLine <= child.end.line) {
-                lineIsCoveredByChild = true;
-                break;
-              }
-            }
-            if (!lineIsCoveredByChild) {
-              linesCoveredPerFile[currentLine] = executionOrders;
-            }
+        let currentLine = startLine;
+        let childStatementIdx = 0;
+        while (currentLine <= endLine) {
+          if (childStatementIdx === topLevelChildStatements.length) {
+            linesCoveredPerFile.add(currentLine.toString());
+            currentLine++;
+          } else if (currentLine < topLevelChildStatements[childStatementIdx].start.line) {
+            linesCoveredPerFile.add(currentLine.toString());
             currentLine++;
+          } else {
+            currentLine = topLevelChildStatements[childStatementIdx].end.line + 1;
+            childStatementIdx++;
           }
         }
+        linesCoveredPerFile.add(startLine.toString());
+        linesCoveredPerFile.add(endLine.toString());
       }
     }
-    unstretchedLinesCovered[filePathRel] = linesCoveredPerFile;
+    unstretchedLinesCovered[filePathRel] = [...linesCoveredPerFile];
     stretchedLinesCovered[filePathRel] = stretchCoverage(
-      Object.keys(unstretchedLinesCovered[filePathRel])
+      unstretchedLinesCovered[filePathRel]
     );
   }
   return {
@@ -155420,6 +155477,13 @@ function computeCoverageHash(coverage, commitId, platform) {
   };
   return sha1_default(stableStringify(hashPayload));
 }
+function computeCoverageHashFromExtractedLineCoverageWithEachFile(linesCovered, commitId) {
+  const hashPayload = {
+    coverage: compressRequestCoverage(linesCovered),
+    commitId
+  };
+  return sha1_default(stableStringify(hashPayload));
+}
 
 // src/instrumentation/helpers/samplingLogic.ts
 var import_generatedClient5 = __toESM(require_generatedClient2());
@@ -155443,7 +155507,7 @@ function remapCoverage(requestCoverage = {}) {
     (coverage, filePathAbs) => {
       const s = {};
       for (const lineNumber of Object.keys(requestCoverage[filePathAbs])) {
-        s[lineNumber] = requestCoverage[filePathAbs][lineNumber].join(",");
+        s[lineNumber] = requestCoverage[filePathAbs][lineNumber][0];
       }
       coverage[filePathAbs] = {
         path: filePathAbs,
@@ -155590,6 +155654,10 @@ var setGitCommitHash = (commitHash) => {
   }
 };
 var setCommitHashFromGit = () => {
+  if (process.env.HT_COMMIT_ID && !process.env.HT_COMMIT_ID.toLocaleLowerCase().includes("unknown")) {
+    _gitCommitHash = process.env.HT_COMMIT_ID;
+    return _gitCommitHash;
+  }
   const spawnSyncOutput = (0, import_child_process3.spawnSync)("git", ["rev-parse", "HEAD"], {
     cwd: process.cwd(),
     /**
@@ -155610,7 +155678,13 @@ var setCommitHashFromGit = () => {
     console.error(
       `Error occurred while trying to get git commit hash. Exit code: ${exitCode}, stderr: ${spawnSyncOutput.stderr.toString()}. Please set commit hash manually using 'HT_COMMIT_ID' env variable or 'setGitCommitHash' method.`
     );
-    throw new Error("Could not get git commit hash");
+    process.env.HT_MODE = "DISABLED";
+    console.log(
+      "HT_MODE set to DISABLED due to inability to fetch current git commit hash"
+    );
+    updateHtMode();
+    synchronousBlock(30);
+    return;
   }
   _gitCommitHash = spawnSyncOutput.stdout.toString().trim();
   return _gitCommitHash;
@@ -161208,19 +161282,36 @@ var HtServerMockAbstract = class {
       }
       const coverage = storeInstance4.getRequestCoverage(htRequestId);
       if (coverage && Object.keys(coverage).length > 0) {
-        const remappedCoverage = remapCoverage(coverage);
-        const coverageHash = computeCoverageHash(
-          remappedCoverage,
-          getGitCommitHash(),
-          import_generatedClient6.Platform.NodeJS
+        let totalRemappedCoverage = {};
+        for (const filePath of Object.keys(coverage)) {
+          const singleFileCoverage = {};
+          singleFileCoverage[filePath] = coverage[filePath];
+          const remappedSingleFileCoverage = remapCoverage(singleFileCoverage);
+          const remappedCoverageData = extractCoverageData(
+            remappedSingleFileCoverage
+          );
+          const linesCovered = getLinesCoveredWithExecutionOrder(
+            remappedCoverageData,
+            import_generatedClient6.Platform.NodeJS,
+            coverage[filePath]
+          );
+          Object.assign(totalRemappedCoverage, linesCovered);
+        }
+        const coverageWithoutExecutionOrder = {};
+        for (const filePath of Object.keys(totalRemappedCoverage)) {
+          coverageWithoutExecutionOrder[filePath] = Object.keys(
+            totalRemappedCoverage[filePath]
+          );
+        }
+        const coverageHash = computeCoverageHashFromExtractedLineCoverageWithEachFile(
+          coverageWithoutExecutionOrder,
+          getGitCommitHash()
         );
         this.span.setAttribute("coverageHash", coverageHash);
-        const remappedCoverageData = extractCoverageData(remappedCoverage);
-        const { unstretchedLinesCovered: linesCovered } = getLinesCovered(
-          remappedCoverageData,
-          import_generatedClient6.Platform.NodeJS
+        this.span.setAttribute(
+          "coverage",
+          JSON.stringify(totalRemappedCoverage)
         );
-        this.span.setAttribute("coverage", JSON.stringify(linesCovered));
         storeInstance4.deleteRequestCoverage(htRequestId);
       }
       this.span.setAttribute("output_status", this.outputStatus);
@@ -161234,7 +161325,7 @@ var HtServerMockAbstract = class {
       if (this.parentHtRequestId) {
         this.span.setAttribute("parentHtRequestId", this.parentHtRequestId);
       }
-      const gitCommitHash = process.env.HT_COMMIT_ID || getGitCommitHash();
+      const gitCommitHash = getGitCommitHash();
       this.span.setAttribute("commit_hash", gitCommitHash);
       const branch = process.env.HT_BRANCH_NAME || getBranchName();
       this.span.setAttribute("branch", branch);
@@ -224314,7 +224405,8 @@ var initialiseNormally = (htConfig) => {
       process.env.DD_TRACE_DISABLED_PLUGINS = current === "" ? "http2" : `${current},http2`;
     }
     const isCurrentFolderInGitRepo = isCurrentFolderInGitRepoFn();
-    if (isCurrentFolderInGitRepo && isHavingUncommittedChangesFn()) {
+    const isDebugRun = process.env.HT_SDK_DEBUG === "true";
+    if (!isDebugRun && isCurrentFolderInGitRepo && isHavingUncommittedChangesFn()) {
       const gitDiff = getUncommittedChanges();
       console.log(
         "The following are the uncommitted changes in your repository."

package/index.mjs

@@ -154920,7 +154920,7 @@ import fs2 from "fs";
 import path3 from "path";
 
 // ../../package.json
-var version = "0.0.1-29";
+var version = "0.0.1-31";
 
 // ../utils/syncSleep/index.ts
 function synchronousBlock(seconds) {
@@ -160775,7 +160775,7 @@ var MemoryStore = class _MemoryStore {
   }
   updateRequestCoverage(htRequestId, filePathAbs, lineNumber) {
     let executionCounter = this.getHtRequestIdExecutionCounter(htRequestId);
-    if (executionCounter) {
+    if (executionCounter && Number.isFinite(executionCounter)) {
       executionCounter += 1;
       this.htRequestIdExecutionCounterMap.set(htRequestId, executionCounter);
     } else {
@@ -163223,6 +163223,69 @@ function isPlatformIncorrect(coverage, platform) {
   }
   return true;
 }
+function getLinesCoveredWithExecutionOrder(coverage, platform, codeCoverageData) {
+  if (Object.keys(coverage).length === 0) {
+    return {};
+  }
+  if (isPlatformIncorrect(coverage, platform)) {
+    console.log(`Your application platform: ${platform} and the coverage is not compatible.
+Code coverage features will not work.
+
+How to rectify ?
+Please verify that your application platform type is correct.
+You need to go to hypertest dashboard to verify.
+Please contact hypertest team if the issue still persists.`);
+    return {};
+  }
+  if (platform === import_generatedClient4.Platform.Java) {
+    const unstretchedLinesCovered2 = coverage;
+    return normalizePaths(unstretchedLinesCovered2);
+  }
+  const projectRoot2 = getProjectRoot();
+  const unstretchedLinesCovered = {};
+  for (const [filePathAbs, fileCoverage] of Object.entries(coverage)) {
+    const linesCoveredPerFile = {};
+    const filePathRel = path.relative(projectRoot2, filePathAbs);
+    const statementMapWithChildStatements = getStatementMapWithChildStatements(
+      filePathRel,
+      fileCoverage.statementMap
+    );
+    for (const [statementNumber, count] of Object.entries(fileCoverage.s)) {
+      if (count) {
+        const {
+          start: { line: startLine },
+          end: { line: endLine },
+          topLevelChildStatements
+        } = statementMapWithChildStatements[statementNumber];
+        let currentExecutionOrderArr = [];
+        for (const orderArr of Object.values(codeCoverageData)) {
+          if (orderArr.includes(count)) {
+            currentExecutionOrderArr = orderArr;
+            break;
+          }
+        }
+        let currentLine = startLine;
+        let childStatementIdx = 0;
+        while (currentLine <= endLine) {
+          if (childStatementIdx === topLevelChildStatements.length) {
+            linesCoveredPerFile[currentLine.toString()] = currentExecutionOrderArr;
+            currentLine++;
+          } else if (currentLine < topLevelChildStatements[childStatementIdx].start.line) {
+            linesCoveredPerFile[currentLine.toString()] = currentExecutionOrderArr;
+            currentLine++;
+          } else {
+            currentLine = topLevelChildStatements[childStatementIdx].end.line + 1;
+            childStatementIdx++;
+          }
+        }
+        linesCoveredPerFile[startLine.toString()] = currentExecutionOrderArr;
+        linesCoveredPerFile[endLine.toString()] = currentExecutionOrderArr;
+      }
+    }
+    unstretchedLinesCovered[filePathRel] = linesCoveredPerFile;
+  }
+  return normalizePaths(unstretchedLinesCovered);
+}
 function getLinesCovered(coverage, platform) {
   if (Object.keys(coverage).length === 0) {
     return {
@@ -163260,7 +163323,7 @@ Please contact hypertest team if the issue still persists.`);
   const stretchedLinesCovered = {};
   const unstretchedLinesCovered = {};
   for (const [filePathAbs, fileCoverage] of Object.entries(coverage)) {
-    const linesCoveredPerFile = {};
+    const linesCoveredPerFile = /* @__PURE__ */ new Set();
     const filePathRel = path.relative(projectRoot2, filePathAbs);
     const statementMapWithChildStatements = getStatementMapWithChildStatements(
       filePathRel,
@@ -163271,35 +163334,29 @@ Please contact hypertest team if the issue still persists.`);
         const {
           start: { line: startLine },
           end: { line: endLine },
-          topLevelChildStatements = []
+          topLevelChildStatements
         } = statementMapWithChildStatements[statementNumber];
-        const executionOrders = fileCoverage.s[statementNumber].split(",");
-        if (startLine === endLine) {
-          linesCoveredPerFile[startLine.toString()] = executionOrders;
-        } else {
-          linesCoveredPerFile[startLine.toString()] = executionOrders;
-          linesCoveredPerFile[endLine.toString()] = executionOrders;
-          let currentLine = startLine + 1;
-          const sortedChildren = [...topLevelChildStatements].sort((a, b2) => a.start.line - b2.start.line);
-          while (currentLine < endLine) {
-            let lineIsCoveredByChild = false;
-            for (const child of sortedChildren) {
-              if (currentLine >= child.start.line && currentLine <= child.end.line) {
-                lineIsCoveredByChild = true;
-                break;
-              }
-            }
-            if (!lineIsCoveredByChild) {
-              linesCoveredPerFile[currentLine] = executionOrders;
-            }
+        let currentLine = startLine;
+        let childStatementIdx = 0;
+        while (currentLine <= endLine) {
+          if (childStatementIdx === topLevelChildStatements.length) {
+            linesCoveredPerFile.add(currentLine.toString());
+            currentLine++;
+          } else if (currentLine < topLevelChildStatements[childStatementIdx].start.line) {
+            linesCoveredPerFile.add(currentLine.toString());
             currentLine++;
+          } else {
+            currentLine = topLevelChildStatements[childStatementIdx].end.line + 1;
+            childStatementIdx++;
           }
         }
+        linesCoveredPerFile.add(startLine.toString());
+        linesCoveredPerFile.add(endLine.toString());
       }
     }
-    unstretchedLinesCovered[filePathRel] = linesCoveredPerFile;
+    unstretchedLinesCovered[filePathRel] = [...linesCoveredPerFile];
     stretchedLinesCovered[filePathRel] = stretchCoverage(
-      Object.keys(unstretchedLinesCovered[filePathRel])
+      unstretchedLinesCovered[filePathRel]
     );
   }
   return {
@@ -163320,6 +163377,13 @@ function computeCoverageHash(coverage, commitId, platform) {
   };
   return sha1_default(stableStringify(hashPayload));
 }
+function computeCoverageHashFromExtractedLineCoverageWithEachFile(linesCovered, commitId) {
+  const hashPayload = {
+    coverage: compressRequestCoverage(linesCovered),
+    commitId
+  };
+  return sha1_default(stableStringify(hashPayload));
+}
 
 // src/instrumentation/helpers/samplingLogic.ts
 var import_generatedClient5 = __toESM(require_generatedClient2());
@@ -163343,7 +163407,7 @@ function remapCoverage(requestCoverage = {}) {
     (coverage, filePathAbs) => {
       const s = {};
       for (const lineNumber of Object.keys(requestCoverage[filePathAbs])) {
-        s[lineNumber] = requestCoverage[filePathAbs][lineNumber].join(",");
+        s[lineNumber] = requestCoverage[filePathAbs][lineNumber][0];
       }
       coverage[filePathAbs] = {
         path: filePathAbs,
@@ -163490,6 +163554,10 @@ var setGitCommitHash = (commitHash) => {
   }
 };
 var setCommitHashFromGit = () => {
+  if (process.env.HT_COMMIT_ID && !process.env.HT_COMMIT_ID.toLocaleLowerCase().includes("unknown")) {
+    _gitCommitHash = process.env.HT_COMMIT_ID;
+    return _gitCommitHash;
+  }
   const spawnSyncOutput = spawnSync3("git", ["rev-parse", "HEAD"], {
     cwd: process.cwd(),
     /**
@@ -163510,7 +163578,13 @@ var setCommitHashFromGit = () => {
     console.error(
       `Error occurred while trying to get git commit hash. Exit code: ${exitCode}, stderr: ${spawnSyncOutput.stderr.toString()}. Please set commit hash manually using 'HT_COMMIT_ID' env variable or 'setGitCommitHash' method.`
     );
-    throw new Error("Could not get git commit hash");
+    process.env.HT_MODE = "DISABLED";
+    console.log(
+      "HT_MODE set to DISABLED due to inability to fetch current git commit hash"
+    );
+    updateHtMode();
+    synchronousBlock(30);
+    return;
   }
   _gitCommitHash = spawnSyncOutput.stdout.toString().trim();
   return _gitCommitHash;
@@ -164989,19 +165063,36 @@ var HtServerMockAbstract = class {
       }
       const coverage = storeInstance4.getRequestCoverage(htRequestId);
       if (coverage && Object.keys(coverage).length > 0) {
-        const remappedCoverage = remapCoverage(coverage);
-        const coverageHash = computeCoverageHash(
-          remappedCoverage,
-          getGitCommitHash(),
-          import_generatedClient6.Platform.NodeJS
+        let totalRemappedCoverage = {};
+        for (const filePath of Object.keys(coverage)) {
+          const singleFileCoverage = {};
+          singleFileCoverage[filePath] = coverage[filePath];
+          const remappedSingleFileCoverage = remapCoverage(singleFileCoverage);
+          const remappedCoverageData = extractCoverageData(
+            remappedSingleFileCoverage
+          );
+          const linesCovered = getLinesCoveredWithExecutionOrder(
+            remappedCoverageData,
+            import_generatedClient6.Platform.NodeJS,
+            coverage[filePath]
+          );
+          Object.assign(totalRemappedCoverage, linesCovered);
+        }
+        const coverageWithoutExecutionOrder = {};
+        for (const filePath of Object.keys(totalRemappedCoverage)) {
+          coverageWithoutExecutionOrder[filePath] = Object.keys(
+            totalRemappedCoverage[filePath]
+          );
+        }
+        const coverageHash = computeCoverageHashFromExtractedLineCoverageWithEachFile(
+          coverageWithoutExecutionOrder,
+          getGitCommitHash()
         );
         this.span.setAttribute("coverageHash", coverageHash);
-        const remappedCoverageData = extractCoverageData(remappedCoverage);
-        const { unstretchedLinesCovered: linesCovered } = getLinesCovered(
-          remappedCoverageData,
-          import_generatedClient6.Platform.NodeJS
+        this.span.setAttribute(
+          "coverage",
+          JSON.stringify(totalRemappedCoverage)
         );
-        this.span.setAttribute("coverage", JSON.stringify(linesCovered));
         storeInstance4.deleteRequestCoverage(htRequestId);
       }
       this.span.setAttribute("output_status", this.outputStatus);
@@ -165015,7 +165106,7 @@ var HtServerMockAbstract = class {
       if (this.parentHtRequestId) {
         this.span.setAttribute("parentHtRequestId", this.parentHtRequestId);
       }
-      const gitCommitHash = process.env.HT_COMMIT_ID || getGitCommitHash();
+      const gitCommitHash = getGitCommitHash();
       this.span.setAttribute("commit_hash", gitCommitHash);
       const branch = process.env.HT_BRANCH_NAME || getBranchName();
       this.span.setAttribute("branch", branch);
@@ -231829,7 +231920,8 @@ var initialiseNormally = (htConfig) => {
       process.env.DD_TRACE_DISABLED_PLUGINS = current === "" ? "http2" : `${current},http2`;
     }
     const isCurrentFolderInGitRepo = isCurrentFolderInGitRepoFn();
-    if (isCurrentFolderInGitRepo && isHavingUncommittedChangesFn()) {
+    const isDebugRun = process.env.HT_SDK_DEBUG === "true";
+    if (!isDebugRun && isCurrentFolderInGitRepo && isHavingUncommittedChangesFn()) {
       const gitDiff = getUncommittedChanges();
       console.log(
         "The following are the uncommitted changes in your repository."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypertestco/node-sdk-v3",
-  "version": "0.0.1-29",
+  "version": "0.0.1-31",
   "description": "node-sdk-v3 for hypertest",
   "private": false,
   "publishConfig": {