@naturalcycles/mysql-lib 4.5.0 → 4.7.0

package/dist/mysql.db.d.ts

@@ -1,9 +1,9 @@
 import type { CommonDB, CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBSupport, RunQueryResult } from '@naturalcycles/db-lib';
-import { BaseCommonDB, CommonDBType, DBQuery } from '@naturalcycles/db-lib';
+import { BaseCommonDB, DBQuery } from '@naturalcycles/db-lib';
 import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { Connection, Pool, PoolConfig, PoolConnection, QueryOptions } from 'mysql';
 export interface MysqlDBOptions extends CommonDBOptions {
 }
@@ -27,7 +27,7 @@ export interface MysqlDBCfg extends PoolConfig {
     logger?: CommonLogger;
 }
 export declare class MysqlDB extends BaseCommonDB implements CommonDB {
-    dbType: CommonDBType;
+    dbType: any;
     support: CommonDBSupport;
     constructor(cfg?: MysqlDBCfg);
     cfg: MysqlDBCfg & {
@@ -54,7 +54,7 @@ export declare class MysqlDB extends BaseCommonDB implements CommonDB {
      */
     runSQLString(s: string): Promise<void>;
     runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBOptions): Promise<number>;
-    streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: MysqlDBOptions): ReadableTyped<ROW>;
+    streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: MysqlDBOptions): Pipeline<ROW>;
     saveBatch<ROW extends ObjectWithId>(table: string, rowsInput: ROW[], opt?: MysqlDBSaveOptions<ROW>): Promise<void>;
     /**
      * Limitation: always returns [], regardless of which rows are actually deleted

package/dist/mysql.db.js

@@ -1,5 +1,4 @@
 import { __decorate } from "tslib";
-import { Readable, Transform } from 'node:stream';
 import { promisify } from 'node:util';
 import { BaseCommonDB, commonDBFullSupport, CommonDBType, DBQuery } from '@naturalcycles/db-lib';
 import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js';
@@ -7,6 +6,7 @@ import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { commonLoggerPrefix } from '@naturalcycles/js-lib/log';
 import { _filterUndefinedValues, _mapKeys, _mapValues, _omit } from '@naturalcycles/js-lib/object';
 import { white } from '@naturalcycles/nodejs-lib/colors';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import * as mysql from 'mysql';
 import { dbQueryToSQLDelete, dbQueryToSQLSelect, dbQueryToSQLUpdate, insertSQL, } from './query.util.js';
 import { jsonSchemaToMySQLDDL, mapNameFromMySQL, mysqlTableStatsToJsonSchemaField, } from './schema/mysql.schema.util.js';
@@ -170,7 +170,7 @@ export class MysqlDB extends BaseCommonDB {
     streamQuery(q, _opt = {}) {
         const sql = dbQueryToSQLSelect(q);
         if (!sql) {
-            return Readable.from([]);
+            return Pipeline.fromArray([]);
         }
         if (this.cfg.logSQL)
             this.cfg.logger.log(`stream: ${sql}`);
@@ -178,15 +178,7 @@ export class MysqlDB extends BaseCommonDB {
         // return (this.pool().query(sql).stream() as ReadableTyped<ROW>).map(row =>
         //   _filterUndefinedValues(row, true),
         // )
-        return this.pool()
-            .query(sql)
-            .stream()
-            .pipe(new Transform({
-            objectMode: true,
-            transform(row, _encoding, cb) {
-                cb(null, _filterUndefinedValues(row, { mutate: true }));
-            },
-        }));
+        return Pipeline.from(this.pool().query(sql).stream()).mapSync(row => _filterUndefinedValues(row, { mutate: true }));
     }
     // SAVE
     async saveBatch(table, rowsInput, opt = {}) {

package/dist/mysqlKeyValueDB.d.ts

@@ -1,16 +1,13 @@
 import type { CommonDBCreateOptions } from '@naturalcycles/db-lib';
 import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib/kv';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { MysqlDBCfg } from './mysql.db.js';
 import { MysqlDB } from './mysql.db.js';
 export declare class MySQLKeyValueDB implements CommonKeyValueDB {
     cfg: MysqlDBCfg;
     constructor(cfg: MysqlDBCfg);
     db: MysqlDB;
-    support: {
-        increment: boolean;
-        count?: boolean;
-    };
+    support: any;
     ping(): Promise<void>;
     close(): Promise<void>;
     createTable(table: string, opt?: CommonDBCreateOptions): Promise<void>;
@@ -21,9 +18,9 @@ export declare class MySQLKeyValueDB implements CommonKeyValueDB {
     dropTable(table: string): Promise<void>;
     deleteByIds(table: string, ids: string[]): Promise<void>;
     saveBatch(table: string, entries: KeyValueDBTuple[]): Promise<void>;
-    streamIds(table: string, limit?: number): ReadableTyped<string>;
-    streamValues(table: string, limit?: number): ReadableTyped<Buffer>;
-    streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple>;
+    streamIds(table: string, limit?: number): Pipeline<string>;
+    streamValues(table: string, limit?: number): Pipeline<Buffer>;
+    streamEntries(table: string, limit?: number): Pipeline<KeyValueDBTuple>;
     beginTransaction(): Promise<void>;
     endTransaction(): Promise<void>;
     count(table: string): Promise<number>;

package/dist/mysqlKeyValueDB.js

@@ -1,7 +1,7 @@
-import { Transform } from 'node:stream';
 import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib/kv';
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { MysqlDB } from './mysql.db.js';
 export class MySQLKeyValueDB {
     cfg;
@@ -70,16 +70,7 @@ export class MySQLKeyValueDB {
             this.db.cfg.logger.log(`stream: ${sql}`);
         // todo: this is nice, but `mysql` package uses `readable-stream@2` which is not compatible with `node:stream` iterable helpers
         // return (this.db.pool().query(sql).stream() as ReadableTyped<ObjectWithId>).map(row => row.id)
-        return this.db
-            .pool()
-            .query(sql)
-            .stream()
-            .pipe(new Transform({
-            objectMode: true,
-            transform(row, _encoding, cb) {
-                cb(null, row.id);
-            },
-        }));
+        return Pipeline.from(this.db.pool().query(sql).stream()).mapSync(r => r.id);
     }
     streamValues(table, limit) {
         let sql = `SELECT v FROM ${table}`;
@@ -87,7 +78,7 @@ export class MySQLKeyValueDB {
             sql += ` LIMIT ${limit}`;
         if (this.cfg.logSQL)
             this.db.cfg.logger.log(`stream: ${sql}`);
-        return this.db.pool().query(sql).stream().map(row => row.v);
+        return Pipeline.from(this.db.pool().query(sql).stream()).mapSync(row => row.v);
     }
     streamEntries(table, limit) {
         let sql = `SELECT id,v FROM ${table}`;
@@ -95,10 +86,7 @@ export class MySQLKeyValueDB {
             sql += ` LIMIT ${limit}`;
         if (this.cfg.logSQL)
             this.db.cfg.logger.log(`stream: ${sql}`);
-        return this.db.pool().query(sql).stream().map(row => [
-            row.id,
-            row.v,
-        ]);
+        return Pipeline.from(this.db.pool().query(sql).stream()).mapSync(row => [row.id, row.v]);
     }
     async beginTransaction() {
         await this.db.runSQL({ sql: `BEGIN TRANSACTION` });

package/dist/query.util.js

@@ -43,7 +43,9 @@ export function insertSQL(table, rows, verb = 'INSERT', logger = console) {
     // VALUES (value1, value2, value3, ...);
     // eslint-disable-next-line unicorn/no-array-reduce
     const fieldSet = rows.reduce((set, row) => {
-        Object.keys(row).forEach(field => set.add(field));
+        for (const field of Object.keys(row)) {
+            set.add(field);
+        }
         return set;
     }, new Set());
     const fields = [...fieldSet];
@@ -62,7 +64,7 @@ export function insertSQL(table, rows, verb = 'INSERT', logger = console) {
         return [full];
     const sqls = [];
     let sql;
-    valueRows.forEach(vrow => {
+    for (const vrow of valueRows) {
         if (!sql) {
             sql = start + vrow;
         }
@@ -75,7 +77,7 @@ export function insertSQL(table, rows, verb = 'INSERT', logger = console) {
                 sql += ',\n ' + vrow; // add
             }
         }
-    });
+    }
     if (sql) {
         sqls.push(sql); // last one
     }

package/package.json

@@ -12,7 +12,7 @@
   "devDependencies": {
     "@types/node": "^24",
     "dotenv": "^17",
-    "@naturalcycles/dev-lib": "19.11.0"
+    "@naturalcycles/dev-lib": "19.37.0"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "version": "4.5.0",
+  "version": "4.7.0",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -1,4 +1,3 @@
-import { Readable, Transform } from 'node:stream'
 import { promisify } from 'node:util'
 import type {
   CommonDB,
@@ -17,7 +16,7 @@ import { commonLoggerPrefix } from '@naturalcycles/js-lib/log'
 import { _filterUndefinedValues, _mapKeys, _mapValues, _omit } from '@naturalcycles/js-lib/object'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import { white } from '@naturalcycles/nodejs-lib/colors'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type {
   Connection,
   OkPacket,
@@ -269,10 +268,10 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
   override streamQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     _opt: MysqlDBOptions = {},
-  ): ReadableTyped<ROW> {
+  ): Pipeline<ROW> {
     const sql = dbQueryToSQLSelect(q)
     if (!sql) {
-      return Readable.from([])
+      return Pipeline.fromArray([])
     }
 
     if (this.cfg.logSQL) this.cfg.logger.log(`stream: ${sql}`)
@@ -281,17 +280,9 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     // return (this.pool().query(sql).stream() as ReadableTyped<ROW>).map(row =>
     //   _filterUndefinedValues(row, true),
     // )
-    return this.pool()
-      .query(sql)
-      .stream()
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform(row: ROW, _encoding, cb) {
-            cb(null, _filterUndefinedValues(row, { mutate: true }))
-          },
-        }),
-      )
+    return Pipeline.from<ROW>(this.pool().query(sql).stream()).mapSync(row =>
+      _filterUndefinedValues(row, { mutate: true }),
+    )
   }
 
   // SAVE

package/src/mysqlKeyValueDB.ts

@@ -1,11 +1,10 @@
-import { Transform } from 'node:stream'
 import type { CommonDBCreateOptions } from '@naturalcycles/db-lib'
 import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib/kv'
 import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib/kv'
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type { QueryOptions } from 'mysql'
 import type { MysqlDBCfg } from './mysql.db.js'
 import { MysqlDB } from './mysql.db.js'
@@ -83,44 +82,32 @@ export class MySQLKeyValueDB implements CommonKeyValueDB {
     })
   }
 
-  streamIds(table: string, limit?: number): ReadableTyped<string> {
+  streamIds(table: string, limit?: number): Pipeline<string> {
     let sql = `SELECT id FROM ${table}`
     if (limit) sql += ` LIMIT ${limit}`
     if (this.cfg.logSQL) this.db.cfg.logger.log(`stream: ${sql}`)
 
     // todo: this is nice, but `mysql` package uses `readable-stream@2` which is not compatible with `node:stream` iterable helpers
     // return (this.db.pool().query(sql).stream() as ReadableTyped<ObjectWithId>).map(row => row.id)
-    return this.db
-      .pool()
-      .query(sql)
-      .stream()
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform(row: ObjectWithId, _encoding, cb) {
-            cb(null, row.id)
-          },
-        }),
-      )
-  }
-
-  streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
+    return Pipeline.from<ObjectWithId>(this.db.pool().query(sql).stream()).mapSync(r => r.id)
+  }
+
+  streamValues(table: string, limit?: number): Pipeline<Buffer> {
     let sql = `SELECT v FROM ${table}`
     if (limit) sql += ` LIMIT ${limit}`
     if (this.cfg.logSQL) this.db.cfg.logger.log(`stream: ${sql}`)
 
-    return (this.db.pool().query(sql).stream() as ReadableTyped<{ v: Buffer }>).map(row => row.v)
+    return Pipeline.from<{ v: Buffer }>(this.db.pool().query(sql).stream()).mapSync(row => row.v)
   }
 
-  streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple> {
+  streamEntries(table: string, limit?: number): Pipeline<KeyValueDBTuple> {
     let sql = `SELECT id,v FROM ${table}`
     if (limit) sql += ` LIMIT ${limit}`
     if (this.cfg.logSQL) this.db.cfg.logger.log(`stream: ${sql}`)
 
-    return (this.db.pool().query(sql).stream() as ReadableTyped<KeyValueObject>).map(row => [
-      row.id,
-      row.v,
-    ])
+    return Pipeline.from<{ id: string; v: Buffer }>(this.db.pool().query(sql).stream()).mapSync(
+      row => [row.id, row.v],
+    )
   }
 
   async beginTransaction(): Promise<void> {

package/src/query.util.ts

@@ -62,7 +62,9 @@ export function insertSQL(
 
   // eslint-disable-next-line unicorn/no-array-reduce
   const fieldSet = rows.reduce((set: Set<string>, row) => {
-    Object.keys(row).forEach(field => set.add(field))
+    for (const field of Object.keys(row)) {
+      set.add(field)
+    }
     return set
   }, new Set<string>())
   const fields = [...fieldSet]
@@ -86,7 +88,7 @@ export function insertSQL(
   const sqls: string[] = []
   let sql: string | undefined
 
-  valueRows.forEach(vrow => {
+  for (const vrow of valueRows) {
     if (!sql) {
       sql = start + vrow
     } else {
@@ -97,7 +99,7 @@ export function insertSQL(
         sql += ',\n ' + vrow // add
       }
     }
-  })
+  }
 
   if (sql) {
     sqls.push(sql) // last one