testilo 11.0.3 → 11.0.5

package/call.js

@@ -95,14 +95,12 @@ const callScore = async (scorerID, selector = '') => {
     // Get the scorer.
     const {scorer} = require(`${functionDir}/score/${scorerID}`);
     // Score the reports.
-    const scoredReports = score(scorer, reports);
+    score(scorer, reports);
     const scoredReportDir = `${reportDir}/scored`;
     // For each scored report:
-    for (const scoredReport of scoredReports) {
+    for (const report of reports) {
       // Save it.
-      await fs.writeFile(
-        `${scoredReportDir}/${scoredReport.id}.json`, JSON.stringify(scoredReport, null, 2)
-      );
+      await fs.writeFile(`${scoredReportDir}/${report.id}.json`, JSON.stringify(report, null, 2));
     };
   }
   // Otherwise, i.e. if no raw reports are to be scored:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "11.0.3",
+  "version": "11.0.5",
   "description": "Client that scores and digests Testaro reports",
   "main": "aim.js",
   "scripts": {

package/procs/score/tsp26.js

@@ -2,13 +2,11 @@
   tsp26
   Testilo score proc 26
 
-  Computes scores from Testilo script ts26 and adds them to a report.
+  Totals the standardized tool totals from a ts26 report and adds them to the report. This proc
+  does not compensate for inter-tool duplicativity, treats tool totals as equivalent, and
+  weighs ordinal severities linearly from 1 to 4.
 */
 
-// IMPORTS
-
-const {issues} = require('./tic26');
-
 // CONSTANTS
 
 // ID of this proc.
@@ -29,49 +27,40 @@ const normalLatency = 20;
 // How much each prevention adds to the score.
 const preventionWeight = 100;
 
-// VARIABLES
-
-let summary = {};
-let preventionScores = {};
-
 // FUNCTIONS
 
 // Scores a report.
-exports.scorer = async report => {
-  // Initialize the score.
-  report.score = {
-    scoreProcID,
-    summary: {
-      total: 0,
-      tools: 0,
-      preventions: 0,
-      log: 0,
-      latency: 0
-    },
-    toolTotals: [],
-    tools: {},
-    preventions: {}
-  };
+exports.scorer = report => {
   // If there are any acts in the report:
   const {acts} = report;
   if (Array.isArray(acts) && acts.length) {
     // If any of them are test acts:
     const testActs = acts.filter(act => act.type === 'test');
     if (testActs.length) {
-      // Initialize a report score.
-      report.score = {
+      // Initialize the score data.
+      const score = {
+        scoreProcID,
+        summary: {
+          total: 0,
+          tools: 0,
+          preventions: 0,
+          log: 0,
+          latency: 0
+        },
+        toolTotals: [0, 0, 0, 0],
         tools: {},
-        total: 0
+        preventions: {}
       };
-      const {score} = report;
       const {summary} = score;
       // For each test act:
       testActs.forEach(act => {
-        // If a result with totals exists:
+        // If a standard result with valid totals exists:
         const {which} = act;
-        if (act.result && act.result.totals && act.result.totals.length === 4) {
+        if (
+          act.standardResult && act.standardResult.totals && act.standardResult.totals.length === 4
+        ) {
           // Add the tool totals to the score.
-          const {totals} = act.result;
+          const {totals} = act.standardResult;
           score.tools[which] = totals;
           score.toolTotals.forEach((total, index) => {
             score.toolTotals[index] += totals[index];
@@ -88,8 +77,8 @@ exports.scorer = async report => {
             act.result.prevented = true;
           };
           // Add the tool and the prevention score to the score.
-          report.score.preventions[which] = preventionWeight;
-          report.score.preventions += preventionWeight;
+          score.preventions[which] = preventionWeight;
+          summary.preventions += preventionWeight;
         }
       });
       // Add the log score to the score.
@@ -105,6 +94,8 @@ exports.scorer = async report => {
       summary.latency = Math.round(latencyWeight * (jobData.visitLatency - normalLatency));
       // Add the total score to the score.
       summary.total = summary.tools + summary.preventions + summary.log + summary.latency;
+      // Add the score to the report.
+      report.score = score;
     }
     // Otherwise, i.e. if none of them is a test act:
     else {