baja-lite 1.5.25 → 1.5.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.5.25",
+  "version": "1.5.28",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -37,7 +37,7 @@
   "dependencies": {
     "@msgpack/msgpack": "3.1.2",
     "@types/request-promise": "4.1.51",
-    "axios": "1.10.0",
+    "axios": "1.11.0",
     "baja-lite-field": "1.4.13",
     "decimal.js": "10.6.0",
     "html-parse-stringify": "3.0.1",
@@ -64,8 +64,8 @@
     "@typescript-eslint/parser": "8.36.0",
     "better-sqlite3": "12.2.0",
     "ioredis": "5.6.1",
-    "mongodb": "6.17.0",
-    "mysql2": "3.14.1",
+    "mongodb": "6.18.0",
+    "mysql2": "3.14.2",
     "pg": "8.16.3",
     "pg-pool": "3.10.1",
     "redlock": "5.0.0-beta.2",

package/sql.d.ts

@@ -57,10 +57,14 @@ export declare enum InsertMode {
     2. 临时表的结构复制正式表
      */
     InsertWithTempTable = 1,
+    /**
+     * 如果不存在则插入
+     * 来源是数据库，根据ID或者指定字段查询
+     */
     InsertIfNotExists = 2,
     /**
     # 插入或者更新
-    1. 判断依据是主键
+    1. 判断依据是主键,来源是从数据库查询
      */
     Replace = 3
 }

package/sql.js

@@ -23,6 +23,7 @@ import { Throw } from './error.js';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
 import { add, calc, ten2Any } from './math.js';
 import { C2P, C2P2, P2C } from './object.js';
+import { snowflake } from './snowflake.js';
 import { emptyString } from './string.js';
 const iterate = ite.iterate;
 BigInt.prototype.toJSON = function () { return this.toString(); };
@@ -129,10 +130,14 @@ export var InsertMode;
     2. 临时表的结构复制正式表
      */
     InsertMode[InsertMode["InsertWithTempTable"] = 1] = "InsertWithTempTable";
+    /**
+     * 如果不存在则插入
+     * 来源是数据库，根据ID或者指定字段查询
+     */
     InsertMode[InsertMode["InsertIfNotExists"] = 2] = "InsertIfNotExists";
     /**
     # 插入或者更新
-    1. 判断依据是主键
+    1. 判断依据是主键,来源是从数据库查询
      */
     InsertMode[InsertMode["Replace"] = 3] = "Replace";
 })(InsertMode || (InsertMode = {}));
@@ -944,6 +949,28 @@ export class Sqlite {
             PRIMARY KEY ( ______tableName )
             );
         `);
+        this[_daoDB].function('UUID_SHORT', { deterministic: false }, () => snowflake.generate());
+        this[_daoDB].function('UUID', { deterministic: false }, () => snowflake.generate());
+        this[_daoDB].function('TIME_TO_SEC', { deterministic: true }, (time) => time.split(':').map((v, i) => parseInt(v) * (i > 0 ? 1 : 60)).reduce((a, b) => a + b, 0));
+        this[_daoDB].function('IF', { deterministic: true }, (condition, v1, v2) => condition ? v1 : v2);
+        this[_daoDB].function('RIGHT', { deterministic: true }, (src, p) => src.slice(p * -1));
+        this[_daoDB].function('LEFT', { deterministic: true }, (str, len) => str?.substring(0, len) || null);
+        this[_daoDB].function('NOW', { deterministic: false }, () => new Date().toISOString().slice(0, 19).replace('T', ' '));
+        this[_daoDB].function('CURDATE', { deterministic: false }, () => new Date().toISOString().split('T')[0]);
+        this[_daoDB].function('DATE_FORMAT', { deterministic: true }, (dateStr, format) => {
+            const date = new Date(dateStr);
+            return format
+                .replace('%Y', date.getFullYear().toString())
+                .replace('%m', (date.getMonth() + 1).toString().padStart(2, '0'))
+                .replace('%d', date.getDate().toString().padStart(2, '0'))
+                .replace('%H', date.getHours().toString().padStart(2, '0'))
+                .replace('%i', date.getMinutes().toString().padStart(2, '0'))
+                .replace('%s', date.getSeconds().toString().padStart(2, '0'));
+        });
+        this[_daoDB].function('RAND', { deterministic: false }, () => Math.random());
+        this[_daoDB].function('UNIX_TIMESTAMP', { deterministic: false }, (dateStr) => dateStr
+            ? Math.floor(new Date(dateStr).getTime() / 1000)
+            : Math.floor(Date.now() / 1000));
     }
     createConnection(sync) {
         if (sync === SyncMode.Async) {
@@ -2862,13 +2889,13 @@ export class SqlService {
         const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.query(SyncMode.Sync, sql, params);
-            return result.map(item => this._select(option.selectResult, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
+            return result.map(item => this._select(option.selectResult, item, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
         }
         else {
             return new Promise(async (resolve, reject) => {
                 try {
                     const result = await option.conn.query(SyncMode.Async, sql, params);
-                    resolve(result.map(item => this._select(option.selectResult, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
+                    resolve(result.map(item => this._select(option.selectResult, item, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
                 }
                 catch (error) {
                     reject(error);
@@ -3975,10 +4002,10 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} t SET ${sets.join(',')}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
             ${where ? ' WHERE ' : ''}
             ${where}
-            `;
+            `.replace(/t\./g, '');
             if (option.sync === SyncMode.Async) {
                 return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
             }
@@ -3994,10 +4021,10 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]} t
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
-        `;
+        `.replace(/t\./g, '');
         // if (option.sync === SyncMode.Async) {
         //     return this._service.delete({ ...option, sync: SyncMode.Async, whereSql: where, whereParams: params });
         // } else {

package/sqlite.js

@@ -1,6 +1,7 @@
-import { extensionCodec, logger } from './sql.js';
+import { decode, encode } from "@msgpack/msgpack";
 import Sqlstring from 'sqlstring';
-import { encode, decode } from "@msgpack/msgpack";
+import { snowflake } from './snowflake.js';
+import { extensionCodec, logger } from './sql.js';
 export class SqliteRemoteClass {
     constructor() {
         this.dbList = {};
@@ -131,6 +132,28 @@ export class SqliteRemoteClass {
                 PRIMARY KEY ( ______tableName )
                 );
             `);
+            this.dbList[dbName].function('UUID_SHORT', { deterministic: false }, () => snowflake.generate());
+            this.dbList[dbName].function('UUID', { deterministic: false }, () => snowflake.generate());
+            this.dbList[dbName].function('TIME_TO_SEC', { deterministic: true }, (time) => time.split(':').map((v, i) => parseInt(v) * (i > 0 ? 1 : 60)).reduce((a, b) => a + b, 0));
+            this.dbList[dbName].function('IF', { deterministic: true }, (condition, v1, v2) => condition ? v1 : v2);
+            this.dbList[dbName].function('RIGHT', { deterministic: true }, (src, p) => src.slice(p * -1));
+            this.dbList[dbName].function('LEFT', { deterministic: true }, (str, len) => str?.substring(0, len) || null);
+            this.dbList[dbName].function('NOW', { deterministic: false }, () => new Date().toISOString().slice(0, 19).replace('T', ' '));
+            this.dbList[dbName].function('CURDATE', { deterministic: false }, () => new Date().toISOString().split('T')[0]);
+            this.dbList[dbName].function('DATE_FORMAT', { deterministic: true }, (dateStr, format) => {
+                const date = new Date(dateStr);
+                return format
+                    .replace('%Y', date.getFullYear().toString())
+                    .replace('%m', (date.getMonth() + 1).toString().padStart(2, '0'))
+                    .replace('%d', date.getDate().toString().padStart(2, '0'))
+                    .replace('%H', date.getHours().toString().padStart(2, '0'))
+                    .replace('%i', date.getMinutes().toString().padStart(2, '0'))
+                    .replace('%s', date.getSeconds().toString().padStart(2, '0'));
+            });
+            this.dbList[dbName].function('RAND', { deterministic: false }, () => Math.random());
+            this.dbList[dbName].function('UNIX_TIMESTAMP', { deterministic: false }, (dateStr) => dateStr
+                ? Math.floor(new Date(dateStr).getTime() / 1000)
+                : Math.floor(Date.now() / 1000));
         }
     }
     async export(dbName, exportPath) {