testilo 33.0.2 → 33.1.0

package/README.md

@@ -875,11 +875,12 @@ A user can invoke `track()` in one of these ways:
 ```javaScript
 node call track ttp99a 'main competitors'
 node call track ttp99a 'main competitors' 241016
+node call track ttp99a 'main competitors' '' 'ABC Foundation'
 node call track ttp99a 'main competitors' 241016 'ABC Foundation'
 ```
 
 When a user invokes `track()` in this example, the `call` module:
-- gets the summary report from the last file in the `summarized` subdirectory of the `REPORTDIR` directory, or if the third argument to `call()` exists the last one whose name begins with `'241016'`.
+- gets the summary report from the last file in the `summarized` subdirectory of the `REPORTDIR` directory, or if the third argument to `call()` exists and is not empty the last one whose name begins with `'241016'`.
 - selects the summarized data for all results in the summary report, or if the fourth argument to `call()` exists from all results whose `target.what` property has the value `'ABC Foundation'`.
 - uses tracker `ttp99a` to create a tracking report that identifies “main competitors” as its subject.
 - assigns an ID to the tracking report.

package/call.js

@@ -60,18 +60,24 @@ const getSummaryReport = async selector => {
   const summaryReportNames = await fs.readdir(summaryDir);
   let summaryReportName;
   if (summaryReportNames && summaryReportNames.length) {
-    summaryReportName = summaryReportNames.findLast(reportName => reportName.startsWith(selector));
-  }
-  else {
-    summaryReportName = summaryReportNames.pop();
-  }
-  if (summaryReportName) {
-    const summaryReportJSON = await fs.readFile(`${summaryDir}/${summaryReportName}`, 'utf8');
-    const summaryReport = JSON.parse(summaryReportJSON);
-    return summaryReport;
+    if (selector) {
+      summaryReportName = summaryReportNames
+      .findLast(reportName => reportName.startsWith(selector));
+    }
+    else {
+      summaryReportName = summaryReportNames.pop();
+    }
+    if (summaryReportName) {
+      const summaryReportJSON = await fs.readFile(`${summaryDir}/${summaryReportName}`, 'utf8');
+      const summaryReport = JSON.parse(summaryReportJSON);
+      return summaryReport;
+    }
+    else {
+      throw new Error('ERROR: Requested summary report not found');
+    }
   }
   else {
-    throw new Error(`ERROR: No summary report name starts with ${selector}`);
+    throw new Error('ERROR: No summary reports exist');
   }
 };
 // Converts a target list to a batch.
@@ -518,7 +524,7 @@ else if (fn === 'compare' && fnArgs.length === 3) {
     console.log('Execution completed');
   });
 }
-else if (fn === 'track' && fnArgs.length > 2 && fnArgs.length < 6) {
+else if (fn === 'track' && fnArgs.length > 1 && fnArgs.length < 5) {
   callTrack(... fnArgs)
   .then(() => {
     console.log('Execution completed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "33.0.2",
+  "version": "33.1.0",
   "description": "Prepares and processes Testaro reports",
   "main": "call.js",
   "scripts": {

package/procs/track/ttp40/index.html

@@ -46,16 +46,17 @@
             Plot.lineY(graphData, {
               x: 'time',
               y: 'score',
-              stroke: 'target'
+              stroke: 'target',
+              marker: 'circle-stroke'
             }),
-            Plot.text(graphData, Plot.selectLast({
+            Plot.text(graphData, {
               x: 'time',
               y: 'score',
               z: 'target',
               text: 'target',
               textAnchor: 'start',
               dx: 3
-            }))
+            })
           ]
         });
         document.getElementById('graph').insertAdjacentElement('beforeend', svg);

package/rescore.js

@@ -17,6 +17,9 @@ const {getNowStamp} = require('./procs/util');
 
 // Rescores a report.
 exports.rescore = (scorer, report, restrictionType, includedIDs) => {
+  const result = {
+    success: true
+  };
   // If tools are restricted:
   const {acts, id, score} = report;
   if (restrictionType === 'tools') {
@@ -30,9 +33,11 @@ exports.rescore = (scorer, report, restrictionType, includedIDs) => {
     }
     // Otherwise, i.e. if any tool included by the restriction is not in the report:
     else {
-      // Report this and quit.
-      console.log(`ERROR: Report includes only tools ${Array.from(reportToolIDs).join(', ')}`);
-      return;
+      // Report this and abort rescoring.
+      const message = `Report includes only tools ${Array.from(reportToolIDs).join(', ')}`;
+      result.success = false;
+      result.error = message;
+      console.log(`ERROR: ${message}`);
     }
   }
   // Otherwise, if issues are restricted:
@@ -94,17 +99,23 @@ exports.rescore = (scorer, report, restrictionType, includedIDs) => {
   }
   // Otherwise, i.e. if neither tools nor issues are restricted:
   else {
-    // Report this and quit.
-    console.log('ERROR: Neither tools nor issues are restricted');
-    return;
+    // Report this and abort rescoring.
+    const message = 'Neither tools nor issues are restricted';
+    result.success = false;
+    result.error = message;
+    console.log(`ERROR: ${message}`);
   }
   // Add rescoring data to the report.
   report.rescore = {
     originalID: id,
     timeStamp: getNowStamp(),
     restrictionType,
-    includedIDs
+    includedIDs,
+    result
+  }
+  // If rescoring was not aborted:
+  if (result.success) {
+    // Rescore the revised report.
+    scorer(report);
   }
-  // Score the revised report.
-  scorer(report);
 }