@naturalcycles/mysql-lib 4.7.0 → 4.8.1

package/dist/mysql.db.d.ts

@@ -1,8 +1,8 @@
 import type { CommonDB, CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBSupport, RunQueryResult } 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 { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { Connection, Pool, PoolConfig, PoolConnection, QueryOptions } from 'mysql';
 export interface MysqlDBOptions extends CommonDBOptions {
@@ -68,8 +68,8 @@ export declare class MysqlDB extends BaseCommonDB implements CommonDB {
     /**
      * dropIfExists=true needed as a safety check
      */
-    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
+    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchema<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>>;
     patchByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, patch: Partial<ROW>): Promise<number>;
 }

package/dist/query.util.js

@@ -41,7 +41,7 @@ export function dbQueryToSQLDelete(q) {
 export function insertSQL(table, rows, verb = 'INSERT', logger = console) {
     // INSERT INTO table_name (column1, column2, column3, ...)
     // VALUES (value1, value2, value3, ...);
-    // eslint-disable-next-line unicorn/no-array-reduce
+    // oxlint-disable-next-line unicorn/no-array-reduce
     const fieldSet = rows.reduce((set, row) => {
         for (const field of Object.keys(row)) {
             set.add(field);

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

@@ -1,6 +1,6 @@
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { AnyObject } from '@naturalcycles/js-lib/types';
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 export interface MySQLTableStats {
     Field: string;
     Type: string;
@@ -15,8 +15,8 @@ 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 extends AnyObject = any>(table: string, stats: MySQLTableStats[], logger: CommonLogger): JsonSchemaRootObject<T>;
+export declare function jsonSchemaToMySQLDDL(table: string, schema: JsonSchema<any>, opt?: MySQLSchemaOptions): string;
+export declare function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(table: string, stats: MySQLTableStats[], logger: CommonLogger): JsonSchema<T>;
 /**
  * Because MySQL doesn't support `.` in field names and escapes them as tableName + fieldName.
  *

package/package.json

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

package/src/mysql.db.ts

@@ -10,11 +10,11 @@ import type {
 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 type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 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 type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { white } from '@naturalcycles/nodejs-lib/colors'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type {
@@ -386,7 +386,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
    */
   override async createTable<ROW extends ObjectWithId>(
     table: string,
-    schema: JsonSchemaObject<ROW>,
+    schema: JsonSchema<ROW>,
     opt: CommonDBCreateOptions = {},
   ): Promise<void> {
     if (opt.dropIfExists) await this.dropTable(table)
@@ -401,9 +401,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
       .filter(Boolean)
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
-    table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  override async getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>> {
     const stats = await this.runSQL<MySQLTableStats[]>({
       sql: `describe ${mysql.escapeId(table)}`,
     })

package/src/query.util.ts

@@ -60,7 +60,7 @@ export function insertSQL(
   // INSERT INTO table_name (column1, column2, column3, ...)
   // VALUES (value1, value2, value3, ...);
 
-  // eslint-disable-next-line unicorn/no-array-reduce
+  // oxlint-disable-next-line unicorn/no-array-reduce
   const fieldSet = rows.reduce((set: Set<string>, row) => {
     for (const field of Object.keys(row)) {
       set.add(field)

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

@@ -1,12 +1,6 @@
-import type {
-  JsonSchemaBoolean,
-  JsonSchemaNumber,
-  JsonSchemaObject,
-  JsonSchemaRootObject,
-  JsonSchemaString,
-} from '@naturalcycles/js-lib/json-schema'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import * as mysql from 'mysql'
 
 export interface MySQLTableStats {
@@ -27,14 +21,14 @@ export interface MySQLSchemaOptions {
  */
 export function jsonSchemaToMySQLDDL(
   table: string,
-  schema: JsonSchemaObject<any>,
+  schema: JsonSchema<any>,
   opt: MySQLSchemaOptions = {},
 ): string {
   const { engine = 'InnoDB' } = opt
 
   const lines: string[] = [`CREATE TABLE ${mysql.escapeId(table)} (`]
 
-  const innerLines = Object.entries(schema.properties).map(([k, s]) => {
+  const innerLines = Object.entries(schema.properties!).map(([k, s]) => {
     if (k === 'id') {
       return `id VARCHAR(255) NOT NULL`
     }
@@ -47,7 +41,7 @@ export function jsonSchemaToMySQLDDL(
     } else if (s.type === 'integer') {
       type = 'INT(11)'
     } else if (s.type === 'number') {
-      if (['unixTimestamp', 'int32'].includes((s as JsonSchemaNumber).format!)) {
+      if (['unixTimestamp', 'int32'].includes((s as JsonSchema<number>).format!)) {
         type = 'INT(11)'
       } else {
         type = 'FLOAT(11)'
@@ -84,8 +78,8 @@ export function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(
   table: string,
   stats: MySQLTableStats[],
   logger: CommonLogger,
-): JsonSchemaRootObject<T> {
-  const s: JsonSchemaRootObject<T> = {
+): JsonSchema<T> {
+  const s: JsonSchema<T> = {
     $id: `${table}.schema.json`,
     type: 'object',
     properties: {} as any,
@@ -98,19 +92,19 @@ export function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(
     const t = stat.Type.toLowerCase()
     const notNull = stat.Null?.toUpperCase() !== 'YES'
     if (notNull) {
-      s.required.push(name as any)
+      s.required!.push(name as any)
     }
 
     if (t.includes('text') || t.includes('char')) {
-      s.properties[name] = { type: 'string' } as JsonSchemaString
+      s.properties![name] = { type: 'string' } as JsonSchema<T[keyof T]>
     } else if (t.includes('lob')) {
-      s.properties[name] = { instanceof: 'Buffer' }
+      s.properties![name] = { instanceof: 'Buffer' }
     } else if (t.startsWith('tinyint') || t.includes('(1)')) {
-      s.properties[name] = { type: 'boolean' } as JsonSchemaBoolean
+      s.properties![name] = { type: 'boolean' } as JsonSchema<T[keyof T]>
     } else if (t === 'int' || t.startsWith('int(')) {
-      s.properties[name] = { type: 'integer' } as JsonSchemaNumber
+      s.properties![name] = { type: 'integer' } as JsonSchema<T[keyof T]>
     } else if (t.startsWith('float')) {
-      s.properties[name] = { type: 'number' } as JsonSchemaNumber
+      s.properties![name] = { type: 'number' } as JsonSchema<T[keyof T]>
     } else {
       logger.log(s)
       throw new Error(`Unknown mysql field type ${name as string} ${stat.Type}`)