@naturalcycles/mysql-lib 3.12.1 → 3.12.3

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");
@@ -75,7 +75,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 +83,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 +91,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 +163,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 +171,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));

package/dist/schema/mysql.schema.util.d.ts

@@ -1,4 +1,4 @@
-import { CommonLogger, JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib';
+import { AnyObject, CommonLogger, JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib';
 export interface MySQLTableStats {
     Field: string;
     Type: string;
@@ -14,7 +14,7 @@ export interface MySQLSchemaOptions {
  * It currently skips nullability and declares everything as "DEFAULT NULL".
  */
 export declare function jsonSchemaToMySQLDDL(table: string, schema: JsonSchemaObject<any>, opt?: MySQLSchemaOptions): string;
-export declare function mysqlTableStatsToJsonSchemaField<T = any>(table: string, stats: MySQLTableStats[], logger: CommonLogger): JsonSchemaRootObject<T>;
+export declare function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(table: string, stats: MySQLTableStats[], logger: CommonLogger): JsonSchemaRootObject<T>;
 /**
  * Because MySQL doesn't support `.` in field names and escapes them as tableName + fieldName.
  *

package/package.json

@@ -11,10 +11,10 @@
     "mysql": "^2.17.1"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^12.7.5",
-    "@types/node": "^17.0.5",
+    "@naturalcycles/dev-lib": "^13.2.1",
+    "@types/node": "^18.7.13",
     "dotenv": "^16.0.0",
-    "jest": "^28.1.0"
+    "jest": "^29.0.0"
   },
   "files": [
     "dist",
@@ -36,7 +36,7 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "version": "3.12.1",
+  "version": "3.12.3",
   "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,
@@ -325,7 +325,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/query.util.ts

@@ -1,5 +1,4 @@
-import { DBQuery } from '@naturalcycles/db-lib'
-import { DBQueryFilterOperator } from '@naturalcycles/db-lib/src/query/dbQuery'
+import { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import { _hb, CommonLogger } from '@naturalcycles/js-lib'
 import { white, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
 import { QueryOptions } from 'mysql'

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

@@ -1,4 +1,5 @@
 import {
+  AnyObject,
   CommonLogger,
   JsonSchemaBoolean,
   JsonSchemaNumber,
@@ -79,7 +80,7 @@ export function jsonSchemaToMySQLDDL(
   return lines.join('\n')
 }
 
-export function mysqlTableStatsToJsonSchemaField<T = any>(
+export function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(
   table: string,
   stats: MySQLTableStats[],
   logger: CommonLogger,
@@ -93,7 +94,7 @@ export function mysqlTableStatsToJsonSchemaField<T = any>(
   }
 
   stats.forEach(stat => {
-    const name = stat.Field
+    const name = stat.Field as keyof T
     const t = stat.Type.toLowerCase()
     const notNull = stat.Null?.toUpperCase() !== 'YES'
     if (notNull) {
@@ -112,7 +113,7 @@ export function mysqlTableStatsToJsonSchemaField<T = any>(
       s.properties[name] = { type: 'number' } as JsonSchemaNumber
     } else {
       logger.log(s)
-      throw new Error(`Unknown mysql field type ${name} ${stat.Type}`)
+      throw new Error(`Unknown mysql field type ${name as string} ${stat.Type}`)
     }
   })