@naturalcycles/mysql-lib 3.12.2 → 3.12.4

package/dist/mysql.db.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlDB = void 0;
 const tslib_1 = require("tslib");
-const stream_1 = require("stream");
-const util_1 = require("util");
+const node_stream_1 = require("node:stream");
+const node_util_1 = require("node:util");
 const db_lib_1 = require("@naturalcycles/db-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
@@ -74,8 +74,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
     }
     async close() {
         const pool = this.pool();
-        // eslint-disable-next-line @typescript-eslint/await-thenable
-        await (0, util_1.promisify)(pool.end.bind(pool))();
+        await (0, node_util_1.promisify)(pool.end.bind(pool))();
         this.cfg.logger.log('closed');
     }
     /**
@@ -83,7 +82,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
      */
     async getConnection() {
         const pool = this.pool();
-        return await (0, util_1.promisify)(pool.getConnection.bind(pool))();
+        return await (0, node_util_1.promisify)(pool.getConnection.bind(pool))();
     }
     /**
      * Manually create a single (not pool) connection.
@@ -91,7 +90,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
      */
     async createSingleConnection() {
         const con = mysql.createConnection(this.cfg);
-        await (0, util_1.promisify)(con.connect.bind(con))();
+        await (0, node_util_1.promisify)(con.connect.bind(con))();
         const { threadId } = con;
         if (this.cfg.debugConnections) {
             this.cfg.logger.log(`createSingleConnection(${threadId})`);
@@ -163,7 +162,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
     streamQuery(q, _opt = {}) {
         const sql = (0, query_util_1.dbQueryToSQLSelect)(q);
         if (!sql) {
-            return stream_1.Readable.from([]);
+            return node_stream_1.Readable.from([]);
         }
         if (this.cfg.logSQL)
             this.cfg.logger.log(`stream: ${sql}`);
@@ -171,7 +170,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
         return this.pool()
             .query(sql)
             .stream()
-            .pipe(new stream_1.Transform({
+            .pipe(new node_stream_1.Transform({
             objectMode: true,
             transform(row, _encoding, cb) {
                 cb(null, (0, js_lib_1._filterUndefinedValues)(row, true));
@@ -184,7 +183,12 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
             return;
         // Stringify object values
         const rows = rowsInput.map(row => (0, js_lib_1._mapValues)(row, (_k, v) => {
-            return v && typeof v === 'object' && !Buffer.isBuffer(v) ? JSON.stringify(v) : v;
+            if (v && typeof v === 'object' && !Buffer.isBuffer(v)) {
+                // This is to avoid implicit Date stringification and mismatch: it gets saved as Date, but loaded as String
+                (0, js_lib_1._assert)(!(v instanceof Date), 'mysql-lib does not support Date values, please stringify them before passing');
+                return JSON.stringify(v);
+            }
+            return v;
         }));
         const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE';
         if (opt.assignGeneratedIds) {

package/dist/mysqlKeyValueDB.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLKeyValueDB = void 0;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const mysql_db_1 = require("./mysql.db");
 class MySQLKeyValueDB {
@@ -67,7 +67,7 @@ class MySQLKeyValueDB {
             .pool()
             .query(sql)
             .stream()
-            .pipe(new stream_1.Transform({
+            .pipe(new node_stream_1.Transform({
             objectMode: true,
             transform(row, _, cb) {
                 cb(null, row.id);
@@ -84,7 +84,7 @@ class MySQLKeyValueDB {
             .pool()
             .query(sql)
             .stream()
-            .pipe(new stream_1.Transform({
+            .pipe(new node_stream_1.Transform({
             objectMode: true,
             transform(row, _, cb) {
                 cb(null, row.v);
@@ -101,7 +101,7 @@ class MySQLKeyValueDB {
             .pool()
             .query(sql)
             .stream()
-            .pipe(new stream_1.Transform({
+            .pipe(new node_stream_1.Transform({
             objectMode: true,
             transform(row, _, cb) {
                 cb(null, [row.id, row.v]);

package/package.json

@@ -34,9 +34,9 @@
     "url": "https://github.com/NaturalCycles/mysql-lib"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.15.0"
   },
-  "version": "3.12.2",
+  "version": "3.12.4",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -1,5 +1,5 @@
-import { Readable, Transform } from 'stream'
-import { promisify } from 'util'
+import { Readable, Transform } from 'node:stream'
+import { promisify } from 'node:util'
 import {
   BaseCommonDB,
   CommonDB,
@@ -10,6 +10,7 @@ import {
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import {
+  _assert,
   _filterUndefinedValues,
   _mapKeys,
   _mapValues,
@@ -143,7 +144,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
 
   async close(): Promise<void> {
     const pool = this.pool()
-    // eslint-disable-next-line @typescript-eslint/await-thenable
+
     await promisify(pool.end.bind(pool))()
     this.cfg.logger.log('closed')
   }
@@ -291,7 +292,15 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     // Stringify object values
     const rows = rowsInput.map(row =>
       _mapValues(row, (_k, v) => {
-        return v && typeof v === 'object' && !Buffer.isBuffer(v) ? JSON.stringify(v) : v
+        if (v && typeof v === 'object' && !Buffer.isBuffer(v)) {
+          // This is to avoid implicit Date stringification and mismatch: it gets saved as Date, but loaded as String
+          _assert(
+            !(v instanceof Date),
+            'mysql-lib does not support Date values, please stringify them before passing',
+          )
+          return JSON.stringify(v)
+        }
+        return v
       }),
     )
 
@@ -325,7 +334,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
   /**
    * Limitation: always returns [], regardless of which rows are actually deleted
    */
-  override async deleteByIds<ROW extends ObjectWithId>(
+  async deleteByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     _opt?: MysqlDBOptions,

package/src/mysqlKeyValueDB.ts

@@ -1,4 +1,4 @@
-import { Transform } from 'stream'
+import { Transform } from 'node:stream'
 import { CommonDBCreateOptions, CommonKeyValueDB, KeyValueDBTuple } from '@naturalcycles/db-lib'
 import { pMap } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'