@naturalcycles/nodejs-lib 15.17.0 → 15.18.1

package/dist/csv/csvWriter.js

@@ -47,6 +47,10 @@ export function arrayToCSVString(arr, cfg = {}) {
  */
 export function arrayToCSVColumns(arr) {
     const cols = new Set();
-    arr.forEach(row => Object.keys(row).forEach(col => cols.add(col)));
+    for (const row of arr) {
+        for (const col of Object.keys(row)) {
+            cols.add(col);
+        }
+    }
     return [...cols];
 }

package/dist/fs/fs2.js

@@ -192,7 +192,9 @@ class FS2 {
             this.ensureDir(dirPath);
             return;
         }
-        items.forEach(item => this.removePath(path.join(dirPath, item)));
+        for (const item of items) {
+            this.removePath(path.join(dirPath, item));
+        }
     }
     async emptyDirAsync(dirPath) {
         let items;

package/dist/fs/kpy.js

@@ -41,7 +41,7 @@ export function kpySync(opt) {
     });
     kpyLogFilenames(opt, filenames);
     const overwrite = !opt.noOverwrite;
-    filenames.forEach(filename => {
+    for (const filename of filenames) {
         const basename = path.basename(filename);
         const srcFilename = path.resolve(opt.baseDir, filename);
         const destFilename = path.resolve(opt.outputDir, opt.flat ? basename : filename);
@@ -56,7 +56,7 @@ export function kpySync(opt) {
         if (opt.verbose) {
             console.log(grey(`  ${filename}`));
         }
-    });
+    }
     kpyLogResult(opt, filenames, started);
 }
 function kpyPrepare(opt) {

package/dist/stream/transform/transformMap.js

@@ -1,7 +1,7 @@
 import { _hc } from '@naturalcycles/js-lib';
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { _anyToError, ErrorMode } from '@naturalcycles/js-lib/error';
-import { pFilter } from '@naturalcycles/js-lib/promise/pFilter.js';
+import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { _stringify } from '@naturalcycles/js-lib/string/stringify.js';
 import { END, SKIP, } from '@naturalcycles/js-lib/types';
 import through2Concurrent from 'through2-concurrent';
@@ -77,15 +77,40 @@ export function transformMap(mapper, opt = {}) {
         const currentIndex = ++index;
         try {
             const res = await mapper(chunk, currentIndex);
-            const passedResults = await pFilter(flattenArrayOutput && Array.isArray(res) ? res : [res], async (r) => {
-                if (r === END) {
-                    isSettled = true; // will be checked later
-                    return false;
+            // Check for isSettled again, as it may happen while mapper was running
+            if (isSettled)
+                return cb();
+            // todo: consider retiring flattenArrayOutput from here
+            // and implementing it as a separate .flat transform/operator
+            const resInput = (flattenArrayOutput && Array.isArray(res) ? res : [res]);
+            if (predicate) {
+                await pMap(resInput, async (r) => {
+                    if (r === END) {
+                        isSettled = true; // will be checked later
+                        return END;
+                    }
+                    if (r === SKIP)
+                        return;
+                    if (await predicate(r, currentIndex)) {
+                        if (isSettled)
+                            return END; // isSettled could have happened in parallel
+                        countOut++;
+                        this.push(r);
+                    }
+                });
+            }
+            else {
+                for (const r of resInput) {
+                    if (r === END) {
+                        isSettled = true; // will be checked later
+                        break;
+                    }
+                    if (r === SKIP)
+                        continue;
+                    countOut++;
+                    this.push(r);
                 }
-                return r !== SKIP && (!predicate || (await predicate(r, currentIndex)));
-            });
-            countOut += passedResults.length;
-            passedResults.forEach(r => this.push(r));
+            }
             if (isSettled) {
                 logger.log(`transformMap END received at index ${currentIndex}`);
                 pipelineClose('transformMap', this, this.sourceReadable, this.streamDone, logger);

package/dist/stream/transform/transformMapSync.js

@@ -29,15 +29,18 @@ export function transformMapSync(mapper, opt = {}) {
             try {
                 // map and pass through
                 const v = mapper(chunk, currentIndex);
-                const passedResults = (flattenArrayOutput && Array.isArray(v) ? v : [v]).filter(r => {
+                // todo: consider retiring flattenArrayOutput option
+                const vInput = (flattenArrayOutput && Array.isArray(v) ? v : [v]);
+                for (const r of vInput) {
                     if (r === END) {
                         isSettled = true; // will be checked later
-                        return false;
+                        break;
                     }
-                    return r !== SKIP && (!predicate || predicate(r, currentIndex));
-                });
-                countOut += passedResults.length;
-                passedResults.forEach(r => this.push(r));
+                    if (r !== SKIP && (!predicate || predicate(r, currentIndex))) {
+                        countOut++;
+                        this.push(r);
+                    }
+                }
                 if (isSettled) {
                     logger.log(`transformMapSync END received at index ${currentIndex}`);
                     pipelineClose('transformMapSync', this, this.sourceReadable, this.streamDone, logger);

package/dist/stream/transform/worker/transformMultiThreaded.js

@@ -59,7 +59,9 @@ export function transformMultiThreaded(opt) {
         async final(cb) {
             try {
                 // Push null (complete) to all sub-streams
-                workers.forEach(worker => worker.postMessage(null));
+                for (const worker of workers) {
+                    worker.postMessage(null);
+                }
                 console.log(`transformMultiThreaded.final is waiting for all chains to be done`);
                 await Promise.all(workerDonePromises);
                 console.log(`transformMultiThreaded.final all chains done`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.17.0",
+  "version": "15.18.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@types/through2-concurrent": "^2",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "19.27.0"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/csv/csvWriter.ts

@@ -78,6 +78,10 @@ export function arrayToCSVString(arr: AnyObject[], cfg: CSVWriterConfig = {}): s
  */
 export function arrayToCSVColumns(arr: AnyObject[]): string[] {
   const cols = new Set<string>()
-  arr.forEach(row => Object.keys(row).forEach(col => cols.add(col)))
+  for (const row of arr) {
+    for (const col of Object.keys(row)) {
+      cols.add(col)
+    }
+  }
   return [...cols]
 }

package/src/fs/fs2.ts

@@ -219,7 +219,9 @@ class FS2 {
       return
     }
 
-    items.forEach(item => this.removePath(path.join(dirPath, item)))
+    for (const item of items) {
+      this.removePath(path.join(dirPath, item))
+    }
   }
 
   async emptyDirAsync(dirPath: string): Promise<void> {

package/src/fs/kpy.ts

@@ -97,7 +97,7 @@ export function kpySync(opt: KpyOptions): void {
 
   const overwrite = !opt.noOverwrite
 
-  filenames.forEach(filename => {
+  for (const filename of filenames) {
     const basename = path.basename(filename)
     const srcFilename = path.resolve(opt.baseDir, filename)
     const destFilename = path.resolve(opt.outputDir, opt.flat ? basename : filename)
@@ -113,7 +113,7 @@ export function kpySync(opt: KpyOptions): void {
     if (opt.verbose) {
       console.log(grey(`  ${filename}`))
     }
-  })
+  }
 
   kpyLogResult(opt, filenames, started)
 }

package/src/stream/transform/transformMap.ts

@@ -2,7 +2,7 @@ import { _hc } from '@naturalcycles/js-lib'
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
 import { _anyToError, ErrorMode } from '@naturalcycles/js-lib/error'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
-import { pFilter } from '@naturalcycles/js-lib/promise/pFilter.js'
+import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import { _stringify } from '@naturalcycles/js-lib/string/stringify.js'
 import {
   type AbortableAsyncMapper,
@@ -203,20 +203,41 @@ export function transformMap<IN = any, OUT = IN>(
       const currentIndex = ++index
 
       try {
-        const res = await mapper(chunk, currentIndex)
-        const passedResults = await pFilter(
-          flattenArrayOutput && Array.isArray(res) ? res : [res],
-          async r => {
+        const res: OUT | typeof SKIP | typeof END = await mapper(chunk, currentIndex)
+        // Check for isSettled again, as it may happen while mapper was running
+        if (isSettled) return cb()
+        // todo: consider retiring flattenArrayOutput from here
+        // and implementing it as a separate .flat transform/operator
+        const resInput = (flattenArrayOutput && Array.isArray(res) ? res : [res]) as (
+          | OUT
+          | typeof SKIP
+          | typeof END
+        )[]
+
+        if (predicate) {
+          await pMap(resInput, async r => {
             if (r === END) {
               isSettled = true // will be checked later
-              return false
+              return END
             }
-            return r !== SKIP && (!predicate || (await predicate(r, currentIndex)))
-          },
-        )
-
-        countOut += passedResults.length
-        passedResults.forEach(r => this.push(r))
+            if (r === SKIP) return
+            if (await predicate(r, currentIndex)) {
+              if (isSettled) return END // isSettled could have happened in parallel
+              countOut++
+              this.push(r)
+            }
+          })
+        } else {
+          for (const r of resInput) {
+            if (r === END) {
+              isSettled = true // will be checked later
+              break
+            }
+            if (r === SKIP) continue
+            countOut++
+            this.push(r)
+          }
+        }
 
         if (isSettled) {
           logger.log(`transformMap END received at index ${currentIndex}`)

package/src/stream/transform/transformMapSync.ts

@@ -102,17 +102,23 @@ export function transformMapSync<IN = any, OUT = IN>(
       try {
         // map and pass through
         const v = mapper(chunk, currentIndex)
-
-        const passedResults = (flattenArrayOutput && Array.isArray(v) ? v : [v]).filter(r => {
+        // todo: consider retiring flattenArrayOutput option
+        const vInput = (flattenArrayOutput && Array.isArray(v) ? v : [v]) as (
+          | OUT
+          | typeof SKIP
+          | typeof END
+        )[]
+
+        for (const r of vInput) {
           if (r === END) {
             isSettled = true // will be checked later
-            return false
+            break
           }
-          return r !== SKIP && (!predicate || predicate(r, currentIndex))
-        })
-
-        countOut += passedResults.length
-        passedResults.forEach(r => this.push(r))
+          if (r !== SKIP && (!predicate || predicate(r, currentIndex))) {
+            countOut++
+            this.push(r)
+          }
+        }
 
         if (isSettled) {
           logger.log(`transformMapSync END received at index ${currentIndex}`)

package/src/stream/transform/worker/transformMultiThreaded.ts

@@ -104,7 +104,9 @@ export function transformMultiThreaded<IN, OUT>(
       async final(cb) {
         try {
           // Push null (complete) to all sub-streams
-          workers.forEach(worker => worker.postMessage(null))
+          for (const worker of workers) {
+            worker.postMessage(null)
+          }
 
           console.log(`transformMultiThreaded.final is waiting for all chains to be done`)
           await Promise.all(workerDonePromises)