@naturalcycles/mysql-lib 4.8.1 → 4.10.0

package/dist/mysql.db.d.ts

@@ -22,7 +22,7 @@ export interface MysqlDBCfg extends PoolConfig {
      */
     debugConnections?: boolean;
     /**
-     * Default to `console`
+     * Default to `consoleLogger`
      */
     logger?: CommonLogger;
 }

package/dist/mysql.db.js

@@ -3,7 +3,7 @@ import { promisify } from 'node:util';
 import { BaseCommonDB, commonDBFullSupport, CommonDBType, DBQuery } from '@naturalcycles/db-lib';
 import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { commonLoggerPrefix } from '@naturalcycles/js-lib/log';
+import { consoleLogger } 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';
@@ -49,7 +49,7 @@ export class MysqlDB extends BaseCommonDB {
             // password: MYSQL_PW,
             // database: MYSQL_DB,
             ...cfg,
-            logger: commonLoggerPrefix(cfg.logger || console, '[mysql]'),
+            logger: (cfg.logger || consoleLogger).child({ module: 'mysql' }),
         };
     }
     cfg;
@@ -108,7 +108,7 @@ export class MysqlDB extends BaseCommonDB {
             con.on('end', () => this.cfg.logger.log(`createSingleConnection(${threadId}).end`));
         }
         con.on('error', err => {
-            this.cfg.logger.error(`createSingleConnection(${threadId}).error`, err);
+            this.cfg.logger.error({ msg: `createSingleConnection(${threadId}).error`, err });
         });
         return con;
     }
@@ -140,8 +140,9 @@ export class MysqlDB extends BaseCommonDB {
         };
     }
     async runSQL(q) {
-        if (this.cfg.logSQL)
-            this.cfg.logger.log(...[q.sql, q.values].filter(Boolean));
+        if (this.cfg.logSQL) {
+            this.cfg.logger.log(_filterUndefinedValues({ msg: q.sql, values: q.values }));
+        }
         return await new Promise((resolve, reject) => {
             this.pool().query(q, (err, res) => {
                 if (err)

package/dist/query.util.js

@@ -1,4 +1,5 @@
 import { _hb } from '@naturalcycles/js-lib';
+import { consoleLogger } from '@naturalcycles/js-lib/log';
 import { white, yellow } from '@naturalcycles/nodejs-lib/colors';
 import * as mysql from 'mysql';
 import { mapNameToMySQL } from './schema/mysql.schema.util.js';
@@ -38,7 +39,7 @@ export function dbQueryToSQLDelete(q) {
 /**
  * Returns array of sql statements to respect the max sql size.
  */
-export function insertSQL(table, rows, verb = 'INSERT', logger = console) {
+export function insertSQL(table, rows, verb = 'INSERT', logger = consoleLogger) {
     // INSERT INTO table_name (column1, column2, column3, ...)
     // VALUES (value1, value2, value3, ...);
     // oxlint-disable-next-line unicorn/no-array-reduce
@@ -48,12 +49,12 @@ export function insertSQL(table, rows, verb = 'INSERT', logger = console) {
         }
         return set;
     }, new Set());
-    const fields = [...fieldSet];
+    const fields = Array.from(fieldSet);
     const start = [
         verb,
         `INTO`,
         mysql.escapeId(table),
-        `(` + [...fields].map(f => mysql.escapeId(mapNameToMySQL(f))).join(',') + `)`,
+        `(` + fields.map(f => mysql.escapeId(mapNameToMySQL(f))).join(',') + `)`,
         `VALUES\n`,
     ].join(' ');
     const valueRows = rows.map(rec => {

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

@@ -83,7 +83,7 @@ export function mysqlTableStatsToJsonSchemaField(table, stats, logger) {
             s.properties[name] = { type: 'number' };
         }
         else {
-            logger.log(s);
+            logger.log({ schema: s });
             throw new Error(`Unknown mysql field type ${name} ${stat.Type}`);
         }
     });

package/package.json

@@ -10,9 +10,9 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@types/node": "^24",
-    "dotenv": "^17",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "20.64.0",
+    "@types/node": "^26",
+    "typescript": "^7"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=24.10.0"
   },
-  "version": "4.8.1",
+  "version": "4.10.0",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -11,7 +11,7 @@ import { BaseCommonDB, commonDBFullSupport, CommonDBType, DBQuery } from '@natur
 import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
-import { commonLoggerPrefix } from '@naturalcycles/js-lib/log'
+import { consoleLogger } from '@naturalcycles/js-lib/log'
 import { _filterUndefinedValues, _mapKeys, _mapValues, _omit } from '@naturalcycles/js-lib/object'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
@@ -58,7 +58,7 @@ export interface MysqlDBCfg extends PoolConfig {
   debugConnections?: boolean
 
   /**
-   * Default to `console`
+   * Default to `consoleLogger`
    */
   logger?: CommonLogger
 }
@@ -106,7 +106,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
       // password: MYSQL_PW,
       // database: MYSQL_DB,
       ...cfg,
-      logger: commonLoggerPrefix(cfg.logger || console, '[mysql]'),
+      logger: (cfg.logger || consoleLogger).child({ module: 'mysql' }),
     }
   }
 
@@ -182,7 +182,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     }
 
     con.on('error', err => {
-      this.cfg.logger.error(`createSingleConnection(${threadId}).error`, err)
+      this.cfg.logger.error({ msg: `createSingleConnection(${threadId}).error`, err })
     })
 
     return con
@@ -232,7 +232,9 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
   }
 
   async runSQL<RESULT>(q: QueryOptions): Promise<RESULT> {
-    if (this.cfg.logSQL) this.cfg.logger.log(...[q.sql, q.values].filter(Boolean))
+    if (this.cfg.logSQL) {
+      this.cfg.logger.log(_filterUndefinedValues({ msg: q.sql, values: q.values }))
+    }
 
     return await new Promise<RESULT>((resolve, reject) => {
       this.pool().query(q, (err, res) => {

package/src/query.util.ts

@@ -1,5 +1,6 @@
 import type { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import { _hb } from '@naturalcycles/js-lib'
+import { consoleLogger } from '@naturalcycles/js-lib/log'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import type { AnyObjectWithId } from '@naturalcycles/js-lib/types'
 import { white, yellow } from '@naturalcycles/nodejs-lib/colors'
@@ -55,7 +56,7 @@ export function insertSQL(
   table: string,
   rows: Record<any, any>[],
   verb: 'INSERT' | 'REPLACE' = 'INSERT',
-  logger: CommonLogger = console,
+  logger: CommonLogger = consoleLogger,
 ): string[] {
   // INSERT INTO table_name (column1, column2, column3, ...)
   // VALUES (value1, value2, value3, ...);
@@ -67,13 +68,13 @@ export function insertSQL(
     }
     return set
   }, new Set<string>())
-  const fields = [...fieldSet]
+  const fields = Array.from(fieldSet)
 
   const start = [
     verb,
     `INTO`,
     mysql.escapeId(table),
-    `(` + [...fields].map(f => mysql.escapeId(mapNameToMySQL(f))).join(',') + `)`,
+    `(` + fields.map(f => mysql.escapeId(mapNameToMySQL(f))).join(',') + `)`,
     `VALUES\n`,
   ].join(' ')
 

package/src/schema/mysql.schema.util.ts

@@ -96,17 +96,17 @@ export function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(
     }
 
     if (t.includes('text') || t.includes('char')) {
-      s.properties![name] = { type: 'string' } as JsonSchema<T[keyof T]>
+      s.properties![name] = { type: 'string' }
     } else if (t.includes('lob')) {
       s.properties![name] = { instanceof: 'Buffer' }
     } else if (t.startsWith('tinyint') || t.includes('(1)')) {
-      s.properties![name] = { type: 'boolean' } as JsonSchema<T[keyof T]>
+      s.properties![name] = { type: 'boolean' }
     } else if (t === 'int' || t.startsWith('int(')) {
-      s.properties![name] = { type: 'integer' } as JsonSchema<T[keyof T]>
+      s.properties![name] = { type: 'integer' }
     } else if (t.startsWith('float')) {
-      s.properties![name] = { type: 'number' } as JsonSchema<T[keyof T]>
+      s.properties![name] = { type: 'number' }
     } else {
-      logger.log(s)
+      logger.log({ schema: s })
       throw new Error(`Unknown mysql field type ${name as string} ${stat.Type}`)
     }
   })