@nu-art/ts-common 0.201.5 → 0.201.7

package/modules/CSVModule.d.ts

@@ -33,7 +33,8 @@ declare class CSVModule_Class extends Module<Config> {
     readCsvFromFile<T extends Partial<StringMap>>(inputFile: string, readOptions?: ReadOptions): Promise<T[]>;
     readCsvFromBuffer<T extends Partial<StringMap>>(buffer: Buffer, readOptions?: ReadOptions): Promise<T[]>;
     readCsvFromStream<T extends Partial<StringMap>>(stream: Readable, readOptions?: ReadOptions): Promise<T[]>;
-    forEachCsvRowFromStream<T extends Partial<StringMap>>(stream: Readable, callback: (instance: T) => Promise<void>, readOptions?: ReadOptions, queueCount?: number): Promise<void>;
+    forEachCsvRowFromStreamAsync<T extends Partial<StringMap>>(stream: Readable, callback: (instance: T) => Promise<void>, readOptions?: ReadOptions, queueCount?: number): Promise<void>;
+    forEachCsvRowFromStreamSync<T extends Partial<StringMap>>(stream: Readable, callback: (instance: T, index: number) => void, readOptions?: ReadOptions): Promise<void>;
     private createReadParserOptions;
 }
 export declare const CSVModule: CSVModule_Class;

package/modules/CSVModule.js

@@ -34,8 +34,8 @@ const export_to_csv_1 = require("export-to-csv");
 const fs_1 = require("fs");
 const module_1 = require("../core/module");
 const stream_1 = require("stream");
-const csvParser = require("csv-parser");
 const queue_1 = require("../utils/queue");
+const csvParser = require("csv-parser");
 const DefaultConfig = {
     options: {
         fieldSeparator: ',',
@@ -99,7 +99,7 @@ class CSVModule_Class extends module_1.Module {
             });
         });
     }
-    forEachCsvRowFromStream(stream, callback, readOptions = {}, queueCount = 5) {
+    forEachCsvRowFromStreamAsync(stream, callback, readOptions = {}, queueCount = 5) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 const instancesQueue = new queue_1.Queue('instancesQueue');
@@ -108,7 +108,22 @@ class CSVModule_Class extends module_1.Module {
                     .pipe(csvParser(this.createReadParserOptions(readOptions)))
                     .on('data', (instance) => instancesQueue.addItem(() => callback(instance)))
                     .on('error', (err) => reject(err))
-                    .on('end', () => resolve());
+                    .on('end', () => instancesQueue.setOnQueueEmpty(() => resolve()));
+            });
+        });
+    }
+    forEachCsvRowFromStreamSync(stream, callback, readOptions = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                let rowIndex = 0;
+                stream
+                    .pipe(csvParser(this.createReadParserOptions(readOptions)))
+                    .on('data', (instance) => callback(instance, rowIndex++))
+                    .on('error', (err) => reject(err))
+                    .on('end', () => {
+                    this.logInfo('read ended');
+                    resolve();
+                });
             });
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/ts-common",
-  "version": "0.201.5",
+  "version": "0.201.7",
   "description": "js and ts infra",
   "keywords": [
     "TacB0sS",