baja-lite 1.4.13 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.4.13",
+  "version": "1.5.1",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -60,9 +60,9 @@
     "@types/node": "24.0.3",
     "@types/shelljs": "0.8.16",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.34.1",
-    "@typescript-eslint/parser": "8.34.1",
-    "better-sqlite3": "11.10.0",
+    "@typescript-eslint/eslint-plugin": "8.35.0",
+    "@typescript-eslint/parser": "8.35.0",
+    "better-sqlite3": "12.1.0",
     "ioredis": "5.6.1",
     "mongodb": "6.17.0",
     "mysql2": "3.14.1",

package/sql.d.ts

@@ -471,7 +471,7 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
     jsMode?: boolean;
 }
 export interface PageQuery<L> {
-    sum?: Record<string, number>;
+    sum?: Record<string, string | number>;
     total?: number;
     size?: number;
     records?: L[];
@@ -1331,6 +1331,7 @@ export declare class SqlService<T extends object> {
         pageNumber?: number;
         limitSelf?: boolean;
         countSelf?: boolean;
+        sum?: boolean;
         sumSelf?: boolean;
         sortName?: string;
         sortType?: string;
@@ -1348,6 +1349,7 @@ export declare class SqlService<T extends object> {
         pageNumber?: number;
         limitSelf?: boolean;
         countSelf?: boolean;
+        sum?: boolean;
         sumSelf?: boolean;
         sortName?: string;
         sortType?: string;

package/sql.js

@@ -2508,11 +2508,11 @@ export class SqlService {
         }
     }
     delete(option) {
-        Throw.if(!!this[_ids] && this[_ids].length > 1 && !option.where, 'muit id must set where!');
-        Throw.if((!this[_ids] || this[_ids].length === 0) && !option.where, 'if not set id on class, must set where!');
-        Throw.if(!option.id && !option.where, 'not found id or where!');
+        Throw.if(!!this[_ids] && this[_ids].length > 1 && !option.where && !option.whereSql, 'muit id must set where!');
+        Throw.if((!this[_ids] || this[_ids].length === 0) && !option.where && !option.whereSql, 'if not set id on class, must set where!');
+        Throw.if(!option.id && !option.where && !option.whereSql, 'not found id or where!');
         Throw.if(!!option.id && !!this[_ids] && this[_ids].length > 1, 'muit id must set where!');
-        Throw.if(!!option.id && !!option.where, 'id and where only one can set!');
+        Throw.if(!!option.id && !!option.where && !option.whereSql, 'id and where only one can set!');
         option.mode ?? (option.mode = DeleteMode.Common);
         const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
         const tableTempESC = tableTemp;
@@ -2945,16 +2945,17 @@ export class SqlService {
         let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ...option.params });
         let sqlSum = '';
         let sqlCount = '';
-        if (option.sumSelf) {
-            sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
-        }
-        if (option.limitSelf !== true) {
-            if (option.countSelf !== true) {
+        if (option.sum) {
+            if (option.sumSelf) {
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_sum`), { ctx: option.context, isCount: false, isSum: true, ...option.params });
             }
-            if (option.pageSize > 0) {
-                sql = `${sql} LIMIT ${option.params['limitStart']}, ${option.pageSize}`;
+            else {
+                sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
             }
         }
+        if (option.limitSelf !== true && option.pageSize > 0) {
+            sql = `${sql} LIMIT ${option.params['limitStart']}, ${option.pageSize}`;
+        }
         if (option.pageSize > 0) {
             if (option.countSelf) {
                 sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx: option.context, isCount: true, isSum: false, ...option.params });