@naturalcycles/mysql-lib 3.14.7 → 3.15.0

package/dist/mysql.db.js

@@ -173,15 +173,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
         if (this.cfg.logSQL)
             this.cfg.logger.log(`stream: ${sql}`);
         // return this.streamSQL(sql, opt)
-        return this.pool()
-            .query(sql)
-            .stream()
-            .pipe(new node_stream_1.Transform({
-            objectMode: true,
-            transform(row, _encoding, cb) {
-                cb(null, (0, js_lib_1._filterUndefinedValues)(row, true));
-            },
-        }));
+        return this.pool().query(sql).stream().map(row => (0, js_lib_1._filterUndefinedValues)(row, true));
     }
     // SAVE
     async saveBatch(table, rowsInput, opt = {}) {

package/dist/mysqlKeyValueDB.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { CommonDBCreateOptions, CommonKeyValueDB, KeyValueDBTuple } from '@naturalcycles/db-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { MysqlDB, MysqlDBCfg } from './mysql.db';
@@ -22,4 +21,5 @@ export declare class MySQLKeyValueDB implements CommonKeyValueDB {
     beginTransaction(): Promise<void>;
     endTransaction(): Promise<void>;
     count(table: string): Promise<number>;
+    increment(_table: string, _id: string, _by?: number): Promise<number>;
 }

package/dist/mysqlKeyValueDB.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLKeyValueDB = void 0;
-const node_stream_1 = require("node:stream");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const mysql_db_1 = require("./mysql.db");
 class MySQLKeyValueDB {
@@ -63,16 +62,7 @@ class MySQLKeyValueDB {
             sql += ` LIMIT ${limit}`;
         if (this.cfg.logSQL)
             this.db.cfg.logger.log(`stream: ${sql}`);
-        return this.db
-            .pool()
-            .query(sql)
-            .stream()
-            .pipe(new node_stream_1.Transform({
-            objectMode: true,
-            transform(row, _, cb) {
-                cb(null, row.id);
-            },
-        }));
+        return this.db.pool().query(sql).stream().map(row => row.id);
     }
     streamValues(table, limit) {
         let sql = `SELECT v FROM ${table}`;
@@ -80,16 +70,7 @@ class MySQLKeyValueDB {
             sql += ` LIMIT ${limit}`;
         if (this.cfg.logSQL)
             this.db.cfg.logger.log(`stream: ${sql}`);
-        return this.db
-            .pool()
-            .query(sql)
-            .stream()
-            .pipe(new node_stream_1.Transform({
-            objectMode: true,
-            transform(row, _, cb) {
-                cb(null, row.v);
-            },
-        }));
+        return this.db.pool().query(sql).stream().map(row => row.v);
     }
     streamEntries(table, limit) {
         let sql = `SELECT id,v FROM ${table}`;
@@ -97,16 +78,10 @@ class MySQLKeyValueDB {
             sql += ` LIMIT ${limit}`;
         if (this.cfg.logSQL)
             this.db.cfg.logger.log(`stream: ${sql}`);
-        return this.db
-            .pool()
-            .query(sql)
-            .stream()
-            .pipe(new node_stream_1.Transform({
-            objectMode: true,
-            transform(row, _, cb) {
-                cb(null, [row.id, row.v]);
-            },
-        }));
+        return this.db.pool().query(sql).stream().map(row => [
+            row.id,
+            row.v,
+        ]);
     }
     async beginTransaction() {
         await this.db.runSQL({ sql: `BEGIN TRANSACTION` });
@@ -121,5 +96,8 @@ class MySQLKeyValueDB {
         const rows = await this.db.runSQL({ sql });
         return rows[0].cnt;
     }
+    async increment(_table, _id, _by) {
+        throw new js_lib_1.AppError('MySQLKeyValueDB.increment() is not implemented');
+    }
 }
 exports.MySQLKeyValueDB = MySQLKeyValueDB;

package/dist/query.util.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbQueryToSQLUpdate = exports.insertSQLSetSingle = exports.insertSQLSingle = exports.insertSQL = exports.dbQueryToSQLDelete = exports.dbQueryToSQLSelect = void 0;
+exports.dbQueryToSQLSelect = dbQueryToSQLSelect;
+exports.dbQueryToSQLDelete = dbQueryToSQLDelete;
+exports.insertSQL = insertSQL;
+exports.insertSQLSingle = insertSQLSingle;
+exports.insertSQLSetSingle = insertSQLSetSingle;
+exports.dbQueryToSQLUpdate = dbQueryToSQLUpdate;
 const tslib_1 = require("tslib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -25,7 +30,6 @@ function dbQueryToSQLSelect(q) {
     tokens.push(...offsetLimitTokens(q));
     return tokens.join(' ');
 }
-exports.dbQueryToSQLSelect = dbQueryToSQLSelect;
 /**
  * Returns null in "0 rows" case.
  */
@@ -40,7 +44,6 @@ function dbQueryToSQLDelete(q) {
     tokens.push(...offsetLimitTokens(q));
     return tokens.join(' ');
 }
-exports.dbQueryToSQLDelete = dbQueryToSQLDelete;
 /**
  * Returns array of sql statements to respect the max sql size.
  */
@@ -89,7 +92,6 @@ function insertSQL(table, rows, verb = 'INSERT', logger = console) {
     return sqls;
     // todo: handle "upsert" later
 }
-exports.insertSQL = insertSQL;
 function insertSQLSingle(table, record) {
     // INSERT INTO table_name (column1, column2, column3, ...)
     // VALUES (value1, value2, value3, ...);
@@ -110,14 +112,12 @@ function insertSQLSingle(table, record) {
     ];
     return tokens.join(' ');
 }
-exports.insertSQLSingle = insertSQLSingle;
 function insertSQLSetSingle(table, record) {
     return {
         sql: `INSERT INTO ${mysql.escapeId(table)} SET ?`,
         values: [record],
     };
 }
-exports.insertSQLSetSingle = insertSQLSetSingle;
 function dbQueryToSQLUpdate(q, record) {
     // var sql = mysql.format('UPDATE posts SET modified = ? WHERE id = ?', [CURRENT_TIMESTAMP, 42]);
     const whereTokens = getWhereTokens(q);
@@ -134,7 +134,6 @@ function dbQueryToSQLUpdate(q, record) {
     ];
     return mysql.format(tokens.join(' '), Object.values(record));
 }
-exports.dbQueryToSQLUpdate = dbQueryToSQLUpdate;
 function selectTokens(q) {
     let fields = ['*'];
     if (q._selectedFieldNames) {

package/dist/schema/mysql.schema.util.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapNameFromMySQL = exports.mapNameToMySQL = exports.mysqlTableStatsToJsonSchemaField = exports.jsonSchemaToMySQLDDL = void 0;
+exports.jsonSchemaToMySQLDDL = jsonSchemaToMySQLDDL;
+exports.mysqlTableStatsToJsonSchemaField = mysqlTableStatsToJsonSchemaField;
+exports.mapNameToMySQL = mapNameToMySQL;
+exports.mapNameFromMySQL = mapNameFromMySQL;
 const tslib_1 = require("tslib");
 const mysql = tslib_1.__importStar(require("mysql"));
 /**
@@ -56,7 +59,6 @@ function jsonSchemaToMySQLDDL(table, schema, opt = {}) {
     lines.push(`) ENGINE=${engine}`);
     return lines.join('\n');
 }
-exports.jsonSchemaToMySQLDDL = jsonSchemaToMySQLDDL;
 function mysqlTableStatsToJsonSchemaField(table, stats, logger) {
     const s = {
         $id: `${table}.schema.json`,
@@ -94,7 +96,6 @@ function mysqlTableStatsToJsonSchemaField(table, stats, logger) {
     });
     return s;
 }
-exports.mysqlTableStatsToJsonSchemaField = mysqlTableStatsToJsonSchemaField;
 /**
  * Because MySQL doesn't support `.` in field names and escapes them as tableName + fieldName.
  *
@@ -103,8 +104,6 @@ exports.mysqlTableStatsToJsonSchemaField = mysqlTableStatsToJsonSchemaField;
 function mapNameToMySQL(name) {
     return name.replaceAll('.', '_dot_');
 }
-exports.mapNameToMySQL = mapNameToMySQL;
 function mapNameFromMySQL(name) {
     return name.replaceAll('_dot_', '.');
 }
-exports.mapNameFromMySQL = mapNameFromMySQL;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/mysql-lib",
   "scripts": {
-    "prepare": "husky install"
+    "prepare": "husky"
   },
   "dependencies": {
     "@naturalcycles/db-lib": "^9.1.0",
@@ -11,7 +11,7 @@
     "mysql": "^2.17.1"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^13.2.1",
+    "@naturalcycles/dev-lib": "^15.18.0",
     "@types/node": "^20.2.3",
     "dotenv": "^16.0.0",
     "jest": "^29.0.0"
@@ -34,9 +34,9 @@
     "url": "https://github.com/NaturalCycles/mysql-lib"
   },
   "engines": {
-    "node": ">=16.15.0"
+    "node": ">=18.12.0"
   },
-  "version": "3.14.7",
+  "version": "3.15.0",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -1,4 +1,4 @@
-import { Readable, Transform } from 'node:stream'
+import { Readable } from 'node:stream'
 import { promisify } from 'node:util'
 import {
   DBPatch,
@@ -278,17 +278,9 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     if (this.cfg.logSQL) this.cfg.logger.log(`stream: ${sql}`)
 
     // return this.streamSQL(sql, opt)
-    return this.pool()
-      .query(sql)
-      .stream()
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform(row, _encoding, cb) {
-            cb(null, _filterUndefinedValues(row, true))
-          },
-        }),
-      )
+    return (this.pool().query(sql).stream() as ReadableTyped<ROW>).map(row =>
+      _filterUndefinedValues(row, true),
+    )
   }
 
   // SAVE

package/src/mysqlKeyValueDB.ts

@@ -1,6 +1,5 @@
-import { Transform } from 'node:stream'
 import { CommonDBCreateOptions, CommonKeyValueDB, KeyValueDBTuple } from '@naturalcycles/db-lib'
-import { pMap } from '@naturalcycles/js-lib'
+import { AppError, ObjectWithId, pMap } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { QueryOptions } from 'mysql'
 import { MysqlDB, MysqlDBCfg } from './mysql.db'
@@ -78,18 +77,7 @@ export class MySQLKeyValueDB implements CommonKeyValueDB {
     if (limit) sql += ` LIMIT ${limit}`
     if (this.cfg.logSQL) this.db.cfg.logger.log(`stream: ${sql}`)
 
-    return this.db
-      .pool()
-      .query(sql)
-      .stream()
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform(row, _, cb) {
-            cb(null, row.id)
-          },
-        }),
-      )
+    return (this.db.pool().query(sql).stream() as ReadableTyped<ObjectWithId>).map(row => row.id)
   }
 
   streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
@@ -97,18 +85,7 @@ export class MySQLKeyValueDB implements CommonKeyValueDB {
     if (limit) sql += ` LIMIT ${limit}`
     if (this.cfg.logSQL) this.db.cfg.logger.log(`stream: ${sql}`)
 
-    return this.db
-      .pool()
-      .query(sql)
-      .stream()
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform(row, _, cb) {
-            cb(null, row.v)
-          },
-        }),
-      )
+    return (this.db.pool().query(sql).stream() as ReadableTyped<{ v: Buffer }>).map(row => row.v)
   }
 
   streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple> {
@@ -116,18 +93,10 @@ export class MySQLKeyValueDB implements CommonKeyValueDB {
     if (limit) sql += ` LIMIT ${limit}`
     if (this.cfg.logSQL) this.db.cfg.logger.log(`stream: ${sql}`)
 
-    return this.db
-      .pool()
-      .query(sql)
-      .stream()
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform(row, _, cb) {
-            cb(null, [row.id, row.v])
-          },
-        }),
-      )
+    return (this.db.pool().query(sql).stream() as ReadableTyped<KeyValueObject>).map(row => [
+      row.id,
+      row.v,
+    ])
   }
 
   async beginTransaction(): Promise<void> {
@@ -145,4 +114,8 @@ export class MySQLKeyValueDB implements CommonKeyValueDB {
     const rows = await this.db.runSQL<{ cnt: number }[]>({ sql })
     return rows[0]!.cnt
   }
+
+  async increment(_table: string, _id: string, _by?: number): Promise<number> {
+    throw new AppError('MySQLKeyValueDB.increment() is not implemented')
+  }
 }