@naturalcycles/db-lib - npm Package Compare versions

Comparing version 8.3.0 to 8.3.1

CHANGELOG.md

@@ -0,1 +1,8 @@
+## [8.3.1](https://github.com/NaturalCycles/db-lib/compare/v8.3.0...v8.3.1) (2020-11-04)
+
+
+### Bug Fixes
+
+* CommonDao.streamQueryForEach* now report progress correctly ([b928dc1](https://github.com/NaturalCycles/db-lib/commit/b928dc13a93480306ab88246a76ed3d8616b0e35))
+
 # [8.3.0](https://github.com/NaturalCycles/db-lib/compare/v8.2.0...v8.3.0) (2020-10-25)
@@ -2,0 +9,0 @@

dist/commondao/common.dao.js

@@ -247,2 +247,7 @@ "use strict";
             nodejs_lib_1.transformTap(() => count++),
+            nodejs_lib_1.transformMap(mapper, {
+                ...opt,
+                predicate: js_lib_1._passthroughPredicate,
+            }),
+            // LogProgress should be AFTER the mapper, to be able to report correct stats
             nodejs_lib_1.transformLogProgress({
@@ -252,3 +257,3 @@ metric: q.table,
             }),
-            nodejs_lib_1.writableForEach(mapper, opt),
+            nodejs_lib_1.writableVoid(),
         ]);
@@ -272,2 +277,7 @@ if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {
             nodejs_lib_1.transformTap(() => count++),
+            nodejs_lib_1.transformMap(mapper, {
+                ...opt,
+                predicate: js_lib_1._passthroughPredicate,
+            }),
+            // LogProgress should be AFTER the mapper, to be able to report correct stats
             nodejs_lib_1.transformLogProgress({
@@ -277,3 +287,3 @@ metric: q.table,
             }),
-            nodejs_lib_1.writableForEach(mapper, opt),
+            nodejs_lib_1.writableVoid(),
         ]);
@@ -345,2 +355,7 @@ if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {
             nodejs_lib_1.transformTap(() => count++),
+            nodejs_lib_1.transformMap(mapper, {
+                ...opt,
+                predicate: js_lib_1._passthroughPredicate,
+            }),
+            // LogProgress should be AFTER the mapper, to be able to report correct stats
             nodejs_lib_1.transformLogProgress({
@@ -350,3 +365,3 @@ metric: q.table,
             }),
-            nodejs_lib_1.writableForEach(mapper, opt),
+            nodejs_lib_1.writableVoid(),
         ]);
@@ -353,0 +368,0 @@ if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {

dist/pipeline/dbPipelineBackup.js

@@ -29,3 +29,3 @@ "use strict";
     console.log(`>> ${colors_1.dimWhite('dbPipelineBackup')} started in ${colors_1.grey(outputDirPath)}...${sinceUpdatedStr}`);
-    await fs.ensureDir(outputDirPath);
+    fs.ensureDirSync(outputDirPath);
     if (!tables) {
@@ -32,0 +32,0 @@ tables = await db.getTables();

dist/pipeline/dbPipelineRestore.js

@@ -23,3 +23,3 @@ "use strict";
     console.log(`>> ${colors_1.dimWhite('dbPipelineRestore')} started in ${colors_1.grey(inputDirPath)}...${sinceUpdatedStr}`);
-    await fs.ensureDir(inputDirPath);
+    fs.ensureDirSync(inputDirPath);
     const tablesToGzip = new Set();
@@ -29,3 +29,3 @@ const sizeByTable = {};
     const tables = [];
-    (await fs.readdir(inputDirPath)).forEach(f => {
+    fs.readdirSync(inputDirPath).forEach(f => {
         let table;
@@ -32,0 +32,0 @@ let gzip = false;

package.json

@@ -44,3 +44,3 @@ {
   },
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "Lowest Common Denominator API to supported Databases",
@@ -47,0 +47,0 @@ "keywords": [

src/commondao/common.dao.ts

@@ -6,2 +6,3 @@ import {
   _filterNullishValues,
+  _passthroughPredicate,
   _since,
@@ -19,3 +20,3 @@ _truncate,
   transformTap,
-  writableForEach,
+  writableVoid,
   _pipeline,
@@ -332,2 +333,7 @@ } from '@naturalcycles/nodejs-lib'
       transformTap(() => count++),
+      transformMap<OUT, void>(mapper, {
+        ...opt,
+        predicate: _passthroughPredicate,
+      }),
+      // LogProgress should be AFTER the mapper, to be able to report correct stats
       transformLogProgress({
@@ -337,3 +343,3 @@ metric: q.table,
       }),
-      writableForEach<OUT>(mapper, opt),
+      writableVoid(),
     ])
@@ -364,7 +370,12 @@
       transformTap(() => count++),
-      transformLogProgress<DBM>({
+      transformMap<OUT, void>(mapper, {
+        ...opt,
+        predicate: _passthroughPredicate,
+      }),
+      // LogProgress should be AFTER the mapper, to be able to report correct stats
+      transformLogProgress({
         metric: q.table,
         ...opt,
       }),
-      writableForEach<OUT>(mapper, opt),
+      writableVoid(),
     ])
@@ -465,7 +476,12 @@
       transformTap(() => count++),
-      transformLogProgress<string>({
+      transformMap<string, void>(mapper, {
+        ...opt,
+        predicate: _passthroughPredicate,
+      }),
+      // LogProgress should be AFTER the mapper, to be able to report correct stats
+      transformLogProgress({
         metric: q.table,
         ...opt,
       }),
-      writableForEach<string>(mapper, opt),
+      writableVoid(),
     ])
@@ -472,0 +488,0 @@

src/pipeline/dbPipelineBackup.ts

@@ -146,3 +146,3 @@ import { AppError, AsyncMapper, ErrorMode, pMap, _passthroughMapper } from '@naturalcycles/js-lib'
 
-  await fs.ensureDir(outputDirPath)
+  fs.ensureDirSync(outputDirPath)
 
@@ -149,0 +149,0 @@ if (!tables) {

src/pipeline/dbPipelineRestore.ts

@@ -137,3 +137,3 @@ import {
 
-  await fs.ensureDir(inputDirPath)
+  fs.ensureDirSync(inputDirPath)
 
@@ -144,3 +144,3 @@ const tablesToGzip = new Set<string>()
   const tables: string[] = []
-  ;(await fs.readdir(inputDirPath)).forEach(f => {
+  fs.readdirSync(inputDirPath).forEach(f => {
     let table: string
@@ -147,0 +147,0 @@ let gzip = false

No alert changes

Improved metrics

Total package byte prevSize

470340

increased by0.35%

Lines of code

8567

increased by0.36%

No dependency changes