testilo 7.0.6 → 7.0.8

package/call.js

@@ -117,34 +117,12 @@ const callScore = async (scoreProcID, reportIDStart = '') => {
 };
 // Fulfills a multiple-report scoring request.
 const callMultiScore = async scoreProcID => {
-  // Identify all the raw reports.
-  const rawFileNames = await fs.readdir(rawDir);
-  const rawReportNames = rawFileNames.filter(fileName => fileName.endsWith('.json'));
-  // If any exist:
-  if (rawReportNames.length) {
-    // For each of them:
-    const {scorer} = require(`${scoreProcDir}/${scoreProcID}.js`);
-    for (const rawReportName of rawReportNames) {
-      // Score it.
-      const rawReportJSON = await fs.readFile(`${rawDir}/${rawReportName}.json`);
-      const rawReport = JSON.parse(rawReportJSON);
-      const scoredReport = score(scorer, rawReport);
-      // Save it, scored.
-      await fs.writeFile(
-        `${scoredDir}/${scoredReport.id}.json`, JSON.stringify(scoredReport, null, 2)
-      );
-      console.log(`Report ${rawReport.id} scored and saved in ${scoredDir}`);
-    }
-  }
-  // Otherwise, i.e. if no raw report exists:
-  else {
-    // Report this.
-    console.log('ERROR: No raw report found');
-  }
+  // Score all raw reports.
+  await multiScore(scoreProcID);
 };
 // Prepares to fulfill a digesting request.
 const digestPrep = async digestProcID => {
-  const {digest} = require('testilo/digest');
+  const {digest} = require('./digest');
   const {makeQuery} = require(`${digestProcDir}/${digestProcID}/index`);
   const digestTemplate = await fs.readFile(`${digestProcDir}/${digestProcID}/index.html`, 'utf8');
   // Identify the scored reports.
@@ -162,12 +140,12 @@ const digestPrep = async digestProcID => {
 // Digests and saves a report.
 const digestReport = async (scoredReportName, prepData) => {
   // Digest the specified report.
-  const scoredReportJSON = await fs.readFile(`${scoredDir}/${scoredReportName}.json`, 'utf8');
+  const scoredReportJSON = await fs.readFile(`${scoredDir}/${scoredReportName}`, 'utf8');
   const scoredReport = JSON.parse(scoredReportJSON);
   const digestedReport = digest(prepData.digestTemplate, prepData.makeQuery, scoredReport);
   // Save it, digested.
-  await fs.writeFile(`${digestedDir}/${digestedReport.id}.html`, digestedReport);
-  console.log(`Report ${scoredReport.id} digested and saved in ${digestedDir}`);
+  await fs.writeFile(`${digestedDir}/${scoredReport.job.id}.html`, digestedReport);
+  console.log(`Digested report ${scoredReport.job.id} saved in ${digestedDir}`);
 };
 // Fulfills a digesting request.
 const callDigest = async (digestProcID, reportIDStart = '') => {
@@ -218,14 +196,14 @@ const callMultiDigest = async digestProcID => {
     console.log('ERROR: No raw report found');
   }
   console.log(
-    `Digesting completed. Digest proc: ${digestProcID}. Report count: ${prepData.scoredReportNames.length}. Directory: ${digestedDir}`
+    `Digesting completed. Digest proc: ${digestProcID}. Report count: ${prepData.scoredReportNames.length}. Directory: ${digestedDir}.`
   );
 };
 // Fulfills a comparison request.
 const callCompare = async (compareProcID, comparisonNameBase) => {
   await compare(compareProcID, comparisonNameBase);
   console.log(
-    `Comparison completed. Comparison proc: ${compareProcID}. Directory: ${comparisonDir}`
+    `Comparison completed. Comparison proc: ${compareProcID}. Directory: ${comparisonDir}.`
   );
 };
 

package/digest.js

@@ -18,8 +18,8 @@ exports.digest = (digestTemplate, digestProc, scoredReport) => {
   const query = {};
   digestProc(scoredReport, query);
   // Use it to replace the placeholders in the template.
-  const digest = replaceHolders(digestTemplate, query);
+  const digestedReport = replaceHolders(digestTemplate, query);
   // Return the digest.
-  console.log(`Report ${scoredReport.id} digested`);
-  return digest;
+  console.log(`Report ${scoredReport.job.id} digested`);
+  return digestedReport;
 };

package/multiScore.js

@@ -14,6 +14,8 @@
 require('dotenv').config();
 // Module to read and write files.
 const fs = require('fs/promises');
+// Module to score reports.
+const {score} = require('./score');
 
 // ########## CONSTANTS
 
@@ -25,21 +27,22 @@ const scoreProcDir = process.env.SCOREPROCDIR || `${__dirname}/procs/score`;
 
 // Score the specified reports and return their count.
 exports.multiScore = async scoreProcID => {
+  // Get the score proc.
+  const {scorer} = require(`${scoreProcDir}/${scoreProcID}`);
   // Identify the reports to be scored.
   let reportFileNames = await fs.readdir(reportDirRaw);
   reportFileNames = reportFileNames.filter(fileName => fileName.endsWith('.json'));
   // For each of them:
-  const {scorer} = require(`${scoreProcDir}/${scoreProcID}`);
   for (const fileName of reportFileNames) {
     // Score it.
-    const reportJSON = await fs.readFile(`${reportDirRaw}/${fileName}`, 'utf8');
-    const report = JSON.parse(reportJSON);
-    await scorer(report);
-    report.scoreProcID = scoreProcID;
+    const rawReportJSON = await fs.readFile(`${reportDirRaw}/${fileName}`, 'utf8');
+    const rawReport = JSON.parse(rawReportJSON);
+    const scoredReport = await score(scorer, rawReport);
     // Write it to a file.
-    const scoredReportJSON = JSON.stringify(report, null, 2);
+    const scoredReportJSON = JSON.stringify(scoredReport, null, 2);
     await fs.writeFile(`${reportDirScored}/${fileName}`, `${scoredReportJSON}\n`);
-    console.log(`Report ${fileName.slice(0, -5)} scored and saved`);
   };
-  return reportFileNames.length;
+  console.log(
+    `Scored reports saved in ${reportDirScored}. Report count: ${reportFileNames.length}.`
+  );
 };

package/package.json

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

package/score.js

@@ -9,11 +9,11 @@
 // ########## FUNCTIONS
 
 // Score the specified raw report and return it, scored.
-exports.score = async (scoreProc, rawReport) => {
+exports.score = async (scorer, rawReport) => {
   // Initialize a scored report.
   const scoredReport = JSON.parse(JSON.stringify(rawReport));
   // Score it.
-  await scoreProc(scoredReport);
+  await scorer(scoredReport);
   console.log(`Report ${rawReport.job.id} scored`);
   return scoredReport;
 };