@engine9-io/input-tools 1.7.0 → 1.7.2

package/ForEachEntry.js

@@ -1,6 +1,6 @@
 const fs = require('node:fs');
 
-const { Writable } = require('node:stream');
+const { Transform, Writable } = require('node:stream');
 const { pipeline } = require('node:stream/promises');
 const { throttle } = require('throttle-debounce');
 const parallelTransform = require('parallel-transform');
@@ -35,15 +35,19 @@ class ForEachEntry {
     };
 
     return this.outputStreams[name].mutex.runExclusive(async () => {
-      const outputFile = await getTempFilename({ postfix });
-      debug(`Output file requested, writing output to to: ${outputFile}`);
+      const fileInfo = {
+        filename: await getTempFilename({ postfix }),
+        records: 0,
+      };
+
+      debug(`Output file requested, writing output to to: ${fileInfo.filename}`);
       const outputStream = new ValidatingReadable({
         objectMode: true,
       }, validatorFunction);
       // eslint-disable-next-line no-underscore-dangle
       outputStream._read = () => {};
 
-      const writeStream = fs.createWriteStream(outputFile);
+      const writeStream = fs.createWriteStream(fileInfo.filename);
       const finishWritingOutputPromise = new Promise((resolve, reject) => {
         writeStream.on('finish', () => {
           resolve();
@@ -52,15 +56,23 @@ class ForEachEntry {
         });
       });
 
-      outputStream
-        .pipe(csv.stringify({ header: true }))
-        .pipe(writeStream);
-
       this.outputStreams[name].items = {
         stream: outputStream,
         promises: [finishWritingOutputPromise],
-        files: [outputFile],
+        files: [fileInfo],
       };
+
+      outputStream
+        .pipe(new Transform({
+          objectMode: true,
+          transform(o, enc, cb) {
+            fileInfo.records += 1;
+            cb();
+          },
+        }))
+        .pipe(csv.stringify({ header: true }))
+        .pipe(writeStream);
+
       return this.outputStreams[name].items;
     });
   }

package/file/FileUtilities.js

@@ -190,7 +190,6 @@ Worker.prototype.fileToObjectStream = async function (options) {
 
   debug(`Reading file ${filename} with encoding:`, encoding);
 
-  const head = null;
   let transforms = [];
 
   if (postfix === 'gz') {
@@ -270,13 +269,14 @@ Worker.prototype.fileToObjectStream = async function (options) {
     },
     flush(cb) {
       // If there's no records at all, push a dummy record, and specify 0 records
+      // Don't push dummy records anymore -- legacy cruft
       debug(`Completed reading file, records=${count}`);
-      if (count === 0) {
+      /* if (count === 0) {
         const o = { _is_placeholder: true };
 
         if (head) head.forEach((c) => { o[c] = null; });
         this.push(o);
-      }
+      } */
       cb();
     },
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@engine9-io/input-tools",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Tools for dealing with Engine9 inputs",
   "main": "index.js",
   "scripts": {

package/test/packet/forEach.js

@@ -55,8 +55,8 @@ describe('Test Person Packet For Each', async () => {
         },
       },
     );
-    assert(result.outputFiles?.timelineOutputFileStream?.length);
-    assert(result.outputFiles?.sampleOutputFileStream?.length);
+    assert(result.outputFiles?.timelineOutputFileStream?.[0]?.records);
+    assert(result.outputFiles?.sampleOutputFileStream?.[0]?.records);
     assert.equal(counter, 1000, `Expected to loop through 1000 people, actual:${counter}`);
   });
   debug('Completed tests');